Make Observation#getContext() return Context

micrometer-metrics · Sep 19, 2022 · 9b20ca5 · 9b20ca5
1 parent 5f46c63
commit 9b20ca5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/NoopObservation.java b/micrometer-observation/src/main/java/io/micrometer/observation/NoopObservation.java
@@ -33,7 +33,7 @@ final class NoopObservation implements Observation {
      */
     static final NoopObservation INSTANCE = new NoopObservation();
 
-    private static final ContextView CONTEXT = new Context();
+    private static final Context CONTEXT = new Context();
 
     private NoopObservation() {
     }
@@ -89,7 +89,7 @@ public Observation start() {
     }
 
     @Override
-    public ContextView getContext() {
+    public Context getContext() {
         return CONTEXT;
     }
 

diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java b/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java
@@ -356,10 +356,12 @@ default boolean isNoop() {
     Observation start();
 
     /**
-     * Returns the context attached to this observation.
+     * Returns the context attached to this observation. This returns a mutable
+     * {@link Context} for this observation. However, it is strongly discouraged to modify
+     * the {@link Context} in the <em>parent observation</em>.
      * @return corresponding context
      */
-    ContextView getContext();
+    Context getContext();
 
     /**
      * Stop the observation. Remember to call this method, otherwise timing calculations

diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java b/micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java
@@ -145,7 +145,7 @@ public Observation start() {
     }
 
     @Override
-    public ContextView getContext() {
+    public Context getContext() {
         return this.context;
     }