opentelemetry-instrumentation-openai 0.38.2__tar.gz → 0.38.3__tar.gz

{opentelemetry_instrumentation_openai-0.38.2 → opentelemetry_instrumentation_openai-0.38.3}/PKG-INFO

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

{opentelemetry_instrumentation_openai-0.38.2 → opentelemetry_instrumentation_openai-0.38.3}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -304,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-0.38.2 → opentelemetry_instrumentation_openai-0.38.3}/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-0.38.2 → opentelemetry_instrumentation_openai-0.38.3}/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-0.38.2 → opentelemetry_instrumentation_openai-0.38.3}/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-0.38.3/opentelemetry/instrumentation/openai/version.py

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

{opentelemetry_instrumentation_openai-0.38.2 → opentelemetry_instrumentation_openai-0.38.3}/pyproject.toml

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

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

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