Remove NoopObservationRegistry.INSTANCE

This breaks the circular reference between NoopObservationRegistry and ObservationRegistry through ObservationRegistry.NOOP. Closes micrometer-metricsgh-4096 Co-authored-by: Tadaya Tsuyukubo <[email protected]>
jonatan-ivanov · Sep 23, 2023 · b368729 · b368729
1 parent a8f078d
commit b368729
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 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