openai: Use json instead of json_schema and json_object for gen_ai.output.type attribute value

Author: SrdjanLL

instrumentation/elastic-opentelemetry-instrumentation-openai/src/opentelemetry/instrumentation/openai/helpers.py

@@ -166,13 +166,16 @@ def _is_set(value):
         # response_format may be string or object with a string in the `type` key
         if isinstance(response_format, Mapping):
             if _is_set(response_format_type := response_format.get("type")):
-                span_attributes[GEN_AI_OUTPUT_TYPE] = response_format_type
+                if response_format_type in ("json_object", "json_schema"):
+                    span_attributes[GEN_AI_OUTPUT_TYPE] = "json"
+                else:
+                    span_attributes[GEN_AI_OUTPUT_TYPE] = response_format_type
         elif isinstance(response_format, str):
             span_attributes[GEN_AI_OUTPUT_TYPE] = response_format
         else:
             # Assume structured output lazily parsed to a schema via type_to_response_format_param or similar.
             # e.g. pydantic._internal._model_construction.ModelMetaclass
-            span_attributes[GEN_AI_OUTPUT_TYPE] = "json_schema"
+            span_attributes[GEN_AI_OUTPUT_TYPE] = "json"
 
     return span_attributes
 

instrumentation/elastic-opentelemetry-instrumentation-openai/tests/test_beta_chat_completions.py

@@ -1545,7 +1545,7 @@ def test_parse_response_format_json_object_with_capture_message_content(
     address, port = address_and_port(client)
     assert dict(span.attributes) == {
         GEN_AI_OPENAI_RESPONSE_SERVICE_TIER: "default",
-        GEN_AI_OUTPUT_TYPE: "json_object",
+        GEN_AI_OUTPUT_TYPE: "json",
         GEN_AI_OPERATION_NAME: "chat",
         GEN_AI_REQUEST_MODEL: TEST_CHAT_MODEL,
         GEN_AI_SYSTEM: "openai",
@@ -1620,7 +1620,7 @@ def test_parse_response_format_structured_output_with_capture_message_content(
     address, port = address_and_port(client)
     assert dict(span.attributes) == {
         GEN_AI_OPENAI_RESPONSE_SERVICE_TIER: "default",
-        GEN_AI_OUTPUT_TYPE: "json_schema",
+        GEN_AI_OUTPUT_TYPE: "json",
         GEN_AI_OPERATION_NAME: "chat",
         GEN_AI_REQUEST_MODEL: TEST_CHAT_MODEL,
         GEN_AI_SYSTEM: "openai",