opentelemetry-instrumentation-openai 0.27.0__py3-none-any.whl → 0.28.0__py3-none-any.whl

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/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/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/version.py

@@ -1 +1 @@
-__version__ = "0.27.0"
+__version__ = "0.28.0"

{opentelemetry_instrumentation_openai-0.27.0.dist-info → opentelemetry_instrumentation_openai-0.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.27.0
+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.27.0.dist-info → opentelemetry_instrumentation_openai-0.28.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
 opentelemetry/instrumentation/openai/__init__.py,sha256=w0gjgORccQ3EsMiK2dzZg6V7J3pa6PcAuDvy1oofQ5A,1503
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=S6QoxypTSF1dMg4gfS3A3M0TzU2HVz9D6J6CleUXI54,8832
-opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=HEe0-vsCS8mDI585b6-Vybzy2EOpQ-FDpAz7LvVMWmQ,26776
+opentelemetry/instrumentation/openai/shared/__init__.py,sha256=HcS1Ar6WX9DPtlJuiPji3u7XV_SwYerTf5O32Kfe1FQ,8839
+opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=J1s8DqJoSPpOZE__21Iq0QrhFPf3WhIeDqcoIaUPtPU,26721
 opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=DO4K0DU3xvCAmBMcp3pS3iDTKHLY6Pc_4Y7GnlnRo0g,6840
 opentelemetry/instrumentation/openai/shared/config.py,sha256=_4AkHau8C44uBc6-fNBl9EzCGPBuj9yDIngTuwSW6ZE,199
-opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=REcu_K8ogVIf8RR935w_UqS-ajGI0CNun73_P476i2o,6930
+opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=YI0lFGulaE8N2F1hdTGHj52kHwUy6KQPIt7Lw9AWJHc,7069
 opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py,sha256=A4qdJIeJdA45SfiLaFj3Vo0Ndcqqfuew1BDsGdnJU3E,2122
 opentelemetry/instrumentation/openai/utils.py,sha256=3ONjsia3xG4rRMOwjU91liOVpZxoRE39CxJ-C5HxIgQ,3464
 opentelemetry/instrumentation/openai/v0/__init__.py,sha256=02-bXv0aZbscMYO2W3jsHpjU521vkVK5RzdfSeGXBzg,5475
 opentelemetry/instrumentation/openai/v1/__init__.py,sha256=kqGsXkjyjIDNRfTSzJKjLdvvGUOViW2shZ73cM4PfS0,7693
 opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=BMiZykQ3u2xrWpo2g3qZOxTJqy317JXRGO4zCVu4bZ8,6277
 opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=kXOuDAt7If23EhWpH2r6L0eUVFvVWQBYrWGu3qJNKR0,2779
-opentelemetry/instrumentation/openai/version.py,sha256=Hjsc9XQ3AkqXm-5cdlX-H8iKjURzi1FQeWNi2xx34Uo,23
-opentelemetry_instrumentation_openai-0.27.0.dist-info/METADATA,sha256=KVupDehy33exBIOWDQ4cPDlws4LJOCq8SbeRdIUJNhA,2255
-opentelemetry_instrumentation_openai-0.27.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-opentelemetry_instrumentation_openai-0.27.0.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.27.0.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/version.py,sha256=MRQGtOXBhcDKeeNOL0LiB-cllo6kfd8_KGJOvaDp0XQ,23
+opentelemetry_instrumentation_openai-0.28.0.dist-info/METADATA,sha256=2ZUsVk7hWnrgtJq4ITVYZbzUHgcQLjDzv1Tuh_rMCu0,2255
+opentelemetry_instrumentation_openai-0.28.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+opentelemetry_instrumentation_openai-0.28.0.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.28.0.dist-info/RECORD,,