testdriverai 7.8.0-test.7 → 7.8.0-test.71

package/test-sentry-span.js

@@ -0,0 +1,35 @@
+const Sentry = require('@sentry/node');
+const crypto = require('crypto');
+
+Sentry.init({ dsn: 'https://test@sentry.io/123', tracesSampleRate: 1.0 });
+
+const sessionId = 'test-session-123';
+const traceId = crypto.createHash('md5').update(sessionId).digest('hex');
+console.log('expected traceId:', traceId);
+
+const sentryTraceHeader = traceId + '-' + crypto.randomBytes(8).toString('hex') + '-1';
+const baggageHeader = 'sentry-trace_id=' + traceId + ',sentry-sampled=true';
+
+// Approach: Use continueTrace + startInactiveSpan for the root, then rely on scope
+// for getTraceData propagation
+Sentry.continueTrace(
+  { sentryTrace: sentryTraceHeader, baggage: baggageHeader },
+  () => {
+    // This sets propagation context on the current scope
+    const rootSpan = Sentry.startInactiveSpan({ name: 'sdk.session', op: 'session', forceTransaction: true });
+    
+    // After continueTrace returns, check if getTraceData still uses the right traceId
+    const td = Sentry.getTraceData();
+    console.log('after continueTrace getTraceData:', JSON.stringify(td));
+    console.log('traceId matches:', td['sentry-trace'] && td['sentry-trace'].startsWith(traceId));
+    
+    // Simulate async: do a child span later
+    setTimeout(() => {
+      const td2 = Sentry.getTraceData();
+      console.log('async getTraceData:', JSON.stringify(td2));
+      console.log('async traceId matches:', td2['sentry-trace'] && td2['sentry-trace'].startsWith(traceId));
+      rootSpan.end();
+      process.exit(0);
+    }, 100);
+  }
+);

package/vitest.config.mjs

@@ -1,7 +1,9 @@
 import TestDriver from "testdriverai/vitest";
 import { defineConfig } from "vitest/config";
-import { readFileSync, existsSync } from "fs";
-import { resolve } from "path";
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
+const { resolveEnv, getEnvironmentNames } = require("../shared/resolve-env");
 
 // Always include AWS setup - it will be a no-op unless TD_OS=windows
 // Note: dotenv is loaded automatically by the TestDriver SDK
@@ -12,8 +14,8 @@ const setupFiles = [
 
 const sharedTestConfig = {
   retry: 0,
-  testTimeout: 900000,
-  hookTimeout: 900000,
+  testTimeout: 480000,
+  hookTimeout: 480000,
   maxConcurrency: 100,
   disableConsoleIntercept: false,
   silent: false,
@@ -25,45 +27,31 @@ const sharedTestConfig = {
   include: ["examples/**/*.test.mjs"],
 };
 
-// ── Parse a simple KEY=VALUE .env file ──────────────────────────────
-function parseEnvFile(filePath) {
-  if (!existsSync(filePath)) return {};
-  const env = {};
-  for (const line of readFileSync(filePath, "utf-8").split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const idx = trimmed.indexOf("=");
-    if (idx === -1) continue;
-    env[trimmed.slice(0, idx)] = trimmed.slice(idx + 1);
-  }
-  return env;
-}
-
-// ── Load base .env + per-environment overlay ────────────────────────
-const monoRoot = resolve(import.meta.dirname, "..");
-const baseEnv = parseEnvFile(resolve(monoRoot, ".env"));
-
-const environments = ["dev", "test", "canary", "stable"];
+// ── Resolve env vars via shared/resolve-env.js ──────────────────────
+// Uses: environments.json (URLs) + envs/{env}.env (overlay) + fixtures (API keys)
+// TD_PLAN selects which plan's API key to use (default: enterprise)
+const plan = process.env.TD_PLAN || "enterprise";
+const defaultEnv = process.env.TD_CHANNEL || "dev";
+const environments = getEnvironmentNames();
 
-function envForProject(envName) {
-  const overlay = parseEnvFile(resolve(monoRoot, "envs", `${envName}.env`));
-  return { ...baseEnv, ...overlay };
-}
+// Apply default env to the main process so the reporter/plugin picks it up
+// (vitest's test.env only propagates to worker processes, not the main process)
+const defaultResolved = resolveEnv(defaultEnv, plan);
+Object.assign(process.env, defaultResolved);
 
-// ── If TD_ENV is set (e.g. from CLI), only run that environment ─────
-// Usage: TD_ENV=dev vitest run
-//        TD_ENV=canary vitest run examples/assert.test.mjs
-//        vitest run --project dev
-//        vitest run --project canary --project stable
+// ── Usage ───────────────────────────────────────────────────────────
+// TD_PLAN=enterprise vitest run --project dev
+// TD_PLAN=free vitest run --project test examples/assert.test.mjs
+// vitest run --project canary --project stable
 export default defineConfig({
   test: {
     ...sharedTestConfig,
-    env: envForProject(process.env.TD_ENV || "dev"),
+    env: defaultResolved,
     projects: environments.map((envName) => ({
       extends: true,
       test: {
         name: envName,
-        env: envForProject(envName),
+        env: resolveEnv(envName, plan),
       },
     })),
   },

package/vitest.runner.config.mjs

@@ -0,0 +1,33 @@
+/**
+ * Vitest config for runner/packer tests.
+ * Lives under sdk/ so vitest resolves from sdk/node_modules,
+ * but uses shared/resolve-env.js for environment variable loading.
+ */
+import { defineConfig } from "vitest/config";
+import { createRequire } from "module";
+import { dirname, resolve } from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const monoRoot = resolve(__dirname, "..");
+
+const require = createRequire(import.meta.url);
+const { resolveEnv } = require("../shared/resolve-env");
+
+const plan = process.env.TD_PLAN || "enterprise";
+const env = process.env.TD_CHANNEL || "dev";
+const resolved = resolveEnv(env, plan);
+
+// Apply to the main process so test code sees the vars immediately
+Object.assign(process.env, resolved);
+
+export default defineConfig({
+  test: {
+    root: monoRoot,
+    testTimeout: 900_000,   // 15 min per test
+    hookTimeout: 2_400_000, // 40 min for beforeAll (AMI build + spawn)
+    reporters: ["default"],
+    include: ["runner/packer/test/**/*.test.mjs"],
+    env: resolved,
+  },
+});