opentelemetry-instrumentation-openai 0.25.0__tar.gz → 0.25.2__tar.gz

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-openai
-Version: 0.25.0
+Version: 0.25.2
 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.25.0 → opentelemetry_instrumentation_openai-0.25.2}/opentelemetry/instrumentation/openai/__init__.py

@@ -1,4 +1,4 @@
-from typing import Collection
+from typing import Callable, Collection
 
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 
@@ -18,11 +18,13 @@ class OpenAIInstrumentor(BaseInstrumentor):
         enrich_assistant: bool = False,
         enrich_token_usage: bool = False,
         exception_logger=None,
+        get_common_metrics_attributes: Callable[[], dict] = lambda: {},
     ):
         super().__init__()
         Config.enrich_assistant = enrich_assistant
         Config.enrich_token_usage = enrich_token_usage
         Config.exception_logger = exception_logger
+        Config.get_common_metrics_attributes = get_common_metrics_attributes
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -8,6 +8,7 @@ from importlib.metadata import version
 
 from opentelemetry import context as context_api
 
+from opentelemetry.instrumentation.openai.shared.config import Config
 from opentelemetry.semconv.ai import SpanAttributes
 from opentelemetry.instrumentation.openai.utils import (
     dont_throw,
@@ -256,10 +257,13 @@ def _token_type(token_type: str):
     return None
 
 
-def _metric_shared_attributes(
+def metric_shared_attributes(
     response_model: str, operation: str, server_address: str, is_streaming: bool = False
 ):
+    attributes = Config.get_common_metrics_attributes()
+
     return {
+        **attributes,
         SpanAttributes.LLM_SYSTEM: "openai",
         SpanAttributes.LLM_RESPONSE_MODEL: response_model,
         "gen_ai.operation.name": operation,

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import time
+from opentelemetry.instrumentation.openai.shared.config import Config
 from wrapt import ObjectProxy
 
 
@@ -18,7 +19,7 @@ from opentelemetry.instrumentation.openai.utils import (
     dont_throw,
 )
 from opentelemetry.instrumentation.openai.shared import (
-    _metric_shared_attributes,
+    metric_shared_attributes,
     _set_client_attributes,
     _set_request_attributes,
     _set_span_attribute,
@@ -155,7 +156,7 @@ async def achat_wrapper(
     if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY) or context_api.get_value(
         SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY
     ):
-        return wrapped(*args, **kwargs)
+        return await wrapped(*args, **kwargs)
 
     span = tracer.start_span(
         SPAN_NAME,
@@ -172,7 +173,9 @@ async def achat_wrapper(
         end_time = time.time()
         duration = end_time - start_time if "start_time" in locals() else 0
 
+        common_attributes = Config.get_common_metrics_attributes()
         attributes = {
+            **common_attributes,
             "error.type": e.__class__.__name__,
         }
 
@@ -277,7 +280,7 @@ def _handle_response(
 def _set_chat_metrics(
     instance, token_counter, choice_counter, duration_histogram, response_dict, duration
 ):
-    shared_attributes = _metric_shared_attributes(
+    shared_attributes = metric_shared_attributes(
         response_model=response_dict.get("model") or None,
         operation="chat",
         server_address=_get_openai_base_url(instance),
@@ -554,7 +557,7 @@ class ChatStream(ObjectProxy):
         _accumulate_stream_items(item, self._complete_response)
 
     def _shared_attributes(self):
-        return _metric_shared_attributes(
+        return metric_shared_attributes(
             response_model=self._complete_response.get("model")
             or self._request_kwargs.get("model")
             or None,

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/opentelemetry/instrumentation/openai/shared/completion_wrappers.py

@@ -67,7 +67,7 @@ async def acompletion_wrapper(tracer, wrapped, instance, args, kwargs):
     if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY) or context_api.get_value(
         SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY
     ):
-        return wrapped(*args, **kwargs)
+        return await wrapped(*args, **kwargs)
 
     span = tracer.start_span(
         name=SPAN_NAME,

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/opentelemetry/instrumentation/openai/shared/config.py

@@ -1,4 +1,8 @@
+from typing import Callable
+
+
 class Config:
     enrich_token_usage = False
     enrich_assistant = False
     exception_logger = None
+    get_common_metrics_attributes: Callable[[], dict] = lambda: {}

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py

@@ -16,7 +16,7 @@ from opentelemetry.instrumentation.openai.utils import (
     _with_embeddings_telemetry_wrapper,
 )
 from opentelemetry.instrumentation.openai.shared import (
-    _metric_shared_attributes,
+    metric_shared_attributes,
     _set_client_attributes,
     _set_request_attributes,
     _set_span_attribute,
@@ -112,7 +112,7 @@ async def aembeddings_wrapper(
     if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY) or context_api.get_value(
         SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY
     ):
-        return wrapped(*args, **kwargs)
+        return await wrapped(*args, **kwargs)
 
     async with start_as_current_span_async(
         tracer=tracer,
@@ -198,7 +198,7 @@ def _set_embeddings_metrics(
     response_dict,
     duration,
 ):
-    shared_attributes = _metric_shared_attributes(
+    shared_attributes = metric_shared_attributes(
         response_model=response_dict.get("model") or None,
         operation="embeddings",
         server_address=_get_openai_base_url(instance),

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/opentelemetry/instrumentation/openai/shared/image_gen_wrappers.py

@@ -4,7 +4,7 @@ from opentelemetry import context as context_api
 from opentelemetry.instrumentation.openai import is_openai_v1
 from opentelemetry.instrumentation.openai.shared import (
     _get_openai_base_url,
-    _metric_shared_attributes,
+    metric_shared_attributes,
     model_as_dict,
 )
 from opentelemetry.instrumentation.openai.utils import (
@@ -55,7 +55,7 @@ def image_gen_metrics_wrapper(
         response_dict = response
 
     # not provide response.model in ImagesResponse response, use model in request kwargs
-    shared_attributes = _metric_shared_attributes(
+    shared_attributes = metric_shared_attributes(
         response_model=kwargs.get("model") or None,
         operation="image_gen",
         server_address=_get_openai_base_url(instance),

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

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

{opentelemetry_instrumentation_openai-0.25.0 → opentelemetry_instrumentation_openai-0.25.2}/pyproject.toml

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

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

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