Skip to content
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

support bedrock and bedrock runtime resources #5

Merged
merged 13 commits into from
Jul 9, 2024
Merged

support bedrock and bedrock runtime resources #5

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d9030c2
support bedrock and bedrock runtime resources
mxiamxia Jun 19, 2024
dbb4f3f
Fix common / extra-dependency-management-enforcement workflow failure.
zzhlogin Jun 25, 2024
63f3a06
Add BedrockAgent Operation based API.
zzhlogin Jun 26, 2024
2434bb7
Apply spitless.
zzhlogin Jun 26, 2024
8e961c3
Change Json dependency pkgs.
zzhlogin Jun 28, 2024
1768c85
Trigger WF.
zzhlogin Jun 28, 2024
a3ec28b
Add unit tests.
zzhlogin Jul 2, 2024
ba588ec
Unit test still dosen't work, removing.
zzhlogin Jul 2, 2024
006684c
Address comments.
zzhlogin Jul 5, 2024
d33e65f
Address comments.
zzhlogin Jul 5, 2024
eb2f2d4
Address comments.
zzhlogin Jul 5, 2024
99ec1af
Use AwsExperimentalAttributes.
zzhlogin Jul 5, 2024
c3de3f2
Change to 1.26.0
zzhlogin Jul 5, 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
30 changes: 30 additions & 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
@@ -0,0 +1,30 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v2_2;

import static io.opentelemetry.api.common.AttributeKey.stringKey;

import io.opentelemetry.api.common.AttributeKey;

final class AwsExperimentalAttributes {
zzhlogin marked this conversation as resolved.
Show resolved Hide resolved
static final AttributeKey<String> AWS_BUCKET_NAME = stringKey("aws.bucket.name");
static final AttributeKey<String> AWS_QUEUE_URL = stringKey("aws.queue.url");
static final AttributeKey<String> AWS_QUEUE_NAME = stringKey("aws.queue.name");
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_BEDROCK_GUARDRAIL_ID =
zzhlogin marked this conversation as resolved.
Show resolved Hide resolved
stringKey("aws.bedrock.guardrail.id");
static final AttributeKey<String> AWS_BEDROCK_AGENT_ID = stringKey("aws.bedrock.agent.id");
static final AttributeKey<String> AWS_BEDROCK_DATASOURCE_ID =
stringKey("aws.bedrock.data_source.id");
static final AttributeKey<String> AWS_BEDROCK_KNOWLEDGEBASE_ID =
stringKey("aws.bedrock.knowledge_base.id");

// TODO: Merge in gen_ai attributes in opentelemetry-semconv-incubating once upgrade to v1.25.0
static final AttributeKey<String> GEN_AI_MODEL = stringKey("gen_ai.request.model");

private AwsExperimentalAttributes() {}
}
44 changes: 44 additions & 0 deletions ...2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@

package io.opentelemetry.instrumentation.awssdk.v2_2;

import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.BEDROCK;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.BEDROCKAGENTOPERATION;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.BEDROCKDATASOURCEOPERATION;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.BEDROCKKNOWLEDGEBASEOPERATION;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.BEDROCKRUNTIME;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.DYNAMODB;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.KINESIS;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.S3;
Expand Down Expand Up @@ -32,6 +37,45 @@ enum AwsSdkRequest {
S3Request(S3, "S3Request"),
SqsRequest(SQS, "SqsRequest"),
KinesisRequest(KINESIS, "KinesisRequest"),
BedrockRequest(BEDROCK, "BedrockRequest"),
BedrockAgentRuntimeRequest(BEDROCKAGENTOPERATION, "BedrockAgentRuntimeRequest"),
BedrockRuntimeRequest(BEDROCKRUNTIME, "BedrockRuntimeRequest"),
// BedrockAgent API based requests. We only support operations that are related to
// Agent/DataSources/KnowledgeBases
// resources and the request/response context contains the resource ID.
BedrockCreateAgentActionGroupRequest(BEDROCKAGENTOPERATION, "CreateAgentActionGroupRequest"),
BedrockCreateAgentAliasRequest(BEDROCKAGENTOPERATION, "CreateAgentAliasRequest"),
BedrockDeleteAgentActionGroupRequest(BEDROCKAGENTOPERATION, "DeleteAgentActionGroupRequest"),
BedrockDeleteAgentAliasRequest(BEDROCKAGENTOPERATION, "DeleteAgentAliasRequest"),
BedrockDeleteAgentVersionRequest(BEDROCKAGENTOPERATION, "DeleteAgentVersionRequest"),
BedrockGetAgentActionGroupRequest(BEDROCKAGENTOPERATION, "GetAgentActionGroupRequest"),
BedrockGetAgentAliasRequest(BEDROCKAGENTOPERATION, "GetAgentAliasRequest"),
BedrockGetAgentRequest(BEDROCKAGENTOPERATION, "GetAgentRequest"),
BedrockGetAgentVersionRequest(BEDROCKAGENTOPERATION, "GetAgentVersionRequest"),
BedrockListAgentActionGroupsRequest(BEDROCKAGENTOPERATION, "ListAgentActionGroupsRequest"),
BedrockListAgentAliasesRequest(BEDROCKAGENTOPERATION, "ListAgentAliasesRequest"),
BedrockListAgentKnowledgeBasesRequest(BEDROCKAGENTOPERATION, "ListAgentKnowledgeBasesRequest"),
BedrocListAgentVersionsRequest(BEDROCKAGENTOPERATION, "ListAgentVersionsRequest"),
BedrockPrepareAgentRequest(BEDROCKAGENTOPERATION, "PrepareAgentRequest"),
BedrockUpdateAgentActionGroupRequest(BEDROCKAGENTOPERATION, "UpdateAgentActionGroupRequest"),
BedrockUpdateAgentAliasRequest(BEDROCKAGENTOPERATION, "UpdateAgentAliasRequest"),
BedrockUpdateAgentRequest(BEDROCKAGENTOPERATION, "UpdateAgentRequest"),
BedrockBedrockAgentRequest(BEDROCKAGENTOPERATION, "BedrockAgentRequest"),
BedrockDeleteDataSourceRequest(BEDROCKDATASOURCEOPERATION, "DeleteDataSourceRequest"),
BedrockGetDataSourceRequest(BEDROCKDATASOURCEOPERATION, "GetDataSourceRequest"),
BedrockUpdateDataSourceRequest(BEDROCKDATASOURCEOPERATION, "UpdateDataSourceRequest"),
BedrocAssociateAgentKnowledgeBaseRequest(
BEDROCKKNOWLEDGEBASEOPERATION, "AssociateAgentKnowledgeBaseRequest"),
BedrockCreateDataSourceRequest(BEDROCKKNOWLEDGEBASEOPERATION, "CreateDataSourceRequest"),
BedrockDeleteKnowledgeBaseRequest(BEDROCKKNOWLEDGEBASEOPERATION, "DeleteKnowledgeBaseRequest"),
BedrockDisassociateAgentKnowledgeBaseRequest(
BEDROCKKNOWLEDGEBASEOPERATION, "DisassociateAgentKnowledgeBaseRequest"),
BedrockGetAgentKnowledgeBaseRequest(
BEDROCKKNOWLEDGEBASEOPERATION, "GetAgentKnowledgeBaseRequest"),
BedrockGetKnowledgeBaseRequest(BEDROCKKNOWLEDGEBASEOPERATION, "GetKnowledgeBaseRequest"),
BedrockListDataSourcesRequest(BEDROCKKNOWLEDGEBASEOPERATION, "ListDataSourcesRequest"),
BedrockUpdateAgentKnowledgeBaseRequest(
BEDROCKKNOWLEDGEBASEOPERATION, "UpdateAgentKnowledgeBaseRequest"),
// specific requests
BatchGetItem(
DYNAMODB,
Expand Down
30 changes: 26 additions & 4 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 @@ -5,17 +5,39 @@

package io.opentelemetry.instrumentation.awssdk.v2_2;

import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_AGENT_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_DATASOURCE_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_GUARDRAIL_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_KNOWLEDGEBASE_ID;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BUCKET_NAME;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_QUEUE_NAME;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_QUEUE_URL;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_STREAM_NAME;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_TABLE_NAME;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.GEN_AI_MODEL;
import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.request;
import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.response;

import java.util.Collections;
import java.util.List;
import java.util.Map;

enum AwsSdkRequestType {
S3(request("aws.bucket.name", "Bucket")),
SQS(request("aws.queue.url", "QueueUrl"), request("aws.queue.name", "QueueName")),
KINESIS(request("aws.stream.name", "StreamName")),
DYNAMODB(request("aws.table.name", "TableName"));
S3(request(AWS_BUCKET_NAME.getKey(), "Bucket")),
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_BEDROCK_GUARDRAIL_ID.getKey(), "guardrailIdentifier")),
BEDROCKAGENTOPERATION(
request(AWS_BEDROCK_AGENT_ID.getKey(), "agentId"),
response(AWS_BEDROCK_AGENT_ID.getKey(), "agentId")),
BEDROCKDATASOURCEOPERATION(
request(AWS_BEDROCK_DATASOURCE_ID.getKey(), "dataSourceId"),
response(AWS_BEDROCK_DATASOURCE_ID.getKey(), "dataSourceId")),
BEDROCKKNOWLEDGEBASEOPERATION(
request(AWS_BEDROCK_KNOWLEDGEBASE_ID.getKey(), "knowledgeBaseId"),
response(AWS_BEDROCK_KNOWLEDGEBASE_ID.getKey(), "knowledgeBaseId")),
BEDROCKRUNTIME(request(GEN_AI_MODEL.getKey(), "modelId"));

// Wrapping in unmodifiableMap
@SuppressWarnings("ImmutableEnumChecker")
Expand Down
7 changes: 7 additions & 0 deletions ...c/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.instrumentation.awssdk.v2_2;

import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.BEDROCKRUNTIME;
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.DYNAMODB;

import io.opentelemetry.api.common.AttributeKey;
Expand Down Expand Up @@ -42,6 +43,8 @@

/** AWS request execution interceptor. */
final class TracingExecutionInterceptor implements ExecutionInterceptor {
private static final AttributeKey<String> GEN_AI_SYSTEM = AttributeKey.stringKey("gen_ai.system");
zzhlogin marked this conversation as resolved.
Show resolved Hide resolved
private static final String GEN_AI_SYSTEM_BEDROCK = "aws_bedrock";

// the class name is part of the attribute name, so that it will be shaded when used in javaagent
// instrumentation, and won't conflict with usage outside javaagent instrumentation
Expand Down Expand Up @@ -317,6 +320,10 @@ private void populateRequestAttributes(
span.setAttribute(SemanticAttributes.DB_OPERATION, operation);
}
}

if (awsSdkRequest.type() == BEDROCKRUNTIME) {
span.setAttribute(GEN_AI_SYSTEM, GEN_AI_SYSTEM_BEDROCK);
}
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions ...rc/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,19 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest {
"$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS"
} else if (service == "Kinesis") {
"aws.stream.name" "somestream"
} else if (service == "Bedrock" && operation == "GetGuardrail") {
"aws.bedrock.guardrail.id" "guardrailId"
} else if (service == "BedrockAgent" && operation == "GetAgent") {
"aws.bedrock.agent.id" "agentId"
} else if (service == "BedrockAgent" && operation == "GetKnowledgeBase") {
"aws.bedrock.knowledge_base.id" "knowledgeBaseId"
} else if (service == "BedrockAgent" && operation == "GetDataSource") {
"aws.bedrock.data_source.id" "datasourceId"
} else if (service == "BedrockRuntime" && operation == "InvokeModel") {
"gen_ai.request.model" "meta.llama2-13b-chat-v1"
"gen_ai.system" "aws_bedrock"
}

}
}
}
Expand Down
Loading