Skip to content

Commit 6bf4006

Browse files
alexander-alderman-webbalexander-alderman-webb
committed
Revert "add experimental v2 option"
This reverts commit 6c5c812.
1 parent 6d1d7ed commit 6bf4006

8 files changed

Lines changed: 0 additions & 311 deletions

File tree

‎tests/integrations/anthropic/test_anthropic.py‎

Lines changed: 0 additions & 53 deletions
Large diffs are not rendered by default.

‎tests/integrations/google_genai/test_google_genai.py‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ def test_nonstreaming_generate_content(
130130
integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)],
131131
traces_sample_rate=1.0,
132132
send_default_pii=send_default_pii,
133-
_experiments={"gen_ai_as_v2_spans": True},
134133
)
135134
items = capture_items("transaction", "span")
136135

@@ -220,7 +219,6 @@ def test_generate_content_with_system_instruction(
220219
integrations=[GoogleGenAIIntegration(include_prompts=True)],
221220
traces_sample_rate=1.0,
222221
send_default_pii=True,
223-
_experiments={"gen_ai_as_v2_spans": True},
224222
)
225223
items = capture_items("span")
226224

@@ -264,7 +262,6 @@ def test_generate_content_with_tools(sentry_init, capture_items, mock_genai_clie
264262
sentry_init(
265263
integrations=[GoogleGenAIIntegration()],
266264
traces_sample_rate=1.0,
267-
_experiments={"gen_ai_as_v2_spans": True},
268265
)
269266
items = capture_items("span")
270267

@@ -347,7 +344,6 @@ def test_tool_execution(sentry_init, capture_items):
347344
integrations=[GoogleGenAIIntegration(include_prompts=True)],
348345
traces_sample_rate=1.0,
349346
send_default_pii=True,
350-
_experiments={"gen_ai_as_v2_spans": True},
351347
)
352348
items = capture_items("span")
353349

@@ -384,7 +380,6 @@ def test_error_handling(sentry_init, capture_items, mock_genai_client):
384380
sentry_init(
385381
integrations=[GoogleGenAIIntegration()],
386382
traces_sample_rate=1.0,
387-
_experiments={"gen_ai_as_v2_spans": True},
388383
)
389384
items = capture_items("event", "transaction")
390385

@@ -416,7 +411,6 @@ def test_streaming_generate_content(sentry_init, capture_items, mock_genai_clien
416411
integrations=[GoogleGenAIIntegration(include_prompts=True)],
417412
traces_sample_rate=1.0,
418413
send_default_pii=True,
419-
_experiments={"gen_ai_as_v2_spans": True},
420414
)
421415
items = capture_items("span")
422416

@@ -533,7 +527,6 @@ def test_span_origin(sentry_init, capture_items, mock_genai_client):
533527
sentry_init(
534528
integrations=[GoogleGenAIIntegration()],
535529
traces_sample_rate=1.0,
536-
_experiments={"gen_ai_as_v2_spans": True},
537530
)
538531
items = capture_items("span", "transaction")
539532

@@ -561,7 +554,6 @@ def test_response_without_usage_metadata(sentry_init, capture_items, mock_genai_
561554
sentry_init(
562555
integrations=[GoogleGenAIIntegration()],
563556
traces_sample_rate=1.0,
564-
_experiments={"gen_ai_as_v2_spans": True},
565557
)
566558
items = capture_items("span")
567559

@@ -603,7 +595,6 @@ def test_multiple_candidates(sentry_init, capture_items, mock_genai_client):
603595
integrations=[GoogleGenAIIntegration(include_prompts=True)],
604596
traces_sample_rate=1.0,
605597
send_default_pii=True,
606-
_experiments={"gen_ai_as_v2_spans": True},
607598
)
608599
items = capture_items("span")
609600

@@ -668,7 +659,6 @@ def test_all_configuration_parameters(sentry_init, capture_items, mock_genai_cli
668659
sentry_init(
669660
integrations=[GoogleGenAIIntegration()],
670661
traces_sample_rate=1.0,
671-
_experiments={"gen_ai_as_v2_spans": True},
672662
)
673663
items = capture_items("span")
674664

@@ -708,7 +698,6 @@ def test_empty_response(sentry_init, capture_items, mock_genai_client):
708698
sentry_init(
709699
integrations=[GoogleGenAIIntegration()],
710700
traces_sample_rate=1.0,
711-
_experiments={"gen_ai_as_v2_spans": True},
712701
)
713702
items = capture_items("span")
714703

@@ -740,7 +729,6 @@ def test_response_with_different_id_fields(
740729
sentry_init(
741730
integrations=[GoogleGenAIIntegration()],
742731
traces_sample_rate=1.0,
743-
_experiments={"gen_ai_as_v2_spans": True},
744732
)
745733
items = capture_items("span")
746734

@@ -783,7 +771,6 @@ def test_tool_with_async_function(sentry_init):
783771
sentry_init(
784772
integrations=[GoogleGenAIIntegration()],
785773
traces_sample_rate=1.0,
786-
_experiments={"gen_ai_as_v2_spans": True},
787774
)
788775

789776
# Create an async tool function
@@ -806,7 +793,6 @@ def test_contents_as_none(sentry_init, capture_items, mock_genai_client):
806793
integrations=[GoogleGenAIIntegration(include_prompts=True)],
807794
traces_sample_rate=1.0,
808795
send_default_pii=True,
809-
_experiments={"gen_ai_as_v2_spans": True},
810796
)
811797
items = capture_items("span")
812798

@@ -833,7 +819,6 @@ def test_tool_calls_extraction(sentry_init, capture_items, mock_genai_client):
833819
sentry_init(
834820
integrations=[GoogleGenAIIntegration()],
835821
traces_sample_rate=1.0,
836-
_experiments={"gen_ai_as_v2_spans": True},
837822
)
838823
items = capture_items("span")
839824

@@ -920,7 +905,6 @@ def test_google_genai_message_truncation(sentry_init, capture_items, mock_genai_
920905
integrations=[GoogleGenAIIntegration(include_prompts=True)],
921906
traces_sample_rate=1.0,
922907
send_default_pii=True,
923-
_experiments={"gen_ai_as_v2_spans": True},
924908
)
925909
items = capture_items("span")
926910

@@ -996,7 +980,6 @@ def test_embed_content(
996980
integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)],
997981
traces_sample_rate=1.0,
998982
send_default_pii=send_default_pii,
999-
_experiments={"gen_ai_as_v2_spans": True},
1000983
)
1001984
items = capture_items("transaction", "span")
1002985

@@ -1058,7 +1041,6 @@ def test_embed_content_string_input(sentry_init, capture_items, mock_genai_clien
10581041
integrations=[GoogleGenAIIntegration(include_prompts=True)],
10591042
traces_sample_rate=1.0,
10601043
send_default_pii=True,
1061-
_experiments={"gen_ai_as_v2_spans": True},
10621044
)
10631045
items = capture_items("span")
10641046

@@ -1105,7 +1087,6 @@ def test_embed_content_error_handling(sentry_init, capture_items, mock_genai_cli
11051087
sentry_init(
11061088
integrations=[GoogleGenAIIntegration()],
11071089
traces_sample_rate=1.0,
1108-
_experiments={"gen_ai_as_v2_spans": True},
11091090
)
11101091
items = capture_items("transaction", "event")
11111092

@@ -1139,7 +1120,6 @@ def test_embed_content_without_statistics(
11391120
sentry_init(
11401121
integrations=[GoogleGenAIIntegration()],
11411122
traces_sample_rate=1.0,
1142-
_experiments={"gen_ai_as_v2_spans": True},
11431123
)
11441124
items = capture_items("span")
11451125

@@ -1179,7 +1159,6 @@ def test_embed_content_span_origin(sentry_init, capture_items, mock_genai_client
11791159
sentry_init(
11801160
integrations=[GoogleGenAIIntegration()],
11811161
traces_sample_rate=1.0,
1182-
_experiments={"gen_ai_as_v2_spans": True},
11831162
)
11841163
items = capture_items("transaction", "span")
11851164

@@ -1220,7 +1199,6 @@ async def test_async_embed_content(
12201199
integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)],
12211200
traces_sample_rate=1.0,
12221201
send_default_pii=send_default_pii,
1223-
_experiments={"gen_ai_as_v2_spans": True},
12241202
)
12251203
items = capture_items("transaction", "span")
12261204

@@ -1285,7 +1263,6 @@ async def test_async_embed_content_string_input(
12851263
integrations=[GoogleGenAIIntegration(include_prompts=True)],
12861264
traces_sample_rate=1.0,
12871265
send_default_pii=True,
1288-
_experiments={"gen_ai_as_v2_spans": True},
12891266
)
12901267
items = capture_items("span")
12911268

@@ -1335,7 +1312,6 @@ async def test_async_embed_content_error_handling(
13351312
sentry_init(
13361313
integrations=[GoogleGenAIIntegration()],
13371314
traces_sample_rate=1.0,
1338-
_experiments={"gen_ai_as_v2_spans": True},
13391315
)
13401316
items = capture_items("transaction", "event")
13411317

@@ -1370,7 +1346,6 @@ async def test_async_embed_content_without_statistics(
13701346
sentry_init(
13711347
integrations=[GoogleGenAIIntegration()],
13721348
traces_sample_rate=1.0,
1373-
_experiments={"gen_ai_as_v2_spans": True},
13741349
)
13751350
items = capture_items("span")
13761351

@@ -1413,7 +1388,6 @@ async def test_async_embed_content_span_origin(
14131388
sentry_init(
14141389
integrations=[GoogleGenAIIntegration()],
14151390
traces_sample_rate=1.0,
1416-
_experiments={"gen_ai_as_v2_spans": True},
14171391
)
14181392
items = capture_items("transaction", "span")
14191393

@@ -1445,7 +1419,6 @@ def test_generate_content_with_content_object(
14451419
integrations=[GoogleGenAIIntegration(include_prompts=True)],
14461420
traces_sample_rate=1.0,
14471421
send_default_pii=True,
1448-
_experiments={"gen_ai_as_v2_spans": True},
14491422
)
14501423
items = capture_items("span")
14511424

@@ -1482,7 +1455,6 @@ def test_generate_content_with_dict_format(
14821455
integrations=[GoogleGenAIIntegration(include_prompts=True)],
14831456
traces_sample_rate=1.0,
14841457
send_default_pii=True,
1485-
_experiments={"gen_ai_as_v2_spans": True},
14861458
)
14871459
items = capture_items("span")
14881460

@@ -1515,7 +1487,6 @@ def test_generate_content_with_file_data(sentry_init, capture_items, mock_genai_
15151487
integrations=[GoogleGenAIIntegration(include_prompts=True)],
15161488
traces_sample_rate=1.0,
15171489
send_default_pii=True,
1518-
_experiments={"gen_ai_as_v2_spans": True},
15191490
)
15201491
items = capture_items("span")
15211492

@@ -1565,7 +1536,6 @@ def test_generate_content_with_inline_data(
15651536
integrations=[GoogleGenAIIntegration(include_prompts=True)],
15661537
traces_sample_rate=1.0,
15671538
send_default_pii=True,
1568-
_experiments={"gen_ai_as_v2_spans": True},
15691539
)
15701540
items = capture_items("span")
15711541

@@ -1611,7 +1581,6 @@ def test_generate_content_with_function_response(
16111581
integrations=[GoogleGenAIIntegration(include_prompts=True)],
16121582
traces_sample_rate=1.0,
16131583
send_default_pii=True,
1614-
_experiments={"gen_ai_as_v2_spans": True},
16151584
)
16161585
items = capture_items("span")
16171586

@@ -1666,7 +1635,6 @@ def test_generate_content_with_mixed_string_and_content(
16661635
integrations=[GoogleGenAIIntegration(include_prompts=True)],
16671636
traces_sample_rate=1.0,
16681637
send_default_pii=True,
1669-
_experiments={"gen_ai_as_v2_spans": True},
16701638
)
16711639
items = capture_items("span")
16721640

@@ -1710,7 +1678,6 @@ def test_generate_content_with_part_object_directly(
17101678
integrations=[GoogleGenAIIntegration(include_prompts=True)],
17111679
traces_sample_rate=1.0,
17121680
send_default_pii=True,
1713-
_experiments={"gen_ai_as_v2_spans": True},
17141681
)
17151682
items = capture_items("span")
17161683

@@ -1749,7 +1716,6 @@ def test_generate_content_with_list_of_dicts(
17491716
integrations=[GoogleGenAIIntegration(include_prompts=True)],
17501717
traces_sample_rate=1.0,
17511718
send_default_pii=True,
1752-
_experiments={"gen_ai_as_v2_spans": True},
17531719
)
17541720
items = capture_items("span")
17551721

@@ -1786,7 +1752,6 @@ def test_generate_content_with_dict_inline_data(
17861752
integrations=[GoogleGenAIIntegration(include_prompts=True)],
17871753
traces_sample_rate=1.0,
17881754
send_default_pii=True,
1789-
_experiments={"gen_ai_as_v2_spans": True},
17901755
)
17911756
items = capture_items("span")
17921757

@@ -1831,7 +1796,6 @@ def test_generate_content_without_parts_property_inline_data(
18311796
integrations=[GoogleGenAIIntegration(include_prompts=True)],
18321797
traces_sample_rate=1.0,
18331798
send_default_pii=True,
1834-
_experiments={"gen_ai_as_v2_spans": True},
18351799
)
18361800
items = capture_items("span")
18371801

@@ -1875,7 +1839,6 @@ def test_generate_content_without_parts_property_inline_data_and_binary_data_wit
18751839
integrations=[GoogleGenAIIntegration(include_prompts=True)],
18761840
traces_sample_rate=1.0,
18771841
send_default_pii=True,
1878-
_experiments={"gen_ai_as_v2_spans": True},
18791842
)
18801843
items = capture_items("span")
18811844

‎tests/integrations/huggingface_hub/test_huggingface_hub.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ def test_text_generation(
480480
traces_sample_rate=1.0,
481481
send_default_pii=send_default_pii,
482482
integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
483-
_experiments={"gen_ai_as_v2_spans": True},
484483
)
485484
items = capture_items("transaction", "span")
486485

@@ -556,7 +555,6 @@ def test_text_generation_streaming(
556555
traces_sample_rate=1.0,
557556
send_default_pii=send_default_pii,
558557
integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
559-
_experiments={"gen_ai_as_v2_spans": True},
560558
)
561559
items = capture_items("transaction", "span")
562560

@@ -633,7 +631,6 @@ def test_chat_completion(
633631
traces_sample_rate=1.0,
634632
send_default_pii=send_default_pii,
635633
integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
636-
_experiments={"gen_ai_as_v2_spans": True},
637634
)
638635
items = capture_items("transaction", "span")
639636

@@ -712,7 +709,6 @@ def test_chat_completion_streaming(
712709
traces_sample_rate=1.0,
713710
send_default_pii=send_default_pii,
714711
integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
715-
_experiments={"gen_ai_as_v2_spans": True},
716712
)
717713
items = capture_items("transaction", "span")
718714

@@ -784,7 +780,6 @@ def test_chat_completion_api_error(
784780
sentry_init: "Any", capture_items: "Any", mock_hf_api_with_errors: "Any"
785781
) -> None:
786782
sentry_init(traces_sample_rate=1.0)
787-
_experiments = ({"gen_ai_as_v2_spans": True},)
788783
items = capture_items("event", "transaction", "span")
789784

790785
client = get_hf_provider_inference_client()
@@ -844,7 +839,6 @@ def test_span_status_error(
844839
sentry_init: "Any", capture_items: "Any", mock_hf_api_with_errors: "Any"
845840
) -> None:
846841
sentry_init(traces_sample_rate=1.0)
847-
_experiments = ({"gen_ai_as_v2_spans": True},)
848842
items = capture_items("event", "transaction", "span")
849843

850844
client = get_hf_provider_inference_client()
@@ -887,7 +881,6 @@ def test_chat_completion_with_tools(
887881
traces_sample_rate=1.0,
888882
send_default_pii=send_default_pii,
889883
integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
890-
_experiments={"gen_ai_as_v2_spans": True},
891884
)
892885
items = capture_items("transaction", "span")
893886

@@ -983,7 +976,6 @@ def test_chat_completion_streaming_with_tools(
983976
traces_sample_rate=1.0,
984977
send_default_pii=send_default_pii,
985978
integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
986-
_experiments={"gen_ai_as_v2_spans": True},
987979
)
988980
items = capture_items("transaction", "span")
989981

0 commit comments

Comments
 (0)