Adapts to ObservationConvention location change (#1071)

Author: violetagg

rsocket-examples/src/test/java/io/rsocket/integration/observation/ObservationIntegrationTest.java

@@ -69,7 +69,7 @@ public class ObservationIntegrationTest extends SampleTestRunner {
   private final RSocketInterceptor responderInterceptor;
 
   ObservationIntegrationTest() {
-    super(SampleRunnerConfig.builder().build(), observationRegistry, registry);
+    super(SampleRunnerConfig.builder().build());
     requesterInterceptor =
         reactiveSocket -> new ObservationRequesterRSocketProxy(reactiveSocket, observationRegistry);
 
@@ -233,4 +233,14 @@ public Mono<Void> fireAndForget(Payload payload) {
       // @formatter:on
     };
   }
+
+  @Override
+  protected MeterRegistry getMeterRegistry() {
+    return registry;
+  }
+
+  @Override
+  protected ObservationRegistry getObservationRegistry() {
+    return observationRegistry;
+  }
 }

rsocket-micrometer/src/main/java/io/rsocket/micrometer/observation/RSocketDocumentedObservation.java

@@ -18,14 +18,15 @@
 
 import io.micrometer.common.docs.KeyName;
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.docs.DocumentedObservation;
 
 enum RSocketDocumentedObservation implements DocumentedObservation {
 
   /** Observation created on the RSocket responder side. */
   RSOCKET_RESPONDER {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketResponderObservationConvention.class;
     }
@@ -34,7 +35,7 @@ enum RSocketDocumentedObservation implements DocumentedObservation {
   /** Observation created on the RSocket requester side for Fire and Forget frame type. */
   RSOCKET_REQUESTER_FNF {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketRequesterObservationConvention.class;
     }
@@ -53,7 +54,7 @@ public String getPrefix() {
   /** Observation created on the RSocket responder side for Fire and Forget frame type. */
   RSOCKET_RESPONDER_FNF {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketResponderObservationConvention.class;
     }
@@ -72,7 +73,7 @@ public String getPrefix() {
   /** Observation created on the RSocket requester side for Request Response frame type. */
   RSOCKET_REQUESTER_REQUEST_RESPONSE {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketRequesterObservationConvention.class;
     }
@@ -91,7 +92,7 @@ public String getPrefix() {
   /** Observation created on the RSocket responder side for Request Response frame type. */
   RSOCKET_RESPONDER_REQUEST_RESPONSE {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketResponderObservationConvention.class;
     }
@@ -110,7 +111,7 @@ public String getPrefix() {
   /** Observation created on the RSocket requester side for Request Stream frame type. */
   RSOCKET_REQUESTER_REQUEST_STREAM {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketRequesterObservationConvention.class;
     }
@@ -129,7 +130,7 @@ public String getPrefix() {
   /** Observation created on the RSocket responder side for Request Stream frame type. */
   RSOCKET_RESPONDER_REQUEST_STREAM {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketResponderObservationConvention.class;
     }
@@ -148,7 +149,7 @@ public String getPrefix() {
   /** Observation created on the RSocket requester side for Request Channel frame type. */
   RSOCKET_REQUESTER_REQUEST_CHANNEL {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketRequesterObservationConvention.class;
     }
@@ -167,7 +168,7 @@ public String getPrefix() {
   /** Observation created on the RSocket responder side for Request Channel frame type. */
   RSOCKET_RESPONDER_REQUEST_CHANNEL {
     @Override
-    public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
+    public Class<? extends ObservationConvention<? extends Observation.Context>>
         getDefaultConvention() {
       return DefaultRSocketResponderObservationConvention.class;
     }

rsocket-micrometer/src/main/java/io/rsocket/micrometer/observation/RSocketRequesterObservationConvention.java

@@ -17,15 +17,16 @@
 package io.rsocket.micrometer.observation;
 
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 
 /**
- * {@link Observation.ObservationConvention} for RSocket requester {@link RSocketContext}.
+ * {@link ObservationConvention} for RSocket requester {@link RSocketContext}.
  *
  * @author Marcin Grzejszczak
  * @since 2.0.0
  */
 public interface RSocketRequesterObservationConvention
-    extends Observation.ObservationConvention<RSocketContext> {
+    extends ObservationConvention<RSocketContext> {
 
   @Override
   default boolean supportsContext(Observation.Context context) {

rsocket-micrometer/src/main/java/io/rsocket/micrometer/observation/RSocketResponderObservationConvention.java

@@ -17,15 +17,16 @@
 package io.rsocket.micrometer.observation;
 
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 
 /**
- * {@link Observation.ObservationConvention} for RSocket responder {@link RSocketContext}.
+ * {@link ObservationConvention} for RSocket responder {@link RSocketContext}.
  *
  * @author Marcin Grzejszczak
  * @since 2.0.0
  */
 public interface RSocketResponderObservationConvention
-    extends Observation.ObservationConvention<RSocketContext> {
+    extends ObservationConvention<RSocketContext> {
 
   @Override
   default boolean supportsContext(Observation.Context context) {