add experimental v2 option

Author: alexander-alderman-webb

tests/integrations/anthropic/test_anthropic.py

@@ -130,6 +130,7 @@ def test_nonstreaming_generate_content(
         integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)],
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -219,6 +220,7 @@ def test_generate_content_with_system_instruction(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -262,6 +264,7 @@ def test_generate_content_with_tools(sentry_init, capture_items, mock_genai_clie
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -344,6 +347,7 @@ def test_tool_execution(sentry_init, capture_items):
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -380,6 +384,7 @@ def test_error_handling(sentry_init, capture_items, mock_genai_client):
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("event", "transaction")
 
@@ -411,6 +416,7 @@ def test_streaming_generate_content(sentry_init, capture_items, mock_genai_clien
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -527,6 +533,7 @@ def test_span_origin(sentry_init, capture_items, mock_genai_client):
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span", "transaction")
 
@@ -554,6 +561,7 @@ def test_response_without_usage_metadata(sentry_init, capture_items, mock_genai_
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -595,6 +603,7 @@ def test_multiple_candidates(sentry_init, capture_items, mock_genai_client):
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -659,6 +668,7 @@ def test_all_configuration_parameters(sentry_init, capture_items, mock_genai_cli
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -698,6 +708,7 @@ def test_empty_response(sentry_init, capture_items, mock_genai_client):
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -729,6 +740,7 @@ def test_response_with_different_id_fields(
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -771,6 +783,7 @@ def test_tool_with_async_function(sentry_init):
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
 
     # Create an async tool function
@@ -793,6 +806,7 @@ def test_contents_as_none(sentry_init, capture_items, mock_genai_client):
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -819,6 +833,7 @@ def test_tool_calls_extraction(sentry_init, capture_items, mock_genai_client):
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -905,6 +920,7 @@ def test_google_genai_message_truncation(sentry_init, capture_items, mock_genai_
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -980,6 +996,7 @@ def test_embed_content(
         integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)],
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -1041,6 +1058,7 @@ def test_embed_content_string_input(sentry_init, capture_items, mock_genai_clien
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1087,6 +1105,7 @@ def test_embed_content_error_handling(sentry_init, capture_items, mock_genai_cli
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "event")
 
@@ -1120,6 +1139,7 @@ def test_embed_content_without_statistics(
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1159,6 +1179,7 @@ def test_embed_content_span_origin(sentry_init, capture_items, mock_genai_client
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -1199,6 +1220,7 @@ async def test_async_embed_content(
         integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)],
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -1263,6 +1285,7 @@ async def test_async_embed_content_string_input(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1312,6 +1335,7 @@ async def test_async_embed_content_error_handling(
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "event")
 
@@ -1346,6 +1370,7 @@ async def test_async_embed_content_without_statistics(
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1388,6 +1413,7 @@ async def test_async_embed_content_span_origin(
     sentry_init(
         integrations=[GoogleGenAIIntegration()],
         traces_sample_rate=1.0,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -1419,6 +1445,7 @@ def test_generate_content_with_content_object(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1455,6 +1482,7 @@ def test_generate_content_with_dict_format(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1487,6 +1515,7 @@ def test_generate_content_with_file_data(sentry_init, capture_items, mock_genai_
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1536,6 +1565,7 @@ def test_generate_content_with_inline_data(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1581,6 +1611,7 @@ def test_generate_content_with_function_response(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1635,6 +1666,7 @@ def test_generate_content_with_mixed_string_and_content(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1678,6 +1710,7 @@ def test_generate_content_with_part_object_directly(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1716,6 +1749,7 @@ def test_generate_content_with_list_of_dicts(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1752,6 +1786,7 @@ def test_generate_content_with_dict_inline_data(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1796,6 +1831,7 @@ def test_generate_content_without_parts_property_inline_data(
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 
@@ -1839,6 +1875,7 @@ def test_generate_content_without_parts_property_inline_data_and_binary_data_wit
         integrations=[GoogleGenAIIntegration(include_prompts=True)],
         traces_sample_rate=1.0,
         send_default_pii=True,
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("span")
 

tests/integrations/google_genai/test_google_genai.py

@@ -480,6 +480,7 @@ def test_text_generation(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
         integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -555,6 +556,7 @@ def test_text_generation_streaming(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
         integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -631,6 +633,7 @@ def test_chat_completion(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
         integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -709,6 +712,7 @@ def test_chat_completion_streaming(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
         integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -780,6 +784,7 @@ def test_chat_completion_api_error(
     sentry_init: "Any", capture_items: "Any", mock_hf_api_with_errors: "Any"
 ) -> None:
     sentry_init(traces_sample_rate=1.0)
+    _experiments = ({"gen_ai_as_v2_spans": True},)
     items = capture_items("event", "transaction", "span")
 
     client = get_hf_provider_inference_client()
@@ -839,6 +844,7 @@ def test_span_status_error(
     sentry_init: "Any", capture_items: "Any", mock_hf_api_with_errors: "Any"
 ) -> None:
     sentry_init(traces_sample_rate=1.0)
+    _experiments = ({"gen_ai_as_v2_spans": True},)
     items = capture_items("event", "transaction", "span")
 
     client = get_hf_provider_inference_client()
@@ -881,6 +887,7 @@ def test_chat_completion_with_tools(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
         integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")
 
@@ -976,6 +983,7 @@ def test_chat_completion_streaming_with_tools(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
         integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)],
+        _experiments={"gen_ai_as_v2_spans": True},
     )
     items = capture_items("transaction", "span")