Upgrade OTel contrib to 1.52.0 and replace AgentInstrumentationConfig with ConfigPropertiesUtil

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

@@ -22,9 +22,10 @@ public Map<String, String> apply(ConfigProperties otelConfig) {
 
     Map<String, String> properties = new HashMap<>();
 
-    properties.put(
-        "applicationinsights.internal.micrometer.step.millis",
-        Long.toString(SECONDS.toMillis(configuration.metricIntervalSeconds)));
+    String stepMillisValue = Long.toString(SECONDS.toMillis(configuration.metricIntervalSeconds));
+    properties.put("applicationinsights.internal.micrometer.step.millis", stepMillisValue);
+    // also set as system property so that instrumentation modules can read it
+    System.setProperty("applicationinsights.internal.micrometer.step.millis", stepMillisValue);
 
     properties.put(
         "otel.metric.export.interval",
@@ -102,6 +103,8 @@ public Map<String, String> apply(ConfigProperties otelConfig) {
         sb.append(']');
       }
       properties.put("applicationinsights.internal.methods.include", sb.toString());
+      // also set as system property so that instrumentation modules can read it
+      System.setProperty("applicationinsights.internal.methods.include", sb.toString());
     }
 
     properties.put("otel.propagators", DelegatingPropagatorProvider.NAME);
@@ -223,6 +226,8 @@ private static void enableInstrumentations(
     String namespace = config.instrumentation.micrometer.namespace;
     if (namespace != null) {
       properties.put("applicationinsights.internal.micrometer.namespace", namespace);
+      // also set as system property so that instrumentation modules can read it
+      System.setProperty("applicationinsights.internal.micrometer.namespace", namespace);
     }
     if (config.instrumentation.azureSdk.enabled) {
       properties.put("otel.instrumentation.azure-core.enabled", "true");

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

@@ -23,7 +23,6 @@
 import io.opentelemetry.javaagent.bootstrap.InternalLogger;
 import io.opentelemetry.javaagent.bootstrap.JavaagentFileHolder;
 import io.opentelemetry.javaagent.tooling.LoggingCustomizer;
-import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
@@ -77,7 +76,7 @@ public String name() {
   }
 
   @Override
-  public void init(EarlyInitAgentConfig earlyConfig) {
+  public void init() {
     try {
       if (DEBUG_SIGNED_JAR_ACCESS) {
         JarVerifierClassFileTransformer transformer = new JarVerifierClassFileTransformer();

agent/agent/build.gradle.kts

@@ -84,6 +84,7 @@ tasks {
       exclude(dependency("io.opentelemetry:opentelemetry-api"))
       exclude(dependency("io.opentelemetry:opentelemetry-context"))
       exclude(dependency("io.opentelemetry:opentelemetry-api-incubator"))
+      exclude(dependency("io.opentelemetry:opentelemetry-common"))
     }
   }
 

agent/instrumentation/azure-functions/src/main/java/io/opentelemetry/javaagent/instrumentation/azurefunctions/InvocationRequestExtractAdapter.java

@@ -5,6 +5,7 @@
 
 import com.microsoft.azure.functions.rpc.messages.RpcTraceContext;
 import io.opentelemetry.context.propagation.TextMapGetter;
+import java.util.Arrays;
 import javax.annotation.Nullable;
 
 public class InvocationRequestExtractAdapter implements TextMapGetter<RpcTraceContext> {
@@ -14,7 +15,7 @@ public class InvocationRequestExtractAdapter implements TextMapGetter<RpcTraceCo
 
   @Override
   public Iterable<String> keys(RpcTraceContext carrier) {
-    return null;
+    return Arrays.asList("traceparent", "tracestate");
   }
 
   @Override

agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodInstrumentationModule.java

@@ -13,7 +13,7 @@
 import static java.util.Collections.emptyList;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.tooling.config.MethodsConfigurationParser;
@@ -33,8 +33,7 @@ public MethodInstrumentationModule() {
     super("ai-methods");
 
     Map<String, Set<String>> classMethodsToTrace =
-        MethodsConfigurationParser.parse(
-            AgentInstrumentationConfig.get().getString(TRACE_METHODS_CONFIG));
+        MethodsConfigurationParser.parse(ConfigPropertiesUtil.getString(TRACE_METHODS_CONFIG));
 
     typeInstrumentations =
         classMethodsToTrace.entrySet().stream()

agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/ai/AzureMonitorRegistryConfig.java

@@ -4,7 +4,7 @@
 package io.opentelemetry.javaagent.instrumentation.micrometer.ai;
 
 import io.micrometer.core.instrument.step.StepRegistryConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import java.time.Duration;
 import javax.annotation.Nullable;
 
@@ -16,13 +16,18 @@ public class AzureMonitorRegistryConfig implements StepRegistryConfig {
   public static final AzureMonitorRegistryConfig INSTANCE = new AzureMonitorRegistryConfig();
 
   private AzureMonitorRegistryConfig() {
-    step =
-        AgentInstrumentationConfig.get()
-            .getDuration(
-                "applicationinsights.internal.micrometer.step.millis", Duration.ofSeconds(60));
-    namespace =
-        AgentInstrumentationConfig.get()
-            .getString("applicationinsights.internal.micrometer.namespace");
+    String stepMillisStr =
+        ConfigPropertiesUtil.getString("applicationinsights.internal.micrometer.step.millis");
+    Duration parsedStep = null;
+    if (stepMillisStr != null) {
+      try {
+        parsedStep = Duration.ofMillis(Long.parseLong(stepMillisStr));
+      } catch (NumberFormatException ignored) {
+        // fall through to default
+      }
+    }
+    step = parsedStep != null ? parsedStep : Duration.ofSeconds(60);
+    namespace = ConfigPropertiesUtil.getString("applicationinsights.internal.micrometer.namespace");
   }
 
   @Override

dependencyManagement/build.gradle.kts

@@ -7,10 +7,10 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
-val otelSdkVersion = "1.55.0"
-val otelInstrumentationAlphaVersion = "2.21.0-alpha"
-val otelInstrumentationVersion = "2.21.0"
-val otelContribVersion = "1.48.0"
+val otelSdkVersion = "1.58.0"
+val otelInstrumentationAlphaVersion = "2.24.0-alpha"
+val otelInstrumentationVersion = "2.24.0"
+val otelContribVersion = "1.52.0"
 
 rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion
 rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion