Skip to content

feat(bedrock): Set gen_ai.system_instructions attribute #8239

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
alexander-alderman-webb merged 2 commits into from
Nov 11, 2026
Merged

feat(bedrock): Set gen_ai.system_instructions attribute #8239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dec8c9
feat(bedrock): Set gen_ai.system_instructions attribute
alexander-alderman-webb Nov 11, 2026
76112fe
move _transform_system_instructions up
alexander-alderman-webb Nov 11, 2026
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
24 changes: 23 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 @@ -6,6 +6,7 @@
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.integrations import DidNotEnable
from sentry_sdk.integrations.boto3._services.base import _ServiceExtension
from sentry_sdk.scope import should_send_default_pii
from sentry_sdk.traces import SpanStatus, StreamedSpan
from sentry_sdk.tracing import SPANSTATUS
from sentry_sdk.utils import (
Expand All @@ -29,7 +30,7 @@
ConverseStreamResponseTypeDef,
)

from sentry_sdk._types import Attributes, ToolDefinition
from sentry_sdk._types import Attributes, TextPart, ToolDefinition
from sentry_sdk.integrations.boto3._context import AwsCallContext
from sentry_sdk.tracing import Span

Expand Down Expand Up @@ -146,6 +147,19 @@ def sentry_patched_close(self: "EventStream[Any]") -> None:
EventStream.close = sentry_patched_close # type: ignore[method-assign]


def _transform_system_instructions(
system_instructions: "Union[list[dict[str, Any]], tuple[dict[str, Any], ...]]",
) -> "list[TextPart]":
instruction_text_parts: "list[TextPart]" = []
for block in system_instructions:
if not isinstance(block, dict) or "text" not in block:
continue

instruction_text_parts.append({"type": "text", "content": block["text"]})

return instruction_text_parts


def _transform_tool_definitions(
tools: "list[dict[str, Any]]",
) -> "list[ToolDefinition]":
Expand Down Expand Up @@ -236,6 +250,14 @@ def get_request_attributes(self, ctx: "AwsCallContext") -> "Attributes":
if not client_options["data_collection"]["gen_ai"]["inputs"]:
return attributes

system_instructions = ctx.params.get("system")
if (
has_data_collection_enabled(client_options) or should_send_default_pii()
) and isinstance(system_instructions, (list, tuple)):
attributes[SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS] = json.dumps(
_transform_system_instructions(system_instructions)
)
Comment thread
alexander-alderman-webb marked this conversation as resolved.
Resolved

tool_config = ctx.params.get("toolConfig")
if not isinstance(tool_config, dict):
return attributes
Expand Down
173 changes: 173 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 @@ -474,6 +474,89 @@ def test_converse_tool_definitions(
)


@pytest.mark.parametrize("data_collection", [True, False])
@pytest.mark.parametrize("span_streaming", [True, False])
@pytest.mark.parametrize("stream_gen_ai_spans", [True, False])
def test_converse_input_attributes(
sentry_init,
capture_items,
capture_events,
data_collection,
span_streaming,
stream_gen_ai_spans,
converse_response,
):
if data_collection:
sentry_init(
traces_sample_rate=1.0,
integrations=[Boto3Integration()],
data_collection={"gen_ai": {"inputs": True}},
stream_gen_ai_spans=stream_gen_ai_spans,
trace_lifecycle="stream" if span_streaming else "static",
)
else:
sentry_init(
traces_sample_rate=1.0,
integrations=[Boto3Integration()],
send_default_pii=True,
stream_gen_ai_spans=stream_gen_ai_spans,
trace_lifecycle="stream" if span_streaming else "static",
)

session = boto3.Session(
aws_access_key_id="-", aws_secret_access_key="-", region_name="us-east-1"
)
client = session.client("bedrock-runtime")
stubber = Stubber(client)
stubber.add_response("converse", converse_response)

if span_streaming or stream_gen_ai_spans:
items = capture_items("span")

with stubber, sentry_sdk.start_transaction(name="parent"):
client.converse(
modelId="anthropic.claude-3-sonnet-20240229-v1:0",
messages=[{"role": "user", "content": [{"text": "Hi"}]}],
system=[
{"text": "You are a helpful assistant."},
{"text": "Be concise and clear."},
],
)

sentry_sdk.flush()
spans = [item.payload for item in items]
(span,) = (
span
for span in spans
if span["attributes"].get("sentry.op") == OP.GEN_AI_CHAT
)

assert json.loads(span["attributes"][SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS]) == [
{"type": "text", "content": "You are a helpful assistant."},
{"type": "text", "content": "Be concise and clear."},
]
else:
events = capture_events()

with stubber, sentry_sdk.start_transaction(name="parent"):
client.converse(
modelId="anthropic.claude-3-sonnet-20240229-v1:0",
messages=[{"role": "user", "content": [{"text": "Hi"}]}],
system=[
{"text": "You are a helpful assistant."},
{"text": "Be concise and clear."},
],
)

(transaction,) = events
(span,) = transaction["spans"]

assert json.loads(span["data"][SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS]) == [
{"type": "text", "content": "You are a helpful assistant."},
{"type": "text", "content": "Be concise and clear."},
]


@pytest.mark.parametrize("span_streaming", [True, False])
@pytest.mark.parametrize("stream_gen_ai_spans", [True, False])
def test_converse_stream(
Expand Down Expand Up @@ -765,3 +848,93 @@ def test_converse_stream_tool_definitions(
json.loads(span["data"][SPANDATA.GEN_AI_TOOL_DEFINITIONS])
== expected_tool_definitions
)


@pytest.mark.parametrize("data_collection", [True, False])
@pytest.mark.parametrize("span_streaming", [True, False])
@pytest.mark.parametrize("stream_gen_ai_spans", [True, False])
def test_converse_stream_input_attributes(
sentry_init,
capture_items,
capture_events,
data_collection,
span_streaming,
stream_gen_ai_spans,
converse_stream_response,
):
if data_collection:
sentry_init(
traces_sample_rate=1.0,
integrations=[Boto3Integration()],
data_collection={"gen_ai": {"inputs": True}},
stream_gen_ai_spans=stream_gen_ai_spans,
trace_lifecycle="stream" if span_streaming else "static",
)
else:
sentry_init(
traces_sample_rate=1.0,
integrations=[Boto3Integration()],
send_default_pii=True,
stream_gen_ai_spans=stream_gen_ai_spans,
trace_lifecycle="stream" if span_streaming else "static",
)

session = boto3.Session(
aws_access_key_id="-", aws_secret_access_key="-", region_name="us-east-1"
)
client = session.client("bedrock-runtime")
mock_http = Mock(status_code=200)
client.meta.events.register(
"before-call.bedrock-runtime.ConverseStream",
lambda **kwargs: (mock_http, converse_stream_response),
)

if span_streaming or stream_gen_ai_spans:
items = capture_items("span")

with sentry_sdk.start_transaction(name="parent"):
response = client.converse_stream(
modelId="anthropic.claude-3-sonnet-20240229-v1:0",
messages=[{"role": "user", "content": [{"text": "Hi"}]}],
system=[
{"text": "You are a helpful assistant."},
{"text": "Be concise and clear."},
],
)
for _ in response["stream"]:
pass

sentry_sdk.flush()
spans = [item.payload for item in items]
(span,) = (
span
for span in spans
if span["attributes"].get("sentry.op") == OP.GEN_AI_CHAT
)

assert json.loads(span["attributes"][SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS]) == [
{"type": "text", "content": "You are a helpful assistant."},
{"type": "text", "content": "Be concise and clear."},
]
else:
events = capture_events()

with sentry_sdk.start_transaction(name="parent"):
response = client.converse_stream(
modelId="anthropic.claude-3-sonnet-20240229-v1:0",
messages=[{"role": "user", "content": [{"text": "Hi"}]}],
system=[
{"text": "You are a helpful assistant."},
{"text": "Be concise and clear."},
],
)
for _ in response["stream"]:
pass

(transaction,) = events
(span,) = transaction["spans"]

assert json.loads(span["data"][SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS]) == [
{"type": "text", "content": "You are a helpful assistant."},
{"type": "text", "content": "Be concise and clear."},
]
Loading