resolve some comments

Author: RulaKhaled

dev-packages/node-integration-tests/suites/tracing/openai/scenario-with-response.mjs

@@ -55,7 +55,7 @@ async function run() {
       apiKey: 'mock-api-key',
     });
 
-    // Test 1: Verify .withResponse() method exists and can be called
+    // Verify .withResponse() method exists and can be called
     const result = client.chat.completions.create({
       model: 'gpt-4',
       messages: [{ role: 'user', content: 'Test withResponse' }],
@@ -67,20 +67,83 @@ async function run() {
     }
 
     // Call .withResponse() and verify structure
-    const { data } = await result.withResponse();
+    const withResponseResult = await result.withResponse();
 
-    if (!data) {
+    // Verify all three properties exist
+    if (!withResponseResult.data) {
       throw new Error('.withResponse() did not return data');
     }
+    if (!withResponseResult.response) {
+      throw new Error('.withResponse() did not return response');
+    }
+    if (withResponseResult.request_id === undefined) {
+      throw new Error('.withResponse() did not return request_id');
+    }
+
+    // Verify data structure matches expected OpenAI response
+    const { data } = withResponseResult;
+    if (data.id !== 'chatcmpl-withresponse') {
+      throw new Error(`Expected data.id to be 'chatcmpl-withresponse', got '${data.id}'`);
+    }
+    if (data.choices[0].message.content !== 'Testing .withResponse() method!') {
+      throw new Error(`Expected specific content, got '${data.choices[0].message.content}'`);
+    }
+    if (data.usage.total_tokens !== 20) {
+      throw new Error(`Expected 20 total tokens, got ${data.usage.total_tokens}`);
+    }
+
+    // Verify response is a Response object with correct headers
+    if (!(withResponseResult.response instanceof Response)) {
+      throw new Error('response is not a Response object');
+    }
+    if (withResponseResult.response.headers.get('x-request-id') !== 'req_withresponse_test') {
+      throw new Error(
+        `Expected x-request-id header 'req_withresponse_test', got '${withResponseResult.response.headers.get('x-request-id')}'`,
+      );
+    }
+
+    // Verify request_id matches the header
+    if (withResponseResult.request_id !== 'req_withresponse_test') {
+      throw new Error(`Expected request_id 'req_withresponse_test', got '${withResponseResult.request_id}'`);
+    }
 
-    // Test 2: Verify regular await still works
-    const result2 = await client.chat.completions.create({
+    // Test 2: Verify .asResponse() method works
+    const result2 = client.chat.completions.create({
       model: 'gpt-4',
-      messages: [{ role: 'user', content: 'Test regular await' }],
+      messages: [{ role: 'user', content: 'Test asResponse' }],
     });
 
-    if (!result2 || result2.id !== 'chatcmpl-withresponse') {
-      throw new Error('Regular await failed');
+    // Verify method exists
+    if (typeof result2.asResponse !== 'function') {
+      throw new Error('.asResponse() method does not exist');
+    }
+
+    // Call .asResponse() and verify it returns raw Response
+    const rawResponse = await result2.asResponse();
+
+    if (!(rawResponse instanceof Response)) {
+      throw new Error('.asResponse() did not return a Response object');
+    }
+
+    // Verify response has correct status
+    if (rawResponse.status !== 200) {
+      throw new Error(`Expected status 200, got ${rawResponse.status}`);
+    }
+
+    // Verify response headers
+    if (rawResponse.headers.get('x-request-id') !== 'req_withresponse_test') {
+      throw new Error(
+        `Expected x-request-id header 'req_withresponse_test', got '${rawResponse.headers.get('x-request-id')}'`,
+      );
+    }
+
+    // Verify we can manually parse the body
+    const body = await rawResponse.json();
+    if (body.id !== 'chatcmpl-withresponse') {
+      throw new Error(`Expected body.id 'chatcmpl-withresponse', got '${body.id}'`);
+    }
+    if (body.choices[0].message.content !== 'Testing .withResponse() method!') {
+      throw new Error(`Expected specific content in body, got '${body.choices[0].message.content}'`);
     }
   });
 

dev-packages/node-integration-tests/suites/tracing/openai/test.ts

@@ -965,7 +965,7 @@ describe('OpenAI integration', () => {
                 op: 'gen_ai.chat',
                 status: 'ok',
               }),
-              // Second call using regular await
+              // Second call using .asResponse()
               expect.objectContaining({
                 data: expect.objectContaining({
                   [GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'chat',

packages/core/src/tracing/openai/index.ts

@@ -211,6 +211,9 @@ function wrapPromiseWithMethods<T>(originalPromiseLike: T, instrumentedPromise:
   // and preserves additional methods from the original result
   return new Proxy(originalPromiseLike, {
     get(target: object, prop: string | symbol): unknown {
+      // For standard Promise methods (.then, .catch, .finally) and Symbol.toStringTag,
+      // use instrumentedPromise to preserve Sentry instrumentation.
+      // For custom methods (like .withResponse()), use the original target.
       const useInstrumentedPromise = prop in Promise.prototype || prop === Symbol.toStringTag;
       const source = useInstrumentedPromise ? instrumentedPromise : target;