gitcommit90
diff --git a/‎sentry_sdk/integrations/openai.py‎
Lines changed: 114 additions & 41 deletions b/‎sentry_sdk/integrations/openai.py‎
Lines changed: 114 additions & 41 deletions
diff --git a/‎tests/integrations/openai/test_openai.py‎
Lines changed: 14 additions & 0 deletions b/‎tests/integrations/openai/test_openai.py‎
Lines changed: 14 additions & 0 deletions
@@ -219,48 +219,54 @@ def _calculate_token_usage(
     )
 
 
-def _commmon_set_input_data(
+def _set_responses_api_input_data(
     span: "Span",
     kwargs: "dict[str, Any]",
+    integration: "OpenAIIntegration",
 ) -> None:
-    # Input attributes: Common
-    set_data_normalized(span, SPANDATA.GEN_AI_SYSTEM, "openai")
-
-    # Input attributes: Optional
-    kwargs_keys_to_attributes = {
-        "model": SPANDATA.GEN_AI_REQUEST_MODEL,
-        "stream": SPANDATA.GEN_AI_RESPONSE_STREAMING,
-        "max_tokens": SPANDATA.GEN_AI_REQUEST_MAX_TOKENS,
-        "presence_penalty": SPANDATA.GEN_AI_REQUEST_PRESENCE_PENALTY,
-        "frequency_penalty": SPANDATA.GEN_AI_REQUEST_FREQUENCY_PENALTY,
-        "temperature": SPANDATA.GEN_AI_REQUEST_TEMPERATURE,
-        "top_p": SPANDATA.GEN_AI_REQUEST_TOP_P,
-    }
-    for key, attribute in kwargs_keys_to_attributes.items():
-        value = kwargs.get(key)
-
-        if value is not None and _is_given(value):
-            set_data_normalized(span, attribute, value)
-
-    # Input attributes: Tools
+    explicit_instructions: "Union[Optional[str], Omit]" = kwargs.get("instructions")
+    messages: "Optional[Union[str, ResponseInputParam]]" = kwargs.get("input")
+
     tools = kwargs.get("tools")
     if tools is not None and _is_given(tools) and len(tools) > 0:
         set_data_normalized(
             span, SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS, safe_serialize(tools)
         )
 
+    model = kwargs.get("model")
+    if model is not None and _is_given(model):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_MODEL, model)
 
-def _set_responses_api_input_data(
-    span: "Span",
-    kwargs: "dict[str, Any]",
-    integration: "OpenAIIntegration",
-) -> None:
-    explicit_instructions: "Union[Optional[str], Omit]" = kwargs.get("instructions")
-    messages: "Optional[Union[str, ResponseInputParam]]" = kwargs.get("input")
+    stream = kwargs.get("stream")
+    if stream is not None and _is_given(stream):
+        set_data_normalized(span, SPANDATA.GEN_AI_RESPONSE_STREAMING, stream)
+
+    max_tokens = kwargs.get("max_tokens")
+    if max_tokens is not None and _is_given(max_tokens):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_MAX_TOKENS, max_tokens)
+
+    presence_penalty = kwargs.get("presence_penalty")
+    if presence_penalty is not None and _is_given(presence_penalty):
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_PRESENCE_PENALTY, presence_penalty
+        )
+
+    frequency_penalty = kwargs.get("frequency_penalty")
+    if frequency_penalty is not None and _is_given(frequency_penalty):
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_FREQUENCY_PENALTY, frequency_penalty
+        )
+
+    temperature = kwargs.get("temperature")
+    if temperature is not None and _is_given(temperature):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_TEMPERATURE, temperature)
+
+    top_p = kwargs.get("top_p")
+    if top_p is not None and _is_given(top_p):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_TOP_P, top_p)
 
     if not should_send_default_pii() or not integration.include_prompts:
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "responses")
-        _commmon_set_input_data(span, kwargs)
         return
 
     if (
@@ -281,12 +287,10 @@ def _set_responses_api_input_data(
         )
 
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "responses")
-        _commmon_set_input_data(span, kwargs)
         return
 
     if messages is None:
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "responses")
-        _commmon_set_input_data(span, kwargs)
         return
 
     instructions_text_parts: "list[TextPart]" = []
@@ -319,7 +323,6 @@ def _set_responses_api_input_data(
             )
 
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "responses")
-        _commmon_set_input_data(span, kwargs)
         return
 
     non_system_messages = [
@@ -335,7 +338,6 @@ def _set_responses_api_input_data(
             )
 
     set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "responses")
-    _commmon_set_input_data(span, kwargs)
 
 
 def _set_completions_api_input_data(
@@ -347,13 +349,50 @@ def _set_completions_api_input_data(
         "messages"
     )
 
+    tools = kwargs.get("tools")
+    if tools is not None and _is_given(tools) and len(tools) > 0:
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS, safe_serialize(tools)
+        )
+
+    model = kwargs.get("model")
+    if model is not None and _is_given(model):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_MODEL, model)
+
+    stream = kwargs.get("stream")
+    if stream is not None and _is_given(stream):
+        set_data_normalized(span, SPANDATA.GEN_AI_RESPONSE_STREAMING, stream)
+
+    max_tokens = kwargs.get("max_tokens")
+    if max_tokens is not None and _is_given(max_tokens):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_MAX_TOKENS, max_tokens)
+
+    presence_penalty = kwargs.get("presence_penalty")
+    if presence_penalty is not None and _is_given(presence_penalty):
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_PRESENCE_PENALTY, presence_penalty
+        )
+
+    frequency_penalty = kwargs.get("frequency_penalty")
+    if frequency_penalty is not None and _is_given(frequency_penalty):
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_FREQUENCY_PENALTY, frequency_penalty
+        )
+
+    temperature = kwargs.get("temperature")
+    if temperature is not None and _is_given(temperature):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_TEMPERATURE, temperature)
+
+    top_p = kwargs.get("top_p")
+    if top_p is not None and _is_given(top_p):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_TOP_P, top_p)
+
     if (
         not should_send_default_pii()
         or not integration.include_prompts
         or messages is None
     ):
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "chat")
-        _commmon_set_input_data(span, kwargs)
         return
 
     if isinstance(messages, str):
@@ -365,13 +404,11 @@ def _set_completions_api_input_data(
                 span, SPANDATA.GEN_AI_REQUEST_MESSAGES, messages_data, unpack=False
             )
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "chat")
-        _commmon_set_input_data(span, kwargs)
         return
 
     # dict special case following https://github.com/openai/openai-python/blob/3e0c05b84a2056870abf3bd6a5e7849020209cc3/src/openai/_utils/_transform.py#L194-L197
     if not isinstance(messages, Iterable) or isinstance(messages, dict):
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "chat")
-        _commmon_set_input_data(span, kwargs)
         return
 
     messages = list(messages)
@@ -399,7 +436,6 @@ def _set_completions_api_input_data(
             )
 
     set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "chat")
-    _commmon_set_input_data(span, kwargs)
 
 
 def _set_embeddings_input_data(
@@ -411,19 +447,55 @@ def _set_embeddings_input_data(
         "input"
     )
 
+    tools = kwargs.get("tools")
+    if tools is not None and _is_given(tools) and len(tools) > 0:
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS, safe_serialize(tools)
+        )
+
+    model = kwargs.get("model")
+    if model is not None and _is_given(model):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_MODEL, model)
+
+    stream = kwargs.get("stream")
+    if stream is not None and _is_given(stream):
+        set_data_normalized(span, SPANDATA.GEN_AI_RESPONSE_STREAMING, stream)
+
+    max_tokens = kwargs.get("max_tokens")
+    if max_tokens is not None and _is_given(max_tokens):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_MAX_TOKENS, max_tokens)
+
+    presence_penalty = kwargs.get("presence_penalty")
+    if presence_penalty is not None and _is_given(presence_penalty):
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_PRESENCE_PENALTY, presence_penalty
+        )
+
+    frequency_penalty = kwargs.get("frequency_penalty")
+    if frequency_penalty is not None and _is_given(frequency_penalty):
+        set_data_normalized(
+            span, SPANDATA.GEN_AI_REQUEST_FREQUENCY_PENALTY, frequency_penalty
+        )
+
+    temperature = kwargs.get("temperature")
+    if temperature is not None and _is_given(temperature):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_TEMPERATURE, temperature)
+
+    top_p = kwargs.get("top_p")
+    if top_p is not None and _is_given(top_p):
+        set_data_normalized(span, SPANDATA.GEN_AI_REQUEST_TOP_P, top_p)
+
     if (
         not should_send_default_pii()
         or not integration.include_prompts
         or messages is None
     ):
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")
-        _commmon_set_input_data(span, kwargs)
 
         return
 
     if isinstance(messages, str):
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")
-        _commmon_set_input_data(span, kwargs)
 
         normalized_messages = normalize_message_roles([messages])  # type: ignore
         scope = sentry_sdk.get_current_scope()
@@ -440,7 +512,6 @@ def _set_embeddings_input_data(
     # dict special case following https://github.com/openai/openai-python/blob/3e0c05b84a2056870abf3bd6a5e7849020209cc3/src/openai/_utils/_transform.py#L194-L197
     if not isinstance(messages, Iterable) or isinstance(messages, dict):
         set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")
-        _commmon_set_input_data(span, kwargs)
         return
 
     messages = list(messages)
@@ -458,7 +529,6 @@ def _set_embeddings_input_data(
             )
 
     set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "embeddings")
-    _commmon_set_input_data(span, kwargs)
 
 
 def _set_common_output_data(
@@ -551,6 +621,7 @@ def _new_chat_completion_common(f: "Any", *args: "Any", **kwargs: "Any") -> "Any
     )
     span.__enter__()
 
+    span.set_data(SPANDATA.GEN_AI_SYSTEM, "openai")
     _set_completions_api_input_data(span, kwargs, integration)
 
     start_time = time.perf_counter()
@@ -945,6 +1016,7 @@ def _new_embeddings_create_common(f: "Any", *args: "Any", **kwargs: "Any") -> "A
         name=f"embeddings {model}",
         origin=OpenAIIntegration.origin,
     ) as span:
+        span.set_data(SPANDATA.GEN_AI_SYSTEM, "openai")
         _set_embeddings_input_data(span, kwargs, integration)
 
         response = yield f, args, kwargs
@@ -1036,6 +1108,7 @@ def _new_responses_create_common(f: "Any", *args: "Any", **kwargs: "Any") -> "An
     )
     span.__enter__()
 
+    span.set_data(SPANDATA.GEN_AI_SYSTEM, "openai")
     _set_responses_api_input_data(span, kwargs, integration)
 
     start_time = time.perf_counter()
 
@@ -161,6 +161,7 @@ def test_nonstreaming_chat_completion_no_prompts(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS not in span["data"]
     assert SPANDATA.GEN_AI_REQUEST_MESSAGES not in span["data"]
@@ -240,6 +241,7 @@ def test_nonstreaming_chat_completion(sentry_init, capture_events, messages, req
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     param_id = request.node.callspec.id
     if "blocks" in param_id:
@@ -306,6 +308,7 @@ async def test_nonstreaming_chat_completion_async_no_prompts(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS not in span["data"]
     assert SPANDATA.GEN_AI_REQUEST_MESSAGES not in span["data"]
@@ -385,6 +388,7 @@ async def test_nonstreaming_chat_completion_async(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     param_id = request.node.callspec.id
     if "blocks" in param_id:
@@ -503,6 +507,7 @@ def test_streaming_chat_completion_no_prompts(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert span["data"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "model-id"
 
@@ -630,6 +635,7 @@ def test_streaming_chat_completion(sentry_init, capture_events, messages, reques
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     param_id = request.node.callspec.id
     if "blocks" in param_id:
@@ -758,6 +764,7 @@ async def test_streaming_chat_completion_async_no_prompts(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert span["data"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "model-id"
 
@@ -895,6 +902,7 @@ async def test_streaming_chat_completion_async(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.chat"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert span["data"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "model-id"
 
@@ -1036,6 +1044,7 @@ def test_embeddings_create_no_pii(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.embeddings"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert SPANDATA.GEN_AI_EMBEDDINGS_INPUT not in span["data"]
 
@@ -1116,6 +1125,7 @@ def test_embeddings_create(sentry_init, capture_events, input, request):
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.embeddings"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     param_id = request.node.callspec.id
     if param_id == "string":
@@ -1187,6 +1197,7 @@ async def test_embeddings_create_async_no_pii(
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.embeddings"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert SPANDATA.GEN_AI_EMBEDDINGS_INPUT not in span["data"]
 
@@ -1270,6 +1281,7 @@ async def test_embeddings_create_async(sentry_init, capture_events, input, reque
     assert tx["type"] == "transaction"
     span = tx["spans"][0]
     assert span["op"] == "gen_ai.embeddings"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     param_id = request.node.callspec.id
     if param_id == "string":
@@ -2772,6 +2784,7 @@ def test_streaming_responses_api(
     (transaction,) = events
     (span,) = transaction["spans"]
     assert span["op"] == "gen_ai.responses"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert span["data"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "response-model-id"
 
@@ -2829,6 +2842,7 @@ async def test_streaming_responses_api_async(
     (transaction,) = events
     (span,) = transaction["spans"]
     assert span["op"] == "gen_ai.responses"
+    assert span["data"][SPANDATA.GEN_AI_SYSTEM] == "openai"
 
     assert span["data"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "response-model-id"