From 3ca7996db3d90b340c84abd62888b49a698ea0ba Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Mon, 18 Aug 2025 03:35:54 -0700 Subject: [PATCH] Use `t.Cleanup` instead of `defer` in `stdouttrace` (#7204) Let the testing system ensure proper cleanup ordering and execution. --- exporters/stdout/stdouttrace/trace_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/stdout/stdouttrace/trace_test.go b/exporters/stdout/stdouttrace/trace_test.go index 3a41401a7..3be90a5ff 100644 --- a/exporters/stdout/stdouttrace/trace_test.go +++ b/exporters/stdout/stdouttrace/trace_test.go @@ -215,7 +215,7 @@ func expectedJSON(now time.Time) string { func TestExporterShutdownIgnoresContext(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute) - defer cancel() + t.Cleanup(cancel) e, err := stdouttrace.New() if err != nil { @@ -453,7 +453,7 @@ func TestSelfObservability(t *testing.T) { } original := otel.GetMeterProvider() - defer otel.SetMeterProvider(original) + t.Cleanup(func() { otel.SetMeterProvider(original) }) r := metric.NewManualReader() mp := metric.NewMeterProvider(metric.WithReader(r))