batchSpanProcessor.ForceFlush noop when ctx is canceled

open-telemetry · Jul 26, 2023 · 1533304 · 1533304
1 parent 0c8d9fa
commit 1533304
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go
@@ -187,6 +187,11 @@ func (f forceFlushSpan) SpanContext() trace.SpanContext {
 
 // ForceFlush exports all ended spans that have not yet been exported.
 func (bsp *batchSpanProcessor) ForceFlush(ctx context.Context) error {
+	// Interrupt if context is already canceled.
+	if err := ctx.Err(); err != nil {
+		return err
+	}
+
 	// Do nothing after Shutdown.
 	if bsp.stopped.Load() {
 		return nil