[release/v1.25.x] Bump io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha from 1.24.0-alpha to 1.25.0-alpha (#842)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <[email protected]>

Author: 3 people

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java

@@ -343,11 +343,11 @@ private static String getArn(Attributes attributes, Resource resource) {
 
   @Nullable
   private static String getLambdaArn(Attributes attributes, Resource resource) {
-    String arn = resource.getAttributes().get(ResourceAttributes.FAAS_ID);
+    String arn = resource.getAttributes().get(ResourceAttributes.CLOUD_RESOURCE_ID);
     if (arn != null) {
       return arn;
     }
-    return attributes.get(ResourceAttributes.FAAS_ID);
+    return attributes.get(ResourceAttributes.CLOUD_RESOURCE_ID);
   }
 
   @Nullable

aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java

@@ -500,7 +500,9 @@ class AwsLambdaTest {
             .put(
                 ResourceAttributes.CLOUD_PLATFORM,
                 ResourceAttributes.CloudPlatformValues.AWS_LAMBDA)
-            .put(ResourceAttributes.FAAS_ID, "arn:aws:xray:us-east-1:595986152929:my-service")
+            .put(
+                ResourceAttributes.CLOUD_RESOURCE_ID,
+                "arn:aws:xray:us-east-1:595986152929:my-service")
             .build();
 
     private final Attributes attributes =
@@ -521,10 +523,12 @@ void resourceFaasIdMatches() {
     void spanFaasIdMatches() {
       Resource resource =
           Resource.create(
-              removeAttribute(this.resource.getAttributes(), ResourceAttributes.FAAS_ID));
+              removeAttribute(this.resource.getAttributes(), ResourceAttributes.CLOUD_RESOURCE_ID));
       Attributes attributes =
           this.attributes.toBuilder()
-              .put(ResourceAttributes.FAAS_ID, "arn:aws:xray:us-east-1:595986152929:my-service")
+              .put(
+                  ResourceAttributes.CLOUD_RESOURCE_ID,
+                  "arn:aws:xray:us-east-1:595986152929:my-service")
               .build();
       assertThat(applier.matches(attributes, resource)).isTrue();
     }

dependencyManagement/build.gradle.kts

@@ -17,7 +17,7 @@ val DEPENDENCY_BOMS = listOf(
   "com.linecorp.armeria:armeria-bom:1.23.1",
   "org.junit:junit-bom:5.9.2",
   "io.grpc:grpc-bom:1.54.1",
-  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha",
+  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha",
   "org.testcontainers:testcontainers-bom:1.18.0"
 )