Merge branch '1.11.x'

jonatan-ivanov · Sep 23, 2023 · fb4a726 · fb4a726
2 parents 80c20e1 + e50fe21
commit fb4a726
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/NoopObservationRegistry.java b/micrometer-observation/src/main/java/io/micrometer/observation/NoopObservationRegistry.java
@@ -26,16 +26,11 @@
  */
 final class NoopObservationRegistry implements ObservationRegistry {
 
-    /**
-     * Instance of {@link NoopObservationRegistry}.
-     */
-    static final NoopObservationRegistry INSTANCE = new NoopObservationRegistry();
-
     static final ObservationRegistry FOR_SCOPES = ObservationRegistry.create();
 
     private final ObservationConfig observationConfig = NoopObservationConfig.INSTANCE;
 
-    private NoopObservationRegistry() {
+    NoopObservationRegistry() {
     }
 
     @Override

diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/ObservationRegistry.java b/micrometer-observation/src/main/java/io/micrometer/observation/ObservationRegistry.java
@@ -45,7 +45,7 @@ static ObservationRegistry create() {
     /**
      * No-op implementation of {@link ObservationRegistry}.
      */
-    ObservationRegistry NOOP = NoopObservationRegistry.INSTANCE;
+    ObservationRegistry NOOP = new NoopObservationRegistry();
 
     /**
      * When previously set will allow to retrieve the {@link Observation} at any point in

diff --git a/micrometer-observation/src/test/java/io/micrometer/observation/ObservationTests.java b/micrometer-observation/src/test/java/io/micrometer/observation/ObservationTests.java
@@ -397,12 +397,12 @@ void observeWithFunction() {
             }
         };
         AtomicReference<Context> passedContextHolder = new AtomicReference<>();
-        result = Observation.createNotStarted("service", supplier, NoopObservationRegistry.INSTANCE)
+        result = Observation.createNotStarted("service", supplier, ObservationRegistry.NOOP)
             .observeWithContext((ctx) -> {
                 passedContextHolder.set(ctx);
                 return "World";
             });
-        assertThat(passedContextHolder).as("passed a noop context").hasValue(NoopObservation.NOOP.getContext());
+        assertThat(passedContextHolder).as("passed a noop context").hasValue(Observation.NOOP.getContext());
         assertThat(contextCreated).isFalse();
         assertThat(result).isEqualTo("World");
     }