update opentelemetry sdk to 1.58.0 (#15817)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: zeitlinger

.github/config/lychee.toml

@@ -26,4 +26,7 @@ exclude = [
   '^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
   # new artifact, remove after 2.21.0 release
   '^https://central.sonatype.com/artifact/io.opentelemetry.instrumentation/opentelemetry-helidon-4.3$',
+  # flaky link
+  '^http://www.slf4j.org.*',
+  '^https://logback.qos.ch/.*'
 ]

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedConfigProvider.java

@@ -8,7 +8,6 @@
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import javax.annotation.Nullable;
 
 /**
  * A {@link ConfigProvider} implementation backed by {@link ConfigProperties}.
@@ -30,7 +29,6 @@ private ConfigPropertiesBackedConfigProvider(ConfigProperties configProperties)
             configProperties);
   }
 
-  @Nullable
   @Override
   public DeclarativeConfigProperties getInstrumentationConfig() {
     return instrumentationConfig;

declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java

@@ -10,7 +10,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.time.Duration;
 import java.util.Arrays;
@@ -31,7 +31,8 @@ void setup() {
 
     OpenTelemetryConfigurationModel emptyModel =
         new OpenTelemetryConfigurationModel()
-            .withAdditionalProperty("instrumentation/development", new InstrumentationModel());
+            .withAdditionalProperty(
+                "instrumentation/development", new ExperimentalInstrumentationModel());
     SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
     emptyBridge =
         new DeclarativeConfigPropertiesBridgeBuilder()

dependencyManagement/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.57.0"
+val otelSdkVersion = "1.58.0"
 val otelContribVersion = "1.52.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 

examples/distro/build.gradle

@@ -27,7 +27,7 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.57.0",
+      opentelemetrySdk           : "1.58.0",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "2.24.0-SNAPSHOT",

examples/extension/build.gradle

@@ -23,7 +23,7 @@ version '1.0'
 ext {
   versions = [
     // this line is managed by .github/scripts/update-sdk-version.sh
-    opentelemetrySdk           : "1.57.0",
+    opentelemetrySdk           : "1.58.0",
 
     // these lines are managed by .github/scripts/update-version.sh
     opentelemetryJavaagent     : "2.24.0-SNAPSHOT",

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.instrumentation.api.incubator.log.LoggingContextConstants;
 import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceResolver;
 import io.opentelemetry.instrumentation.api.internal.HttpConstants;
@@ -44,9 +45,9 @@ interface ValueProvider<T> {
   }
 
   public CommonConfig(OpenTelemetry openTelemetry) {
-    ExtendedDeclarativeConfigProperties generalConfig =
+    DeclarativeConfigProperties generalConfig =
         DeclarativeConfigUtil.getGeneralInstrumentationConfig(openTelemetry);
-    ExtendedDeclarativeConfigProperties commonConfig =
+    DeclarativeConfigProperties commonConfig =
         DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "common");
     peerServiceResolver = PeerServiceResolver.create(openTelemetry);
 

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/DeclarativeConfigUtil.java

@@ -19,25 +19,17 @@ public final class DeclarativeConfigUtil {
 
   private DeclarativeConfigUtil() {}
 
-  public static ExtendedDeclarativeConfigProperties getInstrumentationConfig(
+  public static DeclarativeConfigProperties getInstrumentationConfig(
       OpenTelemetry openTelemetry, String instrumentationName) {
-    return getConfig(openTelemetry).get("java").get(instrumentationName);
+    return openTelemetry instanceof ExtendedOpenTelemetry
+        ? ((ExtendedOpenTelemetry) openTelemetry).getInstrumentationConfig(instrumentationName)
+        : empty();
   }
 
-  public static ExtendedDeclarativeConfigProperties getGeneralInstrumentationConfig(
+  public static DeclarativeConfigProperties getGeneralInstrumentationConfig(
       OpenTelemetry openTelemetry) {
-    return getConfig(openTelemetry).get("general");
-  }
-
-  private static ExtendedDeclarativeConfigProperties getConfig(OpenTelemetry openTelemetry) {
-    if (openTelemetry instanceof ExtendedOpenTelemetry) {
-      ExtendedOpenTelemetry extendedOpenTelemetry = (ExtendedOpenTelemetry) openTelemetry;
-      DeclarativeConfigProperties instrumentationConfig =
-          extendedOpenTelemetry.getConfigProvider().getInstrumentationConfig();
-      if (instrumentationConfig != null) {
-        return new ExtendedDeclarativeConfigProperties(instrumentationConfig);
-      }
-    }
-    return new ExtendedDeclarativeConfigProperties(empty());
+    return openTelemetry instanceof ExtendedOpenTelemetry
+        ? ((ExtendedOpenTelemetry) openTelemetry).getGeneralInstrumentationConfig()
+        : empty();
   }
 }

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/EnduserConfig.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.incubator.config.internal;
 
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import java.util.Objects;
 
 /**
@@ -39,7 +40,7 @@ public class EnduserConfig {
   private final boolean roleEnabled;
   private final boolean scopeEnabled;
 
-  EnduserConfig(ExtendedDeclarativeConfigProperties commonConfig) {
+  EnduserConfig(DeclarativeConfigProperties commonConfig) {
     Objects.requireNonNull(commonConfig, "commonConfig must not be null");
 
     /*