diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 566f64955925c..8cb8338a6ac14 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -27,8 +27,8 @@ 2.1.5.Final 3.1.3.Final 6.2.9.Final - 1.35.0 - 2.1.0-alpha + 1.37.0 + 2.3.0-alpha 1.25.0-alpha 5.3.0 1.12.5 diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml index f759fd76ae26b..5d3624fa1df12 100644 --- a/extensions/opentelemetry/runtime/pom.xml +++ b/extensions/opentelemetry/runtime/pom.xml @@ -100,7 +100,7 @@ io.opentelemetry - opentelemetry-api-events + opentelemetry-api-incubator io.opentelemetry.instrumentation @@ -114,16 +114,6 @@ io.opentelemetry.instrumentation opentelemetry-instrumentation-annotations-support - - - - - - - - - - io.opentelemetry.instrumentation opentelemetry-instrumentation-api-incubator diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryRecorder.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryRecorder.java index 0967428012cb2..bcf640e928bdf 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryRecorder.java +++ b/extensions/opentelemetry/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/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java index 9893313af25a5..507013f2f33e0 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/Substitutions.java +++ b/extensions/opentelemetry/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/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java b/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java index 7e2dd87383e26..99f5edfb3b779 100644 --- a/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java +++ b/integration-tests/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()