opentelemetry-instrumentation-openai 0.38.1__py3-none-any.whl → 0.38.3__py3-none-any.whl

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):
@@ -297,7 +304,13 @@ def metric_shared_attributes(
 
 
 def propagate_trace_context(span, kwargs):
-    extra_headers = kwargs.get("extra_headers", {})
-    ctx = set_span_in_context(span)
-    TraceContextTextMapPropagator().inject(extra_headers, context=ctx)
-    kwargs["extra_headers"] = extra_headers
+    if is_openai_v1():
+        extra_headers = kwargs.get("extra_headers", {})
+        ctx = set_span_in_context(span)
+        TraceContextTextMapPropagator().inject(extra_headers, context=ctx)
+        kwargs["extra_headers"] = extra_headers
+    else:
+        headers = kwargs.get("headers", {})
+        ctx = set_span_in_context(span)
+        TraceContextTextMapPropagator().inject(headers, context=ctx)
+        kwargs["headers"] = headers

opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -98,6 +98,9 @@ def chat_wrapper(
         if exception_counter:
             exception_counter.add(1, attributes=attributes)
 
+        span.set_status(Status(StatusCode.ERROR, str(e)))
+        span.end()
+
         raise e
 
     if is_streaming_response(response):
@@ -190,6 +193,9 @@ async def achat_wrapper(
         if exception_counter:
             exception_counter.add(1, attributes=attributes)
 
+        span.set_status(Status(StatusCode.ERROR, str(e)))
+        span.end()
+
         raise e
 
     if is_streaming_response(response):

opentelemetry/instrumentation/openai/shared/completion_wrappers.py

@@ -53,7 +53,12 @@ def completion_wrapper(tracer, wrapped, instance, args, kwargs):
     )
 
     _handle_request(span, kwargs, instance)
-    response = wrapped(*args, **kwargs)
+    try:
+        response = wrapped(*args, **kwargs)
+    except Exception as e:
+        span.set_status(Status(StatusCode.ERROR, str(e)))
+        span.end()
+        raise e
 
     if is_streaming_response(response):
         # span will be closed after the generator is done
@@ -79,7 +84,12 @@ async def acompletion_wrapper(tracer, wrapped, instance, args, kwargs):
     )
 
     _handle_request(span, kwargs, instance)
-    response = await wrapped(*args, **kwargs)
+    try:
+        response = await wrapped(*args, **kwargs)
+    except Exception as e:
+        span.set_status(Status(StatusCode.ERROR, str(e)))
+        span.end()
+        raise e
 
     if is_streaming_response(response):
         # span will be closed after the generator is done

opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py

@@ -34,6 +34,7 @@ from opentelemetry.instrumentation.openai.shared.config import Config
 from opentelemetry.instrumentation.openai.utils import is_openai_v1
 
 from opentelemetry.trace import SpanKind
+from opentelemetry.trace import Status, StatusCode
 
 SPAN_NAME = "openai.embeddings"
 LLM_REQUEST_TYPE = LLMRequestTypeValues.EMBEDDING
@@ -83,6 +84,9 @@ def embeddings_wrapper(
             if exception_counter:
                 exception_counter.add(1, attributes=attributes)
 
+            span.set_status(Status(StatusCode.ERROR, str(e)))
+            span.end()
+
             raise e
 
         duration = end_time - start_time
@@ -142,6 +146,9 @@ async def aembeddings_wrapper(
             if exception_counter:
                 exception_counter.add(1, attributes=attributes)
 
+            span.set_status(Status(StatusCode.ERROR, str(e)))
+            span.end()
+
             raise e
 
         duration = end_time - start_time

opentelemetry/instrumentation/openai/version.py

@@ -1 +1 @@
-__version__ = "0.38.1"
+__version__ = "0.38.3"

{opentelemetry_instrumentation_openai-0.38.1.dist-info → opentelemetry_instrumentation_openai-0.38.3.dist-info}/METADATA

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

{opentelemetry_instrumentation_openai-0.38.1.dist-info → opentelemetry_instrumentation_openai-0.38.3.dist-info}/RECORD

@@ -1,17 +1,17 @@
 opentelemetry/instrumentation/openai/__init__.py,sha256=g_RyqxN0DEaPegyaFfoZVskxnaPMGx6Yrc9wZvkx7r8,2086
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=Ha5oEgK0VrdTu10wdxs-Dqwcv2fbqw1mqlXlsngH7kg,9493
-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/__init__.py,sha256=k_jTu-WIn6nRSHSUehEhnujzkYhLCWl9tm1Lm5qTG-8,9800
+opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=5otROZDeMN1w6kCWQIr8S9fQd2fHf1s-7absMTpjNPg,28462
+opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=PYQNUaW37pPunsBE8Fj-nbSlwSJ54RN80muf3hjoMTU,7367
 opentelemetry/instrumentation/openai/shared/config.py,sha256=dCQviJ1a5cpFlrP0HcKgE7lpiXB98ssnumLy_CIMibQ,355
-opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=ROnTujsXOrO3YVcXiV5Z-IifeuXbPOBrdqa3Ym6IDwI,7263
+opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=8l_TA_ncJWJr7Pr-1TcQV9eKNfJgdmi-9kOd8eOIwZI,7486
 opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py,sha256=A4qdJIeJdA45SfiLaFj3Vo0Ndcqqfuew1BDsGdnJU3E,2122
 opentelemetry/instrumentation/openai/utils.py,sha256=B085XRVvCjigZlRewFRwEFTG2hdx5gv5qVakVxgYaVo,4086
 opentelemetry/instrumentation/openai/v0/__init__.py,sha256=02-bXv0aZbscMYO2W3jsHpjU521vkVK5RzdfSeGXBzg,5475
 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=tv6kGs6brWBL9uSYr_0VbHxU9OxLYR2pNofcLT9Ti3k,23
-opentelemetry_instrumentation_openai-0.38.1.dist-info/METADATA,sha256=PHvoA4_yXARoM6aB37nfORQdSGFEReWKdgXL_bLUYBs,2186
-opentelemetry_instrumentation_openai-0.38.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-opentelemetry_instrumentation_openai-0.38.1.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.38.1.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/version.py,sha256=1FI0PeL2E5_ENJHZ0QMlPezeXvC8q7AETOrTnDrNxM8,23
+opentelemetry_instrumentation_openai-0.38.3.dist-info/METADATA,sha256=thFhvWmeodBXAHyzun7RB1YYI5v8Vs1jQaRnEimvPsE,2186
+opentelemetry_instrumentation_openai-0.38.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+opentelemetry_instrumentation_openai-0.38.3.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.38.3.dist-info/RECORD,,