Skip to content

Commit f73ce4e

Browse files
feat(bedrock): Set gen_ai.request.model attribute (#8231)
Set the requested model from the `modelId` parameter passed to the Bedrock API.
1 parent b898cd9 commit f73ce4e

2 files changed

Lines changed: 39 additions & 1 deletion

File tree

‎sentry_sdk/integrations/boto3/_services/bedrock.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,18 @@ def get_request_attributes(self, ctx: "AwsCallContext") -> "Attributes":
2828
if ctx.operation_name != "Converse" and ctx.operation_name != "ConverseStream":
2929
return {}
3030

31-
return {
31+
attributes: "Attributes" = {
3232
SPANDATA.GEN_AI_PROVIDER_NAME: "aws.bedrock",
3333
SPANDATA.GEN_AI_OPERATION_NAME: "chat",
3434
SPANDATA.GEN_AI_RESPONSE_STREAMING: ctx.operation_name == "ConverseStream",
3535
}
3636

37+
model_id = ctx.params.get("modelId")
38+
if model_id is not None:
39+
attributes[SPANDATA.GEN_AI_REQUEST_MODEL] = model_id
40+
41+
return attributes
42+
3743
def get_response_attributes(
3844
self,
3945
ctx: "AwsCallContext",

‎tests/integrations/boto3/test_bedrock.py‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ def test_converse(
6868
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
6969
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
7070
assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is False
71+
assert (
72+
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
73+
== "anthropic.claude-3-sonnet-20240229-v1:0"
74+
)
7175
else:
7276
events = capture_events()
7377

@@ -83,6 +87,10 @@ def test_converse(
8387
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
8488
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
8589
assert span["data"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is False
90+
assert (
91+
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
92+
== "anthropic.claude-3-sonnet-20240229-v1:0"
93+
)
8694

8795

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

140148
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
141149
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
150+
assert (
151+
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
152+
== "anthropic.claude-3-sonnet-20240229-v1:0"
153+
)
142154

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

160172
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
161173
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
174+
assert (
175+
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
176+
== "anthropic.claude-3-sonnet-20240229-v1:0"
177+
)
162178

163179
assert span["data"][SPANDATA.ERROR_TYPE] == "AccessDeniedException"
164180
assert span["data"][SPANDATA.HTTP_STATUS_CODE] == 403
@@ -206,6 +222,10 @@ def test_converse_stream(
206222
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
207223
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
208224
assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
225+
assert (
226+
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
227+
== "anthropic.claude-3-sonnet-20240229-v1:0"
228+
)
209229
else:
210230
events = capture_events()
211231

@@ -221,6 +241,10 @@ def test_converse_stream(
221241
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
222242
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
223243
assert span["data"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
244+
assert (
245+
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
246+
== "anthropic.claude-3-sonnet-20240229-v1:0"
247+
)
224248

225249

226250
@pytest.mark.parametrize("span_streaming", [True, False])
@@ -278,6 +302,10 @@ def raise_client_error(**kwargs):
278302
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
279303
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
280304
assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
305+
assert (
306+
span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL]
307+
== "anthropic.claude-3-sonnet-20240229-v1:0"
308+
)
281309

282310
assert span["attributes"][SPANDATA.ERROR_TYPE] == "AccessDeniedException"
283311
assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 403
@@ -299,6 +327,10 @@ def raise_client_error(**kwargs):
299327
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "aws.bedrock"
300328
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "chat"
301329
assert span["data"][SPANDATA.GEN_AI_RESPONSE_STREAMING] is True
330+
assert (
331+
span["data"][SPANDATA.GEN_AI_REQUEST_MODEL]
332+
== "anthropic.claude-3-sonnet-20240229-v1:0"
333+
)
302334

303335
assert span["data"][SPANDATA.ERROR_TYPE] == "AccessDeniedException"
304336
assert span["data"][SPANDATA.HTTP_STATUS_CODE] == 403

0 commit comments

Comments
 (0)