OTel SDK to 1.37.0 and alpha to 2.3.0

quarkusio · Jun 27, 2024 · c5a8d13 · c5a8d13
1 parent ea95248
commit c5a8d13
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -27,8 +27,8 @@
         <resteasy-microprofile.version>2.1.5.Final</resteasy-microprofile.version>
         <resteasy-spring-web.version>3.1.3.Final</resteasy-spring-web.version>
         <resteasy.version>6.2.9.Final</resteasy.version>
-        <opentelemetry.version>1.35.0</opentelemetry.version>
-        <opentelemetry-alpha.version>2.1.0-alpha</opentelemetry-alpha.version>
+        <opentelemetry.version>1.37.0</opentelemetry.version>
+        <opentelemetry-alpha.version>2.3.0-alpha</opentelemetry-alpha.version>
         <opentelemetry-semconv.version>1.25.0-alpha</opentelemetry-semconv.version>
         <quarkus-http.version>5.3.0</quarkus-http.version>
         <micrometer.version>1.12.5</micrometer.version><!-- keep in sync with hdrhistogram -->

diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml
@@ -100,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api-events</artifactId>
+            <artifactId>opentelemetry-api-incubator</artifactId>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
@@ -114,16 +114,6 @@
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>io.opentelemetry.instrumentation</groupId>-->
-<!--            <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>io.opentelemetry.semconv</groupId>-->
-<!--                    <artifactId>opentelemetry-semconv</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>

diff --git a/...lemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryRecorder.java b/...lemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryRecorder.java
@@ -14,7 +14,7 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.events.GlobalEventEmitterProvider;
+import io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider;
 import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.quarkus.arc.SyntheticCreationalContext;
@@ -35,7 +35,7 @@ public class OpenTelemetryRecorder {
     @StaticInit
     public void resetGlobalOpenTelemetryForDevMode() {
         GlobalOpenTelemetry.resetForTest();
-        GlobalEventEmitterProvider.resetForTest();
+        GlobalEventLoggerProvider.resetForTest();
     }
 
     @RuntimeInit

diff --git a/...telemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java b/...telemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java
@@ -8,7 +8,7 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
-import io.opentelemetry.api.events.EventEmitterProvider;
+import io.opentelemetry.api.incubator.events.EventLoggerProvider;
 import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -49,10 +49,10 @@ static void configureLoggerProvider(
         }
     }
 
-    @TargetClass(className = "io.opentelemetry.api.events.GlobalEventEmitterProvider")
+    @TargetClass(className = "io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider")
     static final class Target_GlobalEventEmitterProvider {
         @Substitute
-        public static void set(EventEmitterProvider eventEmitterProvider) {
+        public static void set(EventLoggerProvider eventEmitterProvider) {
             // do nothing. We don't support events yet. Default is EventEmitterProvider.noop()
         }
     }

diff --git a/...ts/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java b/...ts/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java
@@ -66,7 +66,7 @@ void sqlClient() {
 
         // We cannot rely on the order, we must identify the spans.
         SpanData tableCreation = inMemorySpanExporter.getFinishedSpanItems().stream()
-                .filter(sd -> sd.getName().contains("DB Query")).findFirst().orElseThrow();
+                .filter(sd -> sd.getName().contains("CREATE TABLE USERS")).findFirst().orElseThrow();
         SpanData httpSpan = inMemorySpanExporter.getFinishedSpanItems().stream()
                 .filter(sd -> sd.getName().contains("GET /sqlClient")).findFirst().orElseThrow();
         SpanData querySpan = inMemorySpanExporter.getFinishedSpanItems().stream()