Merge branch 'webb/gen-ai-v2' into webb/remove-truncation

alexander-alderman-webb · alexander-alderman-webb · commit 4f52f2df1a90 · 2026-05-12T20:16:54.000+02:00
diff --git a/tests/tracing/test_decorator.py b/tests/tracing/test_decorator.py
@@ -169,7 +169,7 @@ def my_agent():
     if stream_gen_ai_spans:
         sentry_init(
             traces_sample_rate=1.0,
-            _experiments={"stream_gen_ai_spans": stream_gen_ai_spans},
+            stream_gen_ai_spans=stream_gen_ai_spans,
         )
         items = capture_items("span")
 
@@ -251,7 +251,7 @@ def my_agent():
     else:
         sentry_init(
             traces_sample_rate=1.0,
-            _experiments={"stream_gen_ai_spans": stream_gen_ai_spans},
+            stream_gen_ai_spans=stream_gen_ai_spans,
         )
         events = capture_events()
 
@@ -361,7 +361,7 @@ def my_agent():
 
     sentry_init(
         traces_sample_rate=1.0,
-        _experiments={"stream_gen_ai_spans": stream_gen_ai_spans},
+        stream_gen_ai_spans=stream_gen_ai_spans,
     )
 
     if stream_gen_ai_spans:
@@ -537,7 +537,7 @@ def my_agent(*args, **kwargs):
     sentry_init(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
-        _experiments={"stream_gen_ai_spans": stream_gen_ai_spans},
+        stream_gen_ai_spans=stream_gen_ai_spans,
     )
 
     if stream_gen_ai_spans:
diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py
@@ -653,7 +653,7 @@ def test_conversation_id_propagates_to_span_with_gen_ai_op(
         """Span with gen_ai.* op should get conversation_id."""
         sentry_init(
             traces_sample_rate=1.0,
-            _experiments={"stream_gen_ai_spans": stream_gen_ai_spans},
+            stream_gen_ai_spans=stream_gen_ai_spans,
         )
 
         if stream_gen_ai_spans:

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ def test_conversation_id_propagates_to_span_with_gen_ai_op(`
`653`	`653`	`"""Span with gen_ai.* op should get conversation_id."""`
`654`	`654`	`sentry_init(`
`655`	`655`	`traces_sample_rate=1.0,`
`656`		`- _experiments={"stream_gen_ai_spans": stream_gen_ai_spans},`
	`656`	`+ stream_gen_ai_spans=stream_gen_ai_spans,`
`657`	`657`	`)`
`658`	`658`
`659`	`659`	`if stream_gen_ai_spans:`