feedback

Author: Liudmila Molkova

instrumentation/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/__init__.py

@@ -68,12 +68,12 @@ def _instrument(self, **kwargs):
             tracer_provider,
             schema_url=Schemas.V1_28_0.value,
         )
-        event_provider = kwargs.get("event_provider")
+        event_logger_provider = kwargs.get("event_logger_provider")
         event_logger = get_event_logger(
             __name__,
             "",
             schema_url=Schemas.V1_28_0.value,
-            event_logger_provider=event_provider,
+            event_logger_provider=event_logger_provider,
         )
 
         wrap_function_wrapper(

instrumentation/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py

@@ -90,9 +90,6 @@ def traced_method(wrapped, instance, args, kwargs):
 def _set_response_attributes(
     span, result, event_logger: EventLogger, capture_content: bool
 ):
-    if not span.is_recording():
-        return
-
     set_span_attribute(
         span, GenAIAttributes.GEN_AI_RESPONSE_MODEL, result.model
     )

instrumentation/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/utils.py

@@ -68,10 +68,14 @@ def extract_tool_calls(item, capture_content):
 
     calls = []
     for tool_call in tool_calls:
-        tool_call_dict = {
-            "id": get_property_value(tool_call, "id"),
-            "type": get_property_value(tool_call, "type"),
-        }
+        tool_call_dict = {}
+        id = get_property_value(tool_call, "id")
+        if id:
+            tool_call_dict["id"] = id
+
+        type = get_property_value(tool_call, "type")
+        if type:
+            tool_call_dict["type"] = type
 
         func = get_property_value(tool_call, "function")
         if func:
@@ -83,9 +87,11 @@ def extract_tool_calls(item, capture_content):
 
             arguments = get_property_value(func, "arguments")
             if capture_content and arguments:
-                tool_call_dict["function"]["arguments"] = arguments.replace(
-                    "\n", ""
-                )
+                if isinstance(arguments, str):
+                    arguments = arguments.replace(
+                        "\n", ""
+                    )
+                tool_call_dict["function"]["arguments"] = arguments
 
         calls.append(tool_call_dict)
     return calls
@@ -163,7 +169,7 @@ def choice_to_event(choice, span_ctx, capture_content):
         message = {
             "role": choice.message.role
             if choice.message and choice.message.role
-            else "assistant"
+            else None
         }
         tool_calls = extract_tool_calls(choice.message, capture_content)
         if tool_calls:

instrumentation/opentelemetry-instrumentation-openai-v2/tests/conftest.py

@@ -42,12 +42,12 @@ def tracer_provider(span_exporter):
 
 
 @pytest.fixture(scope="function")
-def event_provider(log_exporter):
+def event_logger_provider(log_exporter):
     provider = LoggerProvider()
     provider.add_log_record_processor(SimpleLogRecordProcessor(log_exporter))
-    event_provider = EventLoggerProvider(provider)
+    event_logger_provider = EventLoggerProvider(provider)
 
-    return event_provider
+    return event_logger_provider
 
 
 @pytest.fixture(autouse=True)
@@ -71,24 +71,24 @@ def vcr_config():
 
 
 @pytest.fixture(scope="function")
-def instrument_no_content(tracer_provider, event_provider):
+def instrument_no_content(tracer_provider, event_logger_provider):
     instrumentor = OpenAIInstrumentor()
     instrumentor.instrument(
-        tracer_provider=tracer_provider, event_provider=event_provider
+        tracer_provider=tracer_provider, event_logger_provider=event_logger_provider
     )
 
     yield instrumentor
     instrumentor.uninstrument()
 
 
 @pytest.fixture(scope="function")
-def instrument_with_content(tracer_provider, event_provider):
+def instrument_with_content(tracer_provider, event_logger_provider):
     os.environ.update(
         {OTEL_INSTRUMENTATION_OPENAI_CAPTURE_MESSAGE_CONTENT: "True"}
     )
     instrumentor = OpenAIInstrumentor()
     instrumentor.instrument(
-        tracer_provider=tracer_provider, event_provider=event_provider
+        tracer_provider=tracer_provider, event_logger_provider=event_logger_provider
     )
 
     yield instrumentor