OTel SDK to 1.39.0 and alpha to 2.5.0 plus cleanup

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

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -27,8 +27,12 @@
         <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.37.0</opentelemetry.version>
-        <opentelemetry-alpha.version>2.3.0-alpha</opentelemetry-alpha.version>
+        <opentracing.version>0.33.0</opentracing.version>
+        <opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
+        <opentracing-kafka.version>0.1.15</opentracing-kafka.version>
+        <opentracing-mongo.version>0.1.5</opentracing-mongo.version>
+        <opentelemetry.version>1.39.0</opentelemetry.version>
+        <opentelemetry-alpha.version>2.5.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/.../deployment/src/main/java/io/quarkus/opentelemetry/deployment/OpenTelemetryProcessor.java b/.../deployment/src/main/java/io/quarkus/opentelemetry/deployment/OpenTelemetryProcessor.java
@@ -89,8 +89,6 @@ public boolean test(AnnotationInstance annotationInstance) {
     private static final DotName WITH_SPAN_INTERCEPTOR = DotName.createSimple(WithSpanInterceptor.class.getName());
     private static final DotName ADD_SPAN_ATTRIBUTES_INTERCEPTOR = DotName
             .createSimple(AddingSpanAttributesInterceptor.class.getName());
-    private static final String QUARKUS_OTEL_SEMCONV_STABILITY_OPT_IN = "quarkus.otel.semconv-stability.opt-in";
-    private static final String OTEL_SEMCONV_STABILITY_OPT_IN = "otel.semconv-stability.opt-in";
 
     @BuildStep
     AdditionalBeanBuildItem ensureProducerIsRetained() {
@@ -107,15 +105,6 @@ AdditionalBeanBuildItem ensureProducerIsRetained() {
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     SyntheticBeanBuildItem openTelemetryBean(OpenTelemetryRecorder recorder, OTelRuntimeConfig oTelRuntimeConfig) {
-
-        final String semconvStability = ConfigProvider.getConfig()
-                .getConfigValue(QUARKUS_OTEL_SEMCONV_STABILITY_OPT_IN)
-                .getValue();
-        if (semconvStability != null && !semconvStability.isEmpty()) {
-            // yes, they ignore config supplier on this.
-            System.setProperty(OTEL_SEMCONV_STABILITY_OPT_IN, semconvStability);
-        }
-
         return SyntheticBeanBuildItem.configure(OpenTelemetry.class)
                 .defaultBean()
                 .setRuntimeInit()

diff --git a/...ava/io/quarkus/opentelemetry/runtime/AutoConfiguredOpenTelemetrySdkBuilderCustomizer.java b/...ava/io/quarkus/opentelemetry/runtime/AutoConfiguredOpenTelemetrySdkBuilderCustomizer.java
@@ -99,8 +99,6 @@ public Resource apply(Resource existingResource, ConfigProperties configProperti
 
     @Singleton
     final class SamplerCustomizer implements AutoConfiguredOpenTelemetrySdkBuilderCustomizer {
-        private static final String OTEL_SEMCONV_STABILITY_OPT_IN = "otel.semconv-stability.opt-in";
-
         private final OTelBuildConfig oTelBuildConfig;
         private final OTelRuntimeConfig oTelRuntimeConfig;
         private final List<Sampler> sampler;