opentelemetry-instrumentation-openai 0.38.0__py3-none-any.whl → 0.38.2__py3-none-any.whl

opentelemetry/instrumentation/openai/__init__.py

@@ -5,8 +5,6 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 
 from opentelemetry.instrumentation.openai.shared.config import Config
 from opentelemetry.instrumentation.openai.utils import is_openai_v1
-from opentelemetry.instrumentation.openai.v0 import OpenAIV0Instrumentor
-from opentelemetry.instrumentation.openai.v1 import OpenAIV1Instrumentor
 
 _instruments = ("openai >= 0.27.0",)
 
@@ -38,12 +36,20 @@ class OpenAIInstrumentor(BaseInstrumentor):
 
     def _instrument(self, **kwargs):
         if is_openai_v1():
+            from opentelemetry.instrumentation.openai.v1 import OpenAIV1Instrumentor
+
             OpenAIV1Instrumentor().instrument(**kwargs)
         else:
+            from opentelemetry.instrumentation.openai.v0 import OpenAIV0Instrumentor
+
             OpenAIV0Instrumentor().instrument(**kwargs)
 
     def _uninstrument(self, **kwargs):
         if is_openai_v1():
+            from opentelemetry.instrumentation.openai.v1 import OpenAIV1Instrumentor
+
             OpenAIV1Instrumentor().uninstrument(**kwargs)
         else:
+            from opentelemetry.instrumentation.openai.v0 import OpenAIV0Instrumentor
+
             OpenAIV0Instrumentor().uninstrument(**kwargs)

opentelemetry/instrumentation/openai/shared/__init__.py

@@ -11,7 +11,9 @@ from opentelemetry.trace.propagation import set_span_in_context
 from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
 
 from opentelemetry.instrumentation.openai.shared.config import Config
-from opentelemetry.semconv._incubating.attributes.gen_ai_attributes import GEN_AI_RESPONSE_ID
+from opentelemetry.semconv._incubating.attributes.gen_ai_attributes import (
+    GEN_AI_RESPONSE_ID,
+)
 from opentelemetry.semconv_ai import SpanAttributes
 from opentelemetry.instrumentation.openai.utils import (
     dont_throw,
@@ -38,8 +40,13 @@ def should_send_prompts():
 
 
 def _set_span_attribute(span, name, value):
-    if value is not None and value != "" and value != openai.NOT_GIVEN:
-        span.set_attribute(name, value)
+    if value is None or value == "":
+        return
+
+    if hasattr(openai, "NOT_GIVEN") and value == openai.NOT_GIVEN:
+        return
+
+    span.set_attribute(name, value)
 
 
 def _set_client_attributes(span, instance):

opentelemetry/instrumentation/openai/version.py

@@ -1 +1 @@
-__version__ = "0.38.0"
+__version__ = "0.38.2"

{opentelemetry_instrumentation_openai-0.38.0.dist-info → opentelemetry_instrumentation_openai-0.38.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-openai
-Version: 0.38.0
+Version: 0.38.2
 Summary: OpenTelemetry OpenAI instrumentation
 License: Apache-2.0
 Author: Gal Kleinman

{opentelemetry_instrumentation_openai-0.38.0.dist-info → opentelemetry_instrumentation_openai-0.38.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-opentelemetry/instrumentation/openai/__init__.py,sha256=ly0ZPoOTAVRo1f0EeKfyTWj8_HLna3kZfIo9GWgUJk4,1888
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=Ha5oEgK0VrdTu10wdxs-Dqwcv2fbqw1mqlXlsngH7kg,9493
+opentelemetry/instrumentation/openai/__init__.py,sha256=g_RyqxN0DEaPegyaFfoZVskxnaPMGx6Yrc9wZvkx7r8,2086
+opentelemetry/instrumentation/openai/shared/__init__.py,sha256=AyUsCiNvqx5L6z8Vkn0xx07cASA-L9GYbvMzG9JaPfc,9562
 opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=YYEYBSyqcOSlb5VNORs3LL-J749sk9ZZbOpCn8JikIU,28306
 opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=de35aM1Bjsk3GsfNAdu009OF_mdeFB7H_jBsc4LOKY0,7101
 opentelemetry/instrumentation/openai/shared/config.py,sha256=dCQviJ1a5cpFlrP0HcKgE7lpiXB98ssnumLy_CIMibQ,355
@@ -10,8 +10,8 @@ opentelemetry/instrumentation/openai/v0/__init__.py,sha256=02-bXv0aZbscMYO2W3jsH
 opentelemetry/instrumentation/openai/v1/__init__.py,sha256=B2Ut0X14KQS5in_0jLBMCvXQK73SqBy2rBFIDk5ZRkc,8688
 opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=08ZB03chvpzF-v2dtpHKCToJmm5ztYSwKhBq3pbpPlI,7191
 opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=4HsnPwR450NA5w-KDgMfQjK8U4do_M-sMMPU4LjXyiQ,3444
-opentelemetry/instrumentation/openai/version.py,sha256=GJwyrcH1eJOX_p_9H-LSIMO2ADxtxl7estBuQ7PgzCM,23
-opentelemetry_instrumentation_openai-0.38.0.dist-info/METADATA,sha256=qEvV3MsmEgcjTd9F4I4bk0dNRLrgYkeACMdUTxq9NBY,2186
-opentelemetry_instrumentation_openai-0.38.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-opentelemetry_instrumentation_openai-0.38.0.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.38.0.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/version.py,sha256=Vx3X3hEReOZPCKiGkar2nBiTrf3fCoaKKNz1t5h9gdY,23
+opentelemetry_instrumentation_openai-0.38.2.dist-info/METADATA,sha256=awGbBda7ElRB8MJIAUCSR02TtQB54CFqc_5L9lZNeQg,2186
+opentelemetry_instrumentation_openai-0.38.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+opentelemetry_instrumentation_openai-0.38.2.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.38.2.dist-info/RECORD,,