From ff02d914e3eac41c35502457dab91e0a3d660fe5 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 11 Sep 2025 15:48:12 -0700
Subject: [PATCH] Small config story cleanup

---
 .../internal/init/AiConfigCustomizer.java     | 23 -------------------
 .../agent/internal/init/SecondEntryPoint.java |  3 +++
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
index d45918b054..342402796e 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
@@ -6,7 +6,6 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
-import com.microsoft.applicationinsights.agent.internal.legacyheaders.DelegatingPropagatorProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.HashMap;
 import java.util.List;
@@ -104,28 +103,6 @@ public Map<String, String> apply(ConfigProperties otelConfig) {
       properties.put("applicationinsights.internal.methods.include", sb.toString());
     }
 
-    properties.put("otel.propagators", DelegatingPropagatorProvider.NAME);
-
-    properties.put("otel.traces.sampler", DelegatingSamplerProvider.NAME);
-
-    String tracesExporter = otelConfig.getString("otel.traces.exporter");
-    if (tracesExporter == null) {
-      // this overrides the default "otlp" so the exporter can be configured later
-      properties.put("otel.traces.exporter", "none");
-    }
-
-    String metricsExporter = otelConfig.getString("otel.metrics.exporter");
-    if (metricsExporter == null) {
-      // this overrides the default "otlp" so the exporter can be configured later
-      properties.put("otel.metrics.exporter", "none");
-    }
-
-    String logsExporter = otelConfig.getString("otel.logs.exporter");
-    if (logsExporter == null) {
-      // this overrides the default "otlp" so the exporter can be configured later
-      properties.put("otel.logs.exporter", "none");
-    }
-
     if (configuration.role.name != null) {
       // in case using another exporter
       properties.put("otel.service.name", configuration.role.name);
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java
index bce668a9aa..9905ec99d5 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java
@@ -40,6 +40,7 @@
 import com.microsoft.applicationinsights.agent.internal.exporter.AgentSpanExporter;
 import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient;
 import com.microsoft.applicationinsights.agent.internal.legacyheaders.AiLegacyHeaderSpanProcessor;
+import com.microsoft.applicationinsights.agent.internal.legacyheaders.DelegatingPropagatorProvider;
 import com.microsoft.applicationinsights.agent.internal.processors.ExporterWithLogProcessor;
 import com.microsoft.applicationinsights.agent.internal.processors.ExporterWithSpanProcessor;
 import com.microsoft.applicationinsights.agent.internal.processors.LogExporterWithAttributeProcessor;
@@ -245,6 +246,8 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
         .addPropertiesSupplier(
             () -> {
               Map<String, String> props = new HashMap<>();
+              props.put("otel.propagators", DelegatingPropagatorProvider.NAME);
+              props.put("otel.traces.sampler", DelegatingSamplerProvider.NAME);
               props.put("otel.traces.exporter", AzureMonitorExporterProviderKeys.EXPORTER_NAME);
               props.put("otel.metrics.exporter", AzureMonitorExporterProviderKeys.EXPORTER_NAME);
               props.put("otel.logs.exporter", AzureMonitorExporterProviderKeys.EXPORTER_NAME);