From 3b78786fa1eea7ae39d86d9841e2ea1c896f9529 Mon Sep 17 00:00:00 2001 From: Sam Xie Date: Tue, 23 Apr 2024 18:24:23 -0700 Subject: [PATCH 1/2] Fix flaky test `TestBufferExporter/Shutdown/ContextCancelled` --- sdk/log/exporter_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/log/exporter_test.go b/sdk/log/exporter_test.go index 264abc3a513..a57c9e87a1a 100644 --- a/sdk/log/exporter_test.go +++ b/sdk/log/exporter_test.go @@ -386,6 +386,9 @@ func TestBufferExporter(t *testing.T) { t.Cleanup(func() { close(trigger) }) e := newBufferExporter(exp, 1) + // Make sure there is something to flush. + require.True(t, e.EnqueueExport(make([]Record, 1))) + ctx, cancel := context.WithCancel(context.Background()) cancel() From 706a764edd8a110ae81e5155f96bfb6e3ad9251a Mon Sep 17 00:00:00 2001 From: Sam Xie Date: Thu, 25 Apr 2024 00:03:08 -0700 Subject: [PATCH 2/2] Discard error logs --- sdk/log/exporter_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/log/exporter_test.go b/sdk/log/exporter_test.go index a57c9e87a1a..eb90dbec82d 100644 --- a/sdk/log/exporter_test.go +++ b/sdk/log/exporter_test.go @@ -378,6 +378,13 @@ func TestBufferExporter(t *testing.T) { }) t.Run("ContextCancelled", func(t *testing.T) { + // Discard error logs. + defer func(orig otel.ErrorHandler) { + otel.SetErrorHandler(orig) + }(otel.GetErrorHandler()) + handler := otel.ErrorHandlerFunc(func(err error) {}) + otel.SetErrorHandler(handler) + exp := newTestExporter(assert.AnError) t.Cleanup(exp.Stop)