Revert "Revert "fix(google-genai): migrate Google Generative AI instrumentation to googleapis/python-genai""

packages/opentelemetry-instrumentation-google-generativeai/opentelemetry/instrumentation/google_generativeai/__init__.py

@@ -4,7 +4,7 @@
 import types
 from typing import Collection
 
-from google.generativeai.types.generation_types import GenerateContentResponse
+from google.genai.types import GenerateContentResponse
 from opentelemetry import context as context_api
 from opentelemetry._events import get_event_logger
 from opentelemetry.instrumentation.google_generativeai.config import Config
@@ -20,7 +20,6 @@
 )
 from opentelemetry.instrumentation.google_generativeai.utils import (
     dont_throw,
-    is_package_installed,
     should_emit_events,
 )
 from opentelemetry.instrumentation.google_generativeai.version import __version__
@@ -36,36 +35,6 @@
 
 logger = logging.getLogger(__name__)
 
-LEGACY_WRAPPED_METHODS = [
-    {
-        "package": "google.generativeai.generative_models",
-        "object": "GenerativeModel",
-        "method": "generate_content",
-        "span_name": "gemini.generate_content",
-    },
-    {
-        "package": "google.generativeai.generative_models",
-        "object": "GenerativeModel",
-        "method": "generate_content_async",
-        "span_name": "gemini.generate_content_async",
-    },
-]
-
-WRAPPED_METHODS = [
-    {
-        "package": "google.genai.models",
-        "object": "Models",
-        "method": "generate_content",
-        "span_name": "gemini.generate_content",
-    },
-    {
-        "package": "google.genai.models",
-        "object": "AsyncModels",
-        "method": "generate_content",
-        "span_name": "gemini.generate_content",
-    },
-]
-
 WRAPPED_METHODS = [
     {
         "package": "google.genai.models",
@@ -286,20 +255,10 @@ def __init__(self, exception_logger=None, use_legacy_attributes=True):
         Config.use_legacy_attributes = use_legacy_attributes
 
     def instrumentation_dependencies(self) -> Collection[str]:
-        if is_package_installed("google.genai"):
-            return ("google-genai >= 0.1.0",)
-        elif is_package_installed("google.generativeai"):
-            return ["google-generativeai >= 0.5.0"]
-        else:
-            return []
+        return ("google-genai >= 1.0.0",)
 
     def _wrapped_methods(self):
-        if is_package_installed("google.genai"):
-            return WRAPPED_METHODS
-        elif is_package_installed("google.generativeai"):
-            return LEGACY_WRAPPED_METHODS
-        else:
-            return []
+        return WRAPPED_METHODS
 
     def _instrument(self, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")
@@ -312,7 +271,7 @@ def _instrument(self, **kwargs):
                 __name__, __version__, event_logger_provider=event_logger_provider
             )
 
-        for wrapped_method in WRAPPED_METHODS:
+        for wrapped_method in self._wrapped_methods():
             wrap_package = wrapped_method.get("package")
             wrap_object = wrapped_method.get("object")
             wrap_method = wrapped_method.get("method")

packages/opentelemetry-instrumentation-google-generativeai/opentelemetry/instrumentation/google_generativeai/event_emitter.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from typing import Union
 
-from google.generativeai.types.generation_types import GenerateContentResponse
+from google.genai.types import GenerateContentResponse
 from opentelemetry._events import Event, EventLogger
 from opentelemetry.instrumentation.google_generativeai.event_models import (
     ChoiceEvent,