Skip to content

feat(bedrock): Set gen_ai.request.model attribute #8231

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

Draft
alexander-alderman-webb wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(bedrock): Set gen_ai.request.model attribute #8231

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
8 changes: 7 additions & 1 deletion sentry_sdk/integrations/boto3/_services/bedrock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,18 @@ def get_request_attributes(self, ctx: "AwsCallContext") -> "Attributes":
if ctx.operation_name != "Converse" and ctx.operation_name != "ConverseStream":
return {}

return {
attributes: "Attributes" = {
SPANDATA.GEN_AI_PROVIDER_NAME: "aws.bedrock",
SPANDATA.GEN_AI_OPERATION_NAME: "chat",
SPANDATA.GEN_AI_RESPONSE_STREAMING: ctx.operation_name == "ConverseStream",
}

model_id = ctx.params.get("modelId")
if model_id is not None:
attributes[SPANDATA.GEN_AI_REQUEST_MODEL] = model_id

return attributes

def get_response_attributes(
self,
ctx: "AwsCallContext",
Expand Down
32 changes: 32 additions & 0 deletions tests/integrations/boto3/test_bedrock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ def test_converse(
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is False
assert (
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)
else:
events = capture_events()

Expand All @@ -83,6 +87,10 @@ def test_converse(
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert span["data"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is False
assert (
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)


@pytest.mark.parametrize("span_streaming", [True, False])
Expand Down Expand Up @@ -139,6 +147,10 @@ def raise_client_error(**kwargs):

assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert (
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)

assert span["attributes"][SPANDATA.ERROR_TYPE] == "AccessDeniedException"
assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 403
Expand All @@ -159,6 +171,10 @@ def raise_client_error(**kwargs):

assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert (
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)

assert span["data"][SPANDATA.ERROR_TYPE] == "AccessDeniedException"
assert span["data"][SPANDATA.HTTP_STATUS_CODE] == 403
Expand Down Expand Up @@ -206,6 +222,10 @@ def test_converse_stream(
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
assert (
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)
else:
events = capture_events()

Expand All @@ -221,6 +241,10 @@ def test_converse_stream(
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert span["data"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
assert (
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)


@pytest.mark.parametrize("span_streaming", [True, False])
Expand Down Expand Up @@ -278,6 +302,10 @@ def raise_client_error(**kwargs):
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
assert (
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)

assert span["attributes"][SPANDATA.ERROR_TYPE] == "AccessDeniedException"
assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 403
Expand All @@ -299,6 +327,10 @@ def raise_client_error(**kwargs):
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
assert span["data"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
assert (
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
== "anthropic.claude-3-sonnet-20240229-v1:0"
)

assert span["data"][SPANDATA.ERROR_TYPE] == "AccessDeniedException"
assert span["data"][SPANDATA.HTTP_STATUS_CODE] == 403
Expand Down
Loading