ddtrace/mocktracer: reset global tracer on Stop

DataDog · Mar 20, 2024 · 390dd0b · 390dd0b
1 parent 7a9629a
commit 390dd0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ddtrace/internal/globaltracer.go b/ddtrace/internal/globaltracer.go
@@ -28,7 +28,7 @@ func SetGlobalTracer(t ddtrace.Tracer) {
 // GetGlobalTracer returns the currently active tracer.
 func GetGlobalTracer() ddtrace.Tracer {
 	gt := globalTracer.Load()
-	if gt != nil {
+	if gt != nil && gt.(*TracerV2Adapter) != nil {
 		return *(gt.(*TracerV2Adapter))
 	}
 	tr := v2.GetGlobalTracer()
@@ -37,6 +37,10 @@ func GetGlobalTracer() ddtrace.Tracer {
 	return t
 }
 
+func ResetGlobalTracer() {
+	globalTracer.Swap((*TracerV2Adapter)(nil))
+}
+
 var NoopTracerV2 = TracerV2Adapter{Tracer: v2.NoopTracer{}}
 
 var _ ddtrace.Span = (*NoopSpan)(nil)

diff --git a/ddtrace/mocktracer/mocktracer.go b/ddtrace/mocktracer/mocktracer.go
@@ -16,6 +16,7 @@ import (
 	"sync/atomic"
 
 	v2 "github.com/DataDog/dd-trace-go/v2/ddtrace/mocktracer"
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/datastreams"
 )
 
@@ -92,6 +93,7 @@ func (mta *mocktracerV2Adapter) SentDSMBacklogs() []datastreams.Backlog {
 func (mta *mocktracerV2Adapter) Stop() {
 	mta.tracer.Stop()
 	mta.tracer = nil
+	internal.ResetGlobalTracer()
 	setActive(false)
 }