Fix lint and precommit after open-telemetry#3961

I clicked auto merge and it went through before the checks passed. Presumably because the required checks are out of date.

Author: aabmass

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

@@ -41,8 +41,12 @@
 ---
 """
 
-from .instrumentor import GoogleGenAiSdkInstrumentor
 from .generate_content import GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY
+from .instrumentor import GoogleGenAiSdkInstrumentor
 from .version import __version__
 
-__all__ = ["GoogleGenAiSdkInstrumentor", "GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY", "__version__"]
+__all__ = [
+    "GoogleGenAiSdkInstrumentor",
+    "GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY",
+    "__version__",
+]

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

@@ -20,7 +20,15 @@
 import logging
 import os
 import time
-from typing import Any, AsyncIterator, Awaitable, Iterator, Optional, Union, Mapping
+from typing import (
+    Any,
+    AsyncIterator,
+    Awaitable,
+    Iterator,
+    Mapping,
+    Optional,
+    Union,
+)
 
 from google.genai.models import AsyncModels, Models
 from google.genai.models import t as transformers
@@ -37,6 +45,7 @@
     GenerateContentResponse,
 )
 
+from opentelemetry import context as context_api
 from opentelemetry import trace
 from opentelemetry._logs import LogRecord
 from opentelemetry.instrumentation._semconv import (
@@ -57,10 +66,10 @@
     MessagePart,
     OutputMessage,
 )
+from opentelemetry.util.genai.utils import gen_ai_json_dumps
 from opentelemetry.util.types import (
     AttributeValue,
 )
-from opentelemetry.util.genai.utils import gen_ai_json_dumps
 
 from .allowlist_util import AllowList
 from .custom_semconv import GCP_GENAI_OPERATION_CONFIG
@@ -73,7 +82,6 @@
 )
 from .otel_wrapper import OTelWrapper
 from .tool_call_wrapper import wrapped as wrapped_tool
-from opentelemetry import context as context_api
 
 _logger = logging.getLogger(__name__)
 
@@ -84,7 +92,10 @@
 # Constant used for the value of 'gen_ai.operation.name".
 _GENERATE_CONTENT_OP_NAME = "generate_content"
 
-GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY = context_api.create_key("generate_content_extra_attributes_context_key")
+GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY = context_api.create_key(
+    "generate_content_extra_attributes_context_key"
+)
+
 
 class _MethodsSnapshot:
     def __init__(self):
@@ -299,7 +310,9 @@ def _create_completion_details_attributes(
     return attributes
 
 
-def _get_extra_generate_content_attributes() -> Optional[Mapping[str, AttributeValue]]:
+def _get_extra_generate_content_attributes() -> Optional[
+    Mapping[str, AttributeValue]
+]:
     return context_api.get_value(GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY)
 
 

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/nonstreaming_base.py

@@ -20,19 +20,21 @@
 from google.genai.types import GenerateContentConfig, Part
 from pydantic import BaseModel, Field
 
+from opentelemetry import context as context_api
 from opentelemetry.instrumentation._semconv import (
     _OpenTelemetrySemanticConventionStability,
     _OpenTelemetryStabilitySignalType,
     _StabilityMode,
 )
+from opentelemetry.instrumentation.google_genai import (
+    GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY,
+)
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes,
 )
 from opentelemetry.util.genai.types import ContentCapturingMode
 
 from .base import TestCase
-from opentelemetry import context as context_api
-from opentelemetry.instrumentation.google_genai import GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY
 
 # pylint: disable=too-many-public-methods
 
@@ -103,16 +105,25 @@ def test_generated_span_has_minimal_genai_attributes(self):
 
     def test_generated_span_has_extra_genai_attributes(self):
         self.configure_valid_response(text="Yep, it works!")
-        tok = context_api.attach(context_api.set_value(GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY, {"extra_attribute_key": "extra_attribute_value"}))
+        tok = context_api.attach(
+            context_api.set_value(
+                GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY,
+                {"extra_attribute_key": "extra_attribute_value"},
+            )
+        )
         try:
             self.generate_content(
                 model="gemini-2.0-flash", contents="Does this work?"
             )
-            self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
-            span = self.otel.get_span_named("generate_content gemini-2.0-flash")
-            self.assertEqual(span.attributes["extra_attribute_key"], "extra_attribute_value")
-        except:
-            raise
+            self.otel.assert_has_span_named(
+                "generate_content gemini-2.0-flash"
+            )
+            span = self.otel.get_span_named(
+                "generate_content gemini-2.0-flash"
+            )
+            self.assertEqual(
+                span.attributes["extra_attribute_key"], "extra_attribute_value"
+            )
         finally:
             context_api.detach(tok)
 

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/streaming_base.py

@@ -14,9 +14,12 @@
 
 import unittest
 
-from .base import TestCase
 from opentelemetry import context as context_api
-from opentelemetry.instrumentation.google_genai import GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY
+from opentelemetry.instrumentation.google_genai import (
+    GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY,
+)
+
+from .base import TestCase
 
 
 class StreamingTestCase(TestCase):
@@ -46,16 +49,25 @@ def test_instrumentation_does_not_break_core_functionality(self):
 
     def test_generated_span_has_extra_genai_attributes(self):
         self.configure_valid_response(text="Yep, it works!")
-        tok = context_api.attach(context_api.set_value(GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY, {"extra_attribute_key": "extra_attribute_value"}))
+        tok = context_api.attach(
+            context_api.set_value(
+                GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY,
+                {"extra_attribute_key": "extra_attribute_value"},
+            )
+        )
         try:
             self.generate_content(
                 model="gemini-2.0-flash", contents="Does this work?"
             )
-            self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
-            span = self.otel.get_span_named("generate_content gemini-2.0-flash")
-            self.assertEqual(span.attributes["extra_attribute_key"], "extra_attribute_value")
-        except:
-            raise
+            self.otel.assert_has_span_named(
+                "generate_content gemini-2.0-flash"
+            )
+            span = self.otel.get_span_named(
+                "generate_content gemini-2.0-flash"
+            )
+            self.assertEqual(
+                span.attributes["extra_attribute_key"], "extra_attribute_value"
+            )
         finally:
             context_api.detach(tok)