Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -527,5 +527,58 @@
}
],
"type": "llm"
},
{
"input": {
"kind": "undefined"
},
"metadata": {
"operation": "responses-compact"
},
"metrics": {
"has_time_to_first_token": false
},
"name": "openai-responses-compact-operation",
"output": null,
"type": null
},
{
"input": [
{
"content_kind": "blocks",
"role": "user"
},
{
"content_kind": "blocks",
"role": "assistant"
}
],
"metadata": {
"model": "gpt-4o-mini",
"provider": "openai"
},
"metrics": {
"has_time_to_first_token": true
},
"name": "openai.responses.compact",
"output": [
{
"content_types": [
"input_text"
],
"json_keys": [],
"role": "user",
"status": "completed",
"type": "message"
},
{
"content_types": [],
"json_keys": [],
"role": null,
"status": null,
"type": "compaction"
}
],
"type": "llm"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -361,5 +361,30 @@
},
"name": "openai.responses.parse",
"type": "llm"
},
{
"has_input": false,
"has_output": false,
"metadata": {
"operation": "responses-compact"
},
"metrics": {
"has_time_to_first_token": false
},
"name": "openai-responses-compact-operation",
"type": null
},
{
"has_input": true,
"has_output": true,
"metadata": {
"model": "gpt-4o-mini",
"provider": "openai"
},
"metrics": {
"has_time_to_first_token": true
},
"name": "openai.responses.compact",
"type": "llm"
}
]
63 changes: 53 additions & 10 deletions e2e/scenarios/openai-instrumentation/assertions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type OperationSpec = {
expectsTimeToFirstToken: boolean;
name: string;
operation: string;
requiresResponsesCompact?: boolean;
testName: string;
validate?: (span: CapturedLogEvent | undefined) => void;
};
Expand Down Expand Up @@ -173,8 +174,36 @@ const OPERATION_SPECS: readonly OperationSpec[] = [
expect(output).toContain("value");
},
},
{
childNames: ["openai.responses.compact"],
expectsOutput: true,
expectsTimeToFirstToken: false,
name: "openai-responses-compact-operation",
operation: "responses-compact",
requiresResponsesCompact: true,
testName: "captures trace for client.responses.compact()",
},
] as const;

function supportsResponsesCompact(version: string): boolean {
const [majorRaw, minorRaw] = version.split(".");
const major = Number.parseInt(majorRaw ?? "", 10);
const minor = Number.parseInt(minorRaw ?? "", 10);

return (
Number.isFinite(major) &&
Number.isFinite(minor) &&
(major > 6 || (major === 6 && minor >= 10))
);
}

function getOperationSpecs(version: string): OperationSpec[] {
const compactSupported = supportsResponsesCompact(version);
return OPERATION_SPECS.filter(
(spec) => !spec.requiresResponsesCompact || compactSupported,
);
}

function pickMetadata(
metadata: Record<string, unknown> | undefined,
keys: string[],
Expand Down Expand Up @@ -335,7 +364,11 @@ function summarizeOutput(name: string, output: Json): Json {
: null;
}

if (name === "openai.responses.create" || name === "openai.responses.parse") {
if (
name === "openai.responses.create" ||
name === "openai.responses.parse" ||
name === "openai.responses.compact"
) {
return summarizeResponsesOutput(output);
}

Expand Down Expand Up @@ -395,12 +428,15 @@ function findOpenAISpan(
return undefined;
}

function buildRelevantEvents(events: CapturedLogEvent[]) {
function buildRelevantEvents(
events: CapturedLogEvent[],
operationSpecs: OperationSpec[],
) {
const relevantEvents: RelevantEvent[] = [
{ event: findLatestSpan(events, ROOT_NAME)! },
];

for (const spec of OPERATION_SPECS) {
for (const spec of operationSpecs) {
const operation = findLatestSpan(events, spec.name)!;
relevantEvents.push({ event: operation });
relevantEvents.push({
Expand All @@ -412,17 +448,23 @@ function buildRelevantEvents(events: CapturedLogEvent[]) {
return relevantEvents;
}

function buildSpanSummary(events: CapturedLogEvent[]): Json {
function buildSpanSummary(
events: CapturedLogEvent[],
operationSpecs: OperationSpec[],
): Json {
return normalizeForSnapshot(
buildRelevantEvents(events).map(({ event, summaryName }) =>
buildRelevantEvents(events, operationSpecs).map(({ event, summaryName }) =>
summarizeOpenAISpan(event, summaryName),
) as Json,
);
}

function buildPayloadSummary(events: CapturedLogEvent[]): Json {
function buildPayloadSummary(
events: CapturedLogEvent[],
operationSpecs: OperationSpec[],
): Json {
return normalizeForSnapshot(
buildRelevantEvents(events).map(({ event, summaryName }) =>
buildRelevantEvents(events, operationSpecs).map(({ event, summaryName }) =>
summarizeOpenAIPayload(event, summaryName),
) as Json,
);
Expand All @@ -437,6 +479,7 @@ export function defineOpenAIInstrumentationAssertions(options: {
timeoutMs: number;
version: string;
}): void {
const operationSpecs = getOperationSpecs(options.version);
const spanSnapshotPath = resolveFileSnapshotPath(
options.testFileUrl,
`${options.snapshotName}.span-events.json`,
Expand Down Expand Up @@ -489,7 +532,7 @@ export function defineOpenAIInstrumentationAssertions(options: {
);
}

for (const spec of OPERATION_SPECS) {
for (const spec of operationSpecs) {
test(spec.testName, testConfig, () => {
const root = findLatestSpan(events, ROOT_NAME);
const operation = findLatestSpan(events, spec.name);
Expand Down Expand Up @@ -530,13 +573,13 @@ export function defineOpenAIInstrumentationAssertions(options: {

test("matches the shared span snapshot", testConfig, async () => {
await expect(
formatJsonFileSnapshot(buildSpanSummary(events)),
formatJsonFileSnapshot(buildSpanSummary(events, operationSpecs)),
).toMatchFileSnapshot(spanSnapshotPath);
});

test("matches the shared payload snapshot", testConfig, async () => {
await expect(
formatJsonFileSnapshot(buildPayloadSummary(events)),
formatJsonFileSnapshot(buildPayloadSummary(events, operationSpecs)),
).toMatchFileSnapshot(payloadSnapshotPath);
});
});
Expand Down
33 changes: 33 additions & 0 deletions e2e/scenarios/openai-instrumentation/scenario.impl.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,39 @@ export async function runOpenAIInstrumentationScenario(options) {
}
},
);

if (typeof client.responses?.compact === "function") {
await runOperation(
"openai-responses-compact-operation",
"responses-compact",
async () => {
await client.responses.compact({
model: OPENAI_MODEL,
input: [
{
role: "user",
content: [
{
type: "input_text",
text: "I live in Paris and prefer concise answers.",
},
],
},
{
role: "assistant",
content: [
{
type: "output_text",
text: "Understood. I will keep answers concise.",
},
],
},
],
instructions: "Preserve only durable user preferences.",
});
},
);
}
},
metadata: {
openaiSdkVersion: options.openaiSdkVersion,
Expand Down
14 changes: 14 additions & 0 deletions js/src/auto-instrumentations/configs/openai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,18 @@ export const openaiConfigs: InstrumentationConfig[] = [
kind: "Async",
},
},

{
channelName: openAIChannels.responsesCompact.channelName,
module: {
name: "openai",
versionRange: ">=6.10.0",
filePath: "resources/responses/responses.mjs",
},
functionQuery: {
className: "Responses",
methodName: "compact",
kind: "Async",
},
},
];
10 changes: 10 additions & 0 deletions js/src/instrumentation/plugins/openai-channels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import type {
OpenAIModerationCreateParams,
OpenAIModerationResponse,
OpenAIResponse,
OpenAIResponseCompactParams,
OpenAIResponseCreateParams,
OpenAIResponseStreamEvent,
} from "../../vendor-sdk-types/openai";
Expand Down Expand Up @@ -104,6 +105,15 @@ export const openAIChannels = defineChannels("openai", {
channelName: "responses.parse",
kind: "async",
}),

responsesCompact: channel<
[OpenAIResponseCompactParams],
OpenAIResponse,
OpenAIResponsesChannelExtras
>({
channelName: "responses.compact",
kind: "async",
}),
});

export type OpenAIChannel =
Expand Down
38 changes: 37 additions & 1 deletion js/src/instrumentation/plugins/openai-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import type {
* - Embeddings
* - Moderations
* - Beta API (parse, stream)
* - Responses API (create, stream, parse)
* - Responses API (create, stream, parse, compact)
*/
export class OpenAIPlugin extends BasePlugin {
constructor() {
Expand Down Expand Up @@ -273,6 +273,42 @@ export class OpenAIPlugin extends BasePlugin {
aggregateChunks: aggregateResponseStreamEvents,
}),
);

// Responses API - compact
this.unsubscribers.push(
traceAsyncChannel(openAIChannels.responsesCompact, {
name: "openai.responses.compact",
type: SpanTypeAttribute.LLM,
extractInput: ([params]) => {
const { input, ...metadata } = params;
return {
input: processInputAttachments(input),
metadata: { ...metadata, provider: "openai" },
};
},
extractOutput: (result) => {
return processImagesInOutput(result?.output);
},
extractMetadata: (result) => {
if (!result) {
return undefined;
}
const { output: _output, usage: _usage, ...metadata } = result;
return Object.keys(metadata).length > 0 ? metadata : undefined;
},
extractMetrics: (result, startTime, endEvent) => {
const metrics = withCachedMetric(
parseMetricsFromUsage(result?.usage),
result,
endEvent,
);
if (startTime) {
metrics.time_to_first_token = getCurrentUnixTimestamp() - startTime;
}
return metrics;
},
}),
);
}

protected onDisable(): void {
Expand Down
9 changes: 9 additions & 0 deletions js/src/vendor-sdk-types/openai-common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ export interface OpenAIResponseCreateParams {
[key: string]: unknown;
}

export interface OpenAIResponseCompactParams {
input: unknown;
[key: string]: unknown;
}

// Responses

export interface OpenAIUsage {
Expand Down Expand Up @@ -208,6 +213,10 @@ export interface OpenAIResponses {
params: OpenAIResponseCreateParams,
options?: unknown,
) => OpenAIAPIPromise<OpenAIResponse | OpenAIResponseStream>;
compact?: (
params: OpenAIResponseCompactParams,
options?: unknown,
) => OpenAIAPIPromise<OpenAIResponse>;
parse?: (
params: OpenAIResponseCreateParams,
options?: unknown,
Expand Down
Loading
Loading