npm - autotel-devtools - Versions diffs - 6.0.1 → 6.1.1 - Mend

autotel-devtools 6.0.1 → 6.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/cli.js CHANGED Viewed

@@ -423,13 +423,16 @@ var DevtoolsServer = class {
   addTraces(traces) {
     for (const trace of traces) this.addTrace(trace);
   }
+  // `errors` is full-state on every broadcast (the client replaces, not appends),
+  // so non-trace broadcasts must echo the current error groups rather than `[]` —
+  // otherwise a log/metric arriving after an error would wipe it from the UI.
   addLog(log) {
     this.logs = appendWithLimit(this.logs, log, this.limits.maxLogCount);
-    this.broadcast({ traces: [], metrics: [], logs: [log], errors: [] });
+    this.broadcast({ traces: [], metrics: [], logs: [log], errors: this.errorAggregator.getErrorGroups() });
   }
   addLogs(logs) {
     this.logs = appendManyWithLimit(this.logs, logs, this.limits.maxLogCount);
-    this.broadcast({ traces: [], metrics: [], logs, errors: [] });
+    this.broadcast({ traces: [], metrics: [], logs, errors: this.errorAggregator.getErrorGroups() });
   }
   addMetric(metric) {
     this.metrics = appendWithLimit(
@@ -437,7 +440,7 @@ var DevtoolsServer = class {
       metric,
       this.limits.maxMetricCount
     );
-    this.broadcast({ traces: [], metrics: [metric], logs: [], errors: [] });
+    this.broadcast({ traces: [], metrics: [metric], logs: [], errors: this.errorAggregator.getErrorGroups() });
   }
   getCurrentData() {
     return {
@@ -916,7 +919,38 @@ function decodeOtlpMetricsRequest(body) {
   return decodeRequest("opentelemetry.proto.metrics.v1.ExportMetricsServiceRequest", body);
 }
+// src/server/identity.ts
+var DEVTOOLS_IDENTITY = "autotel-devtools";
+async function probePortHolder(host, port, timeoutMs = 500) {
+  const authority = host.includes(":") ? `[${host}]` : host;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const res = await fetch(`http://${authority}:${port}/healthz`, {
+      signal: controller.signal
+    });
+    if (res.headers.get("x-autotel-devtools")) return "autotel-devtools";
+    try {
+      const body = await res.json();
+      if (body && body.service === DEVTOOLS_IDENTITY) return "autotel-devtools";
+    } catch {
+    }
+    return "foreign";
+  } catch {
+    return "none";
+  } finally {
+    clearTimeout(timer);
+  }
+}
 // src/server/http.ts
+function sendOtlpError(res, req, e) {
+  sendJson(res, 400, {
+    error: "Invalid OTLP payload",
+    message: e instanceof Error ? e.message : String(e),
+    contentType: req.headers["content-type"] ?? null
+  });
+}
 var PROTOBUF_DECODERS = {
   traces: decodeOtlpTraceRequest,
   logs: decodeOtlpLogsRequest,
@@ -937,6 +971,18 @@ function findPackageRoot() {
   return dir;
 }
 var FULLPAGE_HTML = `<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>autotel-devtools</title><style>*{margin:0;padding:0;box-sizing:border-box}html,body{height:100%;width:100%;overflow:hidden}</style></head><body><script src="/widget.js?mode=fullpage"></script></body></html>`;
+var cachedVersion = null;
+function getVersion() {
+  if (cachedVersion !== null) return cachedVersion;
+  let version = "unknown";
+  try {
+    const pkg = JSON.parse(readFileSync(resolve(findPackageRoot(), "package.json"), "utf8"));
+    if (typeof pkg.version === "string") version = pkg.version;
+  } catch {
+  }
+  cachedVersion = version;
+  return version;
+}
 var cachedWidgetJs = null;
 function getWidgetJs() {
   if (!cachedWidgetJs) {
@@ -963,6 +1009,8 @@ function attachDevtoolsRoutes(httpServer, devtools) {
     res.setHeader("Access-Control-Allow-Origin", "*");
     res.setHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, OPTIONS");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type");
+    res.setHeader("x-autotel-devtools", getVersion());
+    res.setHeader("Access-Control-Expose-Headers", "x-autotel-devtools");
     if (req.method === "OPTIONS") {
       res.writeHead(204);
       res.end();
@@ -981,7 +1029,12 @@ function attachDevtoolsRoutes(httpServer, devtools) {
       return;
     }
     if (req.method === "GET" && url === "/healthz") {
-      sendJson(res, 200, { ok: true, clients: devtools.clientCount });
+      sendJson(res, 200, {
+        ok: true,
+        service: DEVTOOLS_IDENTITY,
+        version: getVersion(),
+        clients: devtools.clientCount
+      });
       return;
     }
     if (req.method === "GET" && url === "/v1/traces") {
@@ -1001,7 +1054,7 @@ function attachDevtoolsRoutes(httpServer, devtools) {
         devtools.addTraces(traces);
         sendJson(res, 200, { acceptedTraces: traces.length });
       } catch (e) {
-        sendJson(res, 400, { error: "Invalid OTLP payload", message: e instanceof Error ? e.message : String(e) });
+        sendOtlpError(res, req, e);
       }
       return;
     }
@@ -1012,7 +1065,7 @@ function attachDevtoolsRoutes(httpServer, devtools) {
         devtools.addLogs(logs);
         sendJson(res, 200, { acceptedLogs: logs.length });
       } catch (e) {
-        sendJson(res, 400, { error: "Invalid OTLP payload", message: e instanceof Error ? e.message : String(e) });
+        sendOtlpError(res, req, e);
       }
       return;
     }
@@ -1022,7 +1075,7 @@ function attachDevtoolsRoutes(httpServer, devtools) {
         const count = countOtlpMetrics(payload);
         sendJson(res, 200, { acceptedMetrics: count });
       } catch (e) {
-        sendJson(res, 400, { error: "Invalid OTLP payload", message: e instanceof Error ? e.message : String(e) });
+        sendOtlpError(res, req, e);
       }
       return;
     }
@@ -1239,6 +1292,18 @@ async function main() {
     attachSecondary: (s) => attachDevtoolsRoutes(s, wsServer)
   });
   const { addresses, warnings, port: boundPort } = await listeners.ready;
+  if (boundPort !== options.port) {
+    const holder = await probePortHolder(options.host, options.port);
+    if (holder === "autotel-devtools") {
+      warnings.push(
+        `another autotel-devtools is already running on port ${options.port}; this instance is on ${boundPort}. Use the existing one, or stop it and restart here.`
+      );
+    } else {
+      warnings.push(
+        `port ${options.port} is held by another process that is NOT autotel-devtools. Anything exporting OTLP to :${options.port} is reaching that process, not this devtools. Point your exporter at :${boundPort}, or free :${options.port} and restart.`
+      );
+    }
+  }
   const uiBase = `http://${options.host === "localhost" ? "127.0.0.1" : options.host}:${boundPort}`;
   const title = options.title || "autotel-devtools";
   process.stdout.write(`