opentelemetry-instrumentation-openai 0.44.3__tar.gz → 0.49.6__tar.gz

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: opentelemetry-instrumentation-openai
-Version: 0.44.3
+Version: 0.49.6
 Summary: OpenTelemetry OpenAI instrumentation
 License: Apache-2.0
 Author: Gal Kleinman
@@ -13,11 +13,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: instruments
-Requires-Dist: opentelemetry-api (>=1.28.0,<2.0.0)
-Requires-Dist: opentelemetry-instrumentation (>=0.50b0)
-Requires-Dist: opentelemetry-semantic-conventions (>=0.50b0)
-Requires-Dist: opentelemetry-semantic-conventions-ai (==0.4.11)
+Requires-Dist: opentelemetry-api (>=1.38.0,<2.0.0)
+Requires-Dist: opentelemetry-instrumentation (>=0.59b0)
+Requires-Dist: opentelemetry-semantic-conventions (>=0.59b0)
+Requires-Dist: opentelemetry-semantic-conventions-ai (>=0.4.13,<0.5.0)
 Project-URL: Repository, https://github.com/traceloop/openllmetry/tree/main/packages/opentelemetry-instrumentation-openai
 Description-Content-Type: text/markdown
 

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -1,6 +1,8 @@
 import json
 import logging
 import types
+import openai
+import pydantic
 from importlib.metadata import version
 
 from opentelemetry.instrumentation.openai.shared.config import Config
@@ -8,14 +10,13 @@ from opentelemetry.instrumentation.openai.utils import (
     dont_throw,
     is_openai_v1,
 )
-from opentelemetry.semconv._incubating.attributes.gen_ai_attributes import (
-    GEN_AI_RESPONSE_ID,
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAIAttributes,
+    openai_attributes as OpenAIAttributes,
 )
 from opentelemetry.semconv_ai import SpanAttributes
 from opentelemetry.trace.propagation import set_span_in_context
 from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
-import openai
-import pydantic
 
 OPENAI_LLM_USAGE_TOKEN_TYPES = ["prompt_tokens", "completion_tokens"]
 PROMPT_FILTER_KEY = "prompt_filter_results"
@@ -109,7 +110,7 @@ def _set_request_attributes(span, kwargs, instance=None):
 
     base_url = _get_openai_base_url(instance) if instance else ""
     vendor = _get_vendor_from_url(base_url)
-    _set_span_attribute(span, SpanAttributes.LLM_SYSTEM, vendor)
+    _set_span_attribute(span, GenAIAttributes.GEN_AI_SYSTEM, vendor)
 
     model = kwargs.get("model")
     if vendor == "AWS" and model and "." in model:
@@ -117,14 +118,14 @@ def _set_request_attributes(span, kwargs, instance=None):
     elif vendor == "OpenRouter":
         model = _extract_model_name_from_provider_format(model)
 
-    _set_span_attribute(span, SpanAttributes.LLM_REQUEST_MODEL, model)
+    _set_span_attribute(span, GenAIAttributes.GEN_AI_REQUEST_MODEL, model)
     _set_span_attribute(
-        span, SpanAttributes.LLM_REQUEST_MAX_TOKENS, kwargs.get("max_tokens")
+        span, GenAIAttributes.GEN_AI_REQUEST_MAX_TOKENS, kwargs.get("max_tokens")
     )
     _set_span_attribute(
-        span, SpanAttributes.LLM_REQUEST_TEMPERATURE, kwargs.get("temperature")
+        span, GenAIAttributes.GEN_AI_REQUEST_TEMPERATURE, kwargs.get("temperature")
     )
-    _set_span_attribute(span, SpanAttributes.LLM_REQUEST_TOP_P, kwargs.get("top_p"))
+    _set_span_attribute(span, GenAIAttributes.GEN_AI_REQUEST_TOP_P, kwargs.get("top_p"))
     _set_span_attribute(
         span, SpanAttributes.LLM_FREQUENCY_PENALTY, kwargs.get("frequency_penalty")
     )
@@ -141,6 +142,9 @@ def _set_request_attributes(span, kwargs, instance=None):
     _set_span_attribute(
         span, SpanAttributes.LLM_IS_STREAMING, kwargs.get("stream") or False
     )
+    _set_span_attribute(
+        span, OpenAIAttributes.OPENAI_REQUEST_SERVICE_TIER, kwargs.get("service_tier")
+    )
     if response_format := kwargs.get("response_format"):
         # backward-compatible check for
         # openai.types.shared_params.response_format_json_schema.ResponseFormatJSONSchema
@@ -194,7 +198,7 @@ def _set_response_attributes(span, response):
     if "error" in response:
         _set_span_attribute(
             span,
-            f"{SpanAttributes.LLM_PROMPTS}.{PROMPT_ERROR}",
+            f"{GenAIAttributes.GEN_AI_PROMPT}.{PROMPT_ERROR}",
             json.dumps(response.get("error")),
         )
         return
@@ -202,14 +206,19 @@ def _set_response_attributes(span, response):
     response_model = response.get("model")
     if response_model:
         response_model = _extract_model_name_from_provider_format(response_model)
-    _set_span_attribute(span, SpanAttributes.LLM_RESPONSE_MODEL, response_model)
-    _set_span_attribute(span, GEN_AI_RESPONSE_ID, response.get("id"))
+    _set_span_attribute(span, GenAIAttributes.GEN_AI_RESPONSE_MODEL, response_model)
+    _set_span_attribute(span, GenAIAttributes.GEN_AI_RESPONSE_ID, response.get("id"))
 
     _set_span_attribute(
         span,
         SpanAttributes.LLM_OPENAI_RESPONSE_SYSTEM_FINGERPRINT,
         response.get("system_fingerprint"),
     )
+    _set_span_attribute(
+        span,
+        OpenAIAttributes.OPENAI_RESPONSE_SERVICE_TIER,
+        response.get("service_tier"),
+    )
     _log_prompt_filter(span, response)
     usage = response.get("usage")
     if not usage:
@@ -223,11 +232,11 @@ def _set_response_attributes(span, response):
     )
     _set_span_attribute(
         span,
-        SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
+        GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS,
         usage.get("completion_tokens"),
     )
     _set_span_attribute(
-        span, SpanAttributes.LLM_USAGE_PROMPT_TOKENS, usage.get("prompt_tokens")
+        span, GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS, usage.get("prompt_tokens")
     )
     prompt_tokens_details = dict(usage.get("prompt_tokens_details", {}))
     _set_span_attribute(
@@ -242,7 +251,7 @@ def _log_prompt_filter(span, response_dict):
     if response_dict.get("prompt_filter_results"):
         _set_span_attribute(
             span,
-            f"{SpanAttributes.LLM_PROMPTS}.{PROMPT_FILTER_KEY}",
+            f"{GenAIAttributes.GEN_AI_PROMPT}.{PROMPT_FILTER_KEY}",
             json.dumps(response_dict.get("prompt_filter_results")),
         )
 
@@ -254,11 +263,11 @@ def _set_span_stream_usage(span, prompt_tokens, completion_tokens):
 
     if isinstance(completion_tokens, int) and completion_tokens >= 0:
         _set_span_attribute(
-            span, SpanAttributes.LLM_USAGE_COMPLETION_TOKENS, completion_tokens
+            span, GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS, completion_tokens
         )
 
     if isinstance(prompt_tokens, int) and prompt_tokens >= 0:
-        _set_span_attribute(span, SpanAttributes.LLM_USAGE_PROMPT_TOKENS, prompt_tokens)
+        _set_span_attribute(span, GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS, prompt_tokens)
 
     if (
         isinstance(prompt_tokens, int)
@@ -369,8 +378,8 @@ def metric_shared_attributes(
 
     return {
         **attributes,
-        SpanAttributes.LLM_SYSTEM: vendor,
-        SpanAttributes.LLM_RESPONSE_MODEL: response_model,
+        GenAIAttributes.GEN_AI_SYSTEM: vendor,
+        GenAIAttributes.GEN_AI_RESPONSE_MODEL: response_model,
         "gen_ai.operation.name": operation,
         "server.address": server_address,
         "stream": is_streaming,

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -42,6 +42,9 @@ from opentelemetry.instrumentation.openai.utils import (
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 from opentelemetry.metrics import Counter, Histogram
 from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAIAttributes,
+)
 from opentelemetry.semconv_ai import (
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
     LLMRequestTypeValues,
@@ -285,6 +288,14 @@ async def _handle_request(span, kwargs, instance):
     if Config.enable_trace_context_propagation:
         propagate_trace_context(span, kwargs)
 
+    # Reasoning request attributes
+    reasoning_effort = kwargs.get("reasoning_effort")
+    _set_span_attribute(
+        span,
+        SpanAttributes.LLM_REQUEST_REASONING_EFFORT,
+        reasoning_effort or ()
+    )
+
 
 @dont_throw
 def _handle_response(
@@ -316,6 +327,28 @@ def _handle_response(
     # span attributes
     _set_response_attributes(span, response_dict)
 
+    # Reasoning usage attributes
+    usage = response_dict.get("usage")
+    reasoning_tokens = None
+    if usage:
+        # Support both dict-style and object-style `usage`
+        tokens_details = (
+            usage.get("completion_tokens_details") if isinstance(usage, dict)
+            else getattr(usage, "completion_tokens_details", None)
+        )
+
+        if tokens_details:
+            reasoning_tokens = (
+                tokens_details.get("reasoning_tokens", None) if isinstance(tokens_details, dict)
+                else getattr(tokens_details, "reasoning_tokens", None)
+            )
+
+    _set_span_attribute(
+        span,
+        SpanAttributes.LLM_USAGE_REASONING_TOKENS,
+        reasoning_tokens or 0,
+    )
+
     if should_emit_events():
         if response.choices is not None:
             for choice in response.choices:
@@ -374,7 +407,7 @@ def _set_token_counter_metrics(token_counter, usage, shared_attributes):
         if name in OPENAI_LLM_USAGE_TOKEN_TYPES:
             attributes_with_token_type = {
                 **shared_attributes,
-                SpanAttributes.LLM_TOKEN_TYPE: _token_type(name),
+                GenAIAttributes.GEN_AI_TOKEN_TYPE: _token_type(name),
             }
             token_counter.record(val, attributes=attributes_with_token_type)
 
@@ -399,7 +432,8 @@ async def _process_image_item(item, trace_id, span_id, message_index, content_in
     image_format = item["image_url"]["url"].split(";")[0].split("/")[1]
     image_name = f"message_{message_index}_content_{content_index}.{image_format}"
     base64_string = item["image_url"]["url"].split(",")[1]
-    url = await Config.upload_base64_image(trace_id, span_id, image_name, base64_string)
+    # Convert trace_id and span_id to strings as expected by upload function
+    url = await Config.upload_base64_image(str(trace_id), str(span_id), image_name, base64_string)
 
     return {"type": "image_url", "image_url": {"url": url}}
 
@@ -410,7 +444,7 @@ async def _set_prompts(span, messages):
         return
 
     for i, msg in enumerate(messages):
-        prefix = f"{SpanAttributes.LLM_PROMPTS}.{i}"
+        prefix = f"{GenAIAttributes.GEN_AI_PROMPT}.{i}"
         msg = msg if isinstance(msg, dict) else model_as_dict(msg)
 
         _set_span_attribute(span, f"{prefix}.role", msg.get("role"))
@@ -463,7 +497,7 @@ def _set_completions(span, choices):
 
     for choice in choices:
         index = choice.get("index")
-        prefix = f"{SpanAttributes.LLM_COMPLETIONS}.{index}"
+        prefix = f"{GenAIAttributes.GEN_AI_COMPLETION}.{index}"
         _set_span_attribute(
             span, f"{prefix}.finish_reason", choice.get("finish_reason")
         )
@@ -549,7 +583,7 @@ def _set_streaming_token_metrics(
         if isinstance(prompt_usage, int) and prompt_usage >= 0:
             attributes_with_token_type = {
                 **shared_attributes,
-                SpanAttributes.LLM_TOKEN_TYPE: "input",
+                GenAIAttributes.GEN_AI_TOKEN_TYPE: "input",
             }
             token_counter.record(
                 prompt_usage, attributes=attributes_with_token_type)
@@ -557,7 +591,7 @@ def _set_streaming_token_metrics(
         if isinstance(completion_usage, int) and completion_usage >= 0:
             attributes_with_token_type = {
                 **shared_attributes,
-                SpanAttributes.LLM_TOKEN_TYPE: "output",
+                GenAIAttributes.GEN_AI_TOKEN_TYPE: "output",
             }
             token_counter.record(
                 completion_usage, attributes=attributes_with_token_type
@@ -856,7 +890,7 @@ def _build_from_streaming_response(
         yield item_to_yield
 
     shared_attributes = {
-        SpanAttributes.LLM_RESPONSE_MODEL: complete_response.get("model") or None,
+        GenAIAttributes.GEN_AI_RESPONSE_MODEL: complete_response.get("model") or None,
         "server.address": _get_openai_base_url(instance),
         "stream": True,
     }
@@ -927,7 +961,7 @@ async def _abuild_from_streaming_response(
         yield item_to_yield
 
     shared_attributes = {
-        SpanAttributes.LLM_RESPONSE_MODEL: complete_response.get("model") or None,
+        GenAIAttributes.GEN_AI_RESPONSE_MODEL: complete_response.get("model") or None,
         "server.address": _get_openai_base_url(instance),
         "stream": True,
     }

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/shared/completion_wrappers.py

@@ -28,6 +28,9 @@ from opentelemetry.instrumentation.openai.utils import (
     should_send_prompts,
 )
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAIAttributes,
+)
 from opentelemetry.semconv_ai import (
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
     LLMRequestTypeValues,
@@ -160,7 +163,7 @@ def _set_prompts(span, prompt):
 
     _set_span_attribute(
         span,
-        f"{SpanAttributes.LLM_PROMPTS}.0.user",
+        f"{GenAIAttributes.GEN_AI_PROMPT}.0.user",
         prompt[0] if isinstance(prompt, list) else prompt,
     )
 
@@ -172,7 +175,7 @@ def _set_completions(span, choices):
 
     for choice in choices:
         index = choice.get("index")
-        prefix = f"{SpanAttributes.LLM_COMPLETIONS}.{index}"
+        prefix = f"{GenAIAttributes.GEN_AI_COMPLETION}.{index}"
         _set_span_attribute(
             span, f"{prefix}.finish_reason", choice.get("finish_reason")
         )

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/shared/config.py

@@ -1,15 +1,15 @@
 from typing import Callable, Optional
 
-from opentelemetry._events import EventLogger
+from opentelemetry._logs import Logger
 
 
 class Config:
     enrich_assistant = False
     exception_logger = None
     get_common_metrics_attributes: Callable[[], dict] = lambda: {}
-    upload_base64_image: Callable[[str, str, str], str] = (
-        lambda trace_id, span_id, base64_image_url: str
+    upload_base64_image: Callable[[str, str, str, str], str] = (
+        lambda trace_id, span_id, image_name, base64_string: str
     )
     enable_trace_context_propagation: bool = True
     use_legacy_attributes = True
-    event_logger: Optional[EventLogger] = None
+    event_logger: Optional[Logger] = None

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py

@@ -32,6 +32,9 @@ from opentelemetry.instrumentation.openai.utils import (
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 from opentelemetry.metrics import Counter, Histogram
 from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAIAttributes,
+)
 from opentelemetry.semconv_ai import (
     SUPPRESS_LANGUAGE_MODEL_INSTRUMENTATION_KEY,
     LLMRequestTypeValues,
@@ -248,7 +251,7 @@ def _set_embeddings_metrics(
                     continue
                 attributes_with_token_type = {
                     **shared_attributes,
-                    SpanAttributes.LLM_TOKEN_TYPE: _token_type(name),
+                    GenAIAttributes.GEN_AI_TOKEN_TYPE: _token_type(name),
                 }
                 token_counter.record(val, attributes=attributes_with_token_type)
 
@@ -270,11 +273,11 @@ def _set_prompts(span, prompt):
 
     if isinstance(prompt, list):
         for i, p in enumerate(prompt):
-            _set_span_attribute(span, f"{SpanAttributes.LLM_PROMPTS}.{i}.content", p)
+            _set_span_attribute(span, f"{GenAIAttributes.GEN_AI_PROMPT}.{i}.content", p)
     else:
         _set_span_attribute(
             span,
-            f"{SpanAttributes.LLM_PROMPTS}.0.content",
+            f"{GenAIAttributes.GEN_AI_PROMPT}.0.content",
             prompt,
         )
 

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/shared/event_emitter.py

@@ -2,7 +2,7 @@ from dataclasses import asdict
 from enum import Enum
 from typing import Union
 
-from opentelemetry._events import Event
+from opentelemetry._logs import LogRecord
 from opentelemetry.instrumentation.openai.shared.event_models import (
     ChoiceEvent,
     MessageEvent,
@@ -76,7 +76,12 @@ def _emit_message_event(event: MessageEvent) -> None:
             for tool_call in body["tool_calls"]:
                 tool_call["function"].pop("arguments", None)
 
-    Config.event_logger.emit(Event(name=name, body=body, attributes=EVENT_ATTRIBUTES))
+    log_record = LogRecord(
+        body=body,
+        attributes=EVENT_ATTRIBUTES,
+        event_name=name
+    )
+    Config.event_logger.emit(log_record)
 
 
 def _emit_choice_event(event: ChoiceEvent) -> None:
@@ -95,6 +100,9 @@ def _emit_choice_event(event: ChoiceEvent) -> None:
             for tool_call in body["tool_calls"]:
                 tool_call["function"].pop("arguments", None)
 
-    Config.event_logger.emit(
-        Event(name="gen_ai.choice", body=body, attributes=EVENT_ATTRIBUTES)
+    log_record = LogRecord(
+        body=body,
+        attributes=EVENT_ATTRIBUTES,
+        event_name="gen_ai.choice"
     )
+    Config.event_logger.emit(log_record)

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/utils.py

@@ -5,9 +5,10 @@ import threading
 import traceback
 from contextlib import asynccontextmanager
 from importlib.metadata import version
+from packaging import version as pkg_version
 
 from opentelemetry import context as context_api
-from opentelemetry._events import EventLogger
+from opentelemetry._logs import Logger
 from opentelemetry.instrumentation.openai.shared.config import Config
 
 import openai
@@ -18,7 +19,15 @@ TRACELOOP_TRACE_CONTENT = "TRACELOOP_TRACE_CONTENT"
 
 
 def is_openai_v1():
-    return _OPENAI_VERSION >= "1.0.0"
+    return pkg_version.parse(_OPENAI_VERSION) >= pkg_version.parse("1.0.0")
+
+
+def is_reasoning_supported():
+    # Reasoning has been introduced in OpenAI API on Dec 17, 2024
+    #     as per https://platform.openai.com/docs/changelog.
+    # The updated OpenAI library version is 1.58.0
+    #     as per https://pypi.org/project/openai/.
+    return pkg_version.parse(_OPENAI_VERSION) >= pkg_version.parse("1.58.0")
 
 
 def is_azure_openai(instance):
@@ -177,5 +186,5 @@ def should_emit_events() -> bool:
     and if the event logger is not None.
     """
     return not Config.use_legacy_attributes and isinstance(
-        Config.event_logger, EventLogger
+        Config.event_logger, Logger
     )

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/v0/__init__.py

@@ -1,6 +1,6 @@
 from typing import Collection
 
-from opentelemetry._events import get_event_logger
+from opentelemetry._logs import get_logger
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.openai.shared.chat_wrappers import (
     achat_wrapper,
@@ -39,9 +39,9 @@ class OpenAIV0Instrumentor(BaseInstrumentor):
         meter = get_meter(__name__, __version__, meter_provider)
 
         if not Config.use_legacy_attributes:
-            event_logger_provider = kwargs.get("event_logger_provider")
-            Config.event_logger = get_event_logger(
-                __name__, __version__, event_logger_provider=event_logger_provider
+            logger_provider = kwargs.get("logger_provider")
+            Config.event_logger = get_logger(
+                __name__, __version__, logger_provider=logger_provider
             )
 
         if is_metrics_enabled():

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/v1/__init__.py

@@ -1,6 +1,6 @@
 from typing import Collection
 
-from opentelemetry._events import get_event_logger
+from opentelemetry._logs import get_logger
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.openai.shared.chat_wrappers import (
     achat_wrapper,
@@ -75,9 +75,9 @@ class OpenAIV1Instrumentor(BaseInstrumentor):
         meter = get_meter(__name__, __version__, meter_provider)
 
         if not Config.use_legacy_attributes:
-            event_logger_provider = kwargs.get("event_logger_provider")
-            Config.event_logger = get_event_logger(
-                __name__, __version__, event_logger_provider=event_logger_provider
+            logger_provider = kwargs.get("logger_provider")
+            Config.event_logger = get_logger(
+                __name__, __version__, logger_provider=logger_provider
             )
 
         if is_metrics_enabled():

{opentelemetry_instrumentation_openai-0.44.3 → opentelemetry_instrumentation_openai-0.49.6}/opentelemetry/instrumentation/openai/v1/assistant_wrappers.py

@@ -20,6 +20,9 @@ from opentelemetry.instrumentation.openai.utils import (
 )
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
 from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAIAttributes,
+)
 from opentelemetry.semconv_ai import LLMRequestTypeValues, SpanAttributes
 from opentelemetry.trace import SpanKind, Status, StatusCode
 
@@ -150,37 +153,37 @@ def messages_list_wrapper(tracer, wrapped, instance, args, kwargs):
 
             _set_span_attribute(
                 span,
-                SpanAttributes.LLM_SYSTEM,
+                GenAIAttributes.GEN_AI_SYSTEM,
                 "openai",
             )
             _set_span_attribute(
                 span,
-                SpanAttributes.LLM_REQUEST_MODEL,
+                GenAIAttributes.GEN_AI_REQUEST_MODEL,
                 assistant["model"],
             )
             _set_span_attribute(
                 span,
-                SpanAttributes.LLM_RESPONSE_MODEL,
+                GenAIAttributes.GEN_AI_RESPONSE_MODEL,
                 assistant["model"],
             )
             if should_emit_events():
                 emit_event(MessageEvent(content=assistant["instructions"], role="system"))
             else:
                 _set_span_attribute(
-                    span, f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.role", "system"
+                    span, f"{GenAIAttributes.GEN_AI_PROMPT}.{prompt_index}.role", "system"
                 )
                 _set_span_attribute(
                     span,
-                    f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.content",
+                    f"{GenAIAttributes.GEN_AI_PROMPT}.{prompt_index}.content",
                     assistant["instructions"],
                 )
             prompt_index += 1
         _set_span_attribute(
-            span, f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.role", "system"
+            span, f"{GenAIAttributes.GEN_AI_PROMPT}.{prompt_index}.role", "system"
         )
         _set_span_attribute(
             span,
-            f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.content",
+            f"{GenAIAttributes.GEN_AI_PROMPT}.{prompt_index}.content",
             run["instructions"],
         )
         if should_emit_events():
@@ -189,7 +192,7 @@ def messages_list_wrapper(tracer, wrapped, instance, args, kwargs):
 
         completion_index = 0
         for msg in messages:
-            prefix = f"{SpanAttributes.LLM_COMPLETIONS}.{completion_index}"
+            prefix = f"{GenAIAttributes.GEN_AI_COMPLETION}.{completion_index}"
             content = msg.get("content")
 
             message_content = content[0].get("text").get("value")
@@ -200,12 +203,12 @@ def messages_list_wrapper(tracer, wrapped, instance, args, kwargs):
                 else:
                     _set_span_attribute(
                         span,
-                        f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.role",
+                        f"{GenAIAttributes.GEN_AI_PROMPT}.{prompt_index}.role",
                         message_role,
                     )
                     _set_span_attribute(
                         span,
-                        f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.content",
+                        f"{GenAIAttributes.GEN_AI_PROMPT}.{prompt_index}.content",
                         message_content,
                     )
                 prompt_index += 1
@@ -229,12 +232,12 @@ def messages_list_wrapper(tracer, wrapped, instance, args, kwargs):
             usage_dict = model_as_dict(run.get("usage"))
             _set_span_attribute(
                 span,
-                SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
+                GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS,
                 usage_dict.get("completion_tokens"),
             )
             _set_span_attribute(
                 span,
-                SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
+                GenAIAttributes.GEN_AI_USAGE_OUTPUT_TOKENS,
                 usage_dict.get("prompt_tokens"),
             )
 
@@ -270,16 +273,16 @@ def runs_create_and_stream_wrapper(tracer, wrapped, instance, args, kwargs):
                 assistant = assistants[assistant_id]
 
             _set_span_attribute(
-                span, SpanAttributes.LLM_REQUEST_MODEL, assistants[assistant_id]["model"]
+                span, GenAIAttributes.GEN_AI_REQUEST_MODEL, assistants[assistant_id]["model"]
             )
             _set_span_attribute(
                 span,
-                SpanAttributes.LLM_SYSTEM,
+                GenAIAttributes.GEN_AI_SYSTEM,
                 "openai",
             )
             _set_span_attribute(
                 span,
-                SpanAttributes.LLM_RESPONSE_MODEL,
+                GenAIAttributes.GEN_AI_RESPONSE_MODEL,
                 assistants[assistant_id]["model"],
             )
             if should_emit_events():
@@ -290,20 +293,20 @@ def runs_create_and_stream_wrapper(tracer, wrapped, instance, args, kwargs):
                 )
             else:
                 _set_span_attribute(
-                    span, f"{SpanAttributes.LLM_PROMPTS}.{i}.role", "system"
+                    span, f"{GenAIAttributes.GEN_AI_PROMPT}.{i}.role", "system"
                 )
                 _set_span_attribute(
                     span,
-                    f"{SpanAttributes.LLM_PROMPTS}.{i}.content",
+                    f"{GenAIAttributes.GEN_AI_PROMPT}.{i}.content",
                     assistants[assistant_id]["instructions"],
                 )
             i += 1
         if should_emit_events():
             emit_event(MessageEvent(content=instructions, role="system"))
         else:
-            _set_span_attribute(span, f"{SpanAttributes.LLM_PROMPTS}.{i}.role", "system")
+            _set_span_attribute(span, f"{GenAIAttributes.GEN_AI_PROMPT}.{i}.role", "system")
             _set_span_attribute(
-                span, f"{SpanAttributes.LLM_PROMPTS}.{i}.content", instructions
+                span, f"{GenAIAttributes.GEN_AI_PROMPT}.{i}.content", instructions
             )
 
         from opentelemetry.instrumentation.openai.v1.event_handler_wrapper import (