Fix 'make test' command and lint issues.

Author: michaelsafyan

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

@@ -87,7 +87,7 @@ def _guess_genai_system_from_env():
           "true",
           "1",
       ]:
-      return _get_vertexai_system_name()
+        return _get_vertexai_system_name()
     return _get_gemini_system_name()
 
 
@@ -230,8 +230,8 @@ def _maybe_update_error_type(self, response: GenerateContentResponse):
             (response.prompt_feedback.block_reason == BlockedReason.BLOCKED_REASON_UNSPECIFIED)):
             self._error_type = "NO_CANDIDATES"
             return
-        block_reason = response.prompt_feedback.block_reason
-        self._error_type = "BLOCKED_{}".format(block_reason.name)
+        block_reason = response.prompt_feedback.block_reason.name.upper()
+        self._error_type = f'BLOCKED_{block_reason}'
 
     def _maybe_log_system_instruction(self, config: Optional[GenerateContentConfigOrDict]=None):
         if not self._content_recording_enabled:
@@ -324,8 +324,8 @@ def instrumented_generate_content(
                 response = wrapped_func(self, model=model, contents=contents, config=config)
                 helper.process_response(response)
                 return response
-            except Exception as e:
-                helper.process_error(e)
+            except Exception as error:
+                helper.process_error(error)
                 raise
             finally:
                 helper.finalize_processing()
@@ -353,8 +353,8 @@ def instrumented_generate_content_stream(
                 for response in wrapped_func(self, model=model, contents=contents, config=config):
                     helper.process_response(response)
                     yield response
-            except Exception as e:
-                helper.process_error(e)
+            except Exception as error:
+                helper.process_error(error)
                 raise
             finally:
                 helper.finalize_processing()
@@ -382,8 +382,8 @@ async def instrumented_generate_content(
                 response = await wrapped_func(self, model=model, contents=contents, config=config)
                 helper.process_response(response)
                 return response
-            except Exception as e:
-                helper.process_error(e)
+            except Exception as error:
+                helper.process_error(error)
                 raise
             finally:
                 helper.finalize_processing()
@@ -411,8 +411,8 @@ async def instrumented_generate_content_stream(
                 async for response in wrapped_func(self, model=model, contents=contents, config=config):
                     helper.process_response(response)
                     yield response
-            except Exception as e:
-                helper.process_error(e)
+            except Exception as error:
+                helper.process_error(error)
                 raise
             finally:
                 helper.finalize_processing()

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

@@ -31,7 +31,9 @@ class GoogleGenAiSdkInstrumentor(BaseInstrumentor):
     def __init__(self):
         self._generate_content_snapshot = None
 
-    def instrumentation_dependencies(self) -> Collection[str]:
+    # Inherited, abstract function from 'BaseInstrumentor'. Even though 'self' is
+    # not used in the definition, a method is required per the API contract.
+    def instrumentation_dependencies(self) -> Collection[str]:  # pylint: disable=no-self-use
         return ["google-genai>=1.0.0,<2"]
 
     def _instrument(self, **kwargs: Any):
@@ -47,4 +49,3 @@ def _instrument(self, **kwargs: Any):
 
     def _uninstrument(self, **kwargs: Any):
         uninstrument_generate_content(self._generate_content_snapshot)
-

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

@@ -102,4 +102,3 @@ def log_response_content(self, attributes, body):
     def _log_event(self, event_name, attributes, body):
         event = Event(event_name, body=body, attributes=attributes)
         self.event_logger.emit(event)
-

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/instrumentation_context.py

@@ -16,7 +16,10 @@
 
 sys.path.append("../../src")
 
-from opentelemetry.instrumentation.google_genai import (
+# This import has to happen after 'sys.path.append' above, so that it is possible
+# to use this name relative to "../../src" (at least when this module is imported
+# from a test script that has been invoked directly).
+from opentelemetry.instrumentation.google_genai import (  # pylint: disable=wrong-import-position
     GoogleGenAiSdkInstrumentor,
 )
 

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/otel_mocker.py

@@ -169,7 +169,7 @@ def get_span_named(self, name):
     def assert_has_span_named(self, name):
         span = self.get_span_named(name)
         finished_spans = self.get_finished_spans()
-        assert span is not None, 'Could not find span named "{}"; finished spans: {}'.format(name, finished_spans)
+        assert span is not None, f'Could not find span named "{name}"; finished spans: {finished_spans}'
 
     def get_event_named(self, event_name):
         for event in self.get_finished_logs():
@@ -183,11 +183,11 @@ def get_event_named(self, event_name):
     def assert_has_event_named(self, name):
         event = self.get_event_named(name)
         finished_logs = self.get_finished_logs()
-        assert event is not None, 'Could not find event named "{}"; finished logs: {}'.format(name, finished_logs)
+        assert event is not None, f'Could not find event named "{name}"; finished logs: {finished_logs}'
 
     def assert_does_not_have_event_named(self, name):
         event = self.get_event_named(name)
-        assert event is None, "Unexpected event: {}".format(event)
+        assert event is None, f'Unexpected event: {event}'
 
     def get_metrics_data_named(self, name):
         results = []
@@ -215,4 +215,4 @@ def _install_traces(self):
         provider = TracerProvider()
         provider.add_span_processor(SimpleSpanProcessor(self._traces))
         set_tracer_provider(provider)
-
+    

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/requests_mocker.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import http.client
 import copy
 import functools
 import io
@@ -61,11 +62,11 @@ def response(self):
 
 
 
-def _return_error_status(args: RequestsCallArgs, status_code: int, reason: str):
+def _return_error_status(args: RequestsCallArgs, status_code: int, reason: str=None):
     result = requests.Response()
     result.url = args.request.url
     result.status_code = status_code
-    result.reason = reason
+    result.reason = reason or http.client.responses.get(status_code)
     result.request = args.request
     return result
 
@@ -80,37 +81,39 @@ def _to_response_generator(response):
     if isinstance(response, int):
         return lambda args: _return_error_status(args, response)
     if isinstance(response, requests.Response):
-        def response_generator(args):
+        def generate_response_from_response(args):
             new_response = copy.deepcopy(response)
             new_response.request = args.request
             new_response.url = args.request.url
             return new_response
-        return response_generator
+        return generate_response_from_response
     if isinstance(response, dict):
-        def response_generator(args):
+        def generate_response_from_dict(args):
             result = requests.Response()
             result.status_code = 200
             result.headers["content-type"] = "application/json"
             result.encoding = "utf-8"
             result.raw = io.BytesIO(json.dumps(response).encode())
             return result
-        return response_generator
+        return generate_response_from_dict
     raise ValueError(f"Unsupported response type: {type(response)}")
 
 
 class RequestsMocker:
 
-    def install(self):
+    def __init__(self):
         self._original_send = requests.sessions.Session.send
+        self._calls = []
+        self._handlers = []
+
+    def install(self):
         @functools.wraps(requests.sessions.Session.send)
         def replacement_send(
             s: requests.sessions.Session,
             request: requests.PreparedRequest,
             **kwargs):
             return self._do_send(s, request, **kwargs)
         requests.sessions.Session.send = replacement_send
-        self._calls = []
-        self._handlers = []
 
     def uninstall(self):
         requests.sessions.Session.send = self._original_send
@@ -145,4 +148,3 @@ def _lookup_response_generator(self, args: RequestsCallArgs):
             if matcher(args):
                 return response_generator
         return _return_404
-

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

@@ -21,7 +21,9 @@
 
 sys.path.append("../")
 
-from common.base import TestCase
+# This needs to go after 'sys.path.append' in order to ensure that 'common'
+# can be imported using this naming (when the script is invoked directly).
+from common.base import TestCase  # pylint: disable=wrong-import-position
 
 
 def create_valid_response(response_text="The model response", input_tokens=10, output_tokens=20):
@@ -44,9 +46,6 @@ def create_valid_response(response_text="The model response", input_tokens=10, o
 
 class TestGenerateContentAsyncNonstreaming(TestCase):
 
-    def setUp(self):
-        super().setUp()
-
     def configure_valid_response(self, response_text="The model_response", input_tokens=10, output_tokens=20):
         self.requests.add_response(create_valid_response(
             response_text=response_text,

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

@@ -21,7 +21,9 @@
 
 sys.path.append("../")
 
-from common.base import TestCase
+# This needs to go after 'sys.path.append' in order to ensure that 'common'
+# can be imported using this naming (when the script is invoked directly).
+from common.base import TestCase  # pylint: disable=wrong-import-position
 
 
 def create_valid_response(response_text="The model response", input_tokens=10, output_tokens=20):
@@ -44,9 +46,6 @@ def create_valid_response(response_text="The model response", input_tokens=10, o
 
 class TestGenerateContentAsyncStreaming(TestCase):
 
-    def setUp(self):
-        super().setUp()
-
     def configure_valid_response(self, response_text="The model_response", input_tokens=10, output_tokens=20):
         self.requests.add_response(create_valid_response(
             response_text=response_text,

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

@@ -22,7 +22,9 @@
 
 sys.path.append("../")
 
-from common.base import TestCase
+# This needs to go after 'sys.path.append' in order to ensure that 'common'
+# can be imported using this naming (when the script is invoked directly).
+from common.base import TestCase  # pylint: disable=wrong-import-position
 
 
 def create_valid_response(response_text="The model response", input_tokens=10, output_tokens=20):
@@ -46,9 +48,6 @@ def create_valid_response(response_text="The model response", input_tokens=10, o
 
 class TestGenerateContentSyncNonstreaming(TestCase):
 
-    def setUp(self):
-        super().setUp()
-
     def configure_valid_response(self, response_text="The model_response", input_tokens=10, output_tokens=20):
         self.requests.add_response(create_valid_response(
             response_text=response_text,

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

@@ -20,7 +20,9 @@
 
 sys.path.append("../")
 
-from common.base import TestCase
+# This needs to go after 'sys.path.append' in order to ensure that 'common'
+# can be imported using this naming (when the script is invoked directly).
+from common.base import TestCase  # pylint: disable=wrong-import-position
 
 
 def create_valid_response(response_text="The model response", input_tokens=10, output_tokens=20):
@@ -43,9 +45,6 @@ def create_valid_response(response_text="The model response", input_tokens=10, o
 
 class TestGenerateContentSyncStreaming(TestCase):
 
-    def setUp(self):
-        super().setUp()
-
     def configure_valid_response(self, response_text="The model_response", input_tokens=10, output_tokens=20):
         self.requests.add_response(create_valid_response(
             response_text=response_text,