fix(google-genai): drop gen_ai.request.stream from fetch_response spans

The attribute is not part of the fetch_response span in the GenAI semantic
conventions; a resumed fetch is identified by gen_ai.request.stream_cursor.
Matches the same removal made for the OpenAI package in open-telemetry#709.

Also name the changelog fragment after the PR and sort imports.

Assisted-by: Claude Opus 5

Author: eternalcuriouslearner

…-google-genai/.changelog/PR_NUMBER.added …tation-google-genai/.changelog/755.addedinstrumentation/opentelemetry-instrumentation-google-genai/.changelog/PR_NUMBER.added renamed to instrumentation/opentelemetry-instrumentation-google-genai/.changelog/755.added instrumentation/opentelemetry-instrumentation-google-genai/.changelog/PR_NUMBER.added renamed to instrumentation/opentelemetry-instrumentation-google-genai/.changelog/755.added

@@ -1172,10 +1172,11 @@ def _start_fetch_invocation(
         else GenAIAttributes.GenAiSystemValues.GEMINI.value
     )
     streaming = bool(kwargs.get("stream"))
+    # gen_ai.request.stream is not part of the fetch_response span's attributes;
+    # a resumed fetch is identified by gen_ai.request.stream_cursor instead.
     invocation = telemetry_handler.fetch_response(
         provider=provider,
         response_id=interaction_id,
-        request_stream=streaming or None,
         server_address=server_address,
         error_type_resolver=resolve_error_type,
     )

instrumentation/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/interactions.py

@@ -14,16 +14,20 @@
 )
 
 from ..common.base import TestCase as CommonTestCaseBase
-from .base import _HAS_INTERACTIONS, AsyncInteractionsResource, InteractionsResource
+from .base import (
+    _HAS_INTERACTIONS,
+    AsyncInteractionsResource,
+    InteractionsResource,
+)
 from .util import (
     FakeAsyncStream,
     FakeStream,
+    create_mock_content_event,
     create_mock_error_event,
+    create_mock_fetched_interaction,
+    create_mock_sse_completed_event,
     create_mock_step_event,
     parse_sse_events,
-    create_mock_sse_completed_event,
-    create_mock_content_event,
-    create_mock_fetched_interaction,
 )
 
 _SPAN_NAME = "fetch_response"
@@ -239,9 +243,7 @@ def _result(args: tuple[Any, ...], kwargs: dict[str, Any]) -> Any:
                             "index": 0,
                             "step": {
                                 "type": "model_output",
-                                "content": [
-                                    {"type": "text", "text": "Hello"}
-                                ],
+                                "content": [{"type": "text", "text": "Hello"}],
                             },
                         },
                         {
@@ -357,7 +359,9 @@ def _result(args: tuple[Any, ...], kwargs: dict[str, Any]) -> Any:
                 interaction.steps = None
                 interaction.output_text = None
                 return [
-                    create_mock_step_event("step.start", 0, step_type="thought"),
+                    create_mock_step_event(
+                        "step.start", 0, step_type="thought"
+                    ),
                     create_mock_step_event("step.delta", 0, text=None),
                     create_mock_step_event(
                         "step.start", 1, step_type="model_output"
@@ -408,7 +412,9 @@ def run_streaming_fetch_with_caller_error(
     ) -> None:
         raise NotImplementedError()
 
-    def run_streaming_fetch_closed_early(self, *args: Any, **kwargs: Any) -> Any:
+    def run_streaming_fetch_closed_early(
+        self, *args: Any, **kwargs: Any
+    ) -> Any:
         raise NotImplementedError()
 
     def drain_stream(self, *args: Any, **kwargs: Any) -> Any:
@@ -465,7 +471,9 @@ def test_response_model_and_status_recorded(self) -> None:
         self.assertEqual(
             span.attributes["gen_ai.response.model"], "gemini-2.5-pro"
         )
-        self.assertEqual(span.attributes["gen_ai.response.status"], "completed")
+        self.assertEqual(
+            span.attributes["gen_ai.response.status"], "completed"
+        )
         self.assertEqual(
             span.attributes["gen_ai.response.finish_reasons"], ("stop",)
         )
@@ -645,8 +653,12 @@ def test_streaming_fetch_generates_span(self) -> None:
         self.assertEqual(events[1].interaction.id, "stream-id-1")
         span = self.otel.get_span_named(_SPAN_NAME)
         self.assertEqual(span.attributes["gen_ai.response.id"], "stream-id-1")
-        self.assertIs(span.attributes["gen_ai.request.stream"], True)
-        self.assertEqual(span.attributes["gen_ai.response.status"], "completed")
+        self.assertEqual(
+            span.attributes["gen_ai.response.status"], "completed"
+        )
+        # fetch_response has no gen_ai.request.stream attribute; only a resumed
+        # fetch is distinguished, by its cursor.
+        self.assertNotIn("gen_ai.request.stream", span.attributes)
         self.assertNotIn("gen_ai.request.stream_cursor", span.attributes)
 
     def test_resumed_streaming_fetch_records_cursor(self) -> None:
@@ -693,9 +705,7 @@ def test_mid_stream_error_records_error(self) -> None:
     def test_caller_side_error_records_error_and_closes_stream(self) -> None:
         self.configure_valid_fetch()
         with self.assertRaises(RuntimeError):
-            self.run_streaming_fetch_with_caller_error(
-                "abc-123", stream=True
-            )
+            self.run_streaming_fetch_with_caller_error("abc-123", stream=True)
         span = self.otel.get_span_named(_SPAN_NAME)
         self.assertEqual(span.attributes["error.type"], "RuntimeError")
         self.assertTrue(self._last_stream.closed)
@@ -728,9 +738,7 @@ def test_in_band_stream_error_fails_the_span(self) -> None:
         events = self.run_streaming_fetch("abc-123", stream=True)
         self.assertEqual(len(events), 2)
         span = self.otel.get_span_named(_SPAN_NAME)
-        self.assertEqual(
-            span.attributes["error.type"], "service_unavailable"
-        )
+        self.assertEqual(span.attributes["error.type"], "service_unavailable")
         # No completion event arrived, so nothing is known about the response.
         self.assertNotIn("gen_ai.response.status", span.attributes)
 
@@ -952,8 +960,6 @@ def test_early_close_finalizes_span(self) -> None:
         self.configure_valid_fetch(interaction_id="closed-early")
         self.run_streaming_fetch_closed_early("closed-early", stream=True)
         span = self.otel.get_span_named(_SPAN_NAME)
-        self.assertEqual(
-            span.attributes["gen_ai.response.id"], "closed-early"
-        )
+        self.assertEqual(span.attributes["gen_ai.response.id"], "closed-early")
         self.assertNotIn("error.type", span.attributes)
         self.assertTrue(self._last_stream.closed)

instrumentation/opentelemetry-instrumentation-google-genai/tests/interactions/fetch_base.py

@@ -455,7 +455,7 @@ def test_sync_interactions_get_streaming(
     interaction = completed[0].interaction
 
     span = _fetch_span(otel_mocker)
-    assert span.attributes["gen_ai.request.stream"] is True
+    assert "gen_ai.request.stream" not in span.attributes
     assert span.attributes["gen_ai.response.id"] == created.id
     # Proves the real SSE completion event is recognised and applied.
     assert span.attributes["gen_ai.response.status"] == interaction.status