Cherry pick v1.7 into master
This commit is contained in:
parent
a09dfa3ce1
commit
b6498cdcbc
73 changed files with 6573 additions and 186 deletions
4
vendor/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/internal/globaltracer.go
generated
vendored
4
vendor/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/internal/globaltracer.go
generated
vendored
|
@ -15,6 +15,10 @@ var (
|
|||
func SetGlobalTracer(t ddtrace.Tracer) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if !Testing {
|
||||
// avoid infinite loop when calling (*mocktracer.Tracer).Stop
|
||||
globalTracer.Stop()
|
||||
}
|
||||
globalTracer = t
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue