Merge pull request #41405 from radcortez/fix-40968

Remove OpenTelemetry old Config relocations and fallbacks
quarkusio · Jun 25, 2024 · c4b7769 · c4b7769
2 parents a599bf1 + a047627
commit c4b7769
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 305 deletions.
diff --git a/...va/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledLegacyConfigurationTest.java b/...va/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledLegacyConfigurationTest.java
@@ -24,7 +24,7 @@ public class NonAppEndpointsEnabledLegacyConfigurationTest {
                     .addAsResource(new StringAsset(TestSpanExporterProvider.class.getCanonicalName()),
                             "META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider"))
             .withConfigurationResource("application-default.properties")
-            .overrideConfigKey("quarkus.opentelemetry.tracer.suppress-non-application-uris", "false");
+            .overrideConfigKey("quarkus.otel.traces.suppress-non-application-uris", "false");
 
     @Inject
     TestSpanExporter testSpanExporter;

diff --git a/...c/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryLegacyConfigurationTest.java b/...c/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryLegacyConfigurationTest.java
diff --git a/...eployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledLegacyTest.java b/...eployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledLegacyTest.java
diff --git a/...t/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterBadEndpointTest.java b/...t/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterBadEndpointTest.java
@@ -15,7 +15,7 @@ public class OtlpExporterBadEndpointTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .withEmptyApplication()
             .overrideConfigKey("quarkus.otel.traces.exporter", "cdi")
-            .overrideConfigKey("quarkus.opentelemetry.tracer.exporter.otlp.endpoint", "httz://nada:zero")
+            .overrideConfigKey("quarkus.otel.exporter.otlp.traces.legacy-endpoint", "httz://nada:zero")
             .setExpectedException(IllegalArgumentException.class);
 
     @Inject

diff --git a/...c/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterConfigTest.java b/...c/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterConfigTest.java
@@ -17,7 +17,7 @@ public class OtlpExporterConfigTest {
             .withEmptyApplication()
             .overrideConfigKey("otel.traces.exporter", "cdi")
             .overrideConfigKey("otel.exporter.otlp.traces.protocol", "http/protobuf")
-            .overrideConfigKey("quarkus.opentelemetry.tracer.exporter.otlp.endpoint", "http://localhost ")
+            .overrideConfigKey("quarkus.otel.exporter.otlp.traces.legacy-endpoint", "http://localhost ")
             .overrideConfigKey("quarkus.otel.bsp.schedule.delay", "50")
             .overrideConfigKey("quarkus.otel.bsp.export.timeout", "PT1S");
 

diff --git a/...test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterDisabledTest.java b/...test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterDisabledTest.java
@@ -17,7 +17,7 @@ public class OtlpExporterDisabledTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .withEmptyApplication()
             .overrideConfigKey("otel.traces.exporter", "cdi")
-            .overrideConfigKey("quarkus.opentelemetry.tracer.exporter.otlp.enabled", "false");
+            .overrideConfigKey("quarkus.otel.exporter.otlp.enabled", "false");
 
     @Inject
     OpenTelemetry openTelemetry;

diff --git a/...ain/java/io/quarkus/opentelemetry/runtime/config/OTelFallbackConfigSourceInterceptor.java b/...ain/java/io/quarkus/opentelemetry/runtime/config/OTelFallbackConfigSourceInterceptor.java
diff --git a/...emetry/runtime/config/build/InstrumentBuildTimeConfigFallbackConfigSourceInterceptor.java b/...emetry/runtime/config/build/InstrumentBuildTimeConfigFallbackConfigSourceInterceptor.java
diff --git a/...emetry/runtime/config/build/InstrumentBuildTimeConfigRelocateConfigSourceInterceptor.java b/...emetry/runtime/config/build/InstrumentBuildTimeConfigRelocateConfigSourceInterceptor.java
diff --git a/...c/main/java/io/quarkus/opentelemetry/runtime/config/build/LegacySamplerNameConverter.java b/...c/main/java/io/quarkus/opentelemetry/runtime/config/build/LegacySamplerNameConverter.java
diff --git a/...y/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/...y/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor