simplify

Author: trask

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java

@@ -5,8 +5,6 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorExporterProviderKeys;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
 import com.microsoft.applicationinsights.agent.internal.legacyheaders.DelegatingPropagatorProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -117,14 +115,7 @@ public Map<String, String> apply(ConfigProperties otelConfig) {
     }
 
     String metricsExporter = otelConfig.getString("otel.metrics.exporter");
-    String aksNamespaceId = System.getenv("AKS_ARM_NAMESPACE_ID");
-    String metricsToLogAnalyticsEnabled =
-        otelConfig.getString("applicationinsights.metrics.to.loganalytics.enabled");
-    if (isAksAttach(aksNamespaceId)) {
-      properties.put(
-          "otel.metrics.exporter",
-          updateMetricsExporter(metricsExporter, metricsToLogAnalyticsEnabled));
-    } else if (metricsExporter == null) {
+    if (metricsExporter == null) {
       // this overrides the default "otlp" so the exporter can be configured later
       properties.put("otel.metrics.exporter", "none");
     }
@@ -352,37 +343,4 @@ private static <T> String join(List<T> values, char separator) {
     }
     return sb.toString();
   }
-
-  // visible for tests
-  static boolean isAksAttach(String aksNamespaceId) {
-    return !Strings.isNullOrEmpty(aksNamespaceId);
-  }
-
-  static String updateMetricsExporter(String metricsExporter, String metricsToLogAnalyticsEnabled) {
-    String azureMonitorName = AzureMonitorExporterProviderKeys.EXPORTER_NAME;
-    // If AMLE is true, configure both otlp and azure monitor exporters
-    if (Boolean.parseBoolean(metricsToLogAnalyticsEnabled)) {
-      return azureMonitorName + ",otlp";
-    }
-
-    // If AMLE is unset:
-    if (metricsToLogAnalyticsEnabled == null || metricsToLogAnalyticsEnabled.isEmpty()) {
-      if (metricsExporter == null || metricsExporter.isEmpty()) {
-        // default is "azure_monitor,otlp"
-        return azureMonitorName + ",otlp";
-      } else if (metricsExporter.contains(azureMonitorName) && !metricsExporter.contains("otlp")) {
-        // if azure monitor is already present and otlp is not, add otlp
-        metricsExporter += ",otlp";
-      }
-      return metricsExporter;
-    }
-
-    // If AMLE is false, configure only azure monitor exporter.
-    // 1. Default is azure monitor
-    // 2. If otlp is set, cancel it and replace with azure monitor (AMLE false has higher priority than otlp setting)
-    if (metricsExporter == null || metricsExporter.isEmpty() || metricsExporter.contains(azureMonitorName)) {
-      return azureMonitorName;
-    }
-    return metricsExporter;
-  }
 }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java

@@ -264,6 +264,19 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
               return props;
             })
         .addPropertiesCustomizer(new AiConfigCustomizer())
+        .addPropertiesCustomizer(
+            otelConfig -> {
+              Map<String, String> props = new HashMap<>();
+              if (isAksAttach()) {
+                String metricsExporter = otelConfig.getString("otel.metrics.exporter");
+                String amle =
+                    otelConfig.getString("applicationinsights.metrics.to.loganalytics.enabled");
+                props.put(
+                    "otel.metrics.exporter",
+                    conditionallyAddAzureMonitorExporter(metricsExporter, amle));
+              }
+              return props;
+            })
         .addSpanExporterCustomizer(
             (spanExporter, configProperties) -> {
               if (spanExporter instanceof AzureMonitorSpanExporterProvider.MarkerSpanExporter) {
@@ -798,4 +811,47 @@ private static CompletableResultCode flushAll(
         });
     return overallResult;
   }
+
+  private static boolean isAksAttach() {
+    return !Strings.isNullOrEmpty(System.getenv("AKS_ARM_NAMESPACE_ID"));
+  }
+
+  // visible for tests
+  // Per spec: when amle=true, ensure azure_monitor is included; otherwise respect user's setting
+  // see
+  // https://github.com/aep-health-and-standards/Telemetry-Collection-Spec/blob/main/ApplicationInsights/AutoAttach_Env_Vars.md#metrics-exporter
+  static String conditionallyAddAzureMonitorExporter(String metricsExporter, String amle) {
+
+    // Default to azure_monitor when not set
+    if (Strings.isNullOrEmpty(metricsExporter)) {
+      // Note: this won't really happen since we default otel.metrics.exporter
+      // already in the PropertiesSupplier above which runs before this
+      return AzureMonitorExporterProviderKeys.EXPORTER_NAME;
+    }
+
+    // When amle=true, ensure azure_monitor is included
+    if ("true".equals(amle)) {
+      if ("none".equals(metricsExporter)) {
+        return AzureMonitorExporterProviderKeys.EXPORTER_NAME;
+      }
+      if (!containsAzureMonitor(metricsExporter)) {
+        return metricsExporter + "," + AzureMonitorExporterProviderKeys.EXPORTER_NAME;
+      }
+    }
+
+    return metricsExporter;
+  }
+
+  // visible for tests
+  static boolean containsAzureMonitor(String metricsExporter) {
+    if (metricsExporter == null) {
+      return false;
+    }
+    for (String exporter : metricsExporter.split(",")) {
+      if (AzureMonitorExporterProviderKeys.EXPORTER_NAME.equals(exporter.trim())) {
+        return true;
+      }
+    }
+    return false;
+  }
 }

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizerTest.java

@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.agent.internal.init;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class SecondEntryPointTest {
+
+  // Test cases matching the spec table in
+  // https://github.com/aep-health-and-standards/Telemetry-Collection-Spec/blob/main/ApplicationInsights/AutoAttach_Env_Vars.md#metrics-exporter
+  //
+  // OTEL_METRICS_EXPORTER | AMLE   | azure_monitor included
+  // ----------------------|--------|------------------------
+  static Stream<Arguments> metricsExporterSpecTable() {
+    return Stream.of(
+        // AMLE unset
+        Arguments.of(null, null, true),
+        Arguments.of("none", null, false),
+        Arguments.of("azure_monitor", null, true),
+        Arguments.of("otlp,azure_monitor", null, true),
+        Arguments.of("otlp", null, false),
+        // AMLE=true (always include azure_monitor)
+        Arguments.of(null, "true", true),
+        Arguments.of("none", "true", true),
+        Arguments.of("azure_monitor", "true", true),
+        Arguments.of("otlp,azure_monitor", "true", true),
+        Arguments.of("otlp", "true", true),
+        // AMLE=false (same as unset)
+        Arguments.of(null, "false", true),
+        Arguments.of("none", "false", false),
+        Arguments.of("azure_monitor", "false", true),
+        Arguments.of("otlp,azure_monitor", "false", true),
+        Arguments.of("otlp", "false", false));
+  }
+
+  @ParameterizedTest(name = "exporter={0}, amle={1} -> included={2}")
+  @MethodSource("metricsExporterSpecTable")
+  void testUpdateMetricsExporter(String exporter, String amle, boolean expectAzureMonitor) {
+    String result = SecondEntryPoint.conditionallyAddAzureMonitorExporter(exporter, amle);
+    assertThat(SecondEntryPoint.containsAzureMonitor(result)).isEqualTo(expectAzureMonitor);
+  }
+}