Skip to content

feat: update bedrock resource attributes #13

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
merged 2 commits into from
Oct 11, 2024
Merged

feat: update bedrock resource attributes #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6abeed
feat: update bedrock resource attributes
yiyuan-he Oct 9, 2024
0a93834
feat: create new enum for bedrock agent runtime requests
yiyuan-he Oct 10, 2024
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
1 change: 1 addition & 0 deletions ...rc/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsExperimentalAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ final class AwsExperimentalAttributes {
stringKey("aws.bedrock.knowledge_base.id");
static final AttributeKey<String> AWS_DATA_SOURCE_ID = stringKey("aws.bedrock.data_source.id");
static final AttributeKey<String> AWS_GUARDRAIL_ID = stringKey("aws.bedrock.guardrail.id");
static final AttributeKey<String> AWS_GUARDRAIL_ARN = stringKey("aws.bedrock.guardrail.arn");

// TODO: Merge in gen_ai attributes in opentelemetry-semconv-incubating once upgrade to v1.26.0
static final AttributeKey<String> AWS_BEDROCK_RUNTIME_MODEL_ID =
Expand Down
2 changes: 2 additions & 0 deletions .../io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkExperimentalAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_BEDROCK_SYSTEM;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_BUCKET_NAME;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_ENDPOINT;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_GUARDRAIL_ARN;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_GUARDRAIL_ID;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_KNOWLEDGE_BASE_ID;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_LAMBDA_NAME;
Expand Down Expand Up @@ -154,6 +155,7 @@ private static void bedrockOnEnd(
switch (serviceName) {
case BEDROCK_SERVICE:
setAttribute(attributes, AWS_GUARDRAIL_ID, awsResp, RequestAccess::getGuardrailId);
setAttribute(attributes, AWS_GUARDRAIL_ARN, awsResp, RequestAccess::getGuardrailArn);
break;
case BEDROCK_AGENT_SERVICE:
String responseClassName = awsResp.getClass().getSimpleName();
Expand Down
23 changes: 23 additions & 0 deletions ...11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/RequestAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Method;
import javax.annotation.Nullable;

final class RequestAccess {
Expand Down Expand Up @@ -110,6 +111,11 @@ static String getGuardrailId(Object request) {
return invokeOrNull(access.getGuardrailId, request);
}

@Nullable
static String getGuardrailArn(Object request) {
return findNestedAccessorOrNull(request, "getGuardrailArn");
}

@Nullable
static String getModelId(Object request) {
RequestAccess access = REQUEST_ACCESSORS.get(request.getClass());
Expand Down Expand Up @@ -173,4 +179,21 @@ private static MethodHandle findAccessorOrNull(Class<?> clz, String methodName)
return null;
}
}

@Nullable
private static String findNestedAccessorOrNull(Object obj, String... methodNames) {
Object current = obj;
for (String methodName : methodNames) {
if (current == null) {
return null;
}
try {
Method method = current.getClass().getMethod(methodName);
current = method.invoke(current);
} catch (Exception e) {
return null;
}
}
return (current instanceof String) ? (String) current : null;
}
}
1 change: 1 addition & 0 deletions ...src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsExperimentalAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ final class AwsExperimentalAttributes {
static final AttributeKey<String> AWS_STREAM_NAME = stringKey("aws.stream.name");
static final AttributeKey<String> AWS_TABLE_NAME = stringKey("aws.table.name");
static final AttributeKey<String> AWS_GUARDRAIL_ID = stringKey("aws.bedrock.guardrail.id");
static final AttributeKey<String> AWS_GUARDRAIL_ARN = stringKey("aws.bedrock.guardrail.arn");
static final AttributeKey<String> AWS_AGENT_ID = stringKey("aws.bedrock.agent.id");
static final AttributeKey<String> AWS_DATA_SOURCE_ID = stringKey("aws.bedrock.data_source.id");
static final AttributeKey<String> AWS_KNOWLEDGE_BASE_ID =
Expand Down
10 changes: 8 additions & 2 deletions ...library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequestType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_AGENT_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BUCKET_NAME;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_DATA_SOURCE_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_GUARDRAIL_ARN;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_GUARDRAIL_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_KNOWLEDGE_BASE_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_LAMBDA_ARN;
Expand All @@ -34,9 +35,14 @@ enum AwsSdkRequestType {
SQS(request(AWS_QUEUE_URL.getKey(), "QueueUrl"), request(AWS_QUEUE_NAME.getKey(), "QueueName")),
KINESIS(request(AWS_STREAM_NAME.getKey(), "StreamName")),
DYNAMODB(request(AWS_TABLE_NAME.getKey(), "TableName")),
BEDROCK(request(AWS_GUARDRAIL_ID.getKey(), "guardrailIdentifier")),
BEDROCK(
request(AWS_GUARDRAIL_ID.getKey(), "guardrailIdentifier"),
response(AWS_GUARDRAIL_ARN.getKey(), "guardrailArn")),
BEDROCKAGENTOPERATION(
request(AWS_AGENT_ID.getKey(), "agentId"), response(AWS_AGENT_ID.getKey(), "agentId")),
request(AWS_AGENT_ID.getKey(), "agentId"),
response(AWS_AGENT_ID.getKey(), "agentId"),
request(AWS_KNOWLEDGE_BASE_ID.getKey(), "knowledgeBaseId"),
response(AWS_KNOWLEDGE_BASE_ID.getKey(), "knowledgeBaseId")),
BEDROCKDATASOURCEOPERATION(
request(AWS_DATA_SOURCE_ID.getKey(), "dataSourceId"),
response(AWS_DATA_SOURCE_ID.getKey(), "dataSourceId")),
Expand Down
Loading