Skip to content

update genai system attribute name to align with upstream #26

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
mxiamxia merged 1 commit into from
Dec 17, 2024
Merged

update genai system attribute name to align with upstream #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .../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 @@ -145,7 +145,7 @@ private static void bedrockOnStart(
if (!Objects.equals(requestClassName, "InvokeModelRequest")) {
break;
}
attributes.put(AWS_BEDROCK_SYSTEM, "aws_bedrock");
attributes.put(AWS_BEDROCK_SYSTEM, "aws.bedrock");
Function<Object, String> getter = RequestAccess::getModelId;
String modelId = getter.apply(originalRequest);
attributes.put(AWS_BEDROCK_RUNTIME_MODEL_ID, modelId);
Expand Down
12 changes: 6 additions & 6 deletions ...c/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
} |
[
"gen_ai.request.model": "ai21.jamba-1-5-mini-v1:0",
"gen_ai.system": "aws_bedrock",
"gen_ai.system": "aws.bedrock",
"gen_ai.request.max_tokens": "1000",
"gen_ai.request.temperature": "0.7",
"gen_ai.request.top_p": "0.8",
Expand Down Expand Up @@ -268,7 +268,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
} |
[
"gen_ai.request.model": "amazon.titan-text-premier-v1:0",
"gen_ai.system": "aws_bedrock",
"gen_ai.system": "aws.bedrock",
"gen_ai.request.max_tokens": "100",
"gen_ai.request.temperature": "0.7",
"gen_ai.request.top_p": "0.9",
Expand Down Expand Up @@ -310,7 +310,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
} |
[
"gen_ai.request.model": "anthropic.claude-3-5-sonnet-20241022-v2:0",
"gen_ai.system": "aws_bedrock",
"gen_ai.system": "aws.bedrock",
"gen_ai.request.max_tokens": "100",
"gen_ai.request.temperature": "0.7",
"gen_ai.request.top_p": "0.9",
Expand Down Expand Up @@ -345,7 +345,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
} |
[
"gen_ai.request.model": "meta.llama3-70b-instruct-v1:0",
"gen_ai.system": "aws_bedrock",
"gen_ai.system": "aws.bedrock",
"gen_ai.request.max_tokens": "128",
"gen_ai.request.temperature": "0.1",
"gen_ai.request.top_p": "0.9",
Expand Down Expand Up @@ -378,7 +378,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
} |
[
"gen_ai.request.model": "cohere.command-r-v1:0",
"gen_ai.system": "aws_bedrock",
"gen_ai.system": "aws.bedrock",
"gen_ai.request.max_tokens": "4096",
"gen_ai.request.temperature": "0.8",
"gen_ai.request.top_p": "0.45",
Expand Down Expand Up @@ -410,7 +410,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
} |
[
"gen_ai.request.model": "mistral.mistral-large-2402-v1:0",
"gen_ai.system": "aws_bedrock",
"gen_ai.system": "aws.bedrock",
"gen_ai.request.max_tokens": "4096",
"gen_ai.request.temperature": "0.75",
"gen_ai.request.top_p": "0.25",
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -44,7 +44,7 @@

/** AWS request execution interceptor. */
final class TracingExecutionInterceptor implements ExecutionInterceptor {
private static final String GEN_AI_SYSTEM_BEDROCK = "aws_bedrock";
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
2 changes: 1 addition & 1 deletion ...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 @@ -164,7 +164,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest {
"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"
"gen_ai.system" "aws.bedrock"
} else if (service == "Sfn" && operation == "DescribeStateMachine") {
"aws.stepfunctions.state_machine.arn" "stateMachineArn"
} else if (service == "Sfn" && operation == "DescribeActivity") {
Expand Down