Skip to content

feat(openai-agents): Support data_collection config for input/output gating #7125

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

Open
ericapisani wants to merge 4 commits into from
+336 −24
Open

feat(openai-agents): Support data_collection config for input/output gating #7125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f540e6b
feat(openai-agents): Support data_collection config for input/output …
ericapisani Aug 6, 2026
702ccc7
Trigger Build
ericapisani Aug 7, 2026
9ab5654
gate tool definitions in ai client span when data collection is enabled
ericapisani Aug 7, 2026
3462f77
update other tests to use the test fixture that exists
ericapisani Aug 7, 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
22 changes: 17 additions & 5 deletions sentry_sdk/integrations/openai_agents/spans/ai_client.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.integrations import DidNotEnable
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing_utils import has_span_streaming_enabled
from sentry_sdk.utils import has_data_collection_enabled

try:
from agents import (
Expand Down Expand Up @@ -207,7 +208,9 @@ def ai_client_span(
elif hasattr(agent, "_sentry_request_model"):
model_name = agent._sentry_request_model

span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
client_options = sentry_sdk.get_client().options

span_streaming = has_span_streaming_enabled(client_options)
if span_streaming:
span = sentry_sdk.traces.start_span(
name=f"chat {model_name}",
Expand All @@ -232,10 +235,19 @@ def ai_client_span(

_set_agent_data(span, agent)

set_on_span(
SPANDATA.GEN_AI_TOOL_DEFINITIONS,
json.dumps(_transform_tool_definitions(agent.tools)),
)
if has_data_collection_enabled(client_options):
if client_options["data_collection"]["gen_ai"]["inputs"]:
set_on_span(
SPANDATA.GEN_AI_TOOL_DEFINITIONS,
json.dumps(_transform_tool_definitions(agent.tools)),
)
else:
# This is set unconditionally prior to data collection being introduced.
# Remove this block once data collection is fully rolled out
set_on_span(
SPANDATA.GEN_AI_TOOL_DEFINITIONS,
json.dumps(_transform_tool_definitions(agent.tools)),
)

_set_input_data(span, get_response_kwargs)

Expand Down
19 changes: 15 additions & 4 deletions sentry_sdk/integrations/openai_agents/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
from sentry_sdk.scope import should_send_default_pii
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing_utils import should_truncate_gen_ai_input
from sentry_sdk.utils import event_from_exception, safe_serialize
from sentry_sdk.utils import (
event_from_exception,
has_data_collection_enabled,
safe_serialize,
)

if TYPE_CHECKING:
from typing import Any, Union
Expand Down Expand Up @@ -114,7 +118,11 @@ def _set_input_data(
span: "Union[sentry_sdk.tracing.Span, StreamedSpan]",
get_response_kwargs: "dict[str, Any]",
) -> None:
if not should_send_default_pii():
client = sentry_sdk.get_client()
if has_data_collection_enabled(client.options):
if not client.options["data_collection"]["gen_ai"]["inputs"]:
return
elif not should_send_default_pii():
Comment thread
cursor[bot] marked this conversation as resolved.
return
request_messages = []

Expand Down Expand Up @@ -182,7 +190,6 @@ def _set_input_data(
)

normalized_messages = normalize_message_roles(request_messages)
client = sentry_sdk.get_client()
scope = sentry_sdk.get_current_scope()
messages_data = (
truncate_and_annotate_messages(normalized_messages, span, scope)
Expand All @@ -201,7 +208,11 @@ def _set_input_data(
def _set_output_data(
span: "Union[sentry_sdk.tracing.Span, StreamedSpan]", result: "Any"
) -> None:
if not should_send_default_pii():
client = sentry_sdk.get_client()
if has_data_collection_enabled(client.options):
if not client.options["data_collection"]["gen_ai"]["outputs"]:
return
elif not should_send_default_pii():
return

output_messages: "dict[str, list[Any]]" = {
Expand Down
Loading
Loading