Skip to content

Add instrumentation of AWS Bedrock to use gen_ai conventions #13355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 5 commits into from
Feb 26, 2025
Merged

Add instrumentation of AWS Bedrock to use gen_ai conventions #13355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce57073
Add instrumentation of AWS Bedrock to use gen_ai conventions
anuraaga Feb 20, 2025
1fd295d
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
anuraaga Feb 20, 2025
e8a70b6
Drift
anuraaga Feb 20, 2025
1a6cda3
Update muzzle
anuraaga Feb 20, 2025
8954a51
Cleanup
anuraaga Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update muzzle
  • Loading branch information
@anuraaga
anuraaga committed Feb 20, 2025
commit 1a6cda32e77fd9a7a82035ca20befb31c97e6f2a
20 changes: 18 additions & 2 deletions instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")

Expand All @@ -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")

Expand All @@ -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 {
Expand Down Expand Up @@ -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")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry/javaagent/instrumentation/awssdk/v2_2/BedrockRuntimeInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down Expand Up @@ -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")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading