Update upstream agent to 2.24.0-SNAPSHOT (signalfx#2572)

* Update upstream agent to 2.24.0-SNAPSHOT

* update licenses

* Hopefully fix declarative config used check

* Hopefully fix declarative config used check

Author: laurit

custom/build.gradle.kts

@@ -8,6 +8,7 @@ dependencies {
   compileOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-resources")
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-declarative-config-bridge")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-internal-logging-simple")

custom/src/main/java/com/splunk/opentelemetry/servicename/ServiceNameChecker.java

@@ -20,9 +20,8 @@
 import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getResource;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
-import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
 import io.opentelemetry.javaagent.tooling.BeforeAgentListener;
+import io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
@@ -52,7 +51,7 @@ public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemet
     ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk);
     Resource resource = getResource(autoConfiguredOpenTelemetrySdk);
     if (serviceNameNotConfigured(config, resource)) {
-      if (isDeclarativeConfigInUse()) {
+      if (AutoConfigureUtil.isDeclarativeConfig(autoConfiguredOpenTelemetrySdk)) {
         logWarn.accept(
             "The service.name resource attribute is not set. Your service is unnamed and will be difficult to identify.\n"
                 + " Set your service name in '.resource.attributes' node, or specify appropriate resource detector in the configuration YAML file.");
@@ -78,8 +77,4 @@ static boolean serviceNameNotConfigured(ConfigProperties config, Resource resour
         && !resourceAttributes.containsKey(ServiceAttributes.SERVICE_NAME.getKey())
         && "unknown_service:java".equals(resource.getAttribute(ServiceAttributes.SERVICE_NAME));
   }
-
-  private static boolean isDeclarativeConfigInUse() {
-    return !GlobalConfigProvider.get().equals(ConfigProvider.noop());
-  }
 }

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

@@ -20,6 +20,7 @@
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesBackedConfigProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.logging.Logger;
@@ -46,7 +47,7 @@ public static ConfigProperties getConfig(AutoConfiguredOpenTelemetrySdk sdk) {
   }
 
   public static boolean isDeclarativeConfig(AutoConfiguredOpenTelemetrySdk sdk) {
-    return sdk.getConfigProvider() != null;
+    return !(sdk.getConfigProvider() instanceof ConfigPropertiesBackedConfigProvider);
   }
 
   @Nullable

dependencyManagement/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 val otelVersion = "1.57.0"
 val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
-val otelInstrumentationVersion = "2.23.0"
+val otelInstrumentationVersion = "2.24.0-SNAPSHOT"
 val otelInstrumentationAlphaVersion =  otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 val otelContribAlphaVersion = "1.52.0-alpha"
 

instrumentation/jdbc/src/main/java/com/splunk/opentelemetry/instrumentation/jdbc/SqlCommenterInitializer.java

@@ -17,9 +17,10 @@
 package com.splunk.opentelemetry.instrumentation.jdbc;
 
 import com.google.auto.service.AutoService;
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.internal.SqlCommenterBuilder;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.sqlcommenter.SqlCommenterCustomizer;
 
 @AutoService(SqlCommenterCustomizer.class)
@@ -30,8 +31,8 @@ public class SqlCommenterInitializer implements SqlCommenterCustomizer {
   @Override
   public void customize(SqlCommenterBuilder sqlCommenterBuilder) {
     sqlCommenterBuilder.setEnabled(
-        AgentInstrumentationConfig.get()
-            .getBoolean("otel.instrumentation.splunk-jdbc.enabled", false));
+        DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "splunk-jdbc")
+            .getBoolean("enabled", false));
     sqlCommenterBuilder.setPropagator(
         (connection, executed) -> {
           // note that besides jdbc this applies to r2dbc and other data access apis that upstream

licenses/licenses.md

@@ -1,7 +1,7 @@
 
 # splunk-otel-javaagent
 ## Dependency License Report
-_2025-12-18 12:57:18 EET_
+_2026-01-07 08:08:24 EET_
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `5.3.2` 
@@ -92,7 +92,7 @@ _2025-12-18 12:57:18 EET_
 > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
-**23** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.23.0-alpha` 
+**23** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.24.0-alpha-SNAPSHOT` 
 > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
 

testing/agent-test-extension/src/main/java/com/splunk/opentelemetry/testing/IgnoredTestTypesConfigurer.java

@@ -19,12 +19,11 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
 public class IgnoredTestTypesConfigurer implements IgnoredTypesConfigurer {
   @Override
-  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
+  public void configure(IgnoredTypesBuilder builder) {
     // we don't want to instrument auto-generated mocks
     builder
         .ignoreClass("org.mockito")