testdriverai 7.8.0 → 7.9.0-test.1

package/setup/aws/spawn-runner.sh

@@ -141,6 +141,171 @@ while :; do
   sleep 20
 done
 
+# --- 4) Install/update runner ---
+echo "Installing runner..."
+
+# Determine environment and version
+TD_CHANNEL="${TD_CHANNEL:-stable}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SDK_PKG_JSON="${SCRIPT_DIR}/../../../sdk/package.json"
+RUNNER_DIR="${SCRIPT_DIR}/../../../runner"
+
+if [ -f "$SDK_PKG_JSON" ]; then
+  RUNNER_VERSION=$(jq -r '.version' "$SDK_PKG_JSON")
+  echo "Runner version from SDK: $RUNNER_VERSION"
+else
+  RUNNER_VERSION="$TD_CHANNEL"
+  echo "SDK package.json not found, using env tag: $RUNNER_VERSION"
+fi
+
+if [ "$TD_CHANNEL" = "dev" ]; then
+  echo "Dev mode: packing and uploading local runner to S3..."
+  
+  # Pack local runner
+  TMPDIR=$(mktemp -d)
+  pushd "$RUNNER_DIR" > /dev/null
+  npm pack --pack-destination "$TMPDIR" > /dev/null 2>&1
+  TARBALL=$(ls "$TMPDIR"/*.tgz | head -1)
+  popd > /dev/null
+  
+  # Upload to S3
+  S3_BUCKET="${AWS_BUCKET_IMAGE_TRANSFER:-v7-transfer}"
+  S3_KEY="runner-dev/$(date +%s)-$(openssl rand -hex 4)/runner.tgz"
+  aws s3 cp "$TARBALL" "s3://${S3_BUCKET}/${S3_KEY}" --region "$AWS_REGION"
+  
+  # Generate presigned URL (15 min)
+  DOWNLOAD_URL=$(aws s3 presign "s3://${S3_BUCKET}/${S3_KEY}" --expires-in 900 --region "$AWS_REGION")
+  rm -rf "$TMPDIR"
+  
+  # Build SSM parameters JSON in a temp file to avoid shell escaping issues with URL
+  PARAMS_FILE=$(mktemp)
+  cat > "$PARAMS_FILE" << 'PARAMS_EOF'
+{
+  "commands": [
+    "Write-Host '=== Starting runner dev install ==='",
+    "Write-Host 'Stopping existing runner processes...'",
+    "Stop-ScheduledTask -TaskName RunTestDriverAgent -ErrorAction SilentlyContinue",
+    "Stop-Process -Name node -Force -ErrorAction SilentlyContinue",
+    "Start-Sleep -Seconds 2",
+    "Write-Host 'Current runner version:'",
+    "Get-Content 'C:\\testdriver\\sandbox-agent\\package.json' | ConvertFrom-Json | Select-Object -ExpandProperty version",
+    "Set-Location 'C:\\testdriver\\sandbox-agent'",
+    "Write-Host 'Dev mode: downloading runner from S3...'",
+    "$tarball = 'C:\\Windows\\Temp\\runner-dev.tgz'",
+PARAMS_EOF
+  
+  # Add the URL line with proper JSON escaping
+  echo "    \"Invoke-WebRequest -Uri '$(echo "$DOWNLOAD_URL" | sed 's/"/\\"/g')' -OutFile \$tarball\"," >> "$PARAMS_FILE"
+  
+  cat >> "$PARAMS_FILE" << 'PARAMS_EOF'
+    "Write-Host 'Downloaded tarball size:'",
+    "(Get-Item $tarball).Length",
+    "Write-Host 'Extracting runner...'",
+    "tar -xzf $tarball -C 'C:\\Windows\\Temp'",
+    "Write-Host 'Extracted package contents:'",
+    "Get-ChildItem 'C:\\Windows\\Temp\\package' -Recurse | Select-Object FullName",
+    "Write-Host 'New runner version in package:'",
+    "Get-Content 'C:\\Windows\\Temp\\package\\package.json' | ConvertFrom-Json | Select-Object -ExpandProperty version",
+    "Write-Host 'Clearing old lib folder...'",
+    "Remove-Item 'C:\\testdriver\\sandbox-agent\\lib' -Recurse -Force -ErrorAction SilentlyContinue",
+    "Write-Host 'Copying files to sandbox-agent...'",
+    "xcopy 'C:\\Windows\\Temp\\package\\*' 'C:\\testdriver\\sandbox-agent\\' /E /Y /I",
+    "Write-Host 'Files after copy:'",
+    "Get-ChildItem 'C:\\testdriver\\sandbox-agent' | Select-Object Name",
+    "Remove-Item 'C:\\Windows\\Temp\\package' -Recurse -Force -ErrorAction SilentlyContinue",
+    "Remove-Item $tarball -Force -ErrorAction SilentlyContinue",
+    "Write-Host 'Runner version after copy:'",
+    "Get-Content 'C:\\testdriver\\sandbox-agent\\package.json' | ConvertFrom-Json | Select-Object -ExpandProperty version",
+    "Write-Host 'Installing npm dependencies...'",
+    "npm install --omit=dev 2>&1 | Write-Host",
+    "Write-Host 'Final verification - ably-service.js exists:'",
+    "Test-Path 'C:\\testdriver\\sandbox-agent\\lib\\ably-service.js'",
+    "Write-Host 'Restarting RunTestDriverAgent scheduled task...'",
+    "Start-ScheduledTask -TaskName RunTestDriverAgent -ErrorAction SilentlyContinue",
+    "Write-Host '=== Runner install complete (dev) ==='"
+  ]
+}
+PARAMS_EOF
+
+  echo "Sending SSM command to download and install runner from S3..."
+  INSTALL_CMD=$(aws ssm send-command \
+    --region "$AWS_REGION" \
+    --instance-ids "$INSTANCE_ID" \
+    --document-name "AWS-RunPowerShellScript" \
+    --parameters "file://$PARAMS_FILE" \
+    --timeout-seconds 180 \
+    --output json)
+  rm -f "$PARAMS_FILE"
+else
+  echo "Installing @testdriverai/runner@${RUNNER_VERSION} via npm pack + extract..."
+
+  # Build SSM parameters JSON in a temp file (same approach as dev mode)
+  PARAMS_FILE=$(mktemp)
+  cat > "$PARAMS_FILE" << PARAMS_EOF
+{
+  "commands": [
+    "Write-Host '=== Starting runner install (npm pack) ==='",
+    "Write-Host 'Stopping existing runner processes...'",
+    "Stop-ScheduledTask -TaskName RunTestDriverAgent -ErrorAction SilentlyContinue",
+    "Stop-Process -Name node -Force -ErrorAction SilentlyContinue",
+    "Start-Sleep -Seconds 2",
+    "Write-Host 'Current runner version:'",
+    "Get-Content 'C:\\\\testdriver\\\\sandbox-agent\\\\package.json' | ConvertFrom-Json | Select-Object -ExpandProperty version",
+    "Set-Location 'C:\\\\Windows\\\\Temp'",
+    "Write-Host 'Downloading @testdriverai/runner@${RUNNER_VERSION} via npm pack...'",
+    "npm pack @testdriverai/runner@${RUNNER_VERSION} 2>&1 | Write-Host",
+    "\$tarball = (Get-ChildItem 'C:\\\\Windows\\\\Temp\\\\testdriverai-runner-*.tgz' | Sort-Object LastWriteTime -Descending | Select-Object -First 1).FullName",
+    "Write-Host \"Downloaded tarball: \$tarball\"",
+    "Write-Host 'Extracting runner...'",
+    "tar -xzf \$tarball -C 'C:\\\\Windows\\\\Temp'",
+    "Write-Host 'New runner version in package:'",
+    "Get-Content 'C:\\\\Windows\\\\Temp\\\\package\\\\package.json' | ConvertFrom-Json | Select-Object -ExpandProperty version",
+    "Write-Host 'Clearing old lib folder...'",
+    "Remove-Item 'C:\\\\testdriver\\\\sandbox-agent\\\\lib' -Recurse -Force -ErrorAction SilentlyContinue",
+    "Write-Host 'Copying files to sandbox-agent...'",
+    "xcopy 'C:\\\\Windows\\\\Temp\\\\package\\\\*' 'C:\\\\testdriver\\\\sandbox-agent\\\\' /E /Y /I",
+    "Write-Host 'Runner version after copy:'",
+    "Get-Content 'C:\\\\testdriver\\\\sandbox-agent\\\\package.json' | ConvertFrom-Json | Select-Object -ExpandProperty version",
+    "Remove-Item 'C:\\\\Windows\\\\Temp\\\\package' -Recurse -Force -ErrorAction SilentlyContinue",
+    "Remove-Item \$tarball -Force -ErrorAction SilentlyContinue",
+    "Set-Location 'C:\\\\testdriver\\\\sandbox-agent'",
+    "Write-Host 'Installing npm dependencies...'",
+    "npm install --omit=dev 2>&1 | Write-Host",
+    "Write-Host 'Restarting RunTestDriverAgent scheduled task...'",
+    "Start-ScheduledTask -TaskName RunTestDriverAgent -ErrorAction SilentlyContinue",
+    "Write-Host '=== Runner install complete (npm pack) ==='"
+  ]
+}
+PARAMS_EOF
+
+  INSTALL_CMD=$(aws ssm send-command \
+    --region "$AWS_REGION" \
+    --instance-ids "$INSTANCE_ID" \
+    --document-name "AWS-RunPowerShellScript" \
+    --parameters "file://$PARAMS_FILE" \
+    --timeout-seconds 180 \
+    --output json)
+  rm -f "$PARAMS_FILE"
+fi
+
+INSTALL_CMD_ID=$(jq -r '.Command.CommandId' <<<"$INSTALL_CMD")
+echo "Runner install command sent (Command ID: $INSTALL_CMD_ID)"
+
+# Wait for install to complete
+echo "Waiting for runner install to complete..."
+if aws ssm wait command-executed --region "$AWS_REGION" --command-id "$INSTALL_CMD_ID" --instance-id "$INSTANCE_ID" 2>/dev/null; then
+  echo "✓ Runner install succeeded"
+else
+  INSTALL_STATUS=$(aws ssm get-command-invocation \
+    --region "$AWS_REGION" \
+    --command-id "$INSTALL_CMD_ID" \
+    --instance-id "$INSTANCE_ID" \
+    --output json 2>/dev/null || echo '{}')
+  echo "⚠ Runner install status: $(jq -r '.Status // "Unknown"' <<<"$INSTALL_STATUS")"
+  echo "Output: $(jq -r '.StandardOutputContent // "No output"' <<<"$INSTALL_STATUS" | head -20)"
+  echo "Errors: $(jq -r '.StandardErrorContent // "No errors"' <<<"$INSTALL_STATUS" | head -10)"
+fi
+
 echo "Getting Public IP..."
 
 # --- 5) Get instance Public IP ---

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

@@ -14,11 +14,15 @@ const setupFiles = [
 
 const sharedTestConfig = {
   retry: 0,
-  testTimeout: 900000,
-  hookTimeout: 900000,
+  testTimeout: 480000,
+  hookTimeout: 480000,
   maxConcurrency: 100,
   disableConsoleIntercept: false,
   silent: false,
+  // Use child-process forks so each test FILE gets a completely clean
+  // Node.js process — no shared Ably connections, module-level singletons,
+  // or Sentry globals bleeding between files.
+  pool: "forks",
   reporters: [
     "verbose",
     TestDriver()
@@ -31,7 +35,7 @@ const sharedTestConfig = {
 // 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_ENV || "dev";
+const defaultEnv = process.env.TD_CHANNEL || "dev";
 const environments = getEnvironmentNames();
 
 // Apply default env to the main process so the reporter/plugin picks it up

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,
+  },
+});