fix(google-genai): Add support for generate_content method in google genai models (#3014)

Author: galzilber

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

@@ -24,7 +24,7 @@
 
 logger = logging.getLogger(__name__)
 
-_instruments = ("google-generativeai >= 0.5.0",)
+_instruments = ("google-generativeai >= 0.5.0", "google-genai >= 0.1.0")
 
 WRAPPED_METHODS = [
     {
@@ -39,6 +39,18 @@
         "method": "generate_content_async",
         "span_name": "gemini.generate_content_async",
     },
+    {
+        "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",
+    },
 ]
 
 
@@ -69,7 +81,18 @@ def _set_input_attributes(span, args, kwargs, llm_model):
 
     if "contents" in kwargs:
         contents = kwargs["contents"]
-        if isinstance(contents, list):
+        if isinstance(contents, str):
+            _set_span_attribute(
+                span,
+                f"{SpanAttributes.LLM_PROMPTS}.0.content",
+                contents,
+            )
+            _set_span_attribute(
+                span,
+                f"{SpanAttributes.LLM_PROMPTS}.0.role",
+                "user",
+            )
+        elif isinstance(contents, list):
             for i, content in enumerate(contents):
                 if hasattr(content, "parts"):
                     for part in content.parts:
@@ -255,6 +278,8 @@ async def _awrap(tracer, to_wrap, wrapped, instance, args, kwargs):
         ).replace("models/", "")
     if hasattr(instance, "model") and hasattr(instance.model, "model_name"):
         llm_model = instance.model.model_name.replace("models/", "")
+    if "model" in kwargs:
+        llm_model = kwargs["model"].replace("models/", "")
 
     name = to_wrap.get("span_name")
     span = tracer.start_span(
@@ -299,6 +324,8 @@ def _wrap(tracer, to_wrap, wrapped, instance, args, kwargs):
         ).replace("models/", "")
     if hasattr(instance, "model") and hasattr(instance.model, "model_name"):
         llm_model = instance.model.model_name.replace("models/", "")
+    if "model" in kwargs:
+        llm_model = kwargs["model"].replace("models/", "")
 
     name = to_wrap.get("span_name")
     span = tracer.start_span(