opentelemetry-instrumentation-openai 0.15.3__py3-none-any.whl → 0.15.5__py3-none-any.whl

opentelemetry/instrumentation/openai/shared/__init__.py

@@ -134,6 +134,11 @@ def _set_request_attributes(span, kwargs):
         _set_span_attribute(
             span, SpanAttributes.LLM_HEADERS, str(kwargs.get("headers"))
         )
+        # The new OpenAI SDK removed the `headers` and create new field called `extra_headers`
+        if kwargs.get("extra_headers") is not None:
+            _set_span_attribute(
+                span, SpanAttributes.LLM_HEADERS, str(kwargs.get("extra_headers"))
+            )
         _set_span_attribute(
             span, SpanAttributes.LLM_IS_STREAMING, kwargs.get("stream") or False
         )

opentelemetry/instrumentation/openai/v0/__init__.py

@@ -2,6 +2,7 @@ from typing import Collection
 
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.trace import get_tracer
+from opentelemetry.metrics import get_meter
 from wrapt import wrap_function_wrapper
 
 from opentelemetry.instrumentation.openai.shared.chat_wrappers import (
@@ -16,6 +17,7 @@ from opentelemetry.instrumentation.openai.shared.embeddings_wrappers import (
     embeddings_wrapper,
     aembeddings_wrapper,
 )
+from opentelemetry.instrumentation.openai.utils import is_metrics_enabled
 from opentelemetry.instrumentation.openai.version import __version__
 
 _instruments = ("openai >= 0.27.0", "openai < 1.0.0")
@@ -29,13 +31,115 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
         tracer_provider = kwargs.get("tracer_provider")
         tracer = get_tracer(__name__, __version__, tracer_provider)
 
+        meter_provider = kwargs.get("meter_provider")
+        meter = get_meter(__name__, __version__, meter_provider)
+
+        if is_metrics_enabled():
+            chat_token_counter = meter.create_counter(
+                name="llm.openai.chat_completions.tokens",
+                unit="token",
+                description="Number of tokens used in prompt and completions",
+            )
+
+            chat_choice_counter = meter.create_counter(
+                name="llm.openai.chat_completions.choices",
+                unit="choice",
+                description="Number of choices returned by chat completions call",
+            )
+
+            chat_duration_histogram = meter.create_histogram(
+                name="llm.openai.chat_completions.duration",
+                unit="s",
+                description="Duration of chat completion operation",
+            )
+
+            chat_exception_counter = meter.create_counter(
+                name="llm.openai.chat_completions.exceptions",
+                unit="time",
+                description="Number of exceptions occurred during chat completions",
+            )
+
+            streaming_time_to_first_token = meter.create_histogram(
+                name="llm.openai.chat_completions.streaming_time_to_first_token",
+                unit="s",
+                description="Time to first token in streaming chat completions",
+            )
+            streaming_time_to_generate = meter.create_histogram(
+                name="llm.openai.chat_completions.streaming_time_to_generate",
+                unit="s",
+                description="Time between first token and completion in streaming chat completions",
+            )
+        else:
+            (
+                chat_token_counter,
+                chat_choice_counter,
+                chat_duration_histogram,
+                chat_exception_counter,
+                streaming_time_to_first_token,
+                streaming_time_to_generate,
+            ) = (None, None, None, None, None, None)
+
+        if is_metrics_enabled():
+            embeddings_token_counter = meter.create_counter(
+                name="llm.openai.embeddings.tokens",
+                unit="token",
+                description="Number of tokens used in prompt and completions",
+            )
+
+            embeddings_vector_size_counter = meter.create_counter(
+                name="llm.openai.embeddings.vector_size",
+                unit="element",
+                description="he size of returned vector",
+            )
+
+            embeddings_duration_histogram = meter.create_histogram(
+                name="llm.openai.embeddings.duration",
+                unit="s",
+                description="Duration of embeddings operation",
+            )
+
+            embeddings_exception_counter = meter.create_counter(
+                name="llm.openai.embeddings.exceptions",
+                unit="time",
+                description="Number of exceptions occurred during embeddings operation",
+            )
+        else:
+            (
+                embeddings_token_counter,
+                embeddings_vector_size_counter,
+                embeddings_duration_histogram,
+                embeddings_exception_counter,
+            ) = (None, None, None, None)
+
         wrap_function_wrapper("openai", "Completion.create", completion_wrapper(tracer))
         wrap_function_wrapper(
             "openai", "Completion.acreate", acompletion_wrapper(tracer)
         )
-        wrap_function_wrapper("openai", "ChatCompletion.create", chat_wrapper(tracer))
+        wrap_function_wrapper(
+            "openai",
+            "ChatCompletion.create",
+            chat_wrapper(
+                tracer,
+                chat_token_counter,
+                chat_choice_counter,
+                chat_duration_histogram,
+                chat_exception_counter,
+                streaming_time_to_first_token,
+                streaming_time_to_generate,
+            ),
+        )
         wrap_function_wrapper("openai", "ChatCompletion.acreate", achat_wrapper(tracer))
-        wrap_function_wrapper("openai", "Embedding.create", embeddings_wrapper(tracer))
+        wrap_function_wrapper(
+            "openai",
+            "Embedding.create",
+            embeddings_wrapper(
+                tracer,
+                embeddings_token_counter,
+                embeddings_vector_size_counter,
+                embeddings_duration_histogram,
+                embeddings_exception_counter,
+            ),
+        )
         wrap_function_wrapper(
             "openai", "Embedding.acreate", aembeddings_wrapper(tracer)
         )

opentelemetry/instrumentation/openai/version.py

@@ -1 +1 @@
-__version__ = "0.15.3"
+__version__ = "0.15.5"

{opentelemetry_instrumentation_openai-0.15.3.dist-info → opentelemetry_instrumentation_openai-0.15.5.dist-info}/METADATA

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

@@ -1,17 +1,17 @@
 opentelemetry/instrumentation/openai/__init__.py,sha256=RtjRSDcPG5QYh4wAuu_Szu3PgBSUewxQta5c5jrMEjY,1142
-opentelemetry/instrumentation/openai/shared/__init__.py,sha256=nkDcSKkPMTWPA7U39UYcOqzVIp54eUCHUqi1LrvsS7g,8122
+opentelemetry/instrumentation/openai/shared/__init__.py,sha256=90IJchM1dSyANvSTSXbGQaL04mxLRQOTTZHhZP8CUko,8399
 opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=LvoZNowNh7KhTWgvp528Ma-Wrd506yPYLveBvgeT8p4,13697
 opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=xg9qNqijT5ZJOk509l9Q7kVHLwo88DUH-Uv4tzSkeOQ,7045
 opentelemetry/instrumentation/openai/shared/config.py,sha256=Us6lUrKjNXPy8OLJ0Tk2VFsbOKSNTDYY-f8ByEL2LOA,43
 opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=zr7qsH5bpnRMahErgstpphLI-XPN8y7Pxh2_39Oo4Ds,5573
 opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py,sha256=SnmhXnnO5pyc0x9wvbYb1S_OVM4TYr7qeJPZbs3YxJg,1899
 opentelemetry/instrumentation/openai/utils.py,sha256=aHudimT_OE170ip_AGq9BSiD62pu2_sKGAGyFrY9X9U,2404
-opentelemetry/instrumentation/openai/v0/__init__.py,sha256=z-ueiax_1LvNTSKI4M4Ha-jlfdAQXx3q4FcFecUOh4E,1613
+opentelemetry/instrumentation/openai/v0/__init__.py,sha256=lwKZYa7zhYoEKw9hNQAQ68MZnaYA4-nqJrDUcm2I4ZA,5554
 opentelemetry/instrumentation/openai/v1/__init__.py,sha256=A9X07leoMeErJaBGMMXAD5nYPc6xaUj2Ng5mriOsZ8Q,8162
 opentelemetry/instrumentation/openai/v1/assistant_wrappers.py,sha256=T6Vtdp1fAZdcYjGiTMZwkn4F4DgsltD4p4xLEFW-GhI,5874
 opentelemetry/instrumentation/openai/v1/event_handler_wrapper.py,sha256=SAzYoun2yyOloofyOWtxpm8E2M9TL3Nm8TgKdNyXHuY,2779
-opentelemetry/instrumentation/openai/version.py,sha256=WbcBdqaNCRHsRqs6rGd3pRLP4kQSII2td9dR0Fl6HcU,23
-opentelemetry_instrumentation_openai-0.15.3.dist-info/METADATA,sha256=U3laFeGwDJxwTplA75ZEGSoQaeMFcE4faWsSRc8d8b0,2213
-opentelemetry_instrumentation_openai-0.15.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-opentelemetry_instrumentation_openai-0.15.3.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
-opentelemetry_instrumentation_openai-0.15.3.dist-info/RECORD,,
+opentelemetry/instrumentation/openai/version.py,sha256=axkldpLAi2TFk3heerDJg_kSegHyvqyTI3ogd991rpE,23
+opentelemetry_instrumentation_openai-0.15.5.dist-info/METADATA,sha256=rMv8evgUd1ppj9zDFSyowHvuuM4YXTRPpskMziSqYEQ,2213
+opentelemetry_instrumentation_openai-0.15.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+opentelemetry_instrumentation_openai-0.15.5.dist-info/entry_points.txt,sha256=vTBfiX5yXji5YHikuJHEOoBZ1TFdPQ1EI4ctd2pZSeE,93
+opentelemetry_instrumentation_openai-0.15.5.dist-info/RECORD,,