Merge branch '1.0.x'

Author: marcingrzejszczak

micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/handler/DefaultTracingObservationHandlerBraveTests.java

@@ -18,6 +18,7 @@
 import brave.Tracing;
 import brave.handler.MutableSpan;
 import brave.test.TestSpanHandler;
+import io.micrometer.context.ContextSnapshot;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.Observation.Event;
 import io.micrometer.observation.ObservationRegistry;
@@ -38,6 +39,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.BDDAssertions.then;
@@ -189,6 +191,32 @@ void should_put_and_remove_trace_from_thread_local_on_scope_change_for_the_same_
         then(tracer.currentSpan()).isNull();
     }
 
+    @Test
+    void should_not_break_when_dealing_with_threads() throws InterruptedException {
+        ObservationRegistry registry = ObservationRegistry.create();
+        registry.observationConfig().observationHandler(handler);
+
+        Observation parent = Observation.start("parent", registry);
+        Span parentSpan = getSpanFromObservation(parent);
+
+        then(parentSpan).isNotNull();
+
+        try (Observation.Scope scope = parent.openScope()) {
+            then(tracer.currentSpan()).isEqualTo(parentSpan);
+            AtomicReference<Span> span = new AtomicReference<>();
+            new Thread(ContextSnapshot.captureAll().wrap(() -> {
+                span.set(tracer.currentSpan());
+            })).start();
+
+            Thread.sleep(100);
+
+            then(span.get()).isEqualTo(parentSpan);
+            then(tracer.currentSpan()).isEqualTo(parentSpan);
+        }
+
+        then(tracer.currentSpan()).isNull();
+    }
+
     private static Span getSpanFromObservation(Observation parent) {
         TracingObservationHandler.TracingContext tracingContext = parent.getContextView().getOrDefault(
                 TracingObservationHandler.TracingContext.class, new TracingObservationHandler.TracingContext());

micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/handler/DefaultTracingObservationHandlerOtelTests.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.tracing.otel.handler;
 
+import io.micrometer.context.ContextSnapshot;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.Observation.Event;
 import io.micrometer.observation.ObservationRegistry;
@@ -41,6 +42,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.BDDAssertions.then;
@@ -208,6 +210,32 @@ void should_signal_events() {
         then(data.getEvents()).hasSize(1).element(0).extracting(EventData::getName).isEqualTo("bar");
     }
 
+    @Test
+    void should_not_break_when_dealing_with_threads() throws InterruptedException {
+        ObservationRegistry registry = ObservationRegistry.create();
+        registry.observationConfig().observationHandler(handler);
+
+        Observation parent = Observation.start("parent", registry);
+        Span parentSpan = getSpanFromObservation(parent);
+
+        then(parentSpan).isNotNull();
+
+        try (Observation.Scope scope = parent.openScope()) {
+            then(tracer.currentSpan()).isEqualTo(parentSpan);
+            AtomicReference<Span> span = new AtomicReference<>();
+            new Thread(ContextSnapshot.captureAll().wrap(() -> {
+                span.set(tracer.currentSpan());
+            })).start();
+
+            Thread.sleep(100);
+
+            then(span.get()).isEqualTo(parentSpan);
+            then(tracer.currentSpan()).isEqualTo(parentSpan);
+        }
+
+        then(tracer.currentSpan()).isNull();
+    }
+
     private SpanData takeOnlySpan() {
         Queue<SpanData> spans = testSpanProcessor.spans();
         then(spans).hasSize(1);

micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java

@@ -28,6 +28,9 @@
 import io.micrometer.tracing.Tracer;
 import io.micrometer.tracing.internal.SpanNameUtil;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * Marker interface for tracing handlers.
  *
@@ -180,7 +183,7 @@ class TracingContext {
 
         private Span span;
 
-        private CurrentTraceContext.Scope scope;
+        Map<Thread, CurrentTraceContext.Scope> scopes = new ConcurrentHashMap<>();
 
         /**
          * Returns the span.
@@ -203,15 +206,20 @@ public void setSpan(Span span) {
          * @return scope of the span
          */
         public CurrentTraceContext.Scope getScope() {
-            return this.scope;
+            return this.scopes.get(Thread.currentThread());
         }
 
         /**
          * Sets the current trace context scope.
          * @param scope scope to set
          */
         public void setScope(CurrentTraceContext.Scope scope) {
-            this.scope = scope;
+            if (scope == null) {
+                this.scopes.remove(Thread.currentThread());
+            }
+            else {
+                this.scopes.put(Thread.currentThread(), scope);
+            }
         }
 
         /**
@@ -226,7 +234,7 @@ public void setSpanAndScope(Span span, CurrentTraceContext.Scope scope) {
 
         @Override
         public String toString() {
-            return "TracingContext{" + "span=" + span + ", scope=" + scope + '}';
+            return "TracingContext{" + "span=" + span + ", scope=" + scopes + '}';
         }
 
     }