Fix tests

open-telemetry · Jan 8, 2021 · 213311d · 213311d
1 parent 8bd9fcc
commit 213311d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go
@@ -132,8 +132,10 @@ func (bsp *BatchSpanProcessor) Shutdown(ctx context.Context) error {
 		go func() {
 			close(bsp.stopCh)
 			bsp.stopWait.Wait()
-			if err := bsp.e.Shutdown(ctx); err != nil {
-				otel.Handle(err)
+			if bsp.e != nil {
+				if err := bsp.e.Shutdown(ctx); err != nil {
+					otel.Handle(err)
+				}
 			}
 			close(wait)
 		}()

diff --git a/sdk/trace/batch_span_processor_test.go b/sdk/trace/batch_span_processor_test.go
@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.opentelemetry.io/otel/trace"
 
 	export "go.opentelemetry.io/otel/sdk/export/trace"