@autter/runtime-node 1.6.1 → 1.7.0

package/dist/index.d.cts

@@ -198,8 +198,9 @@ type RuntimeContextHandle = typeof runtimeContext;
  *                                         call)
  *   successful traces            : 1%    (head sampling, configurable)
  *   request metrics              : aggregated every 60 s, keyed by route
- *                                  template (Express routes detected
- *                                  out of the box — see captureExpressRoute)
+ *                                  template (Express and Next.js routes
+ *                                  detected out of the box — see
+ *                                  captureRequestRoute, route-label.ts)
  *   operation / request summaries: 100%  (withRuntimeOperation,
  *                                         autterRequests, … — one wide
  *                                         record per unit of work, never

package/dist/index.d.ts

@@ -198,8 +198,9 @@ type RuntimeContextHandle = typeof runtimeContext;
  *                                         call)
  *   successful traces            : 1%    (head sampling, configurable)
  *   request metrics              : aggregated every 60 s, keyed by route
- *                                  template (Express routes detected
- *                                  out of the box — see captureExpressRoute)
+ *                                  template (Express and Next.js routes
+ *                                  detected out of the box — see
+ *                                  captureRequestRoute, route-label.ts)
  *   operation / request summaries: 100%  (withRuntimeOperation,
  *                                         autterRequests, … — one wide
  *                                         record per unit of work, never

package/dist/index.js

@@ -45,10 +45,10 @@ import {
   splitFingerprint,
   toClientError,
   withRuntimeOperation
-} from "./chunk-5KISVAVB.js";
+} from "./chunk-KA4AOZX2.js";
 import {
   runDoctor
-} from "./chunk-L5ENELB2.js";
+} from "./chunk-QUC6OUE7.js";
 import {
   COMPAT_MANIFEST,
   CountingExporter,
@@ -70,7 +70,7 @@ import {
   sharedSlot,
   telemetryStats,
   unregisterFlushTargets
-} from "./chunk-HRDELHZP.js";
+} from "./chunk-LG52CW3V.js";
 
 // src/relay.ts
 var IpWindow = class {
@@ -441,6 +441,9 @@ function createBrowserRelayHandler(opts) {
 }
 
 // src/server.ts
+import { errorMonitor } from "events";
+import { createRequire } from "module";
+import { join } from "path";
 import { ServerResponse } from "http";
 import { randomUUID } from "crypto";
 import {
@@ -450,7 +453,7 @@ import {
   SpanStatusCode,
   TraceFlags
 } from "@opentelemetry/api";
-import { getRPCMetadata as getRPCMetadata2, RPCType as RPCType2 } from "@opentelemetry/core";
+import { getRPCMetadata as getRPCMetadata3, RPCType as RPCType3 } from "@opentelemetry/core";
 import {
   AggregationTemporalityPreference,
   OTLPMetricExporter
@@ -1276,6 +1279,40 @@ function installUnhandledRejectionCapture(capture, mode = unhandledRejectionsMod
   };
 }
 
+// src/route-label.ts
+import { getRPCMetadata as getRPCMetadata2, RPCType as RPCType2 } from "@opentelemetry/core";
+var ours = /* @__PURE__ */ new WeakMap();
+var RAW_PATH_SPAN_TYPES = /* @__PURE__ */ new Set(["BaseServer.renderToResponse"]);
+function noteFrameworkRoute(parent, attributes) {
+  const route = attributes?.["next.route"];
+  if (typeof route !== "string" || !route.startsWith("/")) return;
+  if (RAW_PATH_SPAN_TYPES.has(String(attributes?.["next.span_type"] ?? ""))) return;
+  const rpc = getRPCMetadata2(parent);
+  if (!rpc || rpc.type !== RPCType2.HTTP) return;
+  const mine = ours.get(rpc);
+  if (rpc.route !== void 0 && rpc.route !== mine) return;
+  if (mine !== void 0 && mine.includes("[") && !route.includes("[")) return;
+  if (mine !== void 0 && (route === `${mine}/route` || route === `${mine}/page`)) return;
+  rpc.route = route;
+  ours.set(rpc, route);
+}
+var RouteLabelSampler = class {
+  constructor(delegate) {
+    this.delegate = delegate;
+  }
+  delegate;
+  shouldSample(ctx, traceId, spanName, spanKind, attributes, links) {
+    try {
+      noteFrameworkRoute(ctx, attributes);
+    } catch {
+    }
+    return this.delegate.shouldSample(ctx, traceId, spanName, spanKind, attributes, links);
+  }
+  toString() {
+    return `RouteLabel(${this.delegate.toString()})`;
+  }
+};
+
 // src/server.ts
 var S = sharedSlot("server", () => ({
   active: null,
@@ -1597,17 +1634,33 @@ function recordError(span, err) {
 function redactWithActive(attributes) {
   return S.redactor(attributes);
 }
-function captureExpressRoute(_span, response) {
+function patchLoadedHttpModules() {
+  try {
+    const load = createRequire(join(process.cwd(), "autter-runtime-http.cjs"));
+    load("http");
+    load("https");
+  } catch {
+  }
+}
+var METRIC_ROUTE_ATTR = "autter.metric_has_route";
+function captureRequestRoute(span, response) {
   if (!(response instanceof ServerResponse)) return;
-  const rpcMetadata = getRPCMetadata2(context2.active());
-  if (rpcMetadata?.type !== RPCType2.HTTP) return;
+  const rpcMetadata = getRPCMetadata3(context2.active());
+  if (rpcMetadata?.type !== RPCType3.HTTP) return;
+  let failed = false;
+  response.on(errorMonitor, () => {
+    failed = true;
+  });
   const setRoute = () => {
     if (rpcMetadata.route) return;
     const route = expressRouteOf(response.req);
     if (route) rpcMetadata.route = route;
   };
   response.prependListener("finish", setRoute);
-  response.prependListener("close", setRoute);
+  response.prependListener("close", () => {
+    setRoute();
+    if (rpcMetadata.route && !failed) span.setAttribute(METRIC_ROUTE_ATTR, true);
+  });
   if (S.hookRequests) startHookRequest(response);
 }
 function structuredErrorAttributes(error) {
@@ -1656,8 +1709,14 @@ function initAutterServer(options) {
     "telemetry.distro.version": distro.version,
     // Tells the ingester request metrics arrive on the metrics pipe, so
     // it must not also fold our server spans into usage rollups (that
-    // would double-count every sampled request).
-    "autter.metrics_wired": true
+    // would double-count every sampled request)...
+    "autter.metrics_wired": true,
+    // ...for the requests whose metric carries their route: those
+    // request spans say so (`autter.metric_has_route`, see
+    // captureRequestRoute). Ingesters honour metrics_wired only with
+    // this, so an older SDK, whose Next.js metrics have no route, keeps
+    // its span-fed per-route counts.
+    "autter.metrics_routes": true
   });
   const rootSampler = new TraceIdRatioBasedSampler(options.traceSampleRate ?? 0.01);
   const headSampler = new ParentBasedSampler({
@@ -1674,6 +1733,7 @@ function initAutterServer(options) {
   const retainTraces = retainOnError || slowThresholdMs > 0;
   let sampler = retainTraces ? new RecordUnsampledSampler(headSampler) : headSampler;
   if (options.llmTracing !== false) sampler = new LlmAwareSampler(sampler);
+  sampler = new RouteLabelSampler(sampler);
   const errorTraceBuffer = retainTraces ? new ErrorTraceRetentionProcessor(
     new BatchSpanProcessor(traceExporter(), { scheduledDelayMillis: 2e3 }),
     retainOnError,
@@ -1712,11 +1772,12 @@ function initAutterServer(options) {
       ) })
     ],
     instrumentations: [
-      new HttpInstrumentation({ responseHook: captureExpressRoute }),
+      new HttpInstrumentation({ responseHook: captureRequestRoute }),
       ...options.instrumentations ?? []
     ]
   });
   sdk.start();
+  patchLoadedHttpModules();
   const stopMemoryMetrics = options.memoryMetrics === false ? null : startMemoryMetrics();
   noteCompatFeature("endpoint_latency");
   if (stopMemoryMetrics) noteCompatFeature("memory_metrics");

package/dist/testing.cjs

@@ -2,22 +2,22 @@
 
 
 
-var _chunkUXTIMS3Gcjs = require('./chunk-UXTIMS3G.cjs');
-require('./chunk-4MVWIRBI.cjs');
+var _chunkRV4MJNM2cjs = require('./chunk-RV4MJNM2.cjs');
+require('./chunk-GYTQLITW.cjs');
 
 // src/testing.ts
 function captureRuntime() {
-  const sink = _chunkUXTIMS3Gcjs.memorySink.call(void 0, );
-  const remove = _chunkUXTIMS3Gcjs.addRuntimeSink.call(void 0, sink);
+  const sink = _chunkRV4MJNM2cjs.memorySink.call(void 0, );
+  const remove = _chunkRV4MJNM2cjs.addRuntimeSink.call(void 0, sink);
   return {
     get events() {
       return [...sink.events];
     },
     get operations() {
-      return sink.events.filter(_chunkUXTIMS3Gcjs.isSummary);
+      return sink.events.filter(_chunkRV4MJNM2cjs.isSummary);
     },
     get logs() {
-      return sink.events.filter((event) => !_chunkUXTIMS3Gcjs.isSummary.call(void 0, event));
+      return sink.events.filter((event) => !_chunkRV4MJNM2cjs.isSummary.call(void 0, event));
     },
     get exceptions() {
       return [...sink.exceptions];
@@ -98,7 +98,7 @@ var OperationExpectation = class {
   }
 };
 function expectOperation(source, name) {
-  const events = Array.isArray(source) ? source.filter(_chunkUXTIMS3Gcjs.isSummary) : source.operations;
+  const events = Array.isArray(source) ? source.filter(_chunkRV4MJNM2cjs.isSummary) : source.operations;
   const matches = events.filter((event2) => {
     const actual = String(_nullishCoalesce(event2.attributes["autter.operation.name"], () => ( "")));
     return typeof name === "string" ? actual === name : name.test(actual);
@@ -118,4 +118,4 @@ function expectOperation(source, name) {
 
 
 
-exports.captureRuntime = captureRuntime; exports.expectOperation = expectOperation; exports.memorySink = _chunkUXTIMS3Gcjs.memorySink;
+exports.captureRuntime = captureRuntime; exports.expectOperation = expectOperation; exports.memorySink = _chunkRV4MJNM2cjs.memorySink;

package/dist/testing.js

@@ -2,8 +2,8 @@ import {
   addRuntimeSink,
   isSummary,
   memorySink
-} from "./chunk-5KISVAVB.js";
-import "./chunk-HRDELHZP.js";
+} from "./chunk-KA4AOZX2.js";
+import "./chunk-LG52CW3V.js";
 
 // src/testing.ts
 function captureRuntime() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@autter/runtime-node",
-	"version": "1.6.1",
+	"version": "1.7.0",
 	"description": "Autter Runtime for Node.js: request wide events, coded errors, operation logging, same-origin browser relay and a curated OpenTelemetry server tracker",
 	"license": "MIT",
 	"type": "module",