Update muzzle

Author: anuraaga

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -11,6 +11,7 @@ muzzle {
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
 
+    excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime")
     excludeInstrumentationName("aws-sdk-2.2-sqs")
     excludeInstrumentationName("aws-sdk-2.2-sns")
     excludeInstrumentationName("aws-sdk-2.2-lambda")
@@ -43,6 +44,7 @@ muzzle {
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
 
+    excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime")
     excludeInstrumentationName("aws-sdk-2.2-sns")
     excludeInstrumentationName("aws-sdk-2.2-lambda")
 
@@ -58,6 +60,7 @@ muzzle {
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
 
+    excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime")
     excludeInstrumentationName("aws-sdk-2.2-sqs")
     excludeInstrumentationName("aws-sdk-2.2-lambda")
 
@@ -72,12 +75,25 @@ muzzle {
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
 
+    excludeInstrumentationName("aws-sdk-2.2-bedrock-runtime")
     excludeInstrumentationName("aws-sdk-2.2-sqs")
     excludeInstrumentationName("aws-sdk-2.2-sns")
 
     // several software.amazon.awssdk artifacts are missing for this version
     skip("2.17.200")
   }
+  pass {
+    group.set("software.amazon.awssdk")
+    module.set("bedrock-runtime")
+    versions.set("[2.25.63,)")
+    // Used by all SDK services, the only case it isn't is an SDK extension such as a custom HTTP
+    // client, which is not target of instrumentation anyways.
+    extraDependency("software.amazon.awssdk:protocol-core")
+
+    excludeInstrumentationName("aws-sdk-2.2-lambda")
+    excludeInstrumentationName("aws-sdk-2.2-sqs")
+    excludeInstrumentationName("aws-sdk-2.2-sns")
+  }
 }
 
 dependencies {
@@ -127,8 +143,8 @@ testing {
         if (findProperty("testLatestDeps") as Boolean) {
           implementation("software.amazon.awssdk:bedrockruntime:+")
         } else {
-          // First .0 release with Converse API
-          implementation("software.amazon.awssdk:bedrockruntime:2.26.0")
+          // First release with Converse API
+          implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
         }
       }
     }

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/BedrockRuntimeInstrumentationModule.java

@@ -19,7 +19,7 @@
 public class BedrockRuntimeInstrumentationModule extends AbstractAwsSdkInstrumentationModule {
 
   public BedrockRuntimeInstrumentationModule() {
-    super("aws-sdk-2.2-bedrock");
+    super("aws-sdk-2.2-bedrock-runtime");
   }
 
   @Override

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

@@ -14,9 +14,10 @@ dependencies {
   compileOnly("software.amazon.awssdk:json-utils:2.17.0")
   compileOnly(project(":muzzle")) // For @NoMuzzle
 
-  // don't use library to make sure base test is run with the floor version.
-  // bedrock runtime is tested separately with newer versions.
-  compileOnly("software.amazon.awssdk:bedrockruntime:2.26.0")
+  // Don't use library to make sure base test is run with the floor version.
+  // bedrock runtime is tested separately in testBedrockRuntime.
+  // First release with Converse API
+  compileOnly("software.amazon.awssdk:bedrockruntime:2.25.63")
 
   testImplementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
 
@@ -68,8 +69,7 @@ testing {
         if (findProperty("testLatestDeps") as Boolean) {
           implementation("software.amazon.awssdk:bedrockruntime:+")
         } else {
-          // First .0 release with Converse API
-          implementation("software.amazon.awssdk:bedrockruntime:2.26.0")
+          implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
         }
       }
     }

instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
 
   // compileOnly because we never want to pin the low version implicitly; need to add dependencies
   // explicitly in user projects, e.g. using testLatestDeps.
-  compileOnly("software.amazon.awssdk:bedrockruntime:2.26.0")
+  compileOnly("software.amazon.awssdk:bedrockruntime:2.25.63")
   compileOnly("software.amazon.awssdk:dynamodb:2.2.0")
   compileOnly("software.amazon.awssdk:ec2:2.2.0")
   compileOnly("software.amazon.awssdk:kinesis:2.2.0")