Merge pull request #13 from AgentOps-AI/agents-responses

Process response data from updated version of OpenAI Agents.

Author: dot-agi

examples/openai-agents-example/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "openai": "^4.0.0",
-    "@openai/agents": "^0.0.1",
+    "@openai/agents": "^0.0.8",
     "agentops": "file:../..",
     "zod": "^3.22.0",
     "dotenv": "^16.0.0"

package.json

@@ -42,7 +42,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@openai/agents": "^0.0.1",
+    "@openai/agents": "^0.0.8",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
     "@opentelemetry/instrumentation": "^0.52.1",

src/instrumentation/openai-agents/attributes.ts

@@ -18,7 +18,7 @@ import { AttributeMap } from '../../attributes';
 import { convertGenerationSpan } from './generation';
 import { convertAgentSpan } from './agent';
 import { convertFunctionSpan } from './function';
-import { convertResponseSpan, convertEnhancedResponseSpan, AgentOpsResponseSpanData } from './response';
+import { convertResponseSpan } from './response';
 import { convertHandoffSpan } from './handoff';
 import { convertCustomSpan } from './custom';
 import { convertGuardrailSpan } from './guardrail';
@@ -94,52 +94,46 @@ export function getSpanAttributes(item: OpenAISpan<any>): Record<string, any> {
     'openai_agents.trace_id': item.traceId,
   };
 
-  let typeSpecificAttributes: Record<string, any> = {};
+  let attributes: Record<string, any> = {};
   switch (spanData.type) {
     case 'generation':
-      typeSpecificAttributes = convertGenerationSpan(spanData as GenerationSpanData);
+      attributes = convertGenerationSpan(spanData as GenerationSpanData);
       break;
     case 'agent':
-      typeSpecificAttributes = convertAgentSpan(spanData as AgentSpanData);
+      attributes = convertAgentSpan(spanData as AgentSpanData);
       break;
     case 'function':
-      typeSpecificAttributes = convertFunctionSpan(spanData as FunctionSpanData);
+      attributes = convertFunctionSpan(spanData as FunctionSpanData);
       break;
     case 'response':
-      // Check if this is an enhanced AgentOps response span with generation data
-      // TODO check this more effectively that this...
-      if ('agentops_model' in spanData || 'agentops_input_messages' in spanData || 'agentops_output_messages' in spanData || 'agentops_usage' in spanData) {
-        typeSpecificAttributes = convertEnhancedResponseSpan(spanData as AgentOpsResponseSpanData);
-      } else {
-        typeSpecificAttributes = convertResponseSpan(spanData as ResponseSpanData);
-      }
+      attributes = convertResponseSpan(spanData as ResponseSpanData);
       break;
     case 'handoff':
-      typeSpecificAttributes = convertHandoffSpan(spanData as HandoffSpanData);
+      attributes = convertHandoffSpan(spanData as HandoffSpanData);
       break;
     case 'custom':
-      typeSpecificAttributes = convertCustomSpan(spanData as CustomSpanData);
+      attributes = convertCustomSpan(spanData as CustomSpanData);
       break;
     case 'guardrail':
-      typeSpecificAttributes = convertGuardrailSpan(spanData as GuardrailSpanData);
+      attributes = convertGuardrailSpan(spanData as GuardrailSpanData);
       break;
     case 'transcription':
-      typeSpecificAttributes = convertTranscriptionSpan(spanData as TranscriptionSpanData);
+      attributes = convertTranscriptionSpan(spanData as TranscriptionSpanData);
       break;
     case 'speech':
-      typeSpecificAttributes = convertSpeechSpan(spanData as SpeechSpanData);
+      attributes = convertSpeechSpan(spanData as SpeechSpanData);
       break;
     case 'speech_group':
-      typeSpecificAttributes = convertSpeechGroupSpan(spanData as SpeechGroupSpanData);
+      attributes = convertSpeechGroupSpan(spanData as SpeechGroupSpanData);
       break;
     case 'mcp_tools':
-      typeSpecificAttributes = convertMCPListToolsSpan(spanData as MCPListToolsSpanData);
+      attributes = convertMCPListToolsSpan(spanData as MCPListToolsSpanData);
       break;
     default:
       // For unknown span types, include the raw span data
-      typeSpecificAttributes = {'span.raw_data': spanData };
+      attributes = {'span.raw_data': spanData };
       break;
   }
 
-  return { ...baseAttributes, ...typeSpecificAttributes };
-}
+  return { ...baseAttributes, ...attributes };
+}

src/instrumentation/openai-agents/exporter.ts

@@ -2,17 +2,13 @@ import { trace, context, SpanStatusCode, SpanKind, Span, ROOT_CONTEXT } from '@o
 import type { TracingExporter, Trace as OpenAITrace, Span as OpenAISpan } from '@openai/agents';
 import { InstrumentationBase } from '../base';
 import { getSpanAttributes, getSpanName, getSpanKind } from './attributes';
-import type { AgentOpsResponseSpanData } from './response';
 
 
 export class OpenAIAgentsTracingExporter implements TracingExporter {
   private readonly instrumentation: InstrumentationBase;
   private readonly traceMap = new Map<string, Span>(); // OpenAI Agents trace ID -> root OpenTelemetry span
   private readonly spanMap = new Map<string, Span>(); // OpenAI Agents span ID -> OpenTelemetry span
 
-  // Storage for enhanced response data, keyed by response ID
-  private readonly enhancedResponseData = new Map<string, Partial<AgentOpsResponseSpanData>>();
-
   /**
    * Creates a new OpenAIAgentsTracingExporter instance.
    * @param instrumentation The instrumentation base to use for exporting spans.
@@ -21,20 +17,6 @@ export class OpenAIAgentsTracingExporter implements TracingExporter {
     this.instrumentation = instrumentation;
   }
 
-  /**
-   * Stores enhanced response data for later injection into response spans.
-   */
-  public storeEnhancedResponseData(responseId: string, enhancedData: Partial<AgentOpsResponseSpanData>): void {
-    this.enhancedResponseData.set(responseId, enhancedData);
-  }
-
-  /**
-   * Retrieves enhanced response data for a given response ID.
-   */
-  private getEnhancedResponseData(responseId: string): Partial<AgentOpsResponseSpanData> | undefined {
-    return this.enhancedResponseData.get(responseId);
-  }
-
   /**
    * Exports OpenAI Agents traces and spans to OpenTelemetry spans.
    * @param items The items to export, which can be either traces or spans.
@@ -81,15 +63,6 @@ export class OpenAIAgentsTracingExporter implements TracingExporter {
    * The span is stored in a map for later reference.
    */
   private handleSpan(item: OpenAISpan<any>): void {
-    // Check if this is a response span that we can enhance with stored generation data
-    if (item.spanData.type === 'response' && item.spanData.response_id) {
-      const enhancedData = this.getEnhancedResponseData(item.spanData.response_id);
-      if (enhancedData) {
-        // Enhance the span data directly
-        Object.assign(item.spanData, enhancedData);
-      }
-    }
-
     const attributes = getSpanAttributes(item);
     const spanName = getSpanName(item.spanData);
 

src/instrumentation/openai-agents/index.ts

@@ -2,7 +2,6 @@ import { BatchTraceProcessor, addTraceProcessor, setTracingDisabled } from '@ope
 import { InstrumentationBase } from '../base';
 import { InstrumentorMetadata } from '../../types';
 import { OpenAIAgentsTracingExporter } from './exporter';
-import { patchOpenAIResponsesModel } from './response';
 
 export const debug = require('debug')('agentops:instrumentation:openai-agents');
 
@@ -34,9 +33,6 @@ export class OpenAIAgentsInstrumentation extends InstrumentationBase {
       const { getGlobalTraceProvider } = moduleExports;
       const globalProvider = getGlobalTraceProvider();
       globalProvider.registerProcessor(processor);
-
-      // Patch OpenAI Responses model to capture enhanced generation data
-      patchOpenAIResponsesModel(exporter, moduleExports);
     } catch (error) {
       console.error('[agentops.instrumentation.openai-agents] failed: ', error);
     }