autotel-adapters 2.0.8 → 2.0.9

package/dist/cloudflare.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
 
@@ -15,13 +15,13 @@ function enrichFromRequest(request) {
 	}
 	const requestId = require_core.getHeader(request.headers, "x-request-id") ?? require_core.getHeader(request.headers, "cf-ray");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...request.url ? { "url.full": request.url } : {},
-		...route ? { "http.route": route } : {},
-		...requestId ? { "http.request.id": requestId } : {},
-		...request.cf?.country ? { "cloudflare.country": request.cf.country } : {},
-		...request.cf?.colo ? { "cloudflare.colo": request.cf.colo } : {},
-		...request.cf?.city ? { "cloudflare.city": request.cf.city } : {}
+		"http.request.method": request.method,
+		"url.full": request.url,
+		"http.route": route,
+		"http.request.id": requestId,
+		"cloudflare.country": request.cf?.country,
+		"cloudflare.colo": request.cf?.colo,
+		"cloudflare.city": request.cf?.city
 	};
 }
 const baseUseLogger = require_core.createUseLogger({

package/dist/cloudflare.d.cts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-D_rlU8Nx.cjs";
+import { n as FrameworkHandlerOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/cloudflare.d.ts

package/dist/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-BAs5uTiD.js";
+import { n as FrameworkHandlerOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/cloudflare.d.ts

package/dist/cloudflare.js

@@ -1,4 +1,4 @@
-import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, n as buildTracedOptions, t as applyLoggerEnrichment } from "./integration-DvibHRzI.js";
+import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, n as buildTracedOptions, t as applyLoggerEnrichment } from "./integration-CfkaoVmE.js";
 import { createUseLogger, getHeader } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
 
@@ -14,13 +14,13 @@ function enrichFromRequest(request) {
 	}
 	const requestId = getHeader(request.headers, "x-request-id") ?? getHeader(request.headers, "cf-ray");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...request.url ? { "url.full": request.url } : {},
-		...route ? { "http.route": route } : {},
-		...requestId ? { "http.request.id": requestId } : {},
-		...request.cf?.country ? { "cloudflare.country": request.cf.country } : {},
-		...request.cf?.colo ? { "cloudflare.colo": request.cf.colo } : {},
-		...request.cf?.city ? { "cloudflare.city": request.cf.city } : {}
+		"http.request.method": request.method,
+		"url.full": request.url,
+		"http.route": route,
+		"http.request.id": requestId,
+		"cloudflare.country": request.cf?.country,
+		"cloudflare.colo": request.cf?.colo,
+		"cloudflare.city": request.cf?.city
 	};
 }
 const baseUseLogger = createUseLogger({

package/dist/core.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 let autotel = require("autotel");
 let autotel_edge = require("autotel-edge");
 
@@ -29,7 +29,7 @@ function createRequestRunner(storage) {
 	return function runRequest(spanName, enrich, handler, options) {
 		if (options?.path && !(0, autotel_edge.shouldInstrumentPath)(options.path, options)) return Promise.resolve(handler());
 		const loggerOptions = require_integration.mergeRequestLoggerOptions(options?.requestLoggerOptions, options?.waitUntil);
-		return (0, autotel.withTracing)({ name: spanName })((ctx) => async () => {
+		return autotel.trace.run(spanName, async (ctx) => {
 			const log = (0, autotel.getRequestLogger)(ctx, loggerOptions);
 			enrich(log);
 			try {
@@ -40,7 +40,7 @@ function createRequestRunner(storage) {
 			} finally {
 				if (options?.autoEmit !== false) log.emitNow(options?.finalize?.());
 			}
-		})();
+		});
 	};
 }
 function resolveEnv(envKeys) {

package/dist/core.d.cts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-D_rlU8Nx.cjs";
+import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-D9g_qI5y.cjs";
 import { DrainPipelineOptions, ParsedError, PipelineDrainFn, RequestLogSnapshot, RequestLogger, RequestLoggerOptions, StructuredError, StructuredErrorInput } from "autotel";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/core.d.ts

package/dist/core.d.ts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-BAs5uTiD.js";
+import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-CQMpu5E4.js";
 import { DrainPipelineOptions, ParsedError, PipelineDrainFn, RequestLogSnapshot, RequestLogger, RequestLoggerOptions, StructuredError, StructuredErrorInput } from "autotel";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/core.d.ts

package/dist/core.js

@@ -1,5 +1,5 @@
-import { d as mergeRequestLoggerOptions, f as shouldInstrumentPath, o as toRouteAdapterOptions } from "./integration-DvibHRzI.js";
-import { getRequestLogger, withTracing } from "autotel";
+import { d as mergeRequestLoggerOptions, f as shouldInstrumentPath, o as toRouteAdapterOptions } from "./integration-CfkaoVmE.js";
+import { getRequestLogger, trace } from "autotel";
 
 //#region src/core.ts
 function createUseLogger(options) {
@@ -27,7 +27,7 @@ function createRequestRunner(storage) {
 	return function runRequest(spanName, enrich, handler, options) {
 		if (options?.path && !shouldInstrumentPath(options.path, options)) return Promise.resolve(handler());
 		const loggerOptions = mergeRequestLoggerOptions(options?.requestLoggerOptions, options?.waitUntil);
-		return withTracing({ name: spanName })((ctx) => async () => {
+		return trace.run(spanName, async (ctx) => {
 			const log = getRequestLogger(ctx, loggerOptions);
 			enrich(log);
 			try {
@@ -38,7 +38,7 @@ function createRequestRunner(storage) {
 			} finally {
 				if (options?.autoEmit !== false) log.emitNow(options?.finalize?.());
 			}
-		})();
+		});
 	};
 }
 function resolveEnv(envKeys) {

package/dist/elysia.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_toolkit_storage = require('./toolkit/storage.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
@@ -13,7 +13,7 @@ function enrichFromContext(ctx) {
 		"http.request.method": ctx.request.method,
 		"url.full": ctx.request.url,
 		"http.route": ctx.path,
-		...requestId ? { "http.request.id": requestId } : {}
+		"http.request.id": requestId
 	};
 }
 const integration = require_integration.defineFrameworkIntegration({

package/dist/elysia.d.cts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-D_rlU8Nx.cjs";
+import { n as FrameworkHandlerOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/elysia.d.ts

package/dist/elysia.d.ts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-BAs5uTiD.js";
+import { n as FrameworkHandlerOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/elysia.d.ts

package/dist/elysia.js

@@ -1,4 +1,4 @@
-import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-DvibHRzI.js";
+import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-CfkaoVmE.js";
 import { createLoggerStorage } from "./toolkit/storage.js";
 import { getHeader } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
@@ -12,7 +12,7 @@ function enrichFromContext(ctx) {
 		"http.request.method": ctx.request.method,
 		"url.full": ctx.request.url,
 		"http.route": ctx.path,
-		...requestId ? { "http.request.id": requestId } : {}
+		"http.request.id": requestId
 	};
 }
 const integration = defineFrameworkIntegration({

package/dist/express.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
 let node_async_hooks = require("node:async_hooks");
@@ -18,10 +18,10 @@ function enrichFromRequest(request) {
 	const route = request.route?.path ?? request.path ?? url;
 	const requestId = headerValue(request.headers, "x-request-id");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...url ? { "url.full": url } : {},
-		...route ? { "http.route": route } : {},
-		...requestId ? { "http.request.id": requestId } : {}
+		"http.request.method": request.method,
+		"url.full": url,
+		"http.route": route,
+		"http.request.id": requestId
 	};
 }
 const baseUseLogger = require_core.createUseLogger({

package/dist/express.d.cts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions } from "./integration-D_rlU8Nx.cjs";
+import { _ as RouteAdapterOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/express.d.ts

package/dist/express.d.ts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions } from "./integration-BAs5uTiD.js";
+import { _ as RouteAdapterOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/express.d.ts

package/dist/express.js

@@ -1,4 +1,4 @@
-import { o as toRouteAdapterOptions } from "./integration-DvibHRzI.js";
+import { o as toRouteAdapterOptions } from "./integration-CfkaoVmE.js";
 import { createRequestRunner, createUseLogger } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -17,10 +17,10 @@ function enrichFromRequest(request) {
 	const route = request.route?.path ?? request.path ?? url;
 	const requestId = headerValue(request.headers, "x-request-id");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...url ? { "url.full": url } : {},
-		...route ? { "http.route": route } : {},
-		...requestId ? { "http.request.id": requestId } : {}
+		"http.request.method": request.method,
+		"url.full": url,
+		"http.route": route,
+		"http.request.id": requestId
 	};
 }
 const baseUseLogger = createUseLogger({

package/dist/fastify.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
 let node_async_hooks = require("node:async_hooks");
@@ -17,10 +17,10 @@ function enrichFromRequest(request) {
 	const route = request.routeOptions?.url ?? request.routerPath ?? request.url;
 	const requestId = request.id ?? headerValue(request.headers, "x-request-id");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...request.url ? { "url.full": request.url } : {},
-		...route ? { "http.route": route } : {},
-		...requestId ? { "http.request.id": requestId } : {}
+		"http.request.method": request.method,
+		"url.full": request.url,
+		"http.route": route,
+		"http.request.id": requestId
 	};
 }
 const baseUseLogger = require_core.createUseLogger({

package/dist/fastify.d.cts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions } from "./integration-D_rlU8Nx.cjs";
+import { _ as RouteAdapterOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/fastify.d.ts

package/dist/fastify.d.ts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions } from "./integration-BAs5uTiD.js";
+import { _ as RouteAdapterOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/fastify.d.ts

package/dist/fastify.js

@@ -1,4 +1,4 @@
-import { o as toRouteAdapterOptions } from "./integration-DvibHRzI.js";
+import { o as toRouteAdapterOptions } from "./integration-CfkaoVmE.js";
 import { createRequestRunner, createUseLogger } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -16,10 +16,10 @@ function enrichFromRequest(request) {
 	const route = request.routeOptions?.url ?? request.routerPath ?? request.url;
 	const requestId = request.id ?? headerValue(request.headers, "x-request-id");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...request.url ? { "url.full": request.url } : {},
-		...route ? { "http.route": route } : {},
-		...requestId ? { "http.request.id": requestId } : {}
+		"http.request.method": request.method,
+		"url.full": request.url,
+		"http.route": route,
+		"http.request.id": requestId
 	};
 }
 const baseUseLogger = createUseLogger({

package/dist/hono.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_toolkit_storage = require('./toolkit/storage.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");

package/dist/hono.d.cts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-D_rlU8Nx.cjs";
+import { n as FrameworkHandlerOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { Context } from "hono";

package/dist/hono.d.ts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-BAs5uTiD.js";
+import { n as FrameworkHandlerOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { Context } from "hono";

package/dist/hono.js

@@ -1,4 +1,4 @@
-import { i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-DvibHRzI.js";
+import { i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-CfkaoVmE.js";
 import { createLoggerStorage } from "./toolkit/storage.js";
 import { createUseLogger } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_core = require('./core.cjs');
 const require_next = require('./next.cjs');
 const require_nitro = require('./nitro.cjs');

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-D_rlU8Nx.cjs";
+import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-D9g_qI5y.cjs";
 import { AdapterUseLoggerOptions, BaseAdapterOptions, ConfigField, DrainPipelineOptions, HeadersLike, ParsedError, PipelineDrainFn, RequestLogSnapshot, RequestLogger, RequestLoggerOptions, RequestRunnerOptions, StructuredError, StructuredErrorInput, createRequestRunner, createUseLogger, getHeader, resolveAdapterConfig, shouldProbeRuntime } from "./core.cjs";
 import { withAutotelFetch } from "./cloudflare.cjs";
 import { autotel, useLogger, withAutotelHandler } from "./elysia.cjs";

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-BAs5uTiD.js";
+import { _ as RouteAdapterOptions, f as toRouteAdapterOptions, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions } from "./integration-CQMpu5E4.js";
 import { AdapterUseLoggerOptions, BaseAdapterOptions, ConfigField, DrainPipelineOptions, HeadersLike, ParsedError, PipelineDrainFn, RequestLogSnapshot, RequestLogger, RequestLoggerOptions, RequestRunnerOptions, StructuredError, StructuredErrorInput, createRequestRunner, createUseLogger, getHeader, resolveAdapterConfig, shouldProbeRuntime } from "./core.js";
 import { withAutotelFetch } from "./cloudflare.js";
 import { autotel, useLogger, withAutotelHandler } from "./elysia.js";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { o as toRouteAdapterOptions } from "./integration-DvibHRzI.js";
+import { o as toRouteAdapterOptions } from "./integration-CfkaoVmE.js";
 import { createRequestRunner, createUseLogger, getHeader, resolveAdapterConfig, shouldProbeRuntime } from "./core.js";
 import { withAutotel } from "./next.js";
 import { withAutotelEventHandler } from "./nitro.js";

package/dist/{integration-BAs5uTiD.d.ts → integration-CQMpu5E4.d.ts}

@@ -65,7 +65,7 @@ interface ExtractedRequest {
 interface IntegratedCompletionOptions {
   autoEmit?: boolean;
   /** Return false for framework control-flow throws that are not failures. */
-  isError?: (error: unknown) => boolean;
+  isError?: (cause: unknown) => boolean;
 }
 type TracedOptionInput = RouteAdapterOptions & {
   requestLoggerOptions?: RequestLoggerOptions;

package/dist/{integration-DvibHRzI.js → integration-CfkaoVmE.js}

@@ -1,5 +1,5 @@
 import { createStorageForkLifecycle } from "./toolkit/storage.js";
-import { createNoopRequestLogger, getRequestLogger, withTracing } from "autotel";
+import { createNoopRequestLogger, getRequestLogger, trace } from "autotel";
 import { getServiceForPath, matchesRoutePattern, shouldInstrumentPath } from "autotel-edge";
 
 //#region src/toolkit/deferred-drain.ts
@@ -155,7 +155,7 @@ async function performFinish(logger, options, startedAt, opts) {
 	}
 	const mergedOverrides = {
 		...overrides ?? {},
-		...tailCtx.shouldKeep ? { "autotel.sampling.tail.keep": true } : {}
+		"autotel.sampling.tail.keep": true
 	};
 	return logger.emitNow(Object.keys(mergedOverrides).length > 0 ? mergedOverrides : void 0);
 }
@@ -276,7 +276,7 @@ function buildHandle(spec, ctx, traceCtx, options = {}) {
 	log.set({
 		"http.request.method": extracted.method,
 		"http.route": extracted.path,
-		...extracted.requestId ? { "http.request.id": extracted.requestId } : {}
+		"http.request.id": extracted.requestId
 	});
 	if (spec.storage) attachForkToLogger(log, spec.forkLifecycle ?? createStorageForkLifecycle(spec.storage));
 	spec.attachLogger(ctx, log);
@@ -324,12 +324,13 @@ function defineFrameworkIntegration(spec) {
 		runTraced(ctx, options, handler, completion) {
 			const extracted = spec.extractRequest(ctx);
 			if (!shouldInstrumentPath(extracted.path, toRouteAdapterOptions(options))) return handler(buildSkippedHandle(spec, ctx, extracted, options));
-			return withTracing({
-				name: options?.spanName ?? resolveSpanName(spec, ctx, extracted),
+			const spanName = options?.spanName ?? resolveSpanName(spec, ctx, extracted);
+			return trace.run({
+				name: spanName,
 				isError: completion?.isError
-			})((traceCtx) => async () => {
+			}, (traceCtx) => {
 				return handler(buildHandle(spec, ctx, traceCtx, options ?? {}));
-			})();
+			});
 		}
 	};
 }

package/dist/{integration-D_rlU8Nx.d.cts → integration-D9g_qI5y.d.cts}

@@ -65,7 +65,7 @@ interface ExtractedRequest {
 interface IntegratedCompletionOptions {
   autoEmit?: boolean;
   /** Return false for framework control-flow throws that are not failures. */
-  isError?: (error: unknown) => boolean;
+  isError?: (cause: unknown) => boolean;
 }
 type TracedOptionInput = RouteAdapterOptions & {
   requestLoggerOptions?: RequestLoggerOptions;

package/dist/{integration-Cc8bXel_.cjs → integration-pKawIXb6.cjs}

@@ -155,7 +155,7 @@ async function performFinish(logger, options, startedAt, opts) {
 	}
 	const mergedOverrides = {
 		...overrides ?? {},
-		...tailCtx.shouldKeep ? { "autotel.sampling.tail.keep": true } : {}
+		"autotel.sampling.tail.keep": true
 	};
 	return logger.emitNow(Object.keys(mergedOverrides).length > 0 ? mergedOverrides : void 0);
 }
@@ -276,7 +276,7 @@ function buildHandle(spec, ctx, traceCtx, options = {}) {
 	log.set({
 		"http.request.method": extracted.method,
 		"http.route": extracted.path,
-		...extracted.requestId ? { "http.request.id": extracted.requestId } : {}
+		"http.request.id": extracted.requestId
 	});
 	if (spec.storage) attachForkToLogger(log, spec.forkLifecycle ?? require_toolkit_storage.createStorageForkLifecycle(spec.storage));
 	spec.attachLogger(ctx, log);
@@ -324,12 +324,13 @@ function defineFrameworkIntegration(spec) {
 		runTraced(ctx, options, handler, completion) {
 			const extracted = spec.extractRequest(ctx);
 			if (!(0, autotel_edge.shouldInstrumentPath)(extracted.path, toRouteAdapterOptions(options))) return handler(buildSkippedHandle(spec, ctx, extracted, options));
-			return (0, autotel.withTracing)({
-				name: options?.spanName ?? resolveSpanName(spec, ctx, extracted),
+			const spanName = options?.spanName ?? resolveSpanName(spec, ctx, extracted);
+			return autotel.trace.run({
+				name: spanName,
 				isError: completion?.isError
-			})((traceCtx) => async () => {
+			}, (traceCtx) => {
 				return handler(buildHandle(spec, ctx, traceCtx, options ?? {}));
-			})();
+			});
 		}
 	};
 }

package/dist/nestjs.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_toolkit_storage = require('./toolkit/storage.cjs');
 let autotel = require("autotel");
 let rxjs = require("rxjs");
@@ -11,9 +11,9 @@ function enrichFromRequest(request) {
 	const url = request.originalUrl ?? request.url;
 	const route = request.path ?? url;
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...url ? { "url.full": url } : {},
-		...route ? { "http.route": route } : {}
+		"http.request.method": request.method,
+		"url.full": url,
+		"http.route": route
 	};
 }
 const integration = require_integration.defineFrameworkIntegration({
@@ -98,8 +98,8 @@ var AutotelInterceptor = class {
 				}));
 			}).then(() => {
 				if (!cancelled) subscriber.complete();
-			}, (error) => {
-				if (!cancelled) subscriber.error(error);
+			}, (cause) => {
+				if (!cancelled) subscriber.error(cause);
 			});
 			return () => {
 				cancelled = true;

package/dist/nestjs.d.cts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-D_rlU8Nx.cjs";
+import { n as FrameworkHandlerOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { Observable } from "rxjs";

package/dist/nestjs.d.ts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-BAs5uTiD.js";
+import { n as FrameworkHandlerOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { Observable } from "rxjs";

package/dist/nestjs.js

@@ -1,4 +1,4 @@
-import { i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-DvibHRzI.js";
+import { i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-CfkaoVmE.js";
 import { createLoggerStorage } from "./toolkit/storage.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { Observable, from, isObservable } from "rxjs";
@@ -10,9 +10,9 @@ function enrichFromRequest(request) {
 	const url = request.originalUrl ?? request.url;
 	const route = request.path ?? url;
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...url ? { "url.full": url } : {},
-		...route ? { "http.route": route } : {}
+		"http.request.method": request.method,
+		"url.full": url,
+		"http.route": route
 	};
 }
 const integration = defineFrameworkIntegration({
@@ -97,8 +97,8 @@ var AutotelInterceptor = class {
 				}));
 			}).then(() => {
 				if (!cancelled) subscriber.complete();
-			}, (error) => {
-				if (!cancelled) subscriber.error(error);
+			}, (cause) => {
+				if (!cancelled) subscriber.error(cause);
 			});
 			return () => {
 				cancelled = true;

package/dist/next.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_toolkit_storage = require('./toolkit/storage.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
@@ -11,16 +11,16 @@ let next_navigation_js = require("next/navigation.js");
 * into responses. Delegate classification to Next itself so new signal types
 * and signals wrapped in `cause` stay covered without duplicating its internals.
 */
-function findNextControlFlowSignal(error) {
+function findNextControlFlowSignal(cause) {
 	try {
-		(0, next_navigation_js.unstable_rethrow)(error);
+		(0, next_navigation_js.unstable_rethrow)(cause);
 		return null;
 	} catch (signal) {
 		return signal;
 	}
 }
-function isRealNextError(error) {
-	return findNextControlFlowSignal(error) === null;
+function isRealNextError(cause) {
+	return findNextControlFlowSignal(cause) === null;
 }
 const { storage: nextLoggerStorage, useLogger: storageUseLogger } = require_toolkit_storage.createLoggerStorage("request context. Wrap handlers with withAutotel() first.");
 function enrichFromRequest(request) {
@@ -33,9 +33,9 @@ function enrichFromRequest(request) {
 	}
 	const requestId = require_core.getHeader(request.headers, "x-request-id");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...request.url ? { "url.full": request.url } : {},
-		...route ? { "http.route": route } : {},
+		"http.request.method": request.method,
+		"url.full": request.url,
+		"http.route": route,
 		...requestId ? { "http.request.header.x-request-id": requestId } : {}
 	};
 }

package/dist/next.d.cts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-D_rlU8Nx.cjs";
+import { n as FrameworkHandlerOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/next.d.ts

package/dist/next.d.ts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-BAs5uTiD.js";
+import { n as FrameworkHandlerOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/next.d.ts

package/dist/next.js

@@ -1,4 +1,4 @@
-import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, n as buildTracedOptions, t as applyLoggerEnrichment } from "./integration-DvibHRzI.js";
+import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, n as buildTracedOptions, t as applyLoggerEnrichment } from "./integration-CfkaoVmE.js";
 import { createLoggerStorage } from "./toolkit/storage.js";
 import { createUseLogger, getHeader } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
@@ -10,16 +10,16 @@ import { unstable_rethrow } from "next/navigation.js";
 * into responses. Delegate classification to Next itself so new signal types
 * and signals wrapped in `cause` stay covered without duplicating its internals.
 */
-function findNextControlFlowSignal(error) {
+function findNextControlFlowSignal(cause) {
 	try {
-		unstable_rethrow(error);
+		unstable_rethrow(cause);
 		return null;
 	} catch (signal) {
 		return signal;
 	}
 }
-function isRealNextError(error) {
-	return findNextControlFlowSignal(error) === null;
+function isRealNextError(cause) {
+	return findNextControlFlowSignal(cause) === null;
 }
 const { storage: nextLoggerStorage, useLogger: storageUseLogger } = createLoggerStorage("request context. Wrap handlers with withAutotel() first.");
 function enrichFromRequest(request) {
@@ -32,9 +32,9 @@ function enrichFromRequest(request) {
 	}
 	const requestId = getHeader(request.headers, "x-request-id");
 	return {
-		...request.method ? { "http.request.method": request.method } : {},
-		...request.url ? { "url.full": request.url } : {},
-		...route ? { "http.route": route } : {},
+		"http.request.method": request.method,
+		"url.full": request.url,
+		"http.route": route,
 		...requestId ? { "http.request.header.x-request-id": requestId } : {}
 	};
 }

package/dist/nitro.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_toolkit_storage = require('./toolkit/storage.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
@@ -8,8 +8,8 @@ let autotel = require("autotel");
 function enrichFromEvent(event) {
 	if (!event) return void 0;
 	return {
-		...event.method ? { "http.request.method": event.method } : {},
-		...event.path ? { "http.route": event.path } : {},
+		"http.request.method": event.method,
+		"http.route": event.path,
 		...typeof event.context?.requestId === "string" ? { "http.request.id": event.context.requestId } : {}
 	};
 }

package/dist/nitro.d.cts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-D_rlU8Nx.cjs";
+import { n as FrameworkHandlerOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/nitro.d.ts

package/dist/nitro.d.ts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-BAs5uTiD.js";
+import { n as FrameworkHandlerOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/nitro.d.ts

package/dist/nitro.js

@@ -1,4 +1,4 @@
-import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, n as buildTracedOptions, t as applyLoggerEnrichment } from "./integration-DvibHRzI.js";
+import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, n as buildTracedOptions, t as applyLoggerEnrichment } from "./integration-CfkaoVmE.js";
 import { createLoggerStorage } from "./toolkit/storage.js";
 import { createUseLogger } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
@@ -7,8 +7,8 @@ import { createDrainPipeline, createStructuredError, parseError } from "autotel"
 function enrichFromEvent(event) {
 	if (!event) return void 0;
 	return {
-		...event.method ? { "http.request.method": event.method } : {},
-		...event.path ? { "http.route": event.path } : {},
+		"http.request.method": event.method,
+		"http.route": event.path,
 		...typeof event.context?.requestId === "string" ? { "http.request.id": event.context.requestId } : {}
 	};
 }

package/dist/sveltekit.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('./integration-Cc8bXel_.cjs');
+const require_integration = require('./integration-pKawIXb6.cjs');
 const require_toolkit_storage = require('./toolkit/storage.cjs');
 let autotel = require("autotel");
 

package/dist/sveltekit.d.cts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-D_rlU8Nx.cjs";
+import { n as FrameworkHandlerOptions } from "./integration-D9g_qI5y.cjs";
 import "./core.cjs";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/sveltekit.d.ts

package/dist/sveltekit.d.ts

@@ -1,4 +1,4 @@
-import { n as FrameworkHandlerOptions } from "./integration-BAs5uTiD.js";
+import { n as FrameworkHandlerOptions } from "./integration-CQMpu5E4.js";
 import "./core.js";
 import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/sveltekit.d.ts

package/dist/sveltekit.js

@@ -1,4 +1,4 @@
-import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-DvibHRzI.js";
+import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-CfkaoVmE.js";
 import { createLoggerStorage } from "./toolkit/storage.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
 

package/dist/tanstack.cjs

@@ -5,8 +5,8 @@ const require_core = require('./core.cjs');
 const useLogger = require_core.createUseLogger({
 	adapterName: "tanstack",
 	enrich: (ctx) => ({
-		...ctx.method ? { "http.request.method": ctx.method } : {},
-		...ctx.pathname ? { "http.route": ctx.pathname } : {}
+		"http.request.method": ctx.method,
+		"http.route": ctx.pathname
 	})
 });
 

package/dist/tanstack.js

@@ -4,8 +4,8 @@ import { createUseLogger } from "./core.js";
 const useLogger = createUseLogger({
 	adapterName: "tanstack",
 	enrich: (ctx) => ({
-		...ctx.method ? { "http.request.method": ctx.method } : {},
-		...ctx.pathname ? { "http.route": ctx.pathname } : {}
+		"http.request.method": ctx.method,
+		"http.route": ctx.pathname
 	})
 });
 

package/dist/toolkit/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_integration = require('../integration-Cc8bXel_.cjs');
+const require_integration = require('../integration-pKawIXb6.cjs');
 const require_toolkit_storage = require('./storage.cjs');
 let autotel_edge = require("autotel-edge");
 

package/dist/toolkit/index.d.cts

@@ -1,4 +1,4 @@
-import { C as matchesRoutePattern, S as getServiceForPath, T as shouldInstrumentPath, _ as RouteAdapterOptions, a as FrameworkRequestHandle, b as TailSamplingContext, c as buildTracedOptions, d as runWithIntegratedHandle, f as toRouteAdapterOptions, g as MiddlewareLoggerResult, h as MiddlewareLoggerOptions, i as FrameworkIntegrationSpec, l as completeIntegratedRequest, m as ForkLifecycle, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions, p as BaseAdapterOptions, r as FrameworkIntegrationHelpers, s as applyLoggerEnrichment, t as ExtractedRequest, u as defineFrameworkIntegration, v as RouteFilterOptions, w as mergeRequestLoggerOptions, x as createMiddlewareLogger, y as RouteServiceConfig } from "../integration-D_rlU8Nx.cjs";
+import { C as matchesRoutePattern, S as getServiceForPath, T as shouldInstrumentPath, _ as RouteAdapterOptions, a as FrameworkRequestHandle, b as TailSamplingContext, c as buildTracedOptions, d as runWithIntegratedHandle, f as toRouteAdapterOptions, g as MiddlewareLoggerResult, h as MiddlewareLoggerOptions, i as FrameworkIntegrationSpec, l as completeIntegratedRequest, m as ForkLifecycle, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions, p as BaseAdapterOptions, r as FrameworkIntegrationHelpers, s as applyLoggerEnrichment, t as ExtractedRequest, u as defineFrameworkIntegration, v as RouteFilterOptions, w as mergeRequestLoggerOptions, x as createMiddlewareLogger, y as RouteServiceConfig } from "../integration-D9g_qI5y.cjs";
 import { createLoggerStorage, createStorageForkLifecycle } from "./storage.cjs";
 import { ForkLifecycle as ForkLifecycle$1, RequestLogger } from "autotel";
 //#region src/toolkit/deferred-drain.d.ts

package/dist/toolkit/index.d.ts

@@ -1,4 +1,4 @@
-import { C as matchesRoutePattern, S as getServiceForPath, T as shouldInstrumentPath, _ as RouteAdapterOptions, a as FrameworkRequestHandle, b as TailSamplingContext, c as buildTracedOptions, d as runWithIntegratedHandle, f as toRouteAdapterOptions, g as MiddlewareLoggerResult, h as MiddlewareLoggerOptions, i as FrameworkIntegrationSpec, l as completeIntegratedRequest, m as ForkLifecycle, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions, p as BaseAdapterOptions, r as FrameworkIntegrationHelpers, s as applyLoggerEnrichment, t as ExtractedRequest, u as defineFrameworkIntegration, v as RouteFilterOptions, w as mergeRequestLoggerOptions, x as createMiddlewareLogger, y as RouteServiceConfig } from "../integration-BAs5uTiD.js";
+import { C as matchesRoutePattern, S as getServiceForPath, T as shouldInstrumentPath, _ as RouteAdapterOptions, a as FrameworkRequestHandle, b as TailSamplingContext, c as buildTracedOptions, d as runWithIntegratedHandle, f as toRouteAdapterOptions, g as MiddlewareLoggerResult, h as MiddlewareLoggerOptions, i as FrameworkIntegrationSpec, l as completeIntegratedRequest, m as ForkLifecycle, n as FrameworkHandlerOptions, o as IntegratedCompletionOptions, p as BaseAdapterOptions, r as FrameworkIntegrationHelpers, s as applyLoggerEnrichment, t as ExtractedRequest, u as defineFrameworkIntegration, v as RouteFilterOptions, w as mergeRequestLoggerOptions, x as createMiddlewareLogger, y as RouteServiceConfig } from "../integration-CQMpu5E4.js";
 import { createLoggerStorage, createStorageForkLifecycle } from "./storage.js";
 import { ForkLifecycle as ForkLifecycle$1, RequestLogger } from "autotel";
 //#region src/toolkit/deferred-drain.d.ts

package/dist/toolkit/index.js

@@ -1,4 +1,4 @@
-import { a as runWithIntegratedHandle, c as createMiddlewareLogger, d as mergeRequestLoggerOptions, f as shouldInstrumentPath, g as extendDeferredDrain, h as shouldDeferEmitForResponse, i as defineFrameworkIntegration, l as getServiceForPath, m as isStreamingResponse, n as buildTracedOptions, o as toRouteAdapterOptions, p as bindStreamingResponseLifecycle, r as completeIntegratedRequest, s as attachForkToLogger, t as applyLoggerEnrichment, u as matchesRoutePattern } from "../integration-DvibHRzI.js";
+import { a as runWithIntegratedHandle, c as createMiddlewareLogger, d as mergeRequestLoggerOptions, f as shouldInstrumentPath, g as extendDeferredDrain, h as shouldDeferEmitForResponse, i as defineFrameworkIntegration, l as getServiceForPath, m as isStreamingResponse, n as buildTracedOptions, o as toRouteAdapterOptions, p as bindStreamingResponseLifecycle, r as completeIntegratedRequest, s as attachForkToLogger, t as applyLoggerEnrichment, u as matchesRoutePattern } from "../integration-CfkaoVmE.js";
 import { createLoggerStorage, createStorageForkLifecycle } from "./storage.js";
 
 export { applyLoggerEnrichment, attachForkToLogger, bindStreamingResponseLifecycle, buildTracedOptions, completeIntegratedRequest, createLoggerStorage, createMiddlewareLogger, createStorageForkLifecycle, defineFrameworkIntegration, extendDeferredDrain, getServiceForPath, isStreamingResponse, matchesRoutePattern, mergeRequestLoggerOptions, runWithIntegratedHandle, shouldDeferEmitForResponse, shouldInstrumentPath, toRouteAdapterOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autotel-adapters",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "Framework adapters and composable DX helpers for autotel",
   "license": "Apache-2.0",
   "type": "module",
@@ -84,8 +84,8 @@
     "README.md"
   ],
   "dependencies": {
-    "autotel": "6.5.0",
-    "autotel-edge": "4.0.2"
+    "autotel": "7.0.0",
+    "autotel-edge": "5.0.0"
   },
   "peerDependencies": {
     "hono": ">=4.12.31",