Skip to content

Commit d40b453

Browse files
zzhloginzzhlogin
authored
Align bedrock attributes naming. (#9)
* Align bedrock attributes naming.
1 parent debb9be commit d40b453

File tree

6 files changed

+26
-29
lines changed

6 files changed

+26
-29
lines changed

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsBedrockResourceType.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.instrumentation.awssdk.v1_11;
77

88
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_AGENT_ID;
9-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_DATASOURCE_ID;
10-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_KNOWLEDGEBASE_ID;
9+
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_DATA_SOURCE_ID;
10+
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_KNOWLEDGE_BASE_ID;
1111

1212
import io.opentelemetry.api.common.AttributeKey;
1313
import java.util.Arrays;
@@ -18,8 +18,8 @@
1818

1919
enum AwsBedrockResourceType {
2020
AGENT_TYPE(AWS_AGENT_ID, RequestAccess::getAgentId),
21-
DATA_SOURCE_TYPE(AWS_DATASOURCE_ID, RequestAccess::getDataSourceId),
22-
KNOWLEDGE_BASE_TYPE(AWS_KNOWLEDGEBASE_ID, RequestAccess::getKnowledgeBaseId);
21+
DATA_SOURCE_TYPE(AWS_DATA_SOURCE_ID, RequestAccess::getDataSourceId),
22+
KNOWLEDGE_BASE_TYPE(AWS_KNOWLEDGE_BASE_ID, RequestAccess::getKnowledgeBaseId);
2323

2424
@SuppressWarnings("ImmutableEnumChecker")
2525
private final AttributeKey<String> keyAttribute;

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsExperimentalAttributes.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ final class AwsExperimentalAttributes {
1919
static final AttributeKey<String> AWS_TABLE_NAME = stringKey("aws.table.name");
2020
static final AttributeKey<String> AWS_REQUEST_ID = stringKey("aws.requestId");
2121
static final AttributeKey<String> AWS_AGENT_ID = stringKey("aws.bedrock.agent.id");
22-
static final AttributeKey<String> AWS_KNOWLEDGEBASE_ID =
23-
stringKey("aws.bedrock.knowledgebase.id");
24-
static final AttributeKey<String> AWS_DATASOURCE_ID = stringKey("aws.bedrock.datasource.id");
22+
static final AttributeKey<String> AWS_KNOWLEDGE_BASE_ID =
23+
stringKey("aws.bedrock.knowledge_base.id");
24+
static final AttributeKey<String> AWS_DATA_SOURCE_ID = stringKey("aws.bedrock.data_source.id");
2525
static final AttributeKey<String> AWS_GUARDRAIL_ID = stringKey("aws.bedrock.guardrail.id");
2626

2727
// TODO: Merge in gen_ai attributes in opentelemetry-semconv-incubating once upgrade to v1.26.0

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkExperimentalAttributesExtractor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_BUCKET_NAME;
1313
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_ENDPOINT;
1414
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_GUARDRAIL_ID;
15-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_KNOWLEDGEBASE_ID;
15+
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_KNOWLEDGE_BASE_ID;
1616
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_NAME;
1717
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_URL;
1818
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_REQUEST_ID;
@@ -107,7 +107,7 @@ private static void bedrockOnStart(
107107
case BEDROCK_AGENT_RUNTIME_SERVICE:
108108
setAttribute(attributes, AWS_AGENT_ID, originalRequest, RequestAccess::getAgentId);
109109
setAttribute(
110-
attributes, AWS_KNOWLEDGEBASE_ID, originalRequest, RequestAccess::getKnowledgeBaseId);
110+
attributes, AWS_KNOWLEDGE_BASE_ID, originalRequest, RequestAccess::getKnowledgeBaseId);
111111
break;
112112
case BEDROCK_RUNTIME_SERVICE:
113113
if (!Objects.equals(requestClassName, "InvokeModelRequest")) {
@@ -143,7 +143,7 @@ private static void bedrockOnEnd(
143143
break;
144144
case BEDROCK_AGENT_RUNTIME_SERVICE:
145145
setAttribute(attributes, AWS_AGENT_ID, awsResp, RequestAccess::getAgentId);
146-
setAttribute(attributes, AWS_KNOWLEDGEBASE_ID, awsResp, RequestAccess::getKnowledgeBaseId);
146+
setAttribute(attributes, AWS_KNOWLEDGE_BASE_ID, awsResp, RequestAccess::getKnowledgeBaseId);
147147
break;
148148
default:
149149
break;

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
194194
}
195195
"""
196196
"AWSBedrockAgent" | "GetAgent" | "GET" | "/" | AWSBedrockAgentClientBuilder.standard() | { c -> c.getAgent(new GetAgentRequest().withAgentId("agentId")) } | ["aws.bedrock.agent.id": "agentId"] | ""
197-
"AWSBedrockAgent" | "GetKnowledgeBase" | "GET" | "/" | AWSBedrockAgentClientBuilder.standard() | { c -> c.getKnowledgeBase(new GetKnowledgeBaseRequest().withKnowledgeBaseId("knowledgeBaseId")) } | ["aws.bedrock.knowledgebase.id": "knowledgeBaseId"] | ""
198-
"AWSBedrockAgent" | "GetDataSource" | "GET" | "/" | AWSBedrockAgentClientBuilder.standard() | { c -> c.getDataSource(new GetDataSourceRequest().withDataSourceId("datasourceId").withKnowledgeBaseId("knowledgeBaseId")) } | ["aws.bedrock.datasource.id": "datasourceId"] | ""
197+
"AWSBedrockAgent" | "GetKnowledgeBase" | "GET" | "/" | AWSBedrockAgentClientBuilder.standard() | { c -> c.getKnowledgeBase(new GetKnowledgeBaseRequest().withKnowledgeBaseId("knowledgeBaseId")) } | ["aws.bedrock.knowledge_base.id": "knowledgeBaseId"] | ""
198+
"AWSBedrockAgent" | "GetDataSource" | "GET" | "/" | AWSBedrockAgentClientBuilder.standard() | { c -> c.getDataSource(new GetDataSourceRequest().withDataSourceId("datasourceId").withKnowledgeBaseId("knowledgeBaseId")) } | ["aws.bedrock.data_source.id": "datasourceId"] | ""
199199
"BedrockRuntime" | "InvokeModel" | "POST" | "/" | AmazonBedrockRuntimeClientBuilder.standard() |
200200
{ c -> c.invokeModel(
201201
new InvokeModelRequest().withModelId("anthropic.claude-v2").withBody(StandardCharsets.UTF_8.encode(

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsExperimentalAttributes.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ final class AwsExperimentalAttributes {
1515
static final AttributeKey<String> AWS_QUEUE_NAME = stringKey("aws.queue.name");
1616
static final AttributeKey<String> AWS_STREAM_NAME = stringKey("aws.stream.name");
1717
static final AttributeKey<String> AWS_TABLE_NAME = stringKey("aws.table.name");
18-
static final AttributeKey<String> AWS_BEDROCK_GUARDRAIL_ID =
19-
stringKey("aws.bedrock.guardrail.id");
20-
static final AttributeKey<String> AWS_BEDROCK_AGENT_ID = stringKey("aws.bedrock.agent.id");
21-
static final AttributeKey<String> AWS_BEDROCK_DATASOURCE_ID =
22-
stringKey("aws.bedrock.data_source.id");
23-
static final AttributeKey<String> AWS_BEDROCK_KNOWLEDGEBASE_ID =
18+
static final AttributeKey<String> AWS_GUARDRAIL_ID = stringKey("aws.bedrock.guardrail.id");
19+
static final AttributeKey<String> AWS_AGENT_ID = stringKey("aws.bedrock.agent.id");
20+
static final AttributeKey<String> AWS_DATA_SOURCE_ID = stringKey("aws.bedrock.data_source.id");
21+
static final AttributeKey<String> AWS_KNOWLEDGE_BASE_ID =
2422
stringKey("aws.bedrock.knowledge_base.id");
2523

2624
// TODO: Merge in gen_ai attributes in opentelemetry-semconv-incubating once upgrade to v1.26.0

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequestType.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
package io.opentelemetry.instrumentation.awssdk.v2_2;
77

8-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_AGENT_ID;
9-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_DATASOURCE_ID;
10-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_GUARDRAIL_ID;
11-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BEDROCK_KNOWLEDGEBASE_ID;
8+
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_AGENT_ID;
129
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_BUCKET_NAME;
10+
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_DATA_SOURCE_ID;
11+
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_GUARDRAIL_ID;
12+
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_KNOWLEDGE_BASE_ID;
1313
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_QUEUE_NAME;
1414
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_QUEUE_URL;
1515
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsExperimentalAttributes.AWS_STREAM_NAME;
@@ -27,16 +27,15 @@ enum AwsSdkRequestType {
2727
SQS(request(AWS_QUEUE_URL.getKey(), "QueueUrl"), request(AWS_QUEUE_NAME.getKey(), "QueueName")),
2828
KINESIS(request(AWS_STREAM_NAME.getKey(), "StreamName")),
2929
DYNAMODB(request(AWS_TABLE_NAME.getKey(), "TableName")),
30-
BEDROCK(request(AWS_BEDROCK_GUARDRAIL_ID.getKey(), "guardrailIdentifier")),
30+
BEDROCK(request(AWS_GUARDRAIL_ID.getKey(), "guardrailIdentifier")),
3131
BEDROCKAGENTOPERATION(
32-
request(AWS_BEDROCK_AGENT_ID.getKey(), "agentId"),
33-
response(AWS_BEDROCK_AGENT_ID.getKey(), "agentId")),
32+
request(AWS_AGENT_ID.getKey(), "agentId"), response(AWS_AGENT_ID.getKey(), "agentId")),
3433
BEDROCKDATASOURCEOPERATION(
35-
request(AWS_BEDROCK_DATASOURCE_ID.getKey(), "dataSourceId"),
36-
response(AWS_BEDROCK_DATASOURCE_ID.getKey(), "dataSourceId")),
34+
request(AWS_DATA_SOURCE_ID.getKey(), "dataSourceId"),
35+
response(AWS_DATA_SOURCE_ID.getKey(), "dataSourceId")),
3736
BEDROCKKNOWLEDGEBASEOPERATION(
38-
request(AWS_BEDROCK_KNOWLEDGEBASE_ID.getKey(), "knowledgeBaseId"),
39-
response(AWS_BEDROCK_KNOWLEDGEBASE_ID.getKey(), "knowledgeBaseId")),
37+
request(AWS_KNOWLEDGE_BASE_ID.getKey(), "knowledgeBaseId"),
38+
response(AWS_KNOWLEDGE_BASE_ID.getKey(), "knowledgeBaseId")),
4039
BEDROCKRUNTIME(request(GEN_AI_MODEL.getKey(), "modelId"));
4140

4241
// Wrapping in unmodifiableMap

0 commit comments

Comments
 (0)