test: add tests for non streaming case and tool_call_wrapper.

Author: argaj

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

@@ -13,8 +13,15 @@
 # limitations under the License.
 
 import json
-import os
 import unittest
+from unittest.mock import patch
+
+from opentelemetry.instrumentation._semconv import (
+    _OpenTelemetrySemanticConventionStability,
+    _OpenTelemetryStabilitySignalType,
+    _StabilityMode,
+)
+from opentelemetry.util.genai.types import ContentCapturingMode
 
 from .base import TestCase
 
@@ -111,10 +118,8 @@ def test_generated_span_counts_tokens(self):
         self.assertEqual(span.attributes["gen_ai.usage.input_tokens"], 123)
         self.assertEqual(span.attributes["gen_ai.usage.output_tokens"], 456)
 
+    @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "true"})
     def test_records_system_prompt_as_log(self):
-        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (
-            "true"
-        )
         config = {"system_instruction": "foo"}
         self.configure_valid_response()
         self.generate_content(
@@ -125,10 +130,8 @@ def test_records_system_prompt_as_log(self):
         self.assertEqual(event_record.attributes["gen_ai.system"], "gemini")
         self.assertEqual(event_record.body["content"], "foo")
 
+    @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "false"})
     def test_does_not_record_system_prompt_as_log_if_disabled_by_env(self):
-        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (
-            "false"
-        )
         config = {"system_instruction": "foo"}
         self.configure_valid_response()
         self.generate_content(
@@ -139,42 +142,34 @@ def test_does_not_record_system_prompt_as_log_if_disabled_by_env(self):
         self.assertEqual(event_record.attributes["gen_ai.system"], "gemini")
         self.assertEqual(event_record.body["content"], "<elided>")
 
+    @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "true"})
     def test_does_not_record_system_prompt_as_log_if_no_system_prompt_present(
         self,
     ):
-        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (
-            "true"
-        )
         self.configure_valid_response()
         self.generate_content(model="gemini-2.0-flash", contents="Some input")
         self.otel.assert_does_not_have_event_named("gen_ai.system.message")
 
+    @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "true"})
     def test_records_user_prompt_as_log(self):
-        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (
-            "true"
-        )
         self.configure_valid_response()
         self.generate_content(model="gemini-2.0-flash", contents="Some input")
         self.otel.assert_has_event_named("gen_ai.user.message")
         event_record = self.otel.get_event_named("gen_ai.user.message")
         self.assertEqual(event_record.attributes["gen_ai.system"], "gemini")
         self.assertEqual(event_record.body["content"], "Some input")
 
+    @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "false"})
     def test_does_not_record_user_prompt_as_log_if_disabled_by_env(self):
-        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (
-            "false"
-        )
         self.configure_valid_response()
         self.generate_content(model="gemini-2.0-flash", contents="Some input")
         self.otel.assert_has_event_named("gen_ai.user.message")
         event_record = self.otel.get_event_named("gen_ai.user.message")
         self.assertEqual(event_record.attributes["gen_ai.system"], "gemini")
         self.assertEqual(event_record.body["content"], "<elided>")
 
+    @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "true"})
     def test_records_response_as_log(self):
-        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (
-            "true"
-        )
         self.configure_valid_response(text="Some response content")
         self.generate_content(model="gemini-2.0-flash", contents="Some input")
         self.otel.assert_has_event_named("gen_ai.choice")
@@ -184,17 +179,46 @@ def test_records_response_as_log(self):
             "Some response content", json.dumps(event_record.body["content"])
         )
 
+    @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "false"})
     def test_does_not_record_response_as_log_if_disabled_by_env(self):
-        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (
-            "false"
-        )
         self.configure_valid_response(text="Some response content")
         self.generate_content(model="gemini-2.0-flash", contents="Some input")
         self.otel.assert_has_event_named("gen_ai.choice")
         event_record = self.otel.get_event_named("gen_ai.choice")
         self.assertEqual(event_record.attributes["gen_ai.system"], "gemini")
         self.assertEqual(event_record.body["content"], "<elided>")
 
+    def test_new_semconv_record_response_as_log(self):
+        for mode in ContentCapturingMode:
+            patched_environ = patch.dict(
+                "os.environ",
+                {
+                    "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": mode.name,
+                    "OTEL_SEMCONV_STABILITY_OPT_IN": "gen_ai_latest_experimental",
+                },
+            )
+            patched_otel_mapping = patch.dict(
+                _OpenTelemetrySemanticConventionStability._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING,
+                {
+                    _OpenTelemetryStabilitySignalType.GEN_AI: _StabilityMode.GEN_AI_LATEST_EXPERIMENTAL
+                },
+            )
+            with self.subTest(f'mode: {mode}', patched_environ=patched_environ):
+                self.setUp()
+                with patched_environ, patched_otel_mapping:
+                    self.configure_valid_response(text="Some response content")
+                    self.generate_content(model="gemini-2.0-flash", contents="Some input")
+
+                    if mode in [
+                        ContentCapturingMode.NO_CONTENT,
+                        ContentCapturingMode.SPAN_ONLY,
+                    ]:
+                        self.otel.assert_does_not_have_event_named("gen_ai.client.inference.operation.details")
+                    else:
+                        self.otel.assert_has_event_named("gen_ai.client.inference.operation.details")
+
+                self.tearDown()
+ 
     def test_records_metrics_data(self):
         self.configure_valid_response()
         self.generate_content(model="gemini-2.0-flash", contents="Some input")

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.latest.txt

@@ -41,9 +41,10 @@ pytest-asyncio==0.21.0
 pytest-vcr==1.0.2
 
 google-auth==2.38.0
-google-genai==1.0.0
+google-genai==1.32.0
 
 # Install locally from the folder. This path is relative to the
 # root directory, given invocation from "tox" at root level.
 -e opentelemetry-instrumentation
--e instrumentation-genai/opentelemetry-instrumentation-google-genai
+-e instrumentation-genai/opentelemetry-instrumentation-google-genai
+-e util/opentelemetry-util-genai

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/utils/test_tool_call_wrapper.py

@@ -17,14 +17,16 @@
 from unittest.mock import patch
 
 from google.genai import types as genai_types
-
 from opentelemetry._events import get_event_logger_provider
-from opentelemetry.instrumentation.google_genai import (
-    otel_wrapper,
-    tool_call_wrapper,
+from opentelemetry.instrumentation._semconv import (
+    _OpenTelemetrySemanticConventionStability,
+    _OpenTelemetryStabilitySignalType,
+    _StabilityMode,
 )
+from opentelemetry.instrumentation.google_genai import otel_wrapper, tool_call_wrapper
 from opentelemetry.metrics import get_meter_provider
 from opentelemetry.trace import get_tracer_provider
+from opentelemetry.util.genai.types import ContentCapturingMode
 
 from ..common import otel_mocker
 
@@ -278,3 +280,39 @@ def somefunction(arg=None):
             span.attributes["code.function.parameters.arg.value"],
             '[123, "abc"]',
         )
+
+    def test_handle_with_new_sem_conv(self):
+        def somefunction(arg=None):
+            pass
+
+        for mode in ContentCapturingMode:
+            patched_environ = patch.dict(
+                "os.environ",
+                {
+                    "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": mode.name,
+                    "OTEL_SEMCONV_STABILITY_OPT_IN": "gen_ai_latest_experimental",
+                },
+            )
+            patched_otel_mapping = patch.dict(
+                _OpenTelemetrySemanticConventionStability._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING,
+                {
+                    _OpenTelemetryStabilitySignalType.GEN_AI: _StabilityMode.GEN_AI_LATEST_EXPERIMENTAL
+                },
+            )
+            with self.subTest(f'mode: {mode}', patched_environ=patched_environ):
+                self.setUp()
+                with patched_environ, patched_otel_mapping:
+                    wrapped_somefunction = self.wrap(somefunction)
+                    wrapped_somefunction(12345)
+
+                    span = self.otel.get_span_named("execute_tool somefunction")
+
+                    print(mode)
+                    if mode in [
+                        ContentCapturingMode.NO_CONTENT,
+                        ContentCapturingMode.EVENT_ONLY,
+                    ]:
+                        self.assertNotIn("code.function.parameters.arg.value", span.attributes)
+                    else:
+                        self.assertIn("code.function.parameters.arg.value", span.attributes)
+                self.tearDown()