feat(google-genai): Support span streaming by alexander-alderman-webb · Pull Request #6313 · getsentry/sentry-python

alexander-alderman-webb · 2026-05-21T08:50:06Z

Note: Depends on #6314

Description

Use sentry_sdk.traces.start_span, replace Span.set_data() with StreamedSpan.set_attribute() and Span.set_status(SPANSTATUS.INTERNAL_ERROR) with StreamedSpan.status = SpanStatus.ERROR when in span streaming mode.

Parametrize tests on the trace lifecycle option.

Issues

Closes #6024

Reminders

Please add tests to validate your changes, and lint your code using tox -e linters.
Add GH Issue ID & Linear ID (if applicable)
PR title should use conventional commit style (feat:, fix:, ref:, meta:)
For external contributors: CONTRIBUTING.md, Sentry SDK development docs, Discord community

github-actions · 2026-05-21T08:51:51Z

Codecov Results 📊

✅ 76 passed | Total: 76 | Pass Rate: 100% | Execution Time: 8.66s

📊 Comparison with Base Branch

Metric	Change
Total Tests	📈 +69
Passed Tests	📈 +69
Failed Tests	—
Skipped Tests	—

All tests are passing successfully.

❌ Patch coverage is 1.48%. Project has 16563 uncovered lines.
❌ Project coverage is 26.21%. Comparing base (base) to head (head).

Files with missing lines (4)

File	Patch %	Lines
`utils.py`	0.00%	⚠️ 529 Missing
`tracing_utils.py`	50.66%	⚠️ 372 Missing and 66 partials
`__init__.py`	5.02%	⚠️ 246 Missing
`streaming.py`	0.00%	⚠️ 66 Missing

Coverage diff

@@            Coverage Diff             @@
##          main       #PR       +/-##
==========================================
- Coverage    26.35%    26.21%    -0.14%
==========================================
  Files          190       190         —
  Lines        22483     22445       -38
  Branches      7652      7997      +345
==========================================
+ Hits          5924      5882       -42
- Misses       16559     16563        +4
- Partials       561       548       -13

Generated by Codecov Action

cursor

Cursor Bugbot has reviewed your changes and found 2 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit bdf8ded. Configure here.}

sentrivana

lgtm, some suggestions

sentrivana · 2026-05-21T10:42:35Z

+        set_on_span(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
+        set_on_span(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)
+        set_on_span(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
        set_span_data_for_request(chat_span, integration, model_name, contents, kwargs)
-        chat_span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)
+        set_on_span(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)


We could put these attrs into the attributes dict of the streaming start_span alongside sentry.op and sentry.origin. That way they'd be accessible in people's traces_samplers (since sampling happens right on start_span).

Basically, as long as the attrs are known on start_span, it's good to set them on the span from the get go.

sentrivana · 2026-05-21T10:43:16Z

+            set_on_span = chat_span.set_data
+            chat_span.__enter__()
+
+        set_on_span(SPANDATA.GEN_AI_OPERATION_NAME, "chat")


Same comment here

sentrivana · 2026-05-21T10:44:26Z

+                attributes={
+                    "sentry.op": OP.GEN_AI_CHAT,
+                    "sentry.origin": ORIGIN,
+                },
+            ) as chat_span:
+                chat_span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
+                chat_span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)
+                chat_span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)


...and here

Suggested change

attributes={

"sentry.op": OP.GEN_AI_CHAT,

"sentry.origin": ORIGIN,

},

) as chat_span:

chat_span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "chat")

chat_span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)

chat_span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)

attributes={

"sentry.op": OP.GEN_AI_CHAT,

"sentry.origin": ORIGIN,

SPANDATA.GEN_AI_OPERATION_NAME: "chat",

SPANDATA.GEN_AI_SYSTEM: GEN_AI_SYSTEM,

SPANDATA.GEN_AI_REQUEST_MODEL: model_name,

},

) as chat_span:

sentrivana · 2026-05-21T10:45:38Z

+                attributes={
+                    "sentry.op": OP.GEN_AI_CHAT,
+                    "sentry.origin": ORIGIN,
+                },
+            ) as chat_span:
+                chat_span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
+                chat_span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)
+                chat_span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)


Suggested change

attributes={

"sentry.op": OP.GEN_AI_CHAT,

"sentry.origin": ORIGIN,

},

) as chat_span:

chat_span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "chat")

chat_span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)

chat_span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)

attributes={

"sentry.op": OP.GEN_AI_CHAT,

"sentry.origin": ORIGIN,

SPANDATA.GEN_AI_OPERATION_NAME: "chat",

SPANDATA.GEN_AI_SYSTEM: GEN_AI_SYSTEM,

SPANDATA.GEN_AI_REQUEST_MODEL: model_name

},

) as chat_span:

sentrivana · 2026-05-21T10:46:23Z

+                attributes={
+                    "sentry.op": OP.GEN_AI_EMBEDDINGS,
+                    "sentry.origin": ORIGIN,
+                },
+            ) as span:
+                span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")
+                span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)
+                span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)


Suggested change

attributes={

"sentry.op": OP.GEN_AI_EMBEDDINGS,

"sentry.origin": ORIGIN,

},

) as span:

span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")

span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)

span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)

attributes={

"sentry.op": OP.GEN_AI_EMBEDDINGS,

"sentry.origin": ORIGIN,

SPANDATA.GEN_AI_OPERATION_NAME: "embeddings",

SPANDATA.GEN_AI_SYSTEM: GEN_AI_SYSTEM,

SPANDATA.GEN_AI_REQUEST_MODEL: model_name

},

) as span:

sentrivana · 2026-05-21T10:47:07Z

+                attributes={
+                    "sentry.op": OP.GEN_AI_EMBEDDINGS,
+                    "sentry.origin": ORIGIN,
+                },
+            ) as span:
+                span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")
+                span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)
+                span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)


Suggested change

attributes={

"sentry.op": OP.GEN_AI_EMBEDDINGS,

"sentry.origin": ORIGIN,

},

) as span:

span.set_attribute(SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")

span.set_attribute(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)

span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)

attributes={

"sentry.op": OP.GEN_AI_EMBEDDINGS,

"sentry.origin": ORIGIN,

SPANDATA.GEN_AI_OPERATION_NAME: "embeddings",

SPANDATA.GEN_AI_SYSTEM: GEN_AI_SYSTEM,

SPANDATA.GEN_AI_REQUEST_MODEL: model_name,

},

) as span:

sentrivana · 2026-05-21T10:49:02Z

+        span = sentry_sdk.traces.start_span(
+            name=f"execute_tool {tool_name}",
+            attributes={
+                "sentry.op": OP.GEN_AI_EXECUTE_TOOL,
+                "sentry.origin": ORIGIN,
+            },
+        )
+        span.set_attribute(SPANDATA.GEN_AI_TOOL_NAME, tool_name)
+        if tool_doc:
+            span.set_attribute(SPANDATA.GEN_AI_TOOL_DESCRIPTION, tool_doc)


Suggested change

span = sentry_sdk.traces.start_span(

name=f"execute_tool {tool_name}",

attributes={

"sentry.op": OP.GEN_AI_EXECUTE_TOOL,

"sentry.origin": ORIGIN,

},

)

span.set_attribute(SPANDATA.GEN_AI_TOOL_NAME, tool_name)

if tool_doc:

span.set_attribute(SPANDATA.GEN_AI_TOOL_DESCRIPTION, tool_doc)

attributes = {

"sentry.op": OP.GEN_AI_EXECUTE_TOOL,

"sentry.origin": ORIGIN,

SPANDATA.GEN_AI_TOOL_NAME: tool_name,

}

if tool_doc:

attributes[SPANDATA.GEN_AI_TOOL_DESCRIPTION] = tool_doc

span = sentry_sdk.traces.start_span(

name=f"execute_tool {tool_name}",

attributes=attributes,

)

feat(google-genai): Support span streaming

8eacaad

alexander-alderman-webb added 4 commits May 21, 2026 10:55

mypy errors

ba2d985

call enter only in legacy path

dc21d8a

fix(google-genai): Guard against None response ID and response model

126f3f5

merge

bdf8ded

alexander-alderman-webb marked this pull request as ready for review May 21, 2026 09:07

alexander-alderman-webb requested a review from a team as a code owner May 21, 2026 09:07

cursor Bot reviewed May 21, 2026

View reviewed changes

Comment thread sentry_sdk/tracing_utils.py

Comment thread sentry_sdk/integrations/google_genai/__init__.py

sentry Bot reviewed May 21, 2026

View reviewed changes

Comment thread sentry_sdk/integrations/google_genai/utils.py

alexander-alderman-webb added 2 commits May 21, 2026 11:14

use should_truncate_gen_ai_input

6dac848

use sentry_sdk.traces.start_span directly

0d6b7dc

sentry Bot reviewed May 21, 2026

View reviewed changes

Comment thread sentry_sdk/integrations/google_genai/__init__.py

alexander-alderman-webb mentioned this pull request May 21, 2026

Fix leaked spans in google-genai #6315

Open

sentrivana approved these changes May 21, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(google-genai): Support span streaming#6313

feat(google-genai): Support span streaming#6313
alexander-alderman-webb wants to merge 7 commits into
masterfrom
webb/google-genai/span-first

alexander-alderman-webb commented May 21, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented May 21, 2026 •

edited

Loading

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sentrivana left a comment

Uh oh!

sentrivana May 21, 2026

Uh oh!

sentrivana May 21, 2026

Uh oh!

sentrivana May 21, 2026

Uh oh!

sentrivana May 21, 2026

Uh oh!

sentrivana May 21, 2026

Uh oh!

sentrivana May 21, 2026

Uh oh!

sentrivana May 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

alexander-alderman-webb commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues

Reminders

Uh oh!

github-actions Bot commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Results 📊

📊 Comparison with Base Branch

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sentrivana left a comment

Choose a reason for hiding this comment

Uh oh!

sentrivana May 21, 2026

Choose a reason for hiding this comment

Uh oh!

sentrivana May 21, 2026

Choose a reason for hiding this comment

Uh oh!

sentrivana May 21, 2026

Choose a reason for hiding this comment

Uh oh!

sentrivana May 21, 2026

Choose a reason for hiding this comment

Uh oh!

sentrivana May 21, 2026

Choose a reason for hiding this comment

Uh oh!

sentrivana May 21, 2026

Choose a reason for hiding this comment

Uh oh!

sentrivana May 21, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

alexander-alderman-webb commented May 21, 2026 •

edited

Loading

github-actions Bot commented May 21, 2026 •

edited

Loading