@testdriverai/runner 7.11.70-test → 7.11.71-test

package/lib/ably-service.js

@@ -20,6 +20,7 @@
  */
 const Ably = require('ably');
 const Sentry = require('@sentry/node');
+const betterstack = require('../../shared/betterstack-otel');
 const http = require('http');
 const https = require('https');
 const { EventEmitter } = require('events');
@@ -55,8 +56,12 @@ async function uploadToS3(apiRoot, apiKey, sandboxId, payload, label = 'screensh
     const fileName = `${label}-${Date.now()}.png`;
 
     // Get presigned upload URL from API
-    // Propagate Sentry trace context so this request appears under the active command span
-    const traceHeaders = Sentry.getTraceData ? Sentry.getTraceData() : {};
+    // Propagate Sentry trace context (sentry-trace + baggage) and W3C traceparent
+    // so this request appears under the active span in both Sentry and BetterStack.
+    const traceHeaders = {
+      ...(Sentry.getTraceData ? Sentry.getTraceData() : {}),
+      ...betterstack.getTraceparentHeaders(sandboxId),
+    };
     const uploadUrlResponse = await httpPost(apiRoot, '/api/v7/runner/upload-url', {
       apiKey,
       sandboxId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testdriverai/runner",
-  "version": "7.11.70-test",
+  "version": "7.11.71-test",
   "description": "TestDriver Runner - Ably-based remote automation agent with Node.js automation",
   "main": "index.js",
   "bin": {
@@ -28,6 +28,14 @@
     "test:auto-upgrade": "cd ../sdk && npx vitest run --config vitest.runner.config.mjs runner/packer/test/auto-upgrade.test.mjs"
   },
   "dependencies": {
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api-logs": "^0.208.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.208.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.208.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-logs": "^0.208.0",
+    "@opentelemetry/sdk-trace-base": "^2.2.0",
+    "@opentelemetry/sdk-trace-node": "^2.2.0",
     "@sentry/node": "^10.37.0",
     "ably": "^2.6.0",
     "dashcam": "beta",

package/sandbox-agent.js

@@ -33,6 +33,7 @@
  */
 require('dotenv').config();
 const Sentry = require('@sentry/node');
+const betterstack = require('../shared/betterstack-otel');
 const crypto = require('crypto');
 const fs = require('fs');
 const os = require('os');
@@ -191,6 +192,29 @@ async function main() {
   // for stable) BEFORE writing the config, so by this point we're up to date.
   const config = await waitForConfig(300000);
 
+  // Propagate BetterStack OTLP credentials from the API-supplied config into the
+  // process env so betterstack-otel's createSpanProcessor()/init() can pick them
+  // up (the sandbox VM has no .env of its own).
+  if (config.betterstackSourceToken && !process.env.BETTERSTACK_SOURCE_TOKEN) {
+    process.env.BETTERSTACK_SOURCE_TOKEN = config.betterstackSourceToken;
+  }
+  if (config.betterstackIngestUrl && !process.env.BETTERSTACK_INGEST_URL) {
+    process.env.BETTERSTACK_INGEST_URL = config.betterstackIngestUrl;
+  }
+  if (config.betterstackErrorDsn && !process.env.BETTERSTACK_ERROR_DSN) {
+    process.env.BETTERSTACK_ERROR_DSN = config.betterstackErrorDsn;
+  }
+  if (config.betterstackForce && !process.env.TD_BETTERSTACK_FORCE) {
+    process.env.TD_BETTERSTACK_FORCE = 'true';
+  }
+
+  // Build BetterStack's span processor before Sentry.init so it attaches to
+  // Sentry's OTel provider (openTelemetrySpanProcessors) and mirrors 100% of spans.
+  const betterstackSpanProcessor = betterstack.createSpanProcessor({
+    service: 'runner',
+    version: require('./package.json').version,
+  });
+
   // Initialize Sentry for distributed tracing
   const sentryDsn = process.env.SENTRY_DSN || config.sentryDsn || 'https://452bd5a00dbd83a38ee8813e11c57694@o4510262629236736.ingest.us.sentry.io/4510480443637760';
   const runnerChannel = config.sentryChannel || process.env.TD_CHANNEL;
@@ -199,6 +223,7 @@ async function main() {
     const { version } = require('./package.json');
     Sentry.init({
       dsn: sentryDsn,
+      openTelemetrySpanProcessors: [betterstackSpanProcessor].filter(Boolean),
       // Use tracesSampler to inherit parent sampling decisions
       // This ensures SDK → API → Runner traces stay connected
       tracesSampler: (samplingContext) => {
@@ -249,6 +274,26 @@ async function main() {
 
     Sentry.setTag('sandbox', config.sandboxId);
     log('Sentry initialized');
+
+    // Attach BetterStack after Sentry so it shares Sentry's OTel provider and
+    // the runner.session span/trace id above is exported to both backends.
+    betterstack.init({
+      service: 'runner',
+      version: require('./package.json').version,
+      attributes: {
+        'sandbox.id': config.sandboxId,
+        ...(config.sessionId ? { 'session.id': config.sessionId } : {}),
+      },
+    });
+    // Forward errors to BetterStack's error app so releases populate.
+    betterstack.initErrorReporting({
+      service: 'runner',
+      version: require('./package.json').version,
+      attributes: {
+        'sandbox.id': config.sandboxId,
+        ...(config.sessionId ? { 'session.id': config.sessionId } : {}),
+      },
+    });
   }
   log(`Sandbox ID: ${config.sandboxId}`);
   log(`Transport: Ably`);
@@ -290,6 +335,7 @@ async function main() {
     }
     await ablyService.close();
     automation.cleanup();
+    await betterstack.flush(2000);
     await Sentry.close(2000);
     process.exit(0);
   };