Address PR review feedback

Author: Qard

e2e/config/pr-comment-scenarios.json

@@ -9,6 +9,14 @@
       { "variantKey": "openai-v6", "label": "v6" }
     ]
   },
+  {
+    "scenarioDirName": "openai-agents-instrumentation",
+    "label": "OpenAI Agents Instrumentation",
+    "metadataScenario": "openai-agents-instrumentation",
+    "variants": [
+      { "variantKey": "openai-agents-auto-hook", "label": "Auto-hook" }
+    ]
+  },
   {
     "scenarioDirName": "anthropic-instrumentation",
     "label": "Anthropic Instrumentation",

e2e/scenarios/openai-agents-instrumentation/scenario.test.ts

@@ -9,6 +9,7 @@ import { defineOpenAIAgentsAutoInstrumentationAssertions } from "./assertions";
 const scenarioDir = await prepareScenarioDir({
   scenarioDir: resolveScenarioDir(import.meta.url),
 });
+const OPENAI_AGENTS_VARIANT_KEY = "openai-agents-auto-hook";
 const openAIAgentsVersion = await readInstalledPackageVersion(
   scenarioDir,
   "@openai/agents",
@@ -25,6 +26,7 @@ describe(`openai agents sdk ${openAIAgentsVersion}`, () => {
           NODE_ENV: "development",
         },
         nodeArgs: ["--import", "braintrust/hook.mjs"],
+        runContext: { variantKey: OPENAI_AGENTS_VARIANT_KEY },
         scenarioDir,
         timeoutMs: TIMEOUT_MS,
       });

js/src/auto-instrumentations/configs/openai-agents.test.ts

@@ -10,35 +10,37 @@ describe("openAIAgentsCoreConfigs", () => {
       ["onSpanStart", openAIAgentsCoreChannels.onSpanStart.channelName],
       ["onSpanEnd", openAIAgentsCoreChannels.onSpanEnd.channelName],
     ] as const;
+    const expectedConfigs = [
+      "dist/tracing/processor.mjs",
+      "dist/tracing/processor.js",
+    ]
+      .flatMap((filePath) =>
+        lifecycleMethods.map(([methodName, channelName]) => ({
+          channelName,
+          module: {
+            name: "@openai/agents-core",
+            versionRange: ">=0.0.14",
+            filePath,
+          },
+          functionQuery: {
+            className: "MultiTracingProcessor",
+            methodName,
+            kind: "Async",
+          },
+        })),
+      )
+      .sort((left, right) =>
+        `${left.module.filePath}:${left.functionQuery.methodName}`.localeCompare(
+          `${right.module.filePath}:${right.functionQuery.methodName}`,
+        ),
+      );
 
-    for (const [methodName, channelName] of lifecycleMethods) {
-      expect(openAIAgentsCoreConfigs).toContainEqual({
-        channelName,
-        module: {
-          name: "@openai/agents-core",
-          versionRange: ">=0.0.14",
-          filePath: "dist/tracing/processor.mjs",
-        },
-        functionQuery: {
-          className: "MultiTracingProcessor",
-          methodName,
-          kind: "Async",
-        },
-      });
-
-      expect(openAIAgentsCoreConfigs).toContainEqual({
-        channelName,
-        module: {
-          name: "@openai/agents-core",
-          versionRange: ">=0.0.14",
-          filePath: "dist/tracing/processor.js",
-        },
-        functionQuery: {
-          className: "MultiTracingProcessor",
-          methodName,
-          kind: "Async",
-        },
-      });
-    }
+    expect(
+      [...openAIAgentsCoreConfigs].sort((left, right) =>
+        `${left.module.filePath}:${left.functionQuery.methodName}`.localeCompare(
+          `${right.module.filePath}:${right.functionQuery.methodName}`,
+        ),
+      ),
+    ).toEqual(expectedConfigs);
   });
 });