Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into jmx-metrics-advice

SylvainJuge · SylvainJuge · commit d582535d0ada · 2025-06-23T14:55:57.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
   release:
     permissions:
       contents: write # for creating the release
-    runs-on: oracle-8cpu-32gb-x86-64
+    runs-on: ubuntu-latest
     needs:
       - common
     outputs:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-## Version 2.17.0 (2025-06-18)
+## Version 2.17.0 (2025-06-20)
 
 ### Migration notes
 
diff --git a/benchmark-overhead-jmh/build.gradle.kts b/benchmark-overhead-jmh/build.gradle.kts
@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.1")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.3")
 }
 
 tasks {
diff --git a/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-instrumentation-annotations.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.17.0.jar against opentelemetry-instrumentation-annotations-2.16.0.jar
+No changes.
diff --git a/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-instrumentation-api.txt b/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-instrumentation-api.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-api-2.17.0.jar against opentelemetry-instrumentation-api-2.16.0.jar
+No changes.
diff --git a/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-spring-boot-autoconfigure.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.17.0.jar against opentelemetry-spring-boot-autoconfigure-2.16.0.jar
+No changes.
diff --git a/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/2.17.0_vs_2.16.0/opentelemetry-spring-boot-starter.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.17.0.jar against opentelemetry-spring-boot-starter-2.16.0.jar
+No changes.
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts
@@ -23,7 +23,8 @@ dependencies {
   latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
 }
 
-if (!(findProperty("testLatestDeps") as Boolean)) {
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+if (!testLatestDeps) {
   configurations.testRuntimeClasspath {
     resolutionStrategy {
       eachDependency {
@@ -36,12 +37,26 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
   }
 }
 
+testing {
+  suites {
+    val testSecretsManager by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project())
+        implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
+        version = if (testLatestDeps) "latest.release" else "1.12.80"
+        implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
+      }
+    }
+  }
+}
+
 tasks {
   val testStableSemconv by registering(Test::class) {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
   check {
+    dependsOn(testing.suites)
     dependsOn(testStableSemconv)
   }
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkAttributesExtractor.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkAttributesExtractor.java
@@ -24,6 +24,8 @@ class AwsSdkAttributesExtractor implements AttributesExtractor<Request<?>, Respo
   private static final AttributeKey<String> AWS_REQUEST_ID = stringKey("aws.request_id");
 
   // Copied from AwsIncubatingAttributes
+  private static final AttributeKey<String> AWS_SECRETSMANAGER_SECRET_ARN =
+      stringKey("aws.secretsmanager.secret.arn");
   private static final AttributeKey<String> AWS_STEP_FUNCTIONS_ACTIVITY_ARN =
       stringKey("aws.step_functions.activity.arn");
   private static final AttributeKey<String> AWS_STEP_FUNCTIONS_STATE_MACHINE_ARN =
@@ -62,8 +64,9 @@ public void onEnd(
       Request<?> request,
       @Nullable Response<?> response,
       @Nullable Throwable error) {
-    if (response != null) {
-      Object awsResp = response.getAwsResponse();
+    Object awsResp = getAwsResponse(response);
+    if (awsResp != null) {
+      setAttribute(attributes, AWS_SECRETSMANAGER_SECRET_ARN, awsResp, RequestAccess::getSecretArn);
       setAttribute(
           attributes,
           AWS_STEP_FUNCTIONS_STATE_MACHINE_ARN,
@@ -106,4 +109,11 @@ public static void setAttribute(
       attributes.put(key, value);
     }
   }
+
+  private static Object getAwsResponse(Response<?> response) {
+    if (response == null) {
+      return null;
+    }
+    return response.getAwsResponse();
+  }
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/RequestAccess.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/RequestAccess.java
@@ -11,6 +11,8 @@
 import javax.annotation.Nullable;
 
 final class RequestAccess {
+  private static final String SECRETS_MANAGER_REQUEST_CLASS_PREFIX =
+      "com.amazonaws.services.secretsmanager.model.";
   private static final String STEP_FUNCTIONS_REQUEST_CLASS_PREFIX =
       "com.amazonaws.services.stepfunctions.model.";
 
@@ -22,20 +24,20 @@ protected RequestAccess computeValue(Class<?> type) {
         }
       };
 
+  @Nullable
+  static String getSecretArn(Object request) {
+    RequestAccess access = REQUEST_ACCESSORS.get(request.getClass());
+    return invokeOrNull(access.getSecretArn, request);
+  }
+
   @Nullable
   static String getStepFunctionsActivityArn(Object request) {
-    if (request == null) {
-      return null;
-    }
     RequestAccess access = REQUEST_ACCESSORS.get(request.getClass());
     return invokeOrNull(access.getStepFunctionsActivityArn, request);
   }
 
   @Nullable
   static String getStateMachineArn(Object request) {
-    if (request == null) {
-      return null;
-    }
     RequestAccess access = REQUEST_ACCESSORS.get(request.getClass());
     return invokeOrNull(access.getStateMachineArn, request);
   }
@@ -97,6 +99,7 @@ private static String invokeOrNull(@Nullable MethodHandle method, Object obj) {
   @Nullable private final MethodHandle getBucketName;
   @Nullable private final MethodHandle getQueueUrl;
   @Nullable private final MethodHandle getQueueName;
+  @Nullable private final MethodHandle getSecretArn;
   @Nullable private final MethodHandle getStreamName;
   @Nullable private final MethodHandle getTableName;
   @Nullable private final MethodHandle getTopicArn;
@@ -112,6 +115,9 @@ private RequestAccess(Class<?> clz) {
     getTableName = findAccessorOrNull(clz, "getTableName");
     getTopicArn = findAccessorOrNull(clz, "getTopicArn");
     getTargetArn = findAccessorOrNull(clz, "getTargetArn");
+
+    boolean isSecretsManager = clz.getName().startsWith(SECRETS_MANAGER_REQUEST_CLASS_PREFIX);
+    getSecretArn = isSecretsManager ? findAccessorOrNull(clz, "getARN") : null;
     boolean isStepFunction = clz.getName().startsWith(STEP_FUNCTIONS_REQUEST_CLASS_PREFIX);
     getStateMachineArn = isStepFunction ? findAccessorOrNull(clz, "getStateMachineArn") : null;
     getStepFunctionsActivityArn = isStepFunction ? findAccessorOrNull(clz, "getActivityArn") : null;
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/testSecretsManager/java/io/opentelemetry/instrumentation/awssdk/v1_11/SecretsManagerClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/testSecretsManager/java/io/opentelemetry/instrumentation/awssdk/v1_11/SecretsManagerClientTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awssdk.v1_11;
+
+import com.amazonaws.services.secretsmanager.AWSSecretsManagerClientBuilder;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class SecretsManagerClientTest extends AbstractSecretsManagerClientTest {
+  @RegisterExtension
+  private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
+
+  @Override
+  protected InstrumentationExtension testing() {
+    return testing;
+  }
+
+  @Override
+  public AWSSecretsManagerClientBuilder configureClient(
+      AWSSecretsManagerClientBuilder clientBuilder) {
+
+    return clientBuilder.withRequestHandlers(
+        AwsSdkTelemetry.builder(testing().getOpenTelemetry())
+            .setCaptureExperimentalSpanAttributes(true)
+            .build()
+            .newRequestHandler());
+  }
+}
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
   compileOnly("com.amazonaws:aws-java-sdk-kinesis:1.11.106")
   compileOnly("com.amazonaws:aws-java-sdk-rds:1.11.106")
   compileOnly("com.amazonaws:aws-java-sdk-s3:1.11.106")
+  compileOnly("com.amazonaws:aws-java-sdk-secretsmanager:1.12.80")
   compileOnly("com.amazonaws:aws-java-sdk-sns:1.11.106")
   compileOnly("com.amazonaws:aws-java-sdk-sqs:1.11.106")
   compileOnly("com.amazonaws:aws-java-sdk-stepfunctions:1.11.106")
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSecretsManagerClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSecretsManagerClientTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awssdk.v1_11;
+
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_SECRETSMANAGER_SECRET_ARN;
+import static java.util.Collections.singletonList;
+
+import com.amazonaws.services.secretsmanager.AWSSecretsManager;
+import com.amazonaws.services.secretsmanager.AWSSecretsManagerClientBuilder;
+import com.amazonaws.services.secretsmanager.model.CreateSecretRequest;
+import com.amazonaws.services.secretsmanager.model.DescribeSecretRequest;
+import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
+import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
+import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
+import io.opentelemetry.testing.internal.armeria.common.MediaType;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+public abstract class AbstractSecretsManagerClientTest extends AbstractBaseAwsClientTest {
+
+  public abstract AWSSecretsManagerClientBuilder configureClient(
+      AWSSecretsManagerClientBuilder client);
+
+  @Override
+  protected boolean hasRequestId() {
+    return false;
+  }
+
+  @Test
+  public void sendCreateSecretRequestWithMockedResponse() throws Exception {
+    AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder.standard();
+    AWSSecretsManager client =
+        configureClient(clientBuilder)
+            .withEndpointConfiguration(endpoint)
+            .withCredentials(credentialsProvider)
+            .build();
+
+    String body =
+        "{"
+            + "\"ARN\": \"arn:aws:secretsmanager:us-west-2:123456789012:secret:MyTestDatabaseSecret-a1b2c3\","
+            + "\"Name\": \"MyTestDatabaseSecret\","
+            + "\"VersionId\": \"EXAMPLE1-90ab-cdef-fedc-ba987SECRET1\""
+            + "}";
+    server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body));
+
+    Object response =
+        client.createSecret(
+            new CreateSecretRequest().withName("secretName").withSecretString("secretValue"));
+
+    List<AttributeAssertion> additionalAttributes =
+        singletonList(
+            equalTo(
+                AWS_SECRETSMANAGER_SECRET_ARN,
+                "arn:aws:secretsmanager:us-west-2:123456789012:secret:MyTestDatabaseSecret-a1b2c3"));
+
+    assertRequestWithMockedResponse(
+        response, client, "AWSSecretsManager", "CreateSecret", "POST", additionalAttributes);
+  }
+
+  @Test
+  public void sendDescribeSecretRequestWithMockedResponse() throws Exception {
+    AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder.standard();
+    AWSSecretsManager client =
+        configureClient(clientBuilder)
+            .withEndpointConfiguration(endpoint)
+            .withCredentials(credentialsProvider)
+            .build();
+
+    String body =
+        "{"
+            + "\"ARN\": \"arn:aws:secretsmanager:us-east-1:123456789012:secret:My-Secret-Id-WzAXar\","
+            + "\"Name\": \"My-Secret-Id\","
+            + "\"VersionId\": \"EXAMPLE1-90ab-cdef-fedc-ba987SECRET1\""
+            + "}";
+
+    server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body));
+    Object response =
+        client.describeSecret(new DescribeSecretRequest().withSecretId("My-Secret-Id"));
+
+    List<AttributeAssertion> additionalAttributes =
+        singletonList(
+            equalTo(
+                AWS_SECRETSMANAGER_SECRET_ARN,
+                "arn:aws:secretsmanager:us-east-1:123456789012:secret:My-Secret-Id-WzAXar"));
+
+    assertRequestWithMockedResponse(
+        response, client, "AWSSecretsManager", "DescribeSecret", "POST", additionalAttributes);
+  }
+}
diff --git a/test-report/build.gradle.kts b/test-report/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 dependencies {
   implementation("com.google.api-client:google-api-client:2.8.0")
   implementation("com.google.apis:google-api-services-sheets:v4-rev20250616-2.0.0")
-  implementation("com.google.auth:google-auth-library-oauth2-http:1.37.0")
+  implementation("com.google.auth:google-auth-library-oauth2-http:1.37.1")
 }
 
 otelJava {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ otelJava {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.1")`
	`16`	`+ jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.3")`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.17.0.jar against opentelemetry-instrumentation-annotations-2.16.0.jar`
	`2`	`+No changes.`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ dependencies {`
`23`	`23`	`latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation`
`24`	`24`	`}`
`25`	`25`
`26`		`-if (!(findProperty("testLatestDeps") as Boolean)) {`
	`26`	`+val testLatestDeps = findProperty("testLatestDeps") as Boolean`
	`27`	`+if (!testLatestDeps) {`
`27`	`28`	`configurations.testRuntimeClasspath {`
`28`	`29`	`resolutionStrategy {`
`29`	`30`	`eachDependency {`
`@@ -36,12 +37,26 @@ if (!(findProperty("testLatestDeps") as Boolean)) {`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`
	`40`	`+testing {`
	`41`	`+ suites {`
	`42`	`+ val testSecretsManager by registering(JvmTestSuite::class) {`
	`43`	`+ dependencies {`
	`44`	`+ implementation(project())`
	`45`	`+ implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))`
	`46`	`+ version = if (testLatestDeps) "latest.release" else "1.12.80"`
	`47`	`+ implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")`
	`48`	`+ }`
	`49`	`+ }`
	`50`	`+ }`
	`51`	`+}`
	`52`	`+`
`39`	`53`	`tasks {`
`40`	`54`	`val testStableSemconv by registering(Test::class) {`
`41`	`55`	`jvmArgs("-Dotel.semconv-stability.opt-in=database")`
`42`	`56`	`}`
`43`	`57`
`44`	`58`	`check {`
	`59`	`+ dependsOn(testing.suites)`
`45`	`60`	`dependsOn(testStableSemconv)`
`46`	`61`	`}`
`47`	`62`	`}`