Merge branch '1.0.x' into 1.1.x

micrometer-tracing-tests/micrometer-tracing-test/src/test/java/io/micrometer/tracing/contextpropagation/TestObservationAwareSpanThreadLocalAccessor.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 VMware, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micrometer.tracing.contextpropagation;
+
+import java.util.Map;
+
+import io.micrometer.tracing.contextpropagation.ObservationAwareSpanThreadLocalAccessor.SpanAction;
+
+public class TestObservationAwareSpanThreadLocalAccessor {
+
+    public static Map<Thread, SpanAction> spanActions(ObservationAwareSpanThreadLocalAccessor accessor) {
+        return accessor.spanActions;
+    }
+
+}

micrometer-tracing-tests/micrometer-tracing-test/src/test/java/io/micrometer/tracing/test/contextpropagation/ObservationAwareSpanThreadLocalAccessorTests.java

@@ -23,6 +23,7 @@
 import io.micrometer.tracing.Span;
 import io.micrometer.tracing.Tracer;
 import io.micrometer.tracing.contextpropagation.ObservationAwareSpanThreadLocalAccessor;
+import io.micrometer.tracing.contextpropagation.TestObservationAwareSpanThreadLocalAccessor;
 import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
 import io.micrometer.tracing.test.simple.SimpleSpan;
 import io.micrometer.tracing.test.simple.SimpleTracer;
@@ -64,6 +65,7 @@ void close() {
         executorService.shutdown();
         then(tracer.currentSpan()).isNull();
         then(observationRegistry.getCurrentObservationScope()).isNull();
+        then(TestObservationAwareSpanThreadLocalAccessor.spanActions(accessor)).isEmpty();
     }
 
     @Test