opentelemetry-instrumentation-openai 0.26.5__tar.gz → 0.28.0__tar.gz

{opentelemetry_instrumentation_openai-0.26.5 → opentelemetry_instrumentation_openai-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.26.5
+Version: 0.28.0
 Summary: OpenTelemetry OpenAI instrumentation
 Home-page: https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 License: Apache-2.0

{opentelemetry_instrumentation_openai-0.26.5 → opentelemetry_instrumentation_openai-0.28.0}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -33,10 +33,8 @@ def should_send_prompts():
 
 
 def _set_span_attribute(span, name, value):
-    if value is not None:
-        if value != "":
-            span.set_attribute(name, value)
-    return
+    if value is not None and value != "" and value != openai.NOT_GIVEN:
+        span.set_attribute(name, value)
 
 
 def _set_client_attributes(span, instance):

{opentelemetry_instrumentation_openai-0.26.5 → opentelemetry_instrumentation_openai-0.28.0}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -39,7 +39,7 @@ from opentelemetry.instrumentation.openai.shared import (
 from opentelemetry.trace import SpanKind, Tracer
 from opentelemetry.trace.status import Status, StatusCode
 
-from opentelemetry.instrumentation.openai.utils import is_openai_v1, is_azure_openai
+from opentelemetry.instrumentation.openai.utils import is_openai_v1
 
 SPAN_NAME = "openai.chat"
 PROMPT_FILTER_KEY = "prompt_filter_results"
@@ -428,6 +428,7 @@ def _set_completions(span, choices):
                 )
 
 
+@dont_throw
 def _set_streaming_token_metrics(
     request_kwargs, complete_response, span, token_counter, shared_attributes
 ):
@@ -745,10 +746,9 @@ async def _abuild_from_streaming_response(
         "stream": True,
     }
 
-    if not is_azure_openai(instance):
-        _set_streaming_token_metrics(
-            request_kwargs, complete_response, span, token_counter, shared_attributes
-        )
+    _set_streaming_token_metrics(
+        request_kwargs, complete_response, span, token_counter, shared_attributes
+    )
 
     # choice metrics
     if choice_counter and complete_response.get("choices"):

{opentelemetry_instrumentation_openai-0.26.5 → opentelemetry_instrumentation_openai-0.28.0}/opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py

@@ -209,6 +209,9 @@ def _set_embeddings_metrics(
     if usage and token_counter:
         for name, val in usage.items():
             if name in OPENAI_LLM_USAGE_TOKEN_TYPES:
+                if val is None:
+                    logging.error(f"Received None value for {name} in usage")
+                    continue
                 attributes_with_token_type = {
                     **shared_attributes,
                     SpanAttributes.LLM_TOKEN_TYPE: _token_type(name),

opentelemetry_instrumentation_openai-0.28.0/opentelemetry/instrumentation/openai/version.py

@@ -0,0 +1 @@
+__version__ = "0.28.0"

{opentelemetry_instrumentation_openai-0.26.5 → opentelemetry_instrumentation_openai-0.28.0}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.26.5"
+version = "0.28.0"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",

opentelemetry_instrumentation_openai-0.26.5/opentelemetry/instrumentation/openai/version.py

@@ -1 +0,0 @@
-__version__ = "0.26.5"