Reuses OTel and Brave's "null scopes"

without this change we're trying to clear thread locals and scopes by iterating over all scopes with this change we always add a scope (either from a span or a null-span scope if there's no span). That way we don't mess up the scope hierarchy
micrometer-metrics · May 11, 2023 · b133055 · b133055
1 parent a73e919
commit b133055
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 540 deletions.
diff --git a/micrometer-tracing-bom/gradle.lockfile b/micrometer-tracing-bom/gradle.lockfile
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile
diff --git a/...idge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveCurrentTraceContext.java b/...idge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveCurrentTraceContext.java
@@ -15,7 +15,6 @@
  */
 package io.micrometer.tracing.brave.bridge;
 
-import brave.propagation.ThreadLocalCurrentTraceContext;
 import io.micrometer.tracing.CurrentTraceContext;
 import io.micrometer.tracing.TraceContext;
 
@@ -76,10 +75,6 @@ public Scope newScope(TraceContext context) {
 
     @Override
     public Scope maybeScope(TraceContext context) {
-        if (context == null && delegate instanceof ThreadLocalCurrentTraceContext) {
-            ((ThreadLocalCurrentTraceContext) delegate).clear();
-            return Scope.NOOP;
-        }
         return new BraveScope(
                 this.delegate.maybeScope(io.micrometer.tracing.brave.bridge.BraveTraceContext.toBrave(context)));
     }