autotel-devtools 5.1.0 → 6.0.1

package/dist/index.d.cts

@@ -1,9 +1,9 @@
-import { D as DevtoolsServer, a as DevtoolsSpanExporter } from './exporter-qIQPDw29.cjs';
-export { b as DevtoolsData, E as ErrorGroup, L as LogData, M as MetricData, S as SpanData, T as TraceData } from './exporter-qIQPDw29.cjs';
+import { D as DevtoolsServer, a as DevtoolsSpanExporter } from './exporter-DjLkU621.cjs';
+export { b as DevtoolsData, E as ErrorGroup, L as LogData, M as MetricData, S as SpanData, T as TraceData } from './exporter-DjLkU621.cjs';
 import { Server } from 'node:http';
 export { DevtoolsLogExporter } from './server/log-exporter.cjs';
 export { DevtoolsRemoteExporter } from './server/remote-exporter.cjs';
-export { E as ErrorAggregator } from './error-aggregator-CtZmjm-k.cjs';
+export { E as ErrorAggregator } from './error-aggregator-CbLiuot4.cjs';
 import '@opentelemetry/sdk-trace-base';
 import '@opentelemetry/core';
 import '@opentelemetry/sdk-logs';

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { D as DevtoolsServer, a as DevtoolsSpanExporter } from './exporter-qIQPDw29.js';
-export { b as DevtoolsData, E as ErrorGroup, L as LogData, M as MetricData, S as SpanData, T as TraceData } from './exporter-qIQPDw29.js';
+import { D as DevtoolsServer, a as DevtoolsSpanExporter } from './exporter-DjLkU621.js';
+export { b as DevtoolsData, E as ErrorGroup, L as LogData, M as MetricData, S as SpanData, T as TraceData } from './exporter-DjLkU621.js';
 import { Server } from 'node:http';
 export { DevtoolsLogExporter } from './server/log-exporter.js';
 export { DevtoolsRemoteExporter } from './server/remote-exporter.js';
-export { E as ErrorAggregator } from './error-aggregator-BkO0l8ak.js';
+export { E as ErrorAggregator } from './error-aggregator-CAk_pt3Z.js';
 import '@opentelemetry/sdk-trace-base';
 import '@opentelemetry/core';
 import '@opentelemetry/sdk-logs';

package/dist/index.js

@@ -360,12 +360,17 @@ var DevtoolsServer = class {
   limits;
   verbose;
   _port;
+  onData;
   constructor(options = {}) {
     this.limits = resolveTelemetryLimits(options);
     this.verbose = options.verbose ?? false;
     this._port = options.port ?? 4318;
+    this.onData = options.onData;
     this.httpServer = options.server ?? createServer();
     this.wss = new WebSocketServer({ server: this.httpServer, path: options.path ?? "/ws" });
+    this.wss.on("error", (err) => {
+      if (this.httpServer.listening) throw err;
+    });
     this.wss.on("connection", (ws) => {
       this.clients.add(ws);
       this.log(`Client connected (${this.clients.size} total)`);
@@ -457,6 +462,12 @@ var DevtoolsServer = class {
         client.send(msg);
       }
     }
+    if (this.onData) {
+      try {
+        this.onData(data);
+      } catch {
+      }
+    }
   }
   log(message) {
     if (this.verbose) console.log(`[autotel-devtools] ${message}`);
@@ -510,7 +521,10 @@ function flattenAttributes(attrs) {
 }
 function nanoToMs(nano) {
   if (!nano) return 0;
-  return Number(BigInt(nano) / 1000000n);
+  const ns = BigInt(nano);
+  const ms = ns / 1000000n;
+  const remNs = ns % 1000000n;
+  return Number(ms) + Number(remNs) / 1e6;
 }
 var SPAN_KIND_MAP = {
   0: "INTERNAL",
@@ -548,6 +562,7 @@ function parseOtlpTraces(payload) {
     const service = String(resourceAttrs["service.name"] || "unknown");
     const scopeSpans = rs.scopeSpans || [];
     for (const ss of scopeSpans) {
+      const scope = ss.scope?.name ? { name: ss.scope.name, version: ss.scope.version || void 0 } : void 0;
       for (const span of ss.spans || []) {
         const traceId = normalizeHexId(span.traceId);
         if (!traceId) continue;
@@ -572,7 +587,13 @@ function parseOtlpTraces(payload) {
             name: e.name || "",
             timestamp: nanoToMs(e.timeUnixNano),
             attributes: flattenAttributes(e.attributes)
-          }))
+          })),
+          links: (span.links || []).map((l) => ({
+            traceId: normalizeHexId(l.traceId),
+            spanId: normalizeHexId(l.spanId),
+            attributes: flattenAttributes(l.attributes)
+          })),
+          scope
         };
         const existing = traceMap.get(traceId);
         if (existing) {
@@ -1011,43 +1032,79 @@ function attachDevtoolsRoutes(httpServer, devtools) {
   });
 }
 var LOOPBACK = /* @__PURE__ */ new Set(["localhost", "127.0.0.1", "::1"]);
+var DEFAULT_MAX_PORT_TRIES = 20;
 function formatAddress(host, port) {
   return host.includes(":") ? `[${host}]:${port}` : `${host}:${port}`;
 }
 function listenLoopbackDualStack(args) {
-  const { primary, port, host, attachSecondary } = args;
+  const { primary, port, host, attachSecondary, maxTries } = args;
+  const maxAttempts = Math.max(1, maxTries ?? DEFAULT_MAX_PORT_TRIES);
   let sibling;
   const ready = new Promise(
-    (resolve2) => {
+    (resolve2, reject) => {
       const addresses = [];
       const warnings = [];
       const primaryHost = host === "localhost" ? "127.0.0.1" : host;
-      primary.listen(port, primaryHost, () => {
+      let candidate = port;
+      let attempt = 0;
+      const bindFailed = (atPort, msg) => reject(
+        new Error(`could not bind ${formatAddress(primaryHost, atPort)}: ${msg}`)
+      );
+      const onError = (e) => {
+        if (e.code !== "EADDRINUSE") return bindFailed(candidate, e.message);
+        if (++attempt >= maxAttempts) {
+          reject(
+            new Error(
+              `could not bind ${formatAddress(primaryHost, port)}: ${maxAttempts} consecutive ports in use`
+            )
+          );
+          return;
+        }
+        candidate++;
+        listen();
+      };
+      const onListening = () => {
+        primary.removeListener("error", onError);
+        if (candidate !== port) {
+          warnings.push(`port ${port} was busy; using ${candidate} instead`);
+        }
         const addr = primary.address();
-        const resolvedPort = addr && typeof addr === "object" ? addr.port : port;
+        const resolvedPort = addr && typeof addr === "object" ? addr.port : candidate;
         addresses.push(formatAddress(primaryHost, resolvedPort));
         if (!LOOPBACK.has(host)) {
-          resolve2({ addresses, warnings });
+          resolve2({ addresses, port: resolvedPort, warnings });
           return;
         }
         const siblingHost = primaryHost === "::1" ? "127.0.0.1" : "::1";
         const s = createServer();
         attachSecondary(s);
-        const onError = (e) => {
+        const onSiblingError = (se) => {
           s.close();
           warnings.push(
-            `could not also bind ${formatAddress(siblingHost, resolvedPort)} (${e.message}); clients using the ${siblingHost === "::1" ? "IPv6" : "IPv4"} form of "localhost" may not connect.`
+            `could not also bind ${formatAddress(siblingHost, resolvedPort)} (${se.message}); clients using the ${siblingHost === "::1" ? "IPv6" : "IPv4"} form of "localhost" may not connect.`
           );
-          resolve2({ addresses, warnings });
+          resolve2({ addresses, port: resolvedPort, warnings });
         };
-        s.once("error", onError);
+        s.once("error", onSiblingError);
         s.listen(resolvedPort, siblingHost, () => {
-          s.off("error", onError);
+          s.off("error", onSiblingError);
           sibling = s;
           addresses.push(formatAddress(siblingHost, resolvedPort));
-          resolve2({ addresses, warnings });
+          resolve2({ addresses, port: resolvedPort, warnings });
         });
-      });
+      };
+      const listen = () => {
+        try {
+          primary.listen(candidate, primaryHost);
+        } catch (e) {
+          primary.removeListener("error", onError);
+          primary.removeListener("listening", onListening);
+          bindFailed(candidate, e.message);
+        }
+      };
+      primary.on("error", onError);
+      primary.once("listening", onListening);
+      listen();
     }
   );
   return {
@@ -1164,6 +1221,11 @@ var DevtoolsSpanExporter = class {
       timestamp: event.time[0] * 1e3 + event.time[1] / 1e6,
       attributes: event.attributes ? Object.fromEntries(Object.entries(event.attributes)) : void 0
     }));
+    const links = span.links.map((link) => ({
+      traceId: link.context.traceId,
+      spanId: link.context.spanId,
+      attributes: link.attributes ? Object.fromEntries(Object.entries(link.attributes)) : void 0
+    }));
     return {
       traceId: spanContext.traceId,
       spanId: spanContext.spanId,
@@ -1178,9 +1240,15 @@ var DevtoolsSpanExporter = class {
         code: status,
         message: span.status.message
       },
-      events: events.length > 0 ? events : void 0
+      events: events.length > 0 ? events : void 0,
+      links: links.length > 0 ? links : void 0,
+      scope: this.convertScope(span)
     };
   }
+  convertScope(span) {
+    const s = span.instrumentationScope ?? span.instrumentationLibrary;
+    return s?.name ? { name: s.name, version: s.version || void 0 } : void 0;
+  }
   /**
    * Convert OpenTelemetry SpanKind to string
    */