ObservationAwareBaggageThreadLocalAccessor loses scopes in the wrong order

fixed via changing the scope closing order

fixes gh-579, gh-635

Author: marcingrzejszczak

micrometer-tracing-tests/micrometer-tracing-integration-test/src/test/java/io/micrometer/tracing/contextpropagation/TestObservationAwareBaggageThreadLocalAccessor.java

@@ -0,0 +1,24 @@
+/*
+ * 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;
+
+public class TestObservationAwareBaggageThreadLocalAccessor {
+
+    public static void closeCurrentScope(ObservationAwareBaggageThreadLocalAccessor accessor) {
+        accessor.closeCurrentScope();
+    }
+
+}

micrometer-tracing-tests/micrometer-tracing-integration-test/src/test/java/io/micrometer/tracing/test/contextpropagation/AbstractObservationAwareSpanThreadLocalAccessorTests.java

@@ -376,6 +376,23 @@ void onlyReactorPropagatesBaggageWithContextCaptureAndObservation() {
         assertThat(tenant).isEqualTo("tenantValue");
     }
 
+    @Test
+    void observationAwareBaggageThreadLocalAccessorSetsAndClosesBaggageToPropagate() {
+        then(getTracer().currentTraceContext().context()).isNull();
+
+        Observation.createNotStarted("First span", observationRegistry).observeChecked(() -> {
+            then(getTracer().currentTraceContext().context()).isNotNull();
+
+            BaggageToPropagate baggageToPropagate = new BaggageToPropagate("tenant", "tenantValue", "tenant2",
+                    "tenant2Value");
+            observationAwareBaggageThreadLocalAccessor.setValue(baggageToPropagate);
+            TestObservationAwareBaggageThreadLocalAccessor
+                .closeCurrentScope(observationAwareBaggageThreadLocalAccessor);
+        });
+
+        then(getTracer().currentTraceContext().context()).isNull();
+    }
+
     private String asyncCall() {
         logWithSpan("TASK EXECUTOR");
         if (getTracer().currentSpan() == null) {

micrometer-tracing/src/main/java/io/micrometer/tracing/contextpropagation/ObservationAwareBaggageThreadLocalAccessor.java

@@ -162,7 +162,7 @@ private static BaggageAndScope baggageScopeClosingScope(Entry<String, String> en
         if (scope == null) {
             return scopeClosingBaggageAndScope(entry, baggage);
         }
-        return scope.andThen(scopeClosingBaggageAndScope(entry, baggage));
+        return scopeClosingBaggageAndScope(entry, baggage).andThen(scope);
     }
 
     private static BaggageAndScope scopeClosingBaggageAndScope(Entry<String, String> entry, BaggageInScope baggage) {
@@ -212,7 +212,7 @@ private BaggageAndScope scopeRestoringBaggageAndScope(BaggageAndScope currentSco
         });
     }
 
-    private void closeCurrentScope() {
+    void closeCurrentScope() {
         BaggageAndScope scope = baggageInScope.get(Thread.currentThread());
         if (log.isTraceEnabled()) {
             log.trace("Before close scope [" + scope + "]");