REST filter with Observation API

smallrye · Nov 28, 2024 · acfcf9e · acfcf9e
1 parent 7d3262e
commit acfcf9e
Show file tree

Hide file tree

Showing 36 changed files with 2,092 additions and 492 deletions.
diff --git a/.../java/io/smallrye/opentelemetry/instrumentation/observation/cdi/ObservationExtension.java b/.../java/io/smallrye/opentelemetry/instrumentation/observation/cdi/ObservationExtension.java
@@ -20,15 +20,18 @@
 import jakarta.enterprise.inject.spi.Extension;
 import jakarta.enterprise.util.Nonbinding;
 
-import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.observation.annotation.Observed;
+import io.smallrye.opentelemetry.instrumentation.observation.ObservationRegistryProducer;
+import io.smallrye.opentelemetry.instrumentation.observation.handler.OpenTelemetryObservationHandler;
 
 public class ObservationExtension implements Extension {
     public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager) {
         beforeBeanDiscovery.addInterceptorBinding(
                 new ObservedAnnotatedType(beanManager.createAnnotatedType(Observed.class)));
 
-        beforeBeanDiscovery.addAnnotatedType(ObservationRegistry.class, ObservationRegistry.class.getName());
+        beforeBeanDiscovery.addAnnotatedType(OpenTelemetryObservationHandler.class,
+                OpenTelemetryObservationHandler.class.getName());
+        beforeBeanDiscovery.addAnnotatedType(ObservationRegistryProducer.class, ObservationRegistryProducer.class.getName());
     }
 
     public void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {

diff --git a/...c/test/java/io/smallrye/opentelemetry/implementation/observation/ObservationOTelTest.java b/...c/test/java/io/smallrye/opentelemetry/implementation/observation/ObservationOTelTest.java
@@ -38,7 +38,6 @@
 import io.smallrye.opentelemetry.implementation.cdi.OpenTelemetryExtension;
 import io.smallrye.opentelemetry.implementation.config.OpenTelemetryConfigProducer;
 import io.smallrye.opentelemetry.implementation.micrometer.cdi.MicrometerExtension;
-import io.smallrye.opentelemetry.instrumentation.observation.ObservationRegistryProducer;
 import io.smallrye.opentelemetry.instrumentation.observation.cdi.ObservationExtension;
 import io.smallrye.opentelemetry.instrumentation.observation.handler.OpenTelemetryObservationHandler;
 import io.smallrye.opentelemetry.test.InMemoryExporter;

diff --git a/implementation/rest-observation/pom.xml b/implementation/rest-observation/pom.xml
@@ -16,7 +16,10 @@
             <groupId>io.smallrye.opentelemetry</groupId>
             <artifactId>smallrye-opentelemetry-api</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>io.smallrye.opentelemetry</groupId>
+            <artifactId>smallrye-opentelemetry-micrometer-otel-bridge</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.smallrye.opentelemetry</groupId>
             <artifactId>smallrye-opentelemetry-observation-otel-bridge</artifactId>

diff --git a/...va/io/smallrye/opentelemetry/implementation/rest.observation/ObservationClientFilter.java b/...va/io/smallrye/opentelemetry/implementation/rest.observation/ObservationClientFilter.java