From 5edf4a46e9b6b86efdab1dc5be4ea9da994531dd Mon Sep 17 00:00:00 2001 From: lforst <8118419+lforst@users.noreply.github.com> Date: Fri, 11 Sep 2026 12:31:39 +0000 Subject: [PATCH 1/4] misc: Test and use node 26 --- .github/workflows/checks.yaml | 8 ++++---- .tool-versions | 2 +- integrations/otel-js/Dockerfile.test | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index bc797f238..21b67c99e 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -88,7 +88,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-2025-vs2026] - node-version: [20, 22, 24] + node-version: [20, 22, 24, 26] env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: ${{ matrix.node-version == 20 && 'true' || '' }} steps: @@ -364,7 +364,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [20, 22, 24] + node-version: [20, 22, 24, 26] env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: ${{ matrix.node-version == 20 && 'true' || '' }} steps: @@ -392,7 +392,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [20, 22, 24] + node-version: [20, 22, 24, 26] env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: ${{ matrix.node-version == 20 && 'true' || '' }} steps: @@ -420,7 +420,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [20, 22, 24] + node-version: [20, 22, 24, 26] test-dir: [otel-v1, otel-v2] env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: ${{ matrix.node-version == 20 && 'true' || '' }} diff --git a/.tool-versions b/.tool-versions index 11fbea60c..acea374cc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -nodejs 24.15.0 +nodejs 26.8.2 npm 11.12.1 pnpm 10.33.0 deno 2.7.6 diff --git a/integrations/otel-js/Dockerfile.test b/integrations/otel-js/Dockerfile.test index c0d4d81ba..84c76f791 100644 --- a/integrations/otel-js/Dockerfile.test +++ b/integrations/otel-js/Dockerfile.test @@ -19,9 +19,8 @@ RUN if [ -z "$NODE_VERSION" ] || [ "$NODE_VERSION" = "REQUIRED" ]; then echo "Er RUN if [ -z "$TEST_DIR" ]; then echo "Error: TEST_DIR build arg is required (e.g., --build-arg TEST_DIR=otel-v1)" && exit 1; fi RUN if [ "$TEST_DIR" != "otel-v1" ] && [ "$TEST_DIR" != "otel-v2" ]; then echo "Error: TEST_DIR must be either 'otel-v1' or 'otel-v2', got: '$TEST_DIR'" && exit 1; fi -# Enable pnpm -RUN corepack enable -RUN corepack prepare pnpm@10 --activate +# Install pnpm (Corepack is not included in Node.js 26 images) +RUN npm install --global pnpm@10 # Install build dependencies RUN apt-get update && apt-get upgrade -y && apt-get install -y \ From 472a9d962f8591ba748b7b30d44e4b2c787258b7 Mon Sep 17 00:00:00 2001 From: lforst <8118419+lforst@users.noreply.github.com> Date: Fri, 11 Sep 2026 12:35:44 +0000 Subject: [PATCH 2/4] Update PR #2472 --- .changeset/test-and-use-node-26.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/test-and-use-node-26.md diff --git a/.changeset/test-and-use-node-26.md b/.changeset/test-and-use-node-26.md new file mode 100644 index 000000000..84b08f556 --- /dev/null +++ b/.changeset/test-and-use-node-26.md @@ -0,0 +1,5 @@ +--- +"braintrust": patch +--- + +misc: Test and use node 26 From 73c352951997ff4ca4e95052905dd6e754809bab Mon Sep 17 00:00:00 2001 From: lforst <8118419+lforst@users.noreply.github.com> Date: Mon, 14 Sep 2026 09:37:18 +0000 Subject: [PATCH 3/4] Update PR #2472 --- .changeset/test-and-use-node-26.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .changeset/test-and-use-node-26.md diff --git a/.changeset/test-and-use-node-26.md b/.changeset/test-and-use-node-26.md deleted file mode 100644 index 84b08f556..000000000 --- a/.changeset/test-and-use-node-26.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"braintrust": patch ---- - -misc: Test and use node 26 From feee09a9c45b5781276b2bc759cc0c0362bd2b2f Mon Sep 17 00:00:00 2001 From: lforst <8118419+lforst@users.noreply.github.com> Date: Mon, 14 Sep 2026 10:16:12 +0000 Subject: [PATCH 4/4] Update PR #2472 --- .../__snapshots__/mistral-v1.span-tree.json | 16 ++-- .../__snapshots__/mistral-v1.span-tree.txt | 16 ++-- .../openai-v5-auto-hook.span-tree.json | 82 +------------------ .../openai-v5-auto-hook.span-tree.txt | 82 +------------------ .../openai-v5-latest-auto-hook.span-tree.json | 82 +------------------ .../openai-v5-latest-auto-hook.span-tree.txt | 82 +------------------ .../openai-v5-latest-wrapped.span-tree.json | 82 +------------------ .../openai-v5-latest-wrapped.span-tree.txt | 82 +------------------ .../openai-v5-wrapped.span-tree.json | 82 +------------------ .../openai-v5-wrapped.span-tree.txt | 82 +------------------ .../openai-v6-auto-hook.span-tree.json | 82 +------------------ .../openai-v6-auto-hook.span-tree.txt | 82 +------------------ .../openai-v6-latest-auto-hook.span-tree.json | 82 +------------------ .../openai-v6-latest-auto-hook.span-tree.txt | 82 +------------------ .../openai-v6-latest-wrapped.span-tree.json | 82 +------------------ .../openai-v6-latest-wrapped.span-tree.txt | 82 +------------------ .../openai-v6-wrapped.span-tree.json | 82 +------------------ .../openai-v6-wrapped.span-tree.txt | 82 +------------------ 18 files changed, 54 insertions(+), 1290 deletions(-) diff --git a/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.json b/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.json index 27b7a0916..f0821982f 100644 --- a/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.json +++ b/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.json @@ -70,7 +70,7 @@ ], "output": [ { - "finishReason": null, + "finishReason": "stop", "index": 0, "message": { "content": "streamed output", @@ -89,7 +89,10 @@ "temperature": 0 }, "metrics": { - "time_to_first_token": 0 + "completion_tokens": 4, + "prompt_tokens": 22, + "time_to_first_token": 0, + "tokens": 26 } } ], @@ -113,10 +116,10 @@ ], "output": [ { - "finishReason": null, + "finishReason": "stop", "index": 0, "message": { - "content": "Let's break down the problem step by step to find John's age.\n\n1. **First Sister's Age:**\n - Given: The first sister is **4 years old**.\n\n2. **Second Sister's Age Next Year:**\n - Next year, the second sister will be twice as old as the first sister.\n - First sister's age next year: \\(4 + 1 = 5\\) years.\n - Therefore, second sister's age next year: \\(2 \\times 5 = 10\\) years.\n - **Current age of the second sister:** \\(10 - 1 = 9\\) years.\n\n3. **Third Sister's Age:**\n - The third sister is two years older than the second sister.\n - **Current age of the third sister:** \\(9 + 2 = 11\\) years.\n\n4. **John's Age:**\n - The third sister is half the age of her older brother (John).\n - Therefore, John's age: \\(11 \\times 2 = 22\\) years.\n\n**Final Answer:**\n\\[\n\\box", + "content": "Let's break down the problem step by step to find John's age.\n\n1. **First Sister's Age:**\n - Given: The first sister is **4 years old**.\n\n2. **Second Sister's Age Next Year:**\n - Next year, the second sister will be twice as old as the first sister.\n - First sister's age next year: \\(4 + 1 = 5\\) years.\n - Therefore, second sister's age next year: \\(2 \\times 5 = 10\\) years.\n - **Current age of the second sister:** \\(10 - 1 = 9\\) years.\n\n3. **Third Sister's Age:**\n - The third sister is two years older than the second sister.\n - **Current age of the third sister:** \\(9 + 2 = 11\\) years.\n\n4. **John's Age:**\n - The third sister is half the age of her older brother (John).\n - Therefore, John's age: \\(11 \\times 2 = 22\\) years.\n\n**Final Answer:**\n\\[\n\\boxed{22}\n\\]", "role": "assistant" } } @@ -133,7 +136,10 @@ "temperature": 0 }, "metrics": { - "time_to_first_token": 0 + "completion_tokens": 234, + "prompt_tokens": 83, + "time_to_first_token": 0, + "tokens": 317 } } ], diff --git a/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.txt b/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.txt index dcf7a3bfa..d7a0ee873 100644 --- a/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.txt +++ b/e2e/scenarios/mistral-instrumentation/__snapshots__/mistral-v1.span-tree.txt @@ -61,7 +61,7 @@ span_tree: │ ] │ output: [ │ { - │ "finishReason": null, + │ "finishReason": "stop", │ "index": 0, │ "message": { │ "content": "streamed output", @@ -80,7 +80,10 @@ span_tree: │ "temperature": 0 │ } │ metrics: { - │ "time_to_first_token": 0 + │ "completion_tokens": 4, + │ "prompt_tokens": 22, + │ "time_to_first_token": 0, + │ "tokens": 26 │ } ├── mistral-chat-reasoning-stream-operation │ metadata: { @@ -96,10 +99,10 @@ span_tree: │ ] │ output: [ │ { - │ "finishReason": null, + │ "finishReason": "stop", │ "index": 0, │ "message": { - │ "content": "Let's break down the problem step by step to find John's age.\n\n1. **First Sister's Age:**\n - Given: The first sister is **4 years old**.\n\n2. **Second Sister's Age Next Year:**\n - Next year, the second sister will be twice as old as the first sister.\n - First sister's age next year: \\(4 + 1 = 5\\) years.\n - Therefore, second sister's age next year: \\(2 \\times 5 = 10\\) years.\n - **Current age of the second sister:** \\(10 - 1 = 9\\) years.\n\n3. **Third Sister's Age:**\n - The third sister is two years older than the second sister.\n - **Current age of the third sister:** \\(9 + 2 = 11\\) years.\n\n4. **John's Age:**\n - The third sister is half the age of her older brother (John).\n - Therefore, John's age: \\(11 \\times 2 = 22\\) years.\n\n**Final Answer:**\n\\[\n\\box", + │ "content": "Let's break down the problem step by step to find John's age.\n\n1. **First Sister's Age:**\n - Given: The first sister is **4 years old**.\n\n2. **Second Sister's Age Next Year:**\n - Next year, the second sister will be twice as old as the first sister.\n - First sister's age next year: \\(4 + 1 = 5\\) years.\n - Therefore, second sister's age next year: \\(2 \\times 5 = 10\\) years.\n - **Current age of the second sister:** \\(10 - 1 = 9\\) years.\n\n3. **Third Sister's Age:**\n - The third sister is two years older than the second sister.\n - **Current age of the third sister:** \\(9 + 2 = 11\\) years.\n\n4. **John's Age:**\n - The third sister is half the age of her older brother (John).\n - Therefore, John's age: \\(11 \\times 2 = 22\\) years.\n\n**Final Answer:**\n\\[\n\\boxed{22}\n\\]", │ "role": "assistant" │ } │ } @@ -116,7 +119,10 @@ span_tree: │ "temperature": 0 │ } │ metrics: { - │ "time_to_first_token": 0 + │ "completion_tokens": 234, + │ "prompt_tokens": 83, + │ "time_to_first_token": 0, + │ "tokens": 317 │ } ├── mistral-chat-tool-call-operation │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.json index 9c1ceb588..fea3d809c 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.json @@ -1332,91 +1332,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.txt index 1cab3a397..cefd33089 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-auto-hook.span-tree.txt @@ -1211,91 +1211,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ └── openai-responses-parse-operation │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.json index ea7e9bbd5..7a0a36fff 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.json @@ -1332,91 +1332,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.txt index f23d7a59c..11375eefe 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-auto-hook.span-tree.txt @@ -1211,91 +1211,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ └── openai-responses-parse-operation │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.json index 7a55bc84d..6872fe0af 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.json @@ -1324,91 +1324,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.txt index df3fe7c26..32e5f229c 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-latest-wrapped.span-tree.txt @@ -1203,91 +1203,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ └── openai-responses-parse-operation │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.json index caec24e08..b2f045069 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.json @@ -1324,91 +1324,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.txt index 2b4618cc7..bdff3718e 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v5-wrapped.span-tree.txt @@ -1203,91 +1203,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ └── openai-responses-parse-operation │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.json index 49e79b81e..102b5a911 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.json @@ -1477,91 +1477,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.txt index 05c4fd0e6..7cf68e0d1 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-auto-hook.span-tree.txt @@ -1340,91 +1340,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ ├── openai-responses-parse-operation │ │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.json index 069a10a1e..25fd1f85b 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.json @@ -1477,91 +1477,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.txt index cb3035a9d..153331ab3 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-auto-hook.span-tree.txt @@ -1340,91 +1340,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ ├── openai-responses-parse-operation │ │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.json index e79be40b9..c3c35a733 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.json @@ -1469,91 +1469,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.txt index 7109fd2a6..eb5576533 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-latest-wrapped.span-tree.txt @@ -1332,91 +1332,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ ├── openai-responses-parse-operation │ │ metadata: { diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.json b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.json index 07c1c3b17..62ff943e5 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.json +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.json @@ -1469,91 +1469,13 @@ "type": "llm", "children": [], "input": "Reply with exactly PARTIAL.", - "output": [ - { - "content": [ - { - "annotations": [], - "logprobs": [], - "text": "PARTIAL", - "type": "output_text" - } - ], - "id": "", - "role": "assistant", - "status": "completed", - "type": "message" - } - ], "metadata": { - "background": false, - "completed_at": 0, - "created_at": 0, - "error": null, - "frequency_penalty": 0, - "id": "", - "incomplete_details": null, - "instructions": null, "max_output_tokens": 24, - "max_tool_calls": null, - "metadata": {}, "model": "gpt-4o-mini-2024-07-18", - "moderation": null, - "object": "response", - "parallel_tool_calls": true, - "presence_penalty": 0, - "previous_response_id": null, - "prompt_cache_retention": "in_memory", - "provider": "openai", - "reasoning": { - "context": null, - "effort": null, - "summary": null - }, - "safety_identifier": null, - "service_tier": "default", - "status": "completed", - "store": true, - "temperature": 1, - "text": { - "format": { - "type": "text" - }, - "verbosity": "medium" - }, - "tool_choice": "auto", - "tool_usage": { - "image_gen": { - "input_tokens": 0, - "input_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "output_tokens": 0, - "output_tokens_details": { - "image_tokens": 0, - "text_tokens": 0 - }, - "total_tokens": 0 - }, - "web_search": { - "num_requests": 0 - } - }, - "tools": [], - "top_logprobs": 0, - "top_p": 1, - "truncation": "disabled", - "user": null + "provider": "openai" }, "metrics": { - "completion_reasoning_tokens": 0, - "completion_tokens": 3, - "prompt_cache_write_tokens": 0, - "prompt_cached_tokens": 0, - "prompt_tokens": 13, - "time_to_first_token": 0, - "tokens": 16 + "time_to_first_token": 0 } } ], diff --git a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.txt b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.txt index 263991848..d8efc698a 100644 --- a/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.txt +++ b/e2e/scenarios/openai-instrumentation/__snapshots__/openai-v6-wrapped.span-tree.txt @@ -1332,91 +1332,13 @@ span_tree: │ │ } │ │ └── openai.responses.create [llm] │ │ input: "Reply with exactly PARTIAL." -│ │ output: [ -│ │ { -│ │ "content": [ -│ │ { -│ │ "annotations": [], -│ │ "logprobs": [], -│ │ "text": "PARTIAL", -│ │ "type": "output_text" -│ │ } -│ │ ], -│ │ "id": "", -│ │ "role": "assistant", -│ │ "status": "completed", -│ │ "type": "message" -│ │ } -│ │ ] │ │ metadata: { -│ │ "background": false, -│ │ "completed_at": 0, -│ │ "created_at": 0, -│ │ "error": null, -│ │ "frequency_penalty": 0, -│ │ "id": "", -│ │ "incomplete_details": null, -│ │ "instructions": null, │ │ "max_output_tokens": 24, -│ │ "max_tool_calls": null, -│ │ "metadata": {}, │ │ "model": "gpt-4o-mini-2024-07-18", -│ │ "moderation": null, -│ │ "object": "response", -│ │ "parallel_tool_calls": true, -│ │ "presence_penalty": 0, -│ │ "previous_response_id": null, -│ │ "prompt_cache_retention": "in_memory", -│ │ "provider": "openai", -│ │ "reasoning": { -│ │ "context": null, -│ │ "effort": null, -│ │ "summary": null -│ │ }, -│ │ "safety_identifier": null, -│ │ "service_tier": "default", -│ │ "status": "completed", -│ │ "store": true, -│ │ "temperature": 1, -│ │ "text": { -│ │ "format": { -│ │ "type": "text" -│ │ }, -│ │ "verbosity": "medium" -│ │ }, -│ │ "tool_choice": "auto", -│ │ "tool_usage": { -│ │ "image_gen": { -│ │ "input_tokens": 0, -│ │ "input_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "output_tokens": 0, -│ │ "output_tokens_details": { -│ │ "image_tokens": 0, -│ │ "text_tokens": 0 -│ │ }, -│ │ "total_tokens": 0 -│ │ }, -│ │ "web_search": { -│ │ "num_requests": 0 -│ │ } -│ │ }, -│ │ "tools": [], -│ │ "top_logprobs": 0, -│ │ "top_p": 1, -│ │ "truncation": "disabled", -│ │ "user": null +│ │ "provider": "openai" │ │ } │ │ metrics: { -│ │ "completion_reasoning_tokens": 0, -│ │ "completion_tokens": 3, -│ │ "prompt_cache_write_tokens": 0, -│ │ "prompt_cached_tokens": 0, -│ │ "prompt_tokens": 13, -│ │ "time_to_first_token": 0, -│ │ "tokens": 16 +│ │ "time_to_first_token": 0 │ │ } │ ├── openai-responses-parse-operation │ │ metadata: {