Update otel sdk to 1.58.0

Author: laurit

custom/src/main/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProvider.java

@@ -21,6 +21,7 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
@@ -61,7 +62,7 @@ private static boolean isFeatureEnabled(OpenTelemetryConfigurationModel model) {
       return false;
     }
 
-    Map<String, Object> properties =
+    Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> properties =
         model.getInstrumentationDevelopment().getJava().getAdditionalProperties();
 
     return getAdditionalPropertyOrDefault(properties, CONFIG_CISCO_CTX_ENABLED, false);

custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AdditionalPropertiesUtil.java

@@ -16,6 +16,7 @@
 
 package io.opentelemetry.sdk.autoconfigure;
 
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
@@ -24,7 +25,8 @@
 @SuppressWarnings("unchecked")
 public class AdditionalPropertiesUtil {
   public static Object getAdditionalProperty(
-      Map<String, Object> additionalProperties, String propertyName) {
+      Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> additionalProperties,
+      String propertyName) {
     String[] propertyNameSegments = propertyName.trim().split("\\.");
     if (propertyNameSegments.length == 0) {
       throw new IllegalArgumentException("Empty property name");
@@ -52,13 +54,17 @@ public static Object getAdditionalProperty(
   }
 
   public static Object getAdditionalPropertyOrDefault(
-      Map<String, Object> additionalProperties, String propertyName, Object defaultValue) {
+      Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> additionalProperties,
+      String propertyName,
+      Object defaultValue) {
     Object value = getAdditionalProperty(additionalProperties, propertyName);
     return value == null ? defaultValue : value;
   }
 
   public static Boolean getAdditionalPropertyOrDefault(
-      Map<String, Object> additionalProperties, String propertyName, boolean defaultValue) {
+      Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> additionalProperties,
+      String propertyName,
+      boolean defaultValue) {
     Object value = getAdditionalProperty(additionalProperties, propertyName);
     if (value instanceof Boolean) {
       return (Boolean) value;

custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfigureUtil.java

@@ -18,6 +18,8 @@
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesBackedConfigProvider;
@@ -47,13 +49,22 @@ public static ConfigProperties getConfig(AutoConfiguredOpenTelemetrySdk sdk) {
   }
 
   public static boolean isDeclarativeConfig(AutoConfiguredOpenTelemetrySdk sdk) {
-    return !(sdk.getConfigProvider() instanceof ConfigPropertiesBackedConfigProvider);
+    OpenTelemetry openTelemetry = sdk.getOpenTelemetrySdk();
+    if (openTelemetry instanceof ExtendedOpenTelemetry) {
+      return !(((ExtendedOpenTelemetry) openTelemetry).getConfigProvider()
+          instanceof ConfigPropertiesBackedConfigProvider);
+    }
+    return false;
   }
 
   @Nullable
   public static DeclarativeConfigProperties getDistributionConfig(
       AutoConfiguredOpenTelemetrySdk sdk) {
-    ConfigProvider configProvider = (ConfigProvider) sdk.getConfigProvider();
+    OpenTelemetry openTelemetry = sdk.getOpenTelemetrySdk();
+    if (!(openTelemetry instanceof ExtendedOpenTelemetry)) {
+      return null;
+    }
+    ConfigProvider configProvider = ((ExtendedOpenTelemetry) openTelemetry).getConfigProvider();
     if (configProvider == null) {
       return null;
     }

dependencyManagement/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   `java-platform`
 }
 
-val otelVersion = "1.57.0"
+val otelVersion = "1.58.0"
 val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 val otelInstrumentationVersion = "2.24.0-SNAPSHOT"
 val otelInstrumentationAlphaVersion =  otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

testing/common/src/main/java/com/splunk/opentelemetry/testing/declarativeconfig/DeclarativeConfigTestUtil.java

@@ -16,12 +16,12 @@
 
 package com.splunk.opentelemetry.testing.declarativeconfig;
 
+import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.SdkAutoconfigureAccess;
-import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationBuilder;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
@@ -79,16 +79,16 @@ public static AutoConfiguredOpenTelemetrySdk createAutoConfiguredSdk(String yaml
                           "otel.experimental.config.file", configFilePath.toString()))
               .build();
 
-      ConfigProvider configProvider = AutoConfigureUtil.getConfigProvider(autoConfiguredSdk);
+      ConfigProvider configProvider =
+          ((ExtendedOpenTelemetry) autoConfiguredSdk.getOpenTelemetrySdk()).getConfigProvider();
       OpenTelemetrySdk sdk = autoConfiguredSdk.getOpenTelemetrySdk();
 
       if (configProvider != null) {
         return SdkAutoconfigureAccess.create(
             sdk,
             SdkAutoconfigureAccess.getResource(autoConfiguredSdk),
             new DeclarativeConfigPropertiesBridgeBuilder()
-                .buildFromInstrumentationConfig(configProvider.getInstrumentationConfig()),
-            configProvider);
+                .buildFromInstrumentationConfig(configProvider.getInstrumentationConfig()));
       }
 
       return autoConfiguredSdk;

testing/common/src/main/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java

@@ -29,7 +29,7 @@ public static Resource getResource(AutoConfiguredOpenTelemetrySdk sdk) {
   }
 
   public static AutoConfiguredOpenTelemetrySdk create(
-      OpenTelemetrySdk sdk, Resource resource, ConfigProperties config, Object configProvider) {
-    return AutoConfiguredOpenTelemetrySdk.create(sdk, resource, config, configProvider);
+      OpenTelemetrySdk sdk, Resource resource, ConfigProperties config) {
+    return AutoConfiguredOpenTelemetrySdk.create(sdk, resource, config);
   }
 }