opentelemetry-instrumentation-openai 0.15.3__tar.gz → 0.15.5__tar.gz

{opentelemetry_instrumentation_openai-0.15.3 → opentelemetry_instrumentation_openai-0.15.5}/PKG-INFO

@@ -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 → opentelemetry_instrumentation_openai-0.15.5}/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-0.15.5/opentelemetry/instrumentation/openai/v0/__init__.py

@@ -0,0 +1,148 @@
+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 (
+    chat_wrapper,
+    achat_wrapper,
+)
+from opentelemetry.instrumentation.openai.shared.completion_wrappers import (
+    completion_wrapper,
+    acompletion_wrapper,
+)
+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")
+
+
+class OpenAIV0Instrumentor(BaseInstrumentor):
+    def instrumentation_dependencies(self) -> Collection[str]:
+        return _instruments
+
+    def _instrument(self, **kwargs):
+        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,
+                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,
+                embeddings_token_counter,
+                embeddings_vector_size_counter,
+                embeddings_duration_histogram,
+                embeddings_exception_counter,
+            ),
+        )
+        wrap_function_wrapper(
+            "openai", "Embedding.acreate", aembeddings_wrapper(tracer)
+        )
+
+    def _uninstrument(self, **kwargs):
+        pass

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

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

{opentelemetry_instrumentation_openai-0.15.3 → opentelemetry_instrumentation_openai-0.15.5}/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.15.3"
+version = "0.15.5"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <gal@traceloop.com>",
@@ -30,7 +30,7 @@ opentelemetry-semantic-conventions = "0.44b0"
 opentelemetry-semantic-conventions-ai = "^0.1.1"
 
 [tool.poetry.group.dev.dependencies]
-autopep8 = "2.0.4"
+autopep8 = "2.1.0"
 flake8 = "7.0.0"
 
 [tool.poetry.group.test.dependencies]

opentelemetry_instrumentation_openai-0.15.3/opentelemetry/instrumentation/openai/v0/__init__.py

@@ -1,44 +0,0 @@
-from typing import Collection
-
-from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry.trace import get_tracer
-from wrapt import wrap_function_wrapper
-
-from opentelemetry.instrumentation.openai.shared.chat_wrappers import (
-    chat_wrapper,
-    achat_wrapper,
-)
-from opentelemetry.instrumentation.openai.shared.completion_wrappers import (
-    completion_wrapper,
-    acompletion_wrapper,
-)
-from opentelemetry.instrumentation.openai.shared.embeddings_wrappers import (
-    embeddings_wrapper,
-    aembeddings_wrapper,
-)
-from opentelemetry.instrumentation.openai.version import __version__
-
-_instruments = ("openai >= 0.27.0", "openai < 1.0.0")
-
-
-class OpenAIV0Instrumentor(BaseInstrumentor):
-    def instrumentation_dependencies(self) -> Collection[str]:
-        return _instruments
-
-    def _instrument(self, **kwargs):
-        tracer_provider = kwargs.get("tracer_provider")
-        tracer = get_tracer(__name__, __version__, tracer_provider)
-
-        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.acreate", achat_wrapper(tracer))
-        wrap_function_wrapper("openai", "Embedding.create", embeddings_wrapper(tracer))
-        wrap_function_wrapper(
-            "openai", "Embedding.acreate", aembeddings_wrapper(tracer)
-        )
-
-    def _uninstrument(self, **kwargs):
-        pass

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

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