update

Author: zeitlinger

dependencyManagement/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   `java-platform`
 }
 
-val otelInstrumentationVersion = "2.19.0-alpha"
+val otelInstrumentationVersion = "2.20.0-alpha"
 val semconvVersion = "1.37.0"
 
 javaPlatform {

gcp-auth-extension/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-declarative-config-bridge")
   compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")
 
   // Only dependencies added to `implementation` configuration will be picked up by Shadow plugin
@@ -40,7 +40,7 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations")
-  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
+  testImplementation("io.opentelemetry.instrumentation:opentelemetry-declarative-config-bridge")
 
   testImplementation("org.awaitility:awaitility")
   testImplementation("org.mockito:mockito-inline")
@@ -137,11 +137,3 @@ tasks.register<Test>("IntegrationTestUserCreds") {
     "-Dmockserver.logLevel=trace"
   )
 }
-
-// todo remove when https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14497 is merged
-configurations.all {
-  resolutionStrategy {
-    force("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.20.0-alpha-SNAPSHOT")
-    force("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.19.0")
-  }
-}

gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProvider.java

@@ -6,14 +6,13 @@
 package io.opentelemetry.contrib.gcp.auth;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
-import static java.util.Arrays.stream;
+import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toMap;
 
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auto.service.AutoService;
 import com.google.common.annotations.VisibleForTesting;
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.contrib.gcp.auth.GoogleAuthException.Reason;
 import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
@@ -31,7 +30,6 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -182,8 +180,7 @@ static List<String> targetSignals(ConfigProperties configProperties) {
     return Objects.requireNonNull(
         ConfigurableOption.GOOGLE_OTEL_AUTH_TARGET_SIGNALS.getConfiguredValue(
             configProperties,
-            (properties, name) ->
-                properties.getList(name, Collections.singletonList(SIGNAL_TYPE_ALL))));
+            (properties, name) -> properties.getList(name, singletonList(SIGNAL_TYPE_ALL))));
   }
 
   // Adds authorization headers to the calls made by the OtlpGrpcSpanExporter and
@@ -262,8 +259,7 @@ static Optional<String> getQuotaProjectId(ConfigProperties configProperties) {
   private static Resource customizeResource(Resource resource, ConfigProperties configProperties) {
     Resource res =
         Resource.create(
-            Attributes.of(
-                stringKey(GCP_USER_PROJECT_ID_KEY), getProjectId(configProperties)));
+            Attributes.of(stringKey(GCP_USER_PROJECT_ID_KEY), getProjectId(configProperties)));
     return resource.merge(res);
   }
 

gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthDeclarativeConfigurationCustomizerProvider.java

@@ -12,8 +12,8 @@
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auto.service.AutoService;
 import com.google.common.annotations.VisibleForTesting;
-import io.opentelemetry.instrumentation.api.incubator.config.bridge.ConfigPropertiesUtil;
-import io.opentelemetry.instrumentation.api.incubator.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
+import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesUtil;
+import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;

span-stacktrace/build.gradle.kts

@@ -15,13 +15,8 @@ dependencies {
 
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
-  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
 
   compileOnly("io.opentelemetry.semconv:opentelemetry-semconv")
   testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")
@@ -31,11 +26,3 @@ dependencies {
 
   testImplementation("io.opentelemetry:opentelemetry-exporter-logging")
 }
-
-// todo remove when https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14497 is merged
-configurations.all {
-  resolutionStrategy {
-    force("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.20.0-alpha-SNAPSHOT")
-    force("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.19.0")
-  }
-}

span-stacktrace/src/main/java/io/opentelemetry/contrib/stacktrace/StackTraceAutoConfig.java

@@ -26,26 +26,25 @@ public class StackTraceAutoConfig implements AutoConfigurationCustomizerProvider
 
   private static final Logger log = Logger.getLogger(StackTraceAutoConfig.class.getName());
 
-  static final String PREFIX = "otel.java.experimental.span-stacktrace.";
-  private static final String CONFIG_MIN_DURATION = PREFIX + "min.duration";
+  private static final String CONFIG_MIN_DURATION =
+      "otel.java.experimental.span-stacktrace.min.duration";
   private static final Duration CONFIG_MIN_DURATION_DEFAULT = Duration.ofMillis(5);
-  private static final String CONFIG_FILTER = PREFIX + "filter";
+
+  private static final String CONFIG_FILTER = "otel.java.experimental.span-stacktrace.filter";
 
   @Override
   public void customize(AutoConfigurationCustomizer config) {
     config.addTracerProviderCustomizer(
         (providerBuilder, properties) -> {
-          if (getMinDuration(properties) >= 0) {
-            providerBuilder.addSpanProcessor(create(properties));
+          long minDuration = getMinDuration(properties);
+          if (minDuration >= 0) {
+            Predicate<ReadableSpan> filter = getFilterPredicate(properties);
+            providerBuilder.addSpanProcessor(new StackTraceSpanProcessor(minDuration, filter));
           }
           return providerBuilder;
         });
   }
 
-  static StackTraceSpanProcessor create(ConfigProperties properties) {
-    return new StackTraceSpanProcessor(getMinDuration(properties), getFilterPredicate(properties));
-  }
-
   // package-private for testing
   static long getMinDuration(ConfigProperties properties) {
     long minDuration =