Pass through the extra span arguments.

Author: michaelsafyan

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

@@ -219,12 +219,14 @@ def _coerce_config_to_object(
 
 
 def _wrapped_config_with_tools(
-    otel_wrapper: OTelWrapper, config: GenerateContentConfig
+    otel_wrapper: OTelWrapper,
+    config: GenerateContentConfig,
+    **kwargs,
 ):
     if not config.tools:
         return config
     result = copy.copy(config)
-    result.tools = [wrapped_tool(tool, otel_wrapper) for tool in config.tools]
+    result.tools = [wrapped_tool(tool, otel_wrapper, **kwargs) for tool in config.tools]
     return result
 
 
@@ -257,7 +259,9 @@ def wrapped_config(
         if config is None:
             return None
         return _wrapped_config_with_tools(
-            self._otel_wrapper, _coerce_config_to_object(config)
+            self._otel_wrapper,
+            _coerce_config_to_object(config),
+            extra_span_attributes={"gen_ai.system": self._genai_system},
         )
 
     def start_span_as_current_span(

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

@@ -147,7 +147,7 @@ def _wrap_sync_tool_function(
     tool_function: ToolFunction,
     otel_wrapper: OTelWrapper,
     extra_span_attributes: Optional[dict[str, str]] = None,
-    **kwargs,
+    **unused_kwargs,
 ):
     @functools.wraps(tool_function)
     def wrapped_function(*args, **kwargs):
@@ -172,7 +172,7 @@ def _wrap_async_tool_function(
     tool_function: ToolFunction,
     otel_wrapper: OTelWrapper,
     extra_span_attributes: Optional[dict[str, str]] = None,
-    **kwargs,
+    **unused_kwargs,
 ):
     @functools.wraps(tool_function)
     async def wrapped_function(*args, **kwargs):

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

@@ -44,12 +44,19 @@ def somefunction(somearg):
         wrapped_somefunction = tools[0]
 
         self.assertIsNone(self.otel.get_span_named("execute_tool somefunction"))
-        wrapped_somefunction(somearg="someparam")
+        wrapped_somefunction("someparam")
         self.otel.assert_has_span_named("execute_tool somefunction")
         generated_span = self.otel.get_span_named("execute_tool somefunction")
+        self.assertIn(
+            "gen_ai.system", generated_span.attributes
+        )
         self.assertEqual(
-            generated_span.attributes["code.function.name"], "somefunction"
+            generated_span.attributes["gen_ai.tool.name"], "somefunction"
         )
+        self.assertEqual(
+            generated_span.attributes["code.args.positional.count"], 1)
+        self.assertEqual(
+            generated_span.attributes["code.args.keyword.count"], 0)
 
     def test_tool_calls_with_config_object_outputs_spans(self):
         calls = []
@@ -75,12 +82,19 @@ def somefunction(somearg):
         wrapped_somefunction = tools[0]
 
         self.assertIsNone(self.otel.get_span_named("execute_tool somefunction"))
-        wrapped_somefunction(somearg="someparam")
+        wrapped_somefunction("someparam")
         self.otel.assert_has_span_named("execute_tool somefunction")
         generated_span = self.otel.get_span_named("execute_tool somefunction")
+        self.assertIn(
+            "gen_ai.system", generated_span.attributes
+        )
         self.assertEqual(
-            generated_span.attributes["code.function.name"], "somefunction"
+            generated_span.attributes["gen_ai.tool.name"], "somefunction"
         )
+        self.assertEqual(
+            generated_span.attributes["code.args.positional.count"], 1)
+        self.assertEqual(
+            generated_span.attributes["code.args.keyword.count"], 0)
 
     @patch.dict("os.environ", {"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT": "true"})
     def test_tool_calls_record_parameter_values_on_span_if_enabled(self):