From cad9a5f674170477aa501f1d8660b434900efd56 Mon Sep 17 00:00:00 2001
From: Roberto Cortez <radcortez@yahoo.com>
Date: Tue, 23 May 2023 22:08:51 +0100
Subject: [PATCH] Removed manual OTel properties for fallback, since they are
 now provided automatically

---
 .../OpenTelemetryLegacyConfigurationTest.java | 24 +++++++++++++++++++
 .../OTelFallbackConfigSourceInterceptor.java  | 21 ----------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryLegacyConfigurationTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryLegacyConfigurationTest.java
index 6ae06be35007c..775b2157341ef 100644
--- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryLegacyConfigurationTest.java
+++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryLegacyConfigurationTest.java
@@ -17,6 +17,7 @@
 import io.quarkus.opentelemetry.runtime.config.runtime.OTelRuntimeConfig;
 import io.quarkus.opentelemetry.runtime.config.runtime.exporter.OtlpExporterRuntimeConfig;
 import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.config.SmallRyeConfig;
 
 class OpenTelemetryLegacyConfigurationTest {
     @RegisterExtension
@@ -41,6 +42,8 @@ class OpenTelemetryLegacyConfigurationTest {
     OtlpExporterBuildConfig otlpExporterBuildConfig;
     @Inject
     OtlpExporterRuntimeConfig otlpExporterRuntimeConfig;
+    @Inject
+    SmallRyeConfig config;
 
     @Test
     void config() {
@@ -61,4 +64,25 @@ void config() {
         assertEquals("header=value", otlpExporterRuntimeConfig.traces().headers().get().get(0));
         assertEquals("http://localhost:4318/", otlpExporterRuntimeConfig.traces().legacyEndpoint().get());
     }
+
+    @Test
+    void names() {
+        assertTrue(config.isPropertyPresent("quarkus.otel.enabled"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.metrics.exporter"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.propagators"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.logs.exporter"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.traces.enabled"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.traces.exporter"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.traces.sampler"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.sdk.disabled"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.service.name"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.attribute.count.limit"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.span.attribute.count.limit"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.span.event.count.limit"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.span.link.count.limit"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.bsp.schedule.delay"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.bsp.max.queue.size"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.bsp.max.export.batch.size"));
+        assertTrue(config.isPropertyPresent("quarkus.otel.bsp.export.timeout"));
+    }
 }
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/config/OTelFallbackConfigSourceInterceptor.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/config/OTelFallbackConfigSourceInterceptor.java
index 9d97991d4ca18..4813bbcf61c1a 100644
--- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/config/OTelFallbackConfigSourceInterceptor.java
+++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/config/OTelFallbackConfigSourceInterceptor.java
@@ -72,27 +72,6 @@ public Iterator<String> iterateNames(final ConfigSourceInterceptorContext contex
                 names.add(name);
             }
         }
-
-        // TODO - Required because the defaults ConfigSource for mappings does not provide configuration names.
-        names.add("quarkus.otel.enabled");
-        names.add("quarkus.otel.metrics.exporter");
-        names.add("quarkus.otel.propagators");
-        names.add("quarkus.otel.logs.exporter");
-        names.add("quarkus.otel.traces.enabled");
-        names.add("quarkus.otel.traces.exporter");
-        names.add("quarkus.otel.traces.sampler");
-        names.add("quarkus.otel.sdk.disabled");
-        names.add("quarkus.otel.service.name");
-        names.add("quarkus.otel.attribute.value.length.limit");
-        names.add("quarkus.otel.attribute.count.limit");
-        names.add("quarkus.otel.span.attribute.count.limit");
-        names.add("quarkus.otel.span.event.count.limit");
-        names.add("quarkus.otel.span.link.count.limit");
-        names.add("quarkus.otel.bsp.schedule.delay");
-        names.add("quarkus.otel.bsp.max.queue.size");
-        names.add("quarkus.otel.bsp.max.export.batch.size");
-        names.add("quarkus.otel.bsp.export.timeout");
-        names.add("quarkus.otel.experimental.resource.disabled-keys");
         return names.iterator();
     }
 }