Merge branch '1.11.x'

jonatan-ivanov · Sep 20, 2023 · f267eeb · f267eeb
2 parents 8d18d8c + c024548
commit f267eeb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/...e/src/main/java/io/micrometer/core/instrument/kotlin/KotlinObservationContextElement.java b/...e/src/main/java/io/micrometer/core/instrument/kotlin/KotlinObservationContextElement.java
@@ -19,6 +19,7 @@
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.context.ContextRegistry;
 import io.micrometer.context.ContextSnapshot;
+import io.micrometer.context.ContextSnapshotFactory;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
@@ -41,8 +42,11 @@ class KotlinObservationContextElement implements ThreadContextElement<ContextSna
 
     KotlinObservationContextElement(ObservationRegistry observationRegistry, ContextRegistry contextRegistry) {
         this.observationRegistry = observationRegistry;
-        this.contextSnapshot = ContextSnapshot.captureAllUsing(ObservationThreadLocalAccessor.KEY::equals,
-                contextRegistry);
+        this.contextSnapshot = ContextSnapshotFactory.builder()
+            .captureKeyPredicate(ObservationThreadLocalAccessor.KEY::equals)
+            .contextRegistry(contextRegistry)
+            .build()
+            .captureAll();
     }
 
     @Override

diff --git a/micrometer-observation/src/test/java/io/micrometer/observation/aop/ObservedAspectTests.java b/micrometer-observation/src/test/java/io/micrometer/observation/aop/ObservedAspectTests.java
@@ -20,6 +20,7 @@
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.context.ContextRegistry;
 import io.micrometer.context.ContextSnapshot;
+import io.micrometer.context.ContextSnapshotFactory;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.ObservationTextPublisher;
@@ -351,7 +352,11 @@ void error() {
         @Observed(name = "test.async")
         CompletableFuture<String> async(FakeAsyncTask fakeAsyncTask) {
             System.out.println("async");
-            ContextSnapshot contextSnapshot = ContextSnapshot.captureAllUsing(o -> true, ContextRegistry.getInstance());
+            ContextSnapshot contextSnapshot = ContextSnapshotFactory.builder()
+                .captureKeyPredicate(key -> true)
+                .contextRegistry(ContextRegistry.getInstance())
+                .build()
+                .captureAll();
             return CompletableFuture.supplyAsync(fakeAsyncTask,
                     contextSnapshot.wrapExecutor(Executors.newSingleThreadExecutor()));
         }
@@ -373,7 +378,11 @@ void error() {
 
         CompletableFuture<String> async(FakeAsyncTask fakeAsyncTask) {
             System.out.println("async");
-            ContextSnapshot contextSnapshot = ContextSnapshot.captureAllUsing(o -> true, ContextRegistry.getInstance());
+            ContextSnapshot contextSnapshot = ContextSnapshotFactory.builder()
+                .captureKeyPredicate(key -> true)
+                .contextRegistry(ContextRegistry.getInstance())
+                .build()
+                .captureAll();
             return CompletableFuture.supplyAsync(fakeAsyncTask,
                     contextSnapshot.wrapExecutor(Executors.newSingleThreadExecutor()));
         }

diff --git a/...ava/io/micrometer/observation/contextpropagation/ObservationThreadLocalAccessorTests.java b/...ava/io/micrometer/observation/contextpropagation/ObservationThreadLocalAccessorTests.java
@@ -107,7 +107,11 @@ void capturedThreadLocalValuesShouldBeCapturedRestoredAndCleared()
             try (Observation.Scope scope2 = child.openScope()) {
                 thenCurrentObservationHasParent(parent, child);
                 then(child.getEnclosingScope()).isSameAs(scope2);
-                container = ContextSnapshot.captureAllUsing(key -> true, registry);
+                container = ContextSnapshotFactory.builder()
+                    .captureKeyPredicate(key -> true)
+                    .contextRegistry(registry)
+                    .build()
+                    .captureAll();
             }
         }