autotel-adapters 0.3.19 → 2.0.0

package/dist/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","names":[],"sources":["../src/core.ts"],"mappings":";;;;UAiBiB,uBAAA;EACf,WAAA;EACA,MAAA,IAAU,OAAA,EAAS,QAAA,KAAa,MAAM;AAAA;AAAA,UAGvB,cAAA;EACf,SAAA,GACE,OAAA,GAAU,QAAA,EACV,OAAA,GAAU,oBAAA,KACP,aAAA;EACL,UAAA,GAAa,KAAA,cAAmB,WAAA;EAChC,qBAAA,GAAwB,KAAA,EAAO,oBAAA,KAAyB,eAAA;EACxD,mBAAA,gBACE,OAAA,GAAU,oBAAA,CAAqB,CAAA,OAC3B,KAAA,GAAQ,KAAA,EAAO,CAAA,cAAe,OAAA,WAAkB,eAAA,CAAgB,CAAA;AAAA;AAAA,iBAGxD,eAAA,qBACd,OAAA,EAAS,uBAAA,CAAwB,QAAA,KAG/B,OAAA,GAAU,QAAA,EACV,oBAAA,GAAuB,oBAAA,KACtB,aAAA;AAAA,UAsBY,oBAAA;EACf,oBAAA,GAAuB,oBAAA;EA5Ce;EA8CtC,QAAA;EA3C6B;EA6C7B,QAAA,SAAiB,MAAM;AAAA;;;;;;;iBAST,mBAAA,CAAoB,OAAA,EAAS,iBAAA,CAAkB,aAAA,QAE3D,QAAA,UACA,MAAA,GAAS,GAAA,EAAK,aAAA,WACd,OAAA,QAAe,CAAA,GAAI,OAAA,CAAQ,CAAA,GAC3B,OAAA,GAAU,oBAAA,KACT,OAAA,CAAQ,CAAA;AAAA,iBAsBG,oBAAA,qBACd,OAAA,EAAS,uBAAA,CAAwB,QAAA,IAChC,cAAA,CAAe,QAAA;;;;;UAaD,WAAA;EACf,GAAA,QAAW,CAAC;EACZ,GAAA;AAAA;;;;;;;;;;;;;;;;;;iBA6Bc,kBAAA,IACd,MAAA,EAAQ,WAAA,CAAY,CAAA,KACpB,SAAA,GAAY,OAAA,CAAQ,CAAA;;;;;;AAzHmD;AAGzE;;;;;;;iBA4IsB,oBAAA,IACpB,SAAA,UACA,MAAA,EAAQ,WAAA,CAAY,CAAA,KACpB,SAAA,EAAW,OAAA,CAAQ,CAAA,eACnB,KAAA,QAAa,OAAA,CAAQ,MAAA,6BACpB,OAAA,CAAQ,OAAA,CAAQ,CAAA;AAAA,KAmBP,WAAA;EACN,GAAA,CAAI,IAAA;AAAA,IACN,MAAM;AAAA,iBAEM,SAAA,CACd,OAAA,EAAS,WAAW,cACpB,IAAA"}
+{"version":3,"file":"core.d.ts","names":[],"sources":["../src/core.ts"],"mappings":";;;;KA8BY,qBAAqB;UAEhB,wBAAwB;EACvC;EACA,UAAU,SAAS,aAAa;;iBAGlB,gBAAgB,oBAC9B,SAAS,wBAAwB,aAG/B,UAAU,UACV,uBAAuB,yBACtB;UAsBY,6BAA6B;EAC5C,uBAAuB;;EAEvB;;EAEA;;EAEA,iBAAiB;;;;;;;;iBASH,oBAAoB,SAAS,kBAAkB,kBAClC,GACzB,kBACA,SAAS,KAAK,wBACd,eAAe,IAAI,QAAQ,IAC3B,UAAU,yBACT,QAAQ;;;;;UAmCI,YAAY;EAC3B,WAAW;EACX;;;;;;;;;;;;;;;;;;;iBA6Bc,mBAAmB,GACjC,QAAQ,YAAY,MACpB,YAAY,QAAQ;;;;;;;;;;;;;;iBAsBA,qBAAqB,GACzC,mBACA,QAAQ,YAAY,MACpB,WAAW,QAAQ,gBACnB,aAAa,QAAQ,mCACpB,QAAQ,QAAQ;KAgBP;EACR,IAAI;IAAiC;iBAEzB,UACd,SAAS,yBACT"}

package/dist/core.js

@@ -1,4 +1,5 @@
-import { createDrainPipeline, createStructuredError, getRequestLogger, parseError, trace } from "autotel";
+import { d as mergeRequestLoggerOptions, f as shouldInstrumentPath, o as toRouteAdapterOptions } from "./integration-IUpfttGT.js";
+import { getRequestLogger, withTracing } from "autotel";
 
 //#region src/core.ts
 function createUseLogger(options) {
@@ -24,8 +25,10 @@ function createUseLogger(options) {
 */
 function createRequestRunner(storage) {
 	return function runRequest(spanName, enrich, handler, options) {
-		return trace({ name: spanName }, (ctx) => async () => {
-			const log = getRequestLogger(ctx, options?.requestLoggerOptions);
+		if (options?.path && !shouldInstrumentPath(options.path, options)) return Promise.resolve(handler());
+		const loggerOptions = mergeRequestLoggerOptions(options?.requestLoggerOptions, options?.waitUntil);
+		return withTracing({ name: spanName })((ctx) => async () => {
+			const log = getRequestLogger(ctx, loggerOptions);
 			enrich(log);
 			try {
 				return await storage.run(log, () => handler());
@@ -38,14 +41,6 @@ function createRequestRunner(storage) {
 		})();
 	};
 }
-function createAdapterToolkit(options) {
-	return {
-		useLogger: createUseLogger(options),
-		parseError,
-		createStructuredError,
-		createDrainPipeline
-	};
-}
 function resolveEnv(envKeys) {
 	if (!envKeys) return void 0;
 	for (const key of envKeys) {
@@ -107,5 +102,5 @@ function getHeader(headers, name) {
 }
 
 //#endregion
-export { createAdapterToolkit, createRequestRunner, createUseLogger, getHeader, resolveAdapterConfig, shouldProbeRuntime };
+export { createRequestRunner, createUseLogger, getHeader, resolveAdapterConfig, shouldProbeRuntime, toRouteAdapterOptions };
 //# sourceMappingURL=core.js.map

package/dist/core.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.js","names":[],"sources":["../src/core.ts"],"sourcesContent":["import type { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  createDrainPipeline,\n  createStructuredError,\n  getRequestLogger,\n  parseError,\n  trace,\n  type ParsedError,\n  type RequestLogger,\n  type RequestLoggerOptions,\n  type RequestLogSnapshot,\n  type DrainPipelineOptions,\n  type PipelineDrainFn,\n  type StructuredError,\n  type StructuredErrorInput,\n} from 'autotel';\n\nexport interface AdapterUseLoggerOptions<TContext> {\n  adapterName: string;\n  enrich?: (context: TContext) => Record<string, unknown> | undefined;\n}\n\nexport interface AdapterToolkit<TContext> {\n  useLogger: (\n    context?: TContext,\n    options?: RequestLoggerOptions,\n  ) => RequestLogger;\n  parseError: (error: unknown) => ParsedError;\n  createStructuredError: (input: StructuredErrorInput) => StructuredError;\n  createDrainPipeline: <T = unknown>(\n    options?: DrainPipelineOptions<T>,\n  ) => (drain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>;\n}\n\nexport function createUseLogger<TContext = unknown>(\n  options: AdapterUseLoggerOptions<TContext>,\n) {\n  return function useLogger(\n    context?: TContext,\n    requestLoggerOptions?: RequestLoggerOptions,\n  ): RequestLogger {\n    let logger: RequestLogger;\n    try {\n      logger = getRequestLogger(undefined, requestLoggerOptions);\n    } catch {\n      throw new Error(\n        `[autotel-adapters/${options.adapterName}] No active trace context. ` +\n          `Wrap your handler with autotel trace instrumentation before calling useLogger().`,\n      );\n    }\n\n    if (context && options.enrich) {\n      const extra = options.enrich(context);\n      if (extra && Object.keys(extra).length > 0) {\n        logger.set(extra);\n      }\n    }\n\n    return logger;\n  };\n}\n\nexport interface RequestRunnerOptions {\n  requestLoggerOptions?: RequestLoggerOptions;\n  /** Emit one wide event automatically when the handler settles. Default `true`. */\n  autoEmit?: boolean;\n  /** Fields merged into the wide event at emit time (e.g. response status). */\n  finalize?: () => Record<string, unknown> | undefined;\n}\n\n/**\n * Build a request runner bound to one framework's logger storage. The returned\n * function opens a span, creates a request logger, runs `handler` inside the\n * storage so `useLogger()` resolves it, records thrown errors, and emits one\n * wide event when the handler settles (unless `autoEmit` is `false`).\n */\nexport function createRequestRunner(storage: AsyncLocalStorage<RequestLogger>) {\n  return function runRequest<T>(\n    spanName: string,\n    enrich: (log: RequestLogger) => void,\n    handler: () => T | Promise<T>,\n    options?: RequestRunnerOptions,\n  ): Promise<T> {\n    const wrapped = trace(\n      { name: spanName },\n      (ctx) => async (): Promise<T> => {\n        const log = getRequestLogger(ctx, options?.requestLoggerOptions);\n        enrich(log);\n        try {\n          return await storage.run(log, () => handler());\n        } catch (error) {\n          log.error(error instanceof Error ? error : new Error(String(error)));\n          throw error;\n        } finally {\n          if (options?.autoEmit !== false) {\n            log.emitNow(options?.finalize?.());\n          }\n        }\n      },\n    );\n    return wrapped();\n  };\n}\n\nexport function createAdapterToolkit<TContext = unknown>(\n  options: AdapterUseLoggerOptions<TContext>,\n): AdapterToolkit<TContext> {\n  return {\n    useLogger: createUseLogger(options),\n    parseError,\n    createStructuredError,\n    createDrainPipeline,\n  };\n}\n\n/**\n * Description of a single adapter config field. `env` is the ordered list of\n * environment variables to fall back to.\n */\nexport interface ConfigField<T> {\n  key: keyof T & string;\n  env?: string[];\n}\n\nfunction resolveEnv(envKeys?: string[]): string | undefined {\n  if (!envKeys) return undefined;\n  for (const key of envKeys) {\n    const value = process.env[key];\n    if (value) return value;\n  }\n  return undefined;\n}\n\n/**\n * Returns true when at least one env-backed field is not provided via\n * `overrides`, meaning runtime config may still contribute and should be\n * probed to preserve precedence (`overrides > runtime > env`).\n *\n * @example\n * ```ts\n * const FIELDS: ConfigField<MyAdapterConfig>[] = [\n *   { key: 'token', env: ['MY_ADAPTER_TOKEN'] },\n *   { key: 'endpoint', env: ['MY_ADAPTER_URL'] },\n * ]\n *\n * if (shouldProbeRuntime(FIELDS, overrides)) {\n *   runtimeConfig = await loadRuntimeConfig()\n * }\n * ```\n */\nexport function shouldProbeRuntime<T>(\n  fields: ConfigField<T>[],\n  overrides?: Partial<T>,\n): boolean {\n  return fields.some(({ key, env }) => {\n    if (!env || env.length === 0) return false;\n    if (overrides?.[key] !== undefined) return false;\n    return true;\n  });\n}\n\n/**\n * Resolve adapter configuration with the standard priority chain:\n *\n * 1. `overrides` passed to the adapter factory\n * 2. `runtimeConfig.autotel.{namespace}.{key}` (if a probe was performed)\n * 3. `runtimeConfig.{namespace}.{key}` (if a probe was performed)\n * 4. `process.env[envKey]` for each env in `field.env`\n *\n * Pass an async `probe` to defer the runtime config lookup so it is only\n * invoked when runtime resolution is needed (i.e. at least one env-backed\n * field is not set by overrides). Adapters that have no probe target may pass\n * `() => Promise.resolve(undefined)`.\n */\nexport async function resolveAdapterConfig<T>(\n  namespace: string,\n  fields: ConfigField<T>[],\n  overrides: Partial<T> | undefined,\n  probe: () => Promise<Record<string, any> | undefined>,\n): Promise<Partial<T>> {\n  const runtimeConfig = shouldProbeRuntime(fields, overrides)\n    ? await probe()\n    : undefined;\n  const autotelNs = runtimeConfig?.autotel?.[namespace];\n  const rootNs = runtimeConfig?.[namespace];\n\n  const config: Record<string, unknown> = {};\n  for (const { key, env } of fields) {\n    config[key] =\n      overrides?.[key] ??\n      autotelNs?.[key] ??\n      rootNs?.[key] ??\n      resolveEnv(env);\n  }\n\n  return config as Partial<T>;\n}\n\nexport type HeadersLike =\n  | { get(name: string): string | null }\n  | Record<string, string | undefined>;\n\nexport function getHeader(\n  headers: HeadersLike | undefined,\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  if ('get' in headers && typeof headers.get === 'function') {\n    return headers.get(name) ?? undefined;\n  }\n  const dictionary = headers as Record<string, string | undefined>;\n  const value = dictionary[name] ?? dictionary[name.toLowerCase()];\n  return typeof value === 'string' ? value : undefined;\n}\n\nexport type {\n  RequestLogger,\n  RequestLoggerOptions,\n  RequestLogSnapshot,\n  ParsedError,\n  StructuredError,\n  StructuredErrorInput,\n  DrainPipelineOptions,\n  PipelineDrainFn,\n};\n"],"mappings":";;;AAkCA,SAAgB,gBACd,SACA;CACA,OAAO,SAAS,UACd,SACA,sBACe;EACf,IAAI;EACJ,IAAI;GACF,SAAS,iBAAiB,QAAW,oBAAoB;EAC3D,QAAQ;GACN,MAAM,IAAI,MACR,qBAAqB,QAAQ,YAAY,4GAE3C;EACF;EAEA,IAAI,WAAW,QAAQ,QAAQ;GAC7B,MAAM,QAAQ,QAAQ,OAAO,OAAO;GACpC,IAAI,SAAS,OAAO,KAAK,KAAK,CAAC,CAAC,SAAS,GACvC,OAAO,IAAI,KAAK;EAEpB;EAEA,OAAO;CACT;AACF;;;;;;;AAgBA,SAAgB,oBAAoB,SAA2C;CAC7E,OAAO,SAAS,WACd,UACA,QACA,SACA,SACY;EAkBZ,OAjBgB,MACd,EAAE,MAAM,SAAS,IAChB,QAAQ,YAAwB;GAC/B,MAAM,MAAM,iBAAiB,KAAK,SAAS,oBAAoB;GAC/D,OAAO,GAAG;GACV,IAAI;IACF,OAAO,MAAM,QAAQ,IAAI,WAAW,QAAQ,CAAC;GAC/C,SAAS,OAAO;IACd,IAAI,MAAM,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,OAAO,KAAK,CAAC,CAAC;IACnE,MAAM;GACR,UAAU;IACR,IAAI,SAAS,aAAa,OACxB,IAAI,QAAQ,SAAS,WAAW,CAAC;GAErC;EACF,CAEW,CAAC,CAAC;CACjB;AACF;AAEA,SAAgB,qBACd,SAC0B;CAC1B,OAAO;EACL,WAAW,gBAAgB,OAAO;EAClC;EACA;EACA;CACF;AACF;AAWA,SAAS,WAAW,SAAwC;CAC1D,IAAI,CAAC,SAAS,OAAO;CACrB,KAAK,MAAM,OAAO,SAAS;EACzB,MAAM,QAAQ,QAAQ,IAAI;EAC1B,IAAI,OAAO,OAAO;CACpB;AAEF;;;;;;;;;;;;;;;;;;AAmBA,SAAgB,mBACd,QACA,WACS;CACT,OAAO,OAAO,MAAM,EAAE,KAAK,UAAU;EACnC,IAAI,CAAC,OAAO,IAAI,WAAW,GAAG,OAAO;EACrC,IAAI,YAAY,SAAS,QAAW,OAAO;EAC3C,OAAO;CACT,CAAC;AACH;;;;;;;;;;;;;;AAeA,eAAsB,qBACpB,WACA,QACA,WACA,OACqB;CACrB,MAAM,gBAAgB,mBAAmB,QAAQ,SAAS,IACtD,MAAM,MAAM,IACZ;CACJ,MAAM,YAAY,eAAe,UAAU;CAC3C,MAAM,SAAS,gBAAgB;CAE/B,MAAM,SAAkC,CAAC;CACzC,KAAK,MAAM,EAAE,KAAK,SAAS,QACzB,OAAO,OACL,YAAY,QACZ,YAAY,QACZ,SAAS,QACT,WAAW,GAAG;CAGlB,OAAO;AACT;AAMA,SAAgB,UACd,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,IAAI,SAAS,WAAW,OAAO,QAAQ,QAAQ,YAC7C,OAAO,QAAQ,IAAI,IAAI,KAAK;CAE9B,MAAM,aAAa;CACnB,MAAM,QAAQ,WAAW,SAAS,WAAW,KAAK,YAAY;CAC9D,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C"}
+{"version":3,"file":"core.js","names":[],"sources":["../src/core.ts"],"sourcesContent":["import type { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  getRequestLogger,\n  type ParsedError,\n  type RequestLogger,\n  type RequestLoggerOptions,\n  type RequestLogSnapshot,\n  type DrainPipelineOptions,\n  type PipelineDrainFn,\n  type StructuredError,\n  type StructuredErrorInput,\n  withTracing,\n} from 'autotel';\nimport {\n  mergeRequestLoggerOptions,\n  shouldInstrumentPath,\n  type RouteAdapterOptions,\n} from './toolkit/middleware';\nimport {\n  toRouteAdapterOptions,\n  type FrameworkHandlerOptions,\n  type IntegratedCompletionOptions,\n} from './toolkit/integration';\n\nexport { toRouteAdapterOptions };\nexport type {\n  RouteAdapterOptions,\n  FrameworkHandlerOptions,\n  IntegratedCompletionOptions,\n};\nexport type BaseAdapterOptions = RouteAdapterOptions;\n\nexport interface AdapterUseLoggerOptions<TContext> {\n  adapterName: string;\n  enrich?: (context: TContext) => Record<string, unknown> | undefined;\n}\n\nexport function createUseLogger<TContext = unknown>(\n  options: AdapterUseLoggerOptions<TContext>,\n) {\n  return function useLogger(\n    context?: TContext,\n    requestLoggerOptions?: RequestLoggerOptions,\n  ): RequestLogger {\n    let logger: RequestLogger;\n    try {\n      logger = getRequestLogger(undefined, requestLoggerOptions);\n    } catch {\n      throw new Error(\n        `[autotel-adapters/${options.adapterName}] No active trace context. ` +\n          `Wrap your handler with autotel trace instrumentation before calling useLogger().`,\n      );\n    }\n\n    if (context && options.enrich) {\n      const extra = options.enrich(context);\n      if (extra && Object.keys(extra).length > 0) {\n        logger.set(extra);\n      }\n    }\n\n    return logger;\n  };\n}\n\nexport interface RequestRunnerOptions extends RouteAdapterOptions {\n  requestLoggerOptions?: RequestLoggerOptions;\n  /** HTTP route used for include/exclude filtering. */\n  path?: string;\n  /** Emit one wide event automatically when the handler settles. Default `true`. */\n  autoEmit?: boolean;\n  /** Fields merged into the wide event at emit time (e.g. response status). */\n  finalize?: () => Record<string, unknown> | undefined;\n}\n\n/**\n * Build a request runner bound to one framework's logger storage. The returned\n * function opens a span, creates a request logger, runs `handler` inside the\n * storage so `useLogger()` resolves it, records thrown errors, and emits one\n * wide event when the handler settles (unless `autoEmit` is `false`).\n */\nexport function createRequestRunner(storage: AsyncLocalStorage<RequestLogger>) {\n  return function runRequest<T>(\n    spanName: string,\n    enrich: (log: RequestLogger) => void,\n    handler: () => T | Promise<T>,\n    options?: RequestRunnerOptions,\n  ): Promise<T> {\n    if (options?.path && !shouldInstrumentPath(options.path, options)) {\n      return Promise.resolve(handler());\n    }\n\n    const loggerOptions = mergeRequestLoggerOptions(\n      options?.requestLoggerOptions,\n      options?.waitUntil,\n    );\n\n    const wrapped = withTracing({ name: spanName })(\n      (ctx) => async (): Promise<T> => {\n        const log = getRequestLogger(ctx, loggerOptions);\n        enrich(log);\n        try {\n          return await storage.run(log, () => handler());\n        } catch (error) {\n          log.error(error instanceof Error ? error : new Error(String(error)));\n          throw error;\n        } finally {\n          if (options?.autoEmit !== false) {\n            log.emitNow(options?.finalize?.());\n          }\n        }\n      },\n    );\n    // The wrapped factory is async, so the call always yields a Promise.\n    return wrapped() as Promise<T>;\n  };\n}\n\n/**\n * Description of a single adapter config field. `env` is the ordered list of\n * environment variables to fall back to.\n */\nexport interface ConfigField<T> {\n  key: keyof T & string;\n  env?: string[];\n}\n\nfunction resolveEnv(envKeys?: string[]): string | undefined {\n  if (!envKeys) return undefined;\n  for (const key of envKeys) {\n    const value = process.env[key];\n    if (value) return value;\n  }\n  return undefined;\n}\n\n/**\n * Returns true when at least one env-backed field is not provided via\n * `overrides`, meaning runtime config may still contribute and should be\n * probed to preserve precedence (`overrides > runtime > env`).\n *\n * @example\n * ```ts\n * const FIELDS: ConfigField<MyAdapterConfig>[] = [\n *   { key: 'token', env: ['MY_ADAPTER_TOKEN'] },\n *   { key: 'endpoint', env: ['MY_ADAPTER_URL'] },\n * ]\n *\n * if (shouldProbeRuntime(FIELDS, overrides)) {\n *   runtimeConfig = await loadRuntimeConfig()\n * }\n * ```\n */\nexport function shouldProbeRuntime<T>(\n  fields: ConfigField<T>[],\n  overrides?: Partial<T>,\n): boolean {\n  return fields.some(({ key, env }) => {\n    if (!env || env.length === 0) return false;\n    if (overrides?.[key] !== undefined) return false;\n    return true;\n  });\n}\n\n/**\n * Resolve adapter configuration with the standard priority chain:\n *\n * 1. `overrides` passed to the adapter factory\n * 2. `runtimeConfig.autotel.{namespace}.{key}` (if a probe was performed)\n * 3. `runtimeConfig.{namespace}.{key}` (if a probe was performed)\n * 4. `process.env[envKey]` for each env in `field.env`\n *\n * Pass an async `probe` to defer the runtime config lookup so it is only\n * invoked when runtime resolution is needed (i.e. at least one env-backed\n * field is not set by overrides). Adapters that have no probe target may pass\n * `() => Promise.resolve(undefined)`.\n */\nexport async function resolveAdapterConfig<T>(\n  namespace: string,\n  fields: ConfigField<T>[],\n  overrides: Partial<T> | undefined,\n  probe: () => Promise<Record<string, any> | undefined>,\n): Promise<Partial<T>> {\n  const runtimeConfig = shouldProbeRuntime(fields, overrides)\n    ? await probe()\n    : undefined;\n  const autotelNs = runtimeConfig?.autotel?.[namespace];\n  const rootNs = runtimeConfig?.[namespace];\n\n  const config: Record<string, unknown> = {};\n  for (const { key, env } of fields) {\n    config[key] =\n      overrides?.[key] ?? autotelNs?.[key] ?? rootNs?.[key] ?? resolveEnv(env);\n  }\n\n  return config as Partial<T>;\n}\n\nexport type HeadersLike =\n  { get(name: string): string | null } | Record<string, string | undefined>;\n\nexport function getHeader(\n  headers: HeadersLike | undefined,\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  if ('get' in headers && typeof headers.get === 'function') {\n    return headers.get(name) ?? undefined;\n  }\n  const dictionary = headers as Record<string, string | undefined>;\n  const value = dictionary[name] ?? dictionary[name.toLowerCase()];\n  return typeof value === 'string' ? value : undefined;\n}\n\nexport type {\n  RequestLogger,\n  RequestLoggerOptions,\n  RequestLogSnapshot,\n  ParsedError,\n  StructuredError,\n  StructuredErrorInput,\n  DrainPipelineOptions,\n  PipelineDrainFn,\n};\n"],"mappings":";;;;AAqCA,SAAgB,gBACd,SACA;CACA,OAAO,SAAS,UACd,SACA,sBACe;EACf,IAAI;EACJ,IAAI;GACF,SAAS,iBAAiB,QAAW,oBAAoB;EAC3D,QAAQ;GACN,MAAM,IAAI,MACR,qBAAqB,QAAQ,YAAY,4GAE3C;EACF;EAEA,IAAI,WAAW,QAAQ,QAAQ;GAC7B,MAAM,QAAQ,QAAQ,OAAO,OAAO;GACpC,IAAI,SAAS,OAAO,KAAK,KAAK,CAAC,CAAC,SAAS,GACvC,OAAO,IAAI,KAAK;EAEpB;EAEA,OAAO;CACT;AACF;;;;;;;AAkBA,SAAgB,oBAAoB,SAA2C;CAC7E,OAAO,SAAS,WACd,UACA,QACA,SACA,SACY;EACZ,IAAI,SAAS,QAAQ,CAAC,qBAAqB,QAAQ,MAAM,OAAO,GAC9D,OAAO,QAAQ,QAAQ,QAAQ,CAAC;EAGlC,MAAM,gBAAgB,0BACpB,SAAS,sBACT,SAAS,SACX;EAmBA,OAjBgB,YAAY,EAAE,MAAM,SAAS,CAAC,CAAC,EAC5C,QAAQ,YAAwB;GAC/B,MAAM,MAAM,iBAAiB,KAAK,aAAa;GAC/C,OAAO,GAAG;GACV,IAAI;IACF,OAAO,MAAM,QAAQ,IAAI,WAAW,QAAQ,CAAC;GAC/C,SAAS,OAAO;IACd,IAAI,MAAM,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,OAAO,KAAK,CAAC,CAAC;IACnE,MAAM;GACR,UAAU;IACR,IAAI,SAAS,aAAa,OACxB,IAAI,QAAQ,SAAS,WAAW,CAAC;GAErC;EACF,CAGW,CAAC,CAAC;CACjB;AACF;AAWA,SAAS,WAAW,SAAwC;CAC1D,IAAI,CAAC,SAAS,OAAO;CACrB,KAAK,MAAM,OAAO,SAAS;EACzB,MAAM,QAAQ,QAAQ,IAAI;EAC1B,IAAI,OAAO,OAAO;CACpB;AAEF;;;;;;;;;;;;;;;;;;AAmBA,SAAgB,mBACd,QACA,WACS;CACT,OAAO,OAAO,MAAM,EAAE,KAAK,UAAU;EACnC,IAAI,CAAC,OAAO,IAAI,WAAW,GAAG,OAAO;EACrC,IAAI,YAAY,SAAS,QAAW,OAAO;EAC3C,OAAO;CACT,CAAC;AACH;;;;;;;;;;;;;;AAeA,eAAsB,qBACpB,WACA,QACA,WACA,OACqB;CACrB,MAAM,gBAAgB,mBAAmB,QAAQ,SAAS,IACtD,MAAM,MAAM,IACZ;CACJ,MAAM,YAAY,eAAe,UAAU;CAC3C,MAAM,SAAS,gBAAgB;CAE/B,MAAM,SAAkC,CAAC;CACzC,KAAK,MAAM,EAAE,KAAK,SAAS,QACzB,OAAO,OACL,YAAY,QAAQ,YAAY,QAAQ,SAAS,QAAQ,WAAW,GAAG;CAG3E,OAAO;AACT;AAKA,SAAgB,UACd,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,IAAI,SAAS,WAAW,OAAO,QAAQ,QAAQ,YAC7C,OAAO,QAAQ,IAAI,IAAI,KAAK;CAE9B,MAAM,aAAa;CACnB,MAAM,QAAQ,WAAW,SAAS,WAAW,KAAK,YAAY;CAC9D,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C"}

package/dist/elysia.cjs

@@ -0,0 +1,50 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_integration = require('./integration-guh7BHTF.cjs');
+const require_toolkit_storage = require('./toolkit/storage.cjs');
+const require_core = require('./core.cjs');
+let autotel = require("autotel");
+
+//#region src/elysia.ts
+const { storage: elysiaLoggerStorage, useLogger: storageUseLogger } = require_toolkit_storage.createLoggerStorage("request context. Wrap handlers with withAutotelHandler() first.");
+function enrichFromContext(ctx) {
+	if (!ctx) return void 0;
+	const requestId = require_core.getHeader(ctx.request.headers, "x-request-id");
+	return {
+		"http.request.method": ctx.request.method,
+		"url.full": ctx.request.url,
+		"http.route": ctx.path,
+		...requestId ? { "http.request.id": requestId } : {}
+	};
+}
+const integration = require_integration.defineFrameworkIntegration({
+	name: "elysia",
+	storage: elysiaLoggerStorage,
+	extractRequest: (ctx) => ({
+		method: ctx.request.method,
+		path: ctx.path,
+		headers: ctx.request.headers,
+		requestId: require_core.getHeader(ctx.request.headers, "x-request-id")
+	}),
+	attachLogger: () => {}
+});
+function useLogger() {
+	return storageUseLogger();
+}
+function withAutotelHandler(handler, options = {}) {
+	return (ctx) => integration.runTraced(ctx, options, async (handle) => {
+		if (handle.skipped) return handle.runWith(() => handler(ctx));
+		require_integration.applyLoggerEnrichment(handle.logger, enrichFromContext(ctx), options.enrichRequest?.(ctx));
+		return require_integration.runWithIntegratedHandle(handle, options, () => handler(ctx));
+	});
+}
+/** @deprecated Use {@link withAutotelHandler}. */
+const autotel$1 = withAutotelHandler;
+
+//#endregion
+exports.autotel = autotel$1;
+exports.createDrainPipeline = autotel.createDrainPipeline;
+exports.createStructuredError = autotel.createStructuredError;
+exports.parseError = autotel.parseError;
+exports.useLogger = useLogger;
+exports.withAutotelHandler = withAutotelHandler;
+//# sourceMappingURL=elysia.cjs.map

package/dist/elysia.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"elysia.cjs","names":["createLoggerStorage","getHeader","defineFrameworkIntegration","runWithIntegratedHandle","autotel"],"sources":["../src/elysia.ts"],"sourcesContent":["import {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type RequestLogger,\n} from 'autotel';\nimport { getHeader, type FrameworkHandlerOptions } from './core';\nimport { createLoggerStorage } from './toolkit/storage';\nimport {\n  applyLoggerEnrichment,\n  defineFrameworkIntegration,\n  runWithIntegratedHandle,\n} from './toolkit/integration';\n\nexport interface ElysiaContextLike {\n  request: Request;\n  path: string;\n}\n\nexport interface ElysiaWithAutotelOptions extends FrameworkHandlerOptions {\n  enrichRequest?: (\n    ctx: ElysiaContextLike,\n  ) => Record<string, unknown> | undefined;\n}\n\nconst { storage: elysiaLoggerStorage, useLogger: storageUseLogger } =\n  createLoggerStorage(\n    'request context. Wrap handlers with withAutotelHandler() first.',\n  );\n\nfunction enrichFromContext(\n  ctx?: ElysiaContextLike,\n): Record<string, unknown> | undefined {\n  if (!ctx) return undefined;\n\n  const requestId = getHeader(ctx.request.headers, 'x-request-id');\n\n  return {\n    'http.request.method': ctx.request.method,\n    'url.full': ctx.request.url,\n    'http.route': ctx.path,\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst integration = defineFrameworkIntegration<ElysiaContextLike>({\n  name: 'elysia',\n  storage: elysiaLoggerStorage,\n  extractRequest: (ctx) => ({\n    method: ctx.request.method,\n    path: ctx.path,\n    headers: ctx.request.headers,\n    requestId: getHeader(ctx.request.headers, 'x-request-id'),\n  }),\n  attachLogger: () => {},\n});\n\nexport function useLogger(): RequestLogger {\n  return storageUseLogger();\n}\n\nexport function withAutotelHandler<T>(\n  handler: (ctx: ElysiaContextLike) => T | Promise<T>,\n  options: ElysiaWithAutotelOptions = {},\n) {\n  return (ctx: ElysiaContextLike) =>\n    integration.runTraced(ctx, options, async (handle) => {\n      if (handle.skipped) {\n        return handle.runWith(() => handler(ctx));\n      }\n\n      applyLoggerEnrichment(\n        handle.logger,\n        enrichFromContext(ctx),\n        options.enrichRequest?.(ctx),\n      );\n\n      return runWithIntegratedHandle(handle, options, () => handler(ctx));\n    });\n}\n\n/** @deprecated Use {@link withAutotelHandler}. */\nexport const autotel = withAutotelHandler;\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;;AAyBA,MAAM,EAAE,SAAS,qBAAqB,WAAW,qBAC/CA,4CACE,iEACF;AAEF,SAAS,kBACP,KACqC;CACrC,IAAI,CAAC,KAAK,OAAO;CAEjB,MAAM,YAAYC,uBAAU,IAAI,QAAQ,SAAS,cAAc;CAE/D,OAAO;EACL,uBAAuB,IAAI,QAAQ;EACnC,YAAY,IAAI,QAAQ;EACxB,cAAc,IAAI;EAClB,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,cAAcC,+CAA8C;CAChE,MAAM;CACN,SAAS;CACT,iBAAiB,SAAS;EACxB,QAAQ,IAAI,QAAQ;EACpB,MAAM,IAAI;EACV,SAAS,IAAI,QAAQ;EACrB,WAAWD,uBAAU,IAAI,QAAQ,SAAS,cAAc;CAC1D;CACA,oBAAoB,CAAC;AACvB,CAAC;AAED,SAAgB,YAA2B;CACzC,OAAO,iBAAiB;AAC1B;AAEA,SAAgB,mBACd,SACA,UAAoC,CAAC,GACrC;CACA,QAAQ,QACN,YAAY,UAAU,KAAK,SAAS,OAAO,WAAW;EACpD,IAAI,OAAO,SACT,OAAO,OAAO,cAAc,QAAQ,GAAG,CAAC;EAG1C,0CACE,OAAO,QACP,kBAAkB,GAAG,GACrB,QAAQ,gBAAgB,GAAG,CAC7B;EAEA,OAAOE,4CAAwB,QAAQ,eAAe,QAAQ,GAAG,CAAC;CACpE,CAAC;AACL;;AAGA,MAAaC,YAAU"}

package/dist/elysia.d.cts

@@ -0,0 +1,18 @@
+import { n as FrameworkHandlerOptions } from "./integration-DI-1RuTh.cjs";
+import "./core.cjs";
+import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
+//#region src/elysia.d.ts
+interface ElysiaContextLike {
+  request: Request;
+  path: string;
+}
+interface ElysiaWithAutotelOptions extends FrameworkHandlerOptions {
+  enrichRequest?: (ctx: ElysiaContextLike) => Record<string, unknown> | undefined;
+}
+declare function useLogger(): RequestLogger;
+declare function withAutotelHandler<T>(handler: (ctx: ElysiaContextLike) => T | Promise<T>, options?: ElysiaWithAutotelOptions): (ctx: ElysiaContextLike) => Promise<T>;
+/** @deprecated Use {@link withAutotelHandler}. */
+declare const autotel: typeof withAutotelHandler;
+//#endregion
+export { ElysiaContextLike, ElysiaWithAutotelOptions, autotel, createDrainPipeline, createStructuredError, parseError, useLogger, withAutotelHandler };
+//# sourceMappingURL=elysia.d.cts.map

package/dist/elysia.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"elysia.d.cts","names":[],"sources":["../src/elysia.ts"],"mappings":";;;;UAciB;EACf,SAAS;EACT;;UAGe,iCAAiC;EAChD,iBACE,KAAK,sBACF;;iBAmCS,aAAa;iBAIb,mBAAmB,GACjC,UAAU,KAAK,sBAAsB,IAAI,QAAQ,IACjD,UAAS,4BAED,KAAK,sBAAiB,QAAA;;cAiBnB,gBAAO"}

package/dist/elysia.d.ts

@@ -0,0 +1,18 @@
+import { n as FrameworkHandlerOptions } from "./integration-rYoX8QLk.js";
+import "./core.js";
+import { RequestLogger, createDrainPipeline, createStructuredError, parseError } from "autotel";
+//#region src/elysia.d.ts
+interface ElysiaContextLike {
+  request: Request;
+  path: string;
+}
+interface ElysiaWithAutotelOptions extends FrameworkHandlerOptions {
+  enrichRequest?: (ctx: ElysiaContextLike) => Record<string, unknown> | undefined;
+}
+declare function useLogger(): RequestLogger;
+declare function withAutotelHandler<T>(handler: (ctx: ElysiaContextLike) => T | Promise<T>, options?: ElysiaWithAutotelOptions): (ctx: ElysiaContextLike) => Promise<T>;
+/** @deprecated Use {@link withAutotelHandler}. */
+declare const autotel: typeof withAutotelHandler;
+//#endregion
+export { ElysiaContextLike, ElysiaWithAutotelOptions, autotel, createDrainPipeline, createStructuredError, parseError, useLogger, withAutotelHandler };
+//# sourceMappingURL=elysia.d.ts.map

package/dist/elysia.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"elysia.d.ts","names":[],"sources":["../src/elysia.ts"],"mappings":";;;;UAciB;EACf,SAAS;EACT;;UAGe,iCAAiC;EAChD,iBACE,KAAK,sBACF;;iBAmCS,aAAa;iBAIb,mBAAmB,GACjC,UAAU,KAAK,sBAAsB,IAAI,QAAQ,IACjD,UAAS,4BAED,KAAK,sBAAiB,QAAA;;cAiBnB,gBAAO"}

package/dist/elysia.js

@@ -0,0 +1,44 @@
+import { a as runWithIntegratedHandle, i as defineFrameworkIntegration, t as applyLoggerEnrichment } from "./integration-IUpfttGT.js";
+import { createLoggerStorage } from "./toolkit/storage.js";
+import { getHeader } from "./core.js";
+import { createDrainPipeline, createStructuredError, parseError } from "autotel";
+
+//#region src/elysia.ts
+const { storage: elysiaLoggerStorage, useLogger: storageUseLogger } = createLoggerStorage("request context. Wrap handlers with withAutotelHandler() first.");
+function enrichFromContext(ctx) {
+	if (!ctx) return void 0;
+	const requestId = getHeader(ctx.request.headers, "x-request-id");
+	return {
+		"http.request.method": ctx.request.method,
+		"url.full": ctx.request.url,
+		"http.route": ctx.path,
+		...requestId ? { "http.request.id": requestId } : {}
+	};
+}
+const integration = defineFrameworkIntegration({
+	name: "elysia",
+	storage: elysiaLoggerStorage,
+	extractRequest: (ctx) => ({
+		method: ctx.request.method,
+		path: ctx.path,
+		headers: ctx.request.headers,
+		requestId: getHeader(ctx.request.headers, "x-request-id")
+	}),
+	attachLogger: () => {}
+});
+function useLogger() {
+	return storageUseLogger();
+}
+function withAutotelHandler(handler, options = {}) {
+	return (ctx) => integration.runTraced(ctx, options, async (handle) => {
+		if (handle.skipped) return handle.runWith(() => handler(ctx));
+		applyLoggerEnrichment(handle.logger, enrichFromContext(ctx), options.enrichRequest?.(ctx));
+		return runWithIntegratedHandle(handle, options, () => handler(ctx));
+	});
+}
+/** @deprecated Use {@link withAutotelHandler}. */
+const autotel = withAutotelHandler;
+
+//#endregion
+export { autotel, createDrainPipeline, createStructuredError, parseError, useLogger, withAutotelHandler };
+//# sourceMappingURL=elysia.js.map

package/dist/elysia.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"elysia.js","names":[],"sources":["../src/elysia.ts"],"sourcesContent":["import {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type RequestLogger,\n} from 'autotel';\nimport { getHeader, type FrameworkHandlerOptions } from './core';\nimport { createLoggerStorage } from './toolkit/storage';\nimport {\n  applyLoggerEnrichment,\n  defineFrameworkIntegration,\n  runWithIntegratedHandle,\n} from './toolkit/integration';\n\nexport interface ElysiaContextLike {\n  request: Request;\n  path: string;\n}\n\nexport interface ElysiaWithAutotelOptions extends FrameworkHandlerOptions {\n  enrichRequest?: (\n    ctx: ElysiaContextLike,\n  ) => Record<string, unknown> | undefined;\n}\n\nconst { storage: elysiaLoggerStorage, useLogger: storageUseLogger } =\n  createLoggerStorage(\n    'request context. Wrap handlers with withAutotelHandler() first.',\n  );\n\nfunction enrichFromContext(\n  ctx?: ElysiaContextLike,\n): Record<string, unknown> | undefined {\n  if (!ctx) return undefined;\n\n  const requestId = getHeader(ctx.request.headers, 'x-request-id');\n\n  return {\n    'http.request.method': ctx.request.method,\n    'url.full': ctx.request.url,\n    'http.route': ctx.path,\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst integration = defineFrameworkIntegration<ElysiaContextLike>({\n  name: 'elysia',\n  storage: elysiaLoggerStorage,\n  extractRequest: (ctx) => ({\n    method: ctx.request.method,\n    path: ctx.path,\n    headers: ctx.request.headers,\n    requestId: getHeader(ctx.request.headers, 'x-request-id'),\n  }),\n  attachLogger: () => {},\n});\n\nexport function useLogger(): RequestLogger {\n  return storageUseLogger();\n}\n\nexport function withAutotelHandler<T>(\n  handler: (ctx: ElysiaContextLike) => T | Promise<T>,\n  options: ElysiaWithAutotelOptions = {},\n) {\n  return (ctx: ElysiaContextLike) =>\n    integration.runTraced(ctx, options, async (handle) => {\n      if (handle.skipped) {\n        return handle.runWith(() => handler(ctx));\n      }\n\n      applyLoggerEnrichment(\n        handle.logger,\n        enrichFromContext(ctx),\n        options.enrichRequest?.(ctx),\n      );\n\n      return runWithIntegratedHandle(handle, options, () => handler(ctx));\n    });\n}\n\n/** @deprecated Use {@link withAutotelHandler}. */\nexport const autotel = withAutotelHandler;\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;AAyBA,MAAM,EAAE,SAAS,qBAAqB,WAAW,qBAC/C,oBACE,iEACF;AAEF,SAAS,kBACP,KACqC;CACrC,IAAI,CAAC,KAAK,OAAO;CAEjB,MAAM,YAAY,UAAU,IAAI,QAAQ,SAAS,cAAc;CAE/D,OAAO;EACL,uBAAuB,IAAI,QAAQ;EACnC,YAAY,IAAI,QAAQ;EACxB,cAAc,IAAI;EAClB,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,cAAc,2BAA8C;CAChE,MAAM;CACN,SAAS;CACT,iBAAiB,SAAS;EACxB,QAAQ,IAAI,QAAQ;EACpB,MAAM,IAAI;EACV,SAAS,IAAI,QAAQ;EACrB,WAAW,UAAU,IAAI,QAAQ,SAAS,cAAc;CAC1D;CACA,oBAAoB,CAAC;AACvB,CAAC;AAED,SAAgB,YAA2B;CACzC,OAAO,iBAAiB;AAC1B;AAEA,SAAgB,mBACd,SACA,UAAoC,CAAC,GACrC;CACA,QAAQ,QACN,YAAY,UAAU,KAAK,SAAS,OAAO,WAAW;EACpD,IAAI,OAAO,SACT,OAAO,OAAO,cAAc,QAAQ,GAAG,CAAC;EAG1C,sBACE,OAAO,QACP,kBAAkB,GAAG,GACrB,QAAQ,gBAAgB,GAAG,CAC7B;EAEA,OAAO,wBAAwB,QAAQ,eAAe,QAAQ,GAAG,CAAC;CACpE,CAAC;AACL;;AAGA,MAAa,UAAU"}

package/dist/express.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_integration = require('./integration-guh7BHTF.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
 let node_async_hooks = require("node:async_hooks");
@@ -41,13 +42,16 @@ const runRequest = require_core.createRequestRunner(expressLoggerStorage);
 function withAutotel(handler, options) {
 	return async (req, res, next) => {
 		const spanName = typeof options?.spanName === "function" ? options.spanName(req) : options?.spanName ?? `express.${req.method ?? "request"}`;
+		const route = req.route?.path ?? req.path ?? req.originalUrl ?? req.url ?? "/";
 		try {
 			return await runRequest(spanName, (log) => {
 				const auto = enrichFromRequest(req);
 				if (auto && Object.keys(auto).length > 0) log.set(auto);
-				const custom = options?.enrich?.(req);
+				const custom = options?.enrichRequest?.(req);
 				if (custom && Object.keys(custom).length > 0) log.set(custom);
 			}, () => handler(req, res, next), {
+				...require_integration.toRouteAdapterOptions(options),
+				path: route,
 				requestLoggerOptions: options?.requestLoggerOptions,
 				autoEmit: options?.autoEmit,
 				finalize: () => res.statusCode ? { "http.response.status_code": res.statusCode } : void 0
@@ -61,25 +65,10 @@ function withAutotel(handler, options) {
 		}
 	};
 }
-function createExpressAdapter(options) {
-	return {
-		withAutotel: (handler) => withAutotel(handler, options),
-		useLogger,
-		parseError: (error) => (0, autotel.parseError)(error),
-		createStructuredError: (input) => (0, autotel.createStructuredError)(input),
-		createDrainPipeline: (drainOptions) => (0, autotel.createDrainPipeline)(drainOptions)
-	};
-}
-const expressToolkit = require_core.createAdapterToolkit({
-	adapterName: "express",
-	enrich: enrichFromRequest
-});
 
 //#endregion
 exports.createDrainPipeline = autotel.createDrainPipeline;
-exports.createExpressAdapter = createExpressAdapter;
 exports.createStructuredError = autotel.createStructuredError;
-exports.expressToolkit = expressToolkit;
 exports.parseError = autotel.parseError;
 exports.useLogger = useLogger;
 exports.withAutotel = withAutotel;

package/dist/express.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"express.cjs","names":["AsyncLocalStorage","createUseLogger","createRequestRunner","createAdapterToolkit"],"sources":["../src/express.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type DrainPipelineOptions,\n  type ParsedError,\n  type PipelineDrainFn,\n  type RequestLogger,\n  type RequestLoggerOptions,\n  type StructuredError,\n  type StructuredErrorInput,\n} from 'autotel';\nimport {\n  createAdapterToolkit,\n  createRequestRunner,\n  createUseLogger,\n} from './core';\n\nexport interface ExpressRequestLike {\n  method?: string;\n  originalUrl?: string;\n  url?: string;\n  path?: string;\n  route?: { path?: string };\n  headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface ExpressResponseLike {\n  statusCode?: number;\n}\n\nexport type ExpressNext = (err?: unknown) => void;\n\nexport interface ExpressWithAutotelOptions {\n  spanName?: string | ((request: ExpressRequestLike) => string);\n  requestLoggerOptions?: RequestLoggerOptions;\n  enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;\n  /** Emit one wide event automatically when the handler settles. Default `true`. */\n  autoEmit?: boolean;\n}\n\nconst expressLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n  headers: ExpressRequestLike['headers'],\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  const value = headers[name] ?? headers[name.toLowerCase()];\n  if (Array.isArray(value)) return value[0];\n  return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n  request?: ExpressRequestLike,\n): Record<string, unknown> | undefined {\n  if (!request) return undefined;\n\n  const url = request.originalUrl ?? request.url;\n  const route = request.route?.path ?? request.path ?? url;\n  const requestId = headerValue(request.headers, 'x-request-id');\n\n  return {\n    ...(request.method ? { 'http.request.method': request.method } : {}),\n    ...(url ? { 'url.full': url } : {}),\n    ...(route ? { 'http.route': route } : {}),\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst baseUseLogger = createUseLogger<ExpressRequestLike>({\n  adapterName: 'express',\n  enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n  request?: ExpressRequestLike,\n  requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n  const stored = expressLoggerStorage.getStore();\n  if (stored) return stored;\n  return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(expressLoggerStorage);\n\n/**\n * Wrap an Express route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(req)`), and emits one wide event when\n * the handler settles. Thrown errors are recorded and forwarded to `next`.\n */\nexport function withAutotel<\n  TReq extends ExpressRequestLike,\n  TRes extends ExpressResponseLike,\n  TReturn,\n>(\n  handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>,\n  options?: ExpressWithAutotelOptions,\n): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined> {\n  return async (\n    req: TReq,\n    res: TRes,\n    next?: ExpressNext,\n  ): Promise<TReturn | undefined> => {\n    const spanName =\n      typeof options?.spanName === 'function'\n        ? options.spanName(req)\n        : (options?.spanName ?? `express.${req.method ?? 'request'}`);\n\n    try {\n      return await runRequest<TReturn>(\n        spanName,\n        (log) => {\n          const auto = enrichFromRequest(req);\n          if (auto && Object.keys(auto).length > 0) log.set(auto);\n          const custom = options?.enrich?.(req);\n          if (custom && Object.keys(custom).length > 0) log.set(custom);\n        },\n        () => handler(req, res, next),\n        {\n          requestLoggerOptions: options?.requestLoggerOptions,\n          autoEmit: options?.autoEmit,\n          finalize: () =>\n            res.statusCode\n              ? { 'http.response.status_code': res.statusCode }\n              : undefined,\n        },\n      );\n    } catch (error) {\n      if (typeof next === 'function') {\n        next(error);\n        return undefined;\n      }\n      throw error;\n    }\n  };\n}\n\nexport function createExpressAdapter(options?: ExpressWithAutotelOptions) {\n  return {\n    withAutotel: <\n      TReq extends ExpressRequestLike,\n      TRes extends ExpressResponseLike,\n      TReturn,\n    >(\n      handler: (\n        req: TReq,\n        res: TRes,\n        next?: ExpressNext,\n      ) => TReturn | Promise<TReturn>,\n    ) => withAutotel(handler, options),\n    useLogger,\n    parseError: (error: unknown): ParsedError => parseError(error),\n    createStructuredError: (input: StructuredErrorInput): StructuredError =>\n      createStructuredError(input),\n    createDrainPipeline: <T = unknown>(\n      drainOptions?: DrainPipelineOptions<T>,\n    ): ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>) =>\n      createDrainPipeline(drainOptions),\n  };\n}\n\nexport const expressToolkit = createAdapterToolkit<ExpressRequestLike>({\n  adapterName: 'express',\n  enrich: enrichFromRequest,\n});\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;AA0CA,MAAM,uBAAuB,IAAIA,mCAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,MAAM,QAAQ,eAAe,QAAQ;CAC3C,MAAM,QAAQ,QAAQ,OAAO,QAAQ,QAAQ,QAAQ;CACrD,MAAM,YAAY,YAAY,QAAQ,SAAS,cAAc;CAE7D,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;EACjC,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgBC,6BAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAaC,iCAAoB,oBAAoB;;;;;;AAO3D,SAAgB,YAKd,SACA,SAC4E;CAC5E,OAAO,OACL,KACA,KACA,SACiC;EACjC,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,GAAG,IACnB,SAAS,YAAY,WAAW,IAAI,UAAU;EAErD,IAAI;GACF,OAAO,MAAM,WACX,WACC,QAAQ;IACP,MAAM,OAAO,kBAAkB,GAAG;IAClC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;IACtD,MAAM,SAAS,SAAS,SAAS,GAAG;IACpC,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;GAC9D,SACM,QAAQ,KAAK,KAAK,IAAI,GAC5B;IACE,sBAAsB,SAAS;IAC/B,UAAU,SAAS;IACnB,gBACE,IAAI,aACA,EAAE,6BAA6B,IAAI,WAAW,IAC9C;GACR,CACF;EACF,SAAS,OAAO;GACd,IAAI,OAAO,SAAS,YAAY;IAC9B,KAAK,KAAK;IACV;GACF;GACA,MAAM;EACR;CACF;AACF;AAEA,SAAgB,qBAAqB,SAAqC;CACxE,OAAO;EACL,cAKE,YAKG,YAAY,SAAS,OAAO;EACjC;EACA,aAAa,kCAA2C,KAAK;EAC7D,wBAAwB,6CACA,KAAK;EAC7B,sBACE,kDAEoB,YAAY;CACpC;AACF;AAEA,MAAa,iBAAiBC,kCAAyC;CACrE,aAAa;CACb,QAAQ;AACV,CAAC"}
+{"version":3,"file":"express.cjs","names":["AsyncLocalStorage","createUseLogger","createRequestRunner","toRouteAdapterOptions"],"sources":["../src/express.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type RequestLogger,\n  type RequestLoggerOptions,\n} from 'autotel';\nimport {\n  createRequestRunner,\n  createUseLogger,\n  toRouteAdapterOptions,\n  type RouteAdapterOptions,\n} from './core';\n\nexport interface ExpressRequestLike {\n  method?: string;\n  originalUrl?: string;\n  url?: string;\n  path?: string;\n  route?: { path?: string };\n  headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface ExpressResponseLike {\n  statusCode?: number;\n}\n\nexport type ExpressNext = (err?: unknown) => void;\n\nexport interface ExpressWithAutotelOptions extends RouteAdapterOptions {\n  spanName?: string | ((request: ExpressRequestLike) => string);\n  requestLoggerOptions?: RequestLoggerOptions;\n  enrichRequest?: (\n    request: ExpressRequestLike,\n  ) => Record<string, unknown> | undefined;\n  autoEmit?: boolean;\n}\n\nconst expressLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n  headers: ExpressRequestLike['headers'],\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  const value = headers[name] ?? headers[name.toLowerCase()];\n  if (Array.isArray(value)) return value[0];\n  return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n  request?: ExpressRequestLike,\n): Record<string, unknown> | undefined {\n  if (!request) return undefined;\n\n  const url = request.originalUrl ?? request.url;\n  const route = request.route?.path ?? request.path ?? url;\n  const requestId = headerValue(request.headers, 'x-request-id');\n\n  return {\n    ...(request.method ? { 'http.request.method': request.method } : {}),\n    ...(url ? { 'url.full': url } : {}),\n    ...(route ? { 'http.route': route } : {}),\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst baseUseLogger = createUseLogger<ExpressRequestLike>({\n  adapterName: 'express',\n  enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n  request?: ExpressRequestLike,\n  requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n  const stored = expressLoggerStorage.getStore();\n  if (stored) return stored;\n  return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(expressLoggerStorage);\n\n/**\n * Wrap an Express route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(req)`), and emits one wide event when\n * the handler settles. Thrown errors are recorded and forwarded to `next`.\n */\nexport function withAutotel<\n  TReq extends ExpressRequestLike,\n  TRes extends ExpressResponseLike,\n  TReturn,\n>(\n  handler: (\n    req: TReq,\n    res: TRes,\n    next?: ExpressNext,\n  ) => TReturn | Promise<TReturn>,\n  options?: ExpressWithAutotelOptions,\n): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined> {\n  return async (\n    req: TReq,\n    res: TRes,\n    next?: ExpressNext,\n  ): Promise<TReturn | undefined> => {\n    const spanName =\n      typeof options?.spanName === 'function'\n        ? options.spanName(req)\n        : (options?.spanName ?? `express.${req.method ?? 'request'}`);\n\n    const route =\n      req.route?.path ?? req.path ?? req.originalUrl ?? req.url ?? '/';\n\n    try {\n      return await runRequest<TReturn>(\n        spanName,\n        (log) => {\n          const auto = enrichFromRequest(req);\n          if (auto && Object.keys(auto).length > 0) log.set(auto);\n          const custom = options?.enrichRequest?.(req);\n          if (custom && Object.keys(custom).length > 0) log.set(custom);\n        },\n        () => handler(req, res, next),\n        {\n          ...toRouteAdapterOptions(options),\n          path: route,\n          requestLoggerOptions: options?.requestLoggerOptions,\n          autoEmit: options?.autoEmit,\n          finalize: () =>\n            res.statusCode\n              ? { 'http.response.status_code': res.statusCode }\n              : undefined,\n        },\n      );\n    } catch (error) {\n      if (typeof next === 'function') {\n        next(error);\n        return undefined;\n      }\n      throw error;\n    }\n  };\n}\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;;AAuCA,MAAM,uBAAuB,IAAIA,mCAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,MAAM,QAAQ,eAAe,QAAQ;CAC3C,MAAM,QAAQ,QAAQ,OAAO,QAAQ,QAAQ,QAAQ;CACrD,MAAM,YAAY,YAAY,QAAQ,SAAS,cAAc;CAE7D,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;EACjC,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgBC,6BAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAaC,iCAAoB,oBAAoB;;;;;;AAO3D,SAAgB,YAKd,SAKA,SAC4E;CAC5E,OAAO,OACL,KACA,KACA,SACiC;EACjC,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,GAAG,IACnB,SAAS,YAAY,WAAW,IAAI,UAAU;EAErD,MAAM,QACJ,IAAI,OAAO,QAAQ,IAAI,QAAQ,IAAI,eAAe,IAAI,OAAO;EAE/D,IAAI;GACF,OAAO,MAAM,WACX,WACC,QAAQ;IACP,MAAM,OAAO,kBAAkB,GAAG;IAClC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;IACtD,MAAM,SAAS,SAAS,gBAAgB,GAAG;IAC3C,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;GAC9D,SACM,QAAQ,KAAK,KAAK,IAAI,GAC5B;IACE,GAAGC,0CAAsB,OAAO;IAChC,MAAM;IACN,sBAAsB,SAAS;IAC/B,UAAU,SAAS;IACnB,gBACE,IAAI,aACA,EAAE,6BAA6B,IAAI,WAAW,IAC9C;GACR,CACF;EACF,SAAS,OAAO;GACd,IAAI,OAAO,SAAS,YAAY;IAC9B,KAAK,KAAK;IACV;GACF;GACA,MAAM;EACR;CACF;AACF"}

package/dist/express.d.cts

@@ -1,6 +1,6 @@
-import { AdapterToolkit } from "./core.cjs";
-import { DrainPipelineOptions, ParsedError, PipelineDrainFn, RequestLogger, RequestLoggerOptions, StructuredError, StructuredErrorInput, createDrainPipeline, createStructuredError, parseError } from "autotel";
-
+import { _ as RouteAdapterOptions } from "./integration-DI-1RuTh.cjs";
+import "./core.cjs";
+import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/express.d.ts
 interface ExpressRequestLike {
   method?: string;
@@ -16,11 +16,10 @@ interface ExpressResponseLike {
   statusCode?: number;
 }
 type ExpressNext = (err?: unknown) => void;
-interface ExpressWithAutotelOptions {
+interface ExpressWithAutotelOptions extends RouteAdapterOptions {
   spanName?: string | ((request: ExpressRequestLike) => string);
   requestLoggerOptions?: RequestLoggerOptions;
-  enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
-  /** Emit one wide event automatically when the handler settles. Default `true`. */
+  enrichRequest?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
   autoEmit?: boolean;
 }
 declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?: RequestLoggerOptions): RequestLogger;
@@ -30,14 +29,6 @@ declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?:
  * the handler settles. Thrown errors are recorded and forwarded to `next`.
  */
 declare function withAutotel<TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>, options?: ExpressWithAutotelOptions): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
-declare function createExpressAdapter(options?: ExpressWithAutotelOptions): {
-  withAutotel: <TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>) => (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
-  useLogger: typeof useLogger;
-  parseError: (error: unknown) => ParsedError;
-  createStructuredError: (input: StructuredErrorInput) => StructuredError;
-  createDrainPipeline: <T = unknown>(drainOptions?: DrainPipelineOptions<T>) => ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>);
-};
-declare const expressToolkit: AdapterToolkit<ExpressRequestLike>;
 //#endregion
-export { ExpressNext, ExpressRequestLike, ExpressResponseLike, ExpressWithAutotelOptions, createDrainPipeline, createExpressAdapter, createStructuredError, expressToolkit, parseError, useLogger, withAutotel };
+export { ExpressNext, ExpressRequestLike, ExpressResponseLike, ExpressWithAutotelOptions, createDrainPipeline, createStructuredError, parseError, useLogger, withAutotel };
 //# sourceMappingURL=express.d.cts.map

package/dist/express.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"express.d.cts","names":[],"sources":["../src/express.ts"],"mappings":";;;;UAmBiB,kBAAA;EACf,MAAA;EACA,WAAA;EACA,GAAA;EACA,IAAA;EACA,KAAA;IAAU,IAAA;EAAA;EACV,OAAA,GAAU,MAAM;AAAA;AAAA,UAGD,mBAAA;EACf,UAAU;AAAA;AAAA,KAGA,WAAA,IAAe,GAAa;AAAA,UAEvB,yBAAA;EACf,QAAA,cAAsB,OAAA,EAAS,kBAAA;EAC/B,oBAAA,GAAuB,oBAAA;EACvB,MAAA,IAAU,OAAA,EAAS,kBAAA,KAAuB,MAAA;EATR;EAWlC,QAAA;AAAA;AAAA,iBAqCc,SAAA,CACd,OAAA,GAAU,kBAAA,EACV,oBAAA,GAAuB,oBAAA,GACtB,aAAA;AA/CH;;;;AAAwC;AAAxC,iBA4DgB,WAAA,cACD,kBAAA,eACA,mBAAA,WAGb,OAAA,GAAU,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,GAAU,OAAA,CAAQ,OAAA,GACzE,OAAA,GAAU,yBAAA,IACR,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,CAAQ,OAAA;AAAA,iBAwCzC,oBAAA,CAAqB,OAAA,GAAU,yBAAA;6BAG5B,kBAAA,eACA,mBAAA,WACN,OAAA,GAGL,GAAA,EAAK,IAAA,EACL,GAAA,EAAK,IAAA,EACL,IAAA,GAAO,WAAA,KACJ,OAAA,GAAU,OAAA,CAAQ,OAAA,OAAQ,GAAA,EAAA,IAAA,EAAA,GAAA,EAAA,IAAA,EAAA,IAAA,GAnDJ,WAAA,KAAW,OAAA,CAAA,OAAA;;kCAsDV,WAAA;iCACC,oBAAA,KAAuB,eAAA;qCAE/B,YAAA,GACN,oBAAA,CAAqB,CAAA,QACjC,UAAA,GAAa,KAAA,EAAO,CAAA,cAAe,OAAA,WAAkB,eAAA,CAAgB,CAAA;AAAA;AAAA,cAKjE,cAAA,EAAc,cAAA,CAAA,kBAAA"}
+{"version":3,"file":"express.d.cts","names":[],"sources":["../src/express.ts"],"mappings":";;;;UAeiB;EACf;EACA;EACA;EACA;EACA;IAAU;;EACV,UAAU;;UAGK;EACf;;KAGU,eAAe;UAEV,kCAAkC;EACjD,sBAAsB,SAAS;EAC/B,uBAAuB;EACvB,iBACE,SAAS,uBACN;EACL;;iBAqCc,UACd,UAAU,oBACV,uBAAuB,uBACtB;;;;;;iBAaa,YACd,aAAa,oBACb,aAAa,qBACb,SAEA,UACE,KAAK,MACL,KAAK,MACL,OAAO,gBACJ,UAAU,QAAQ,UACvB,UAAU,6BACR,KAAK,MAAM,KAAK,MAAM,OAAO,gBAAgB,QAAQ"}

package/dist/express.d.ts

@@ -1,6 +1,6 @@
-import { AdapterToolkit } from "./core.js";
-import { DrainPipelineOptions, ParsedError, PipelineDrainFn, RequestLogger, RequestLoggerOptions, StructuredError, StructuredErrorInput, createDrainPipeline, createStructuredError, parseError } from "autotel";
-
+import { _ as RouteAdapterOptions } from "./integration-rYoX8QLk.js";
+import "./core.js";
+import { RequestLogger, RequestLoggerOptions, createDrainPipeline, createStructuredError, parseError } from "autotel";
 //#region src/express.d.ts
 interface ExpressRequestLike {
   method?: string;
@@ -16,11 +16,10 @@ interface ExpressResponseLike {
   statusCode?: number;
 }
 type ExpressNext = (err?: unknown) => void;
-interface ExpressWithAutotelOptions {
+interface ExpressWithAutotelOptions extends RouteAdapterOptions {
   spanName?: string | ((request: ExpressRequestLike) => string);
   requestLoggerOptions?: RequestLoggerOptions;
-  enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
-  /** Emit one wide event automatically when the handler settles. Default `true`. */
+  enrichRequest?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
   autoEmit?: boolean;
 }
 declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?: RequestLoggerOptions): RequestLogger;
@@ -30,14 +29,6 @@ declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?:
  * the handler settles. Thrown errors are recorded and forwarded to `next`.
  */
 declare function withAutotel<TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>, options?: ExpressWithAutotelOptions): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
-declare function createExpressAdapter(options?: ExpressWithAutotelOptions): {
-  withAutotel: <TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>) => (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
-  useLogger: typeof useLogger;
-  parseError: (error: unknown) => ParsedError;
-  createStructuredError: (input: StructuredErrorInput) => StructuredError;
-  createDrainPipeline: <T = unknown>(drainOptions?: DrainPipelineOptions<T>) => ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>);
-};
-declare const expressToolkit: AdapterToolkit<ExpressRequestLike>;
 //#endregion
-export { ExpressNext, ExpressRequestLike, ExpressResponseLike, ExpressWithAutotelOptions, createDrainPipeline, createExpressAdapter, createStructuredError, expressToolkit, parseError, useLogger, withAutotel };
+export { ExpressNext, ExpressRequestLike, ExpressResponseLike, ExpressWithAutotelOptions, createDrainPipeline, createStructuredError, parseError, useLogger, withAutotel };
 //# sourceMappingURL=express.d.ts.map

package/dist/express.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"express.d.ts","names":[],"sources":["../src/express.ts"],"mappings":";;;;UAmBiB,kBAAA;EACf,MAAA;EACA,WAAA;EACA,GAAA;EACA,IAAA;EACA,KAAA;IAAU,IAAA;EAAA;EACV,OAAA,GAAU,MAAM;AAAA;AAAA,UAGD,mBAAA;EACf,UAAU;AAAA;AAAA,KAGA,WAAA,IAAe,GAAa;AAAA,UAEvB,yBAAA;EACf,QAAA,cAAsB,OAAA,EAAS,kBAAA;EAC/B,oBAAA,GAAuB,oBAAA;EACvB,MAAA,IAAU,OAAA,EAAS,kBAAA,KAAuB,MAAA;EATR;EAWlC,QAAA;AAAA;AAAA,iBAqCc,SAAA,CACd,OAAA,GAAU,kBAAA,EACV,oBAAA,GAAuB,oBAAA,GACtB,aAAA;AA/CH;;;;AAAwC;AAAxC,iBA4DgB,WAAA,cACD,kBAAA,eACA,mBAAA,WAGb,OAAA,GAAU,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,GAAU,OAAA,CAAQ,OAAA,GACzE,OAAA,GAAU,yBAAA,IACR,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,CAAQ,OAAA;AAAA,iBAwCzC,oBAAA,CAAqB,OAAA,GAAU,yBAAA;6BAG5B,kBAAA,eACA,mBAAA,WACN,OAAA,GAGL,GAAA,EAAK,IAAA,EACL,GAAA,EAAK,IAAA,EACL,IAAA,GAAO,WAAA,KACJ,OAAA,GAAU,OAAA,CAAQ,OAAA,OAAQ,GAAA,EAAA,IAAA,EAAA,GAAA,EAAA,IAAA,EAAA,IAAA,GAnDJ,WAAA,KAAW,OAAA,CAAA,OAAA;;kCAsDV,WAAA;iCACC,oBAAA,KAAuB,eAAA;qCAE/B,YAAA,GACN,oBAAA,CAAqB,CAAA,QACjC,UAAA,GAAa,KAAA,EAAO,CAAA,cAAe,OAAA,WAAkB,eAAA,CAAgB,CAAA;AAAA;AAAA,cAKjE,cAAA,EAAc,cAAA,CAAA,kBAAA"}
+{"version":3,"file":"express.d.ts","names":[],"sources":["../src/express.ts"],"mappings":";;;;UAeiB;EACf;EACA;EACA;EACA;EACA;IAAU;;EACV,UAAU;;UAGK;EACf;;KAGU,eAAe;UAEV,kCAAkC;EACjD,sBAAsB,SAAS;EAC/B,uBAAuB;EACvB,iBACE,SAAS,uBACN;EACL;;iBAqCc,UACd,UAAU,oBACV,uBAAuB,uBACtB;;;;;;iBAaa,YACd,aAAa,oBACb,aAAa,qBACb,SAEA,UACE,KAAK,MACL,KAAK,MACL,OAAO,gBACJ,UAAU,QAAQ,UACvB,UAAU,6BACR,KAAK,MAAM,KAAK,MAAM,OAAO,gBAAgB,QAAQ"}

package/dist/express.js

@@ -1,4 +1,5 @@
-import { createAdapterToolkit, createRequestRunner, createUseLogger } from "./core.js";
+import { o as toRouteAdapterOptions } from "./integration-IUpfttGT.js";
+import { createRequestRunner, createUseLogger } from "./core.js";
 import { createDrainPipeline, createStructuredError, parseError } from "autotel";
 import { AsyncLocalStorage } from "node:async_hooks";
 
@@ -40,13 +41,16 @@ const runRequest = createRequestRunner(expressLoggerStorage);
 function withAutotel(handler, options) {
 	return async (req, res, next) => {
 		const spanName = typeof options?.spanName === "function" ? options.spanName(req) : options?.spanName ?? `express.${req.method ?? "request"}`;
+		const route = req.route?.path ?? req.path ?? req.originalUrl ?? req.url ?? "/";
 		try {
 			return await runRequest(spanName, (log) => {
 				const auto = enrichFromRequest(req);
 				if (auto && Object.keys(auto).length > 0) log.set(auto);
-				const custom = options?.enrich?.(req);
+				const custom = options?.enrichRequest?.(req);
 				if (custom && Object.keys(custom).length > 0) log.set(custom);
 			}, () => handler(req, res, next), {
+				...toRouteAdapterOptions(options),
+				path: route,
 				requestLoggerOptions: options?.requestLoggerOptions,
 				autoEmit: options?.autoEmit,
 				finalize: () => res.statusCode ? { "http.response.status_code": res.statusCode } : void 0
@@ -60,20 +64,7 @@ function withAutotel(handler, options) {
 		}
 	};
 }
-function createExpressAdapter(options) {
-	return {
-		withAutotel: (handler) => withAutotel(handler, options),
-		useLogger,
-		parseError: (error) => parseError(error),
-		createStructuredError: (input) => createStructuredError(input),
-		createDrainPipeline: (drainOptions) => createDrainPipeline(drainOptions)
-	};
-}
-const expressToolkit = createAdapterToolkit({
-	adapterName: "express",
-	enrich: enrichFromRequest
-});
 
 //#endregion
-export { createDrainPipeline, createExpressAdapter, createStructuredError, expressToolkit, parseError, useLogger, withAutotel };
+export { createDrainPipeline, createStructuredError, parseError, useLogger, withAutotel };
 //# sourceMappingURL=express.js.map

package/dist/express.js.map

@@ -1 +1 @@
-{"version":3,"file":"express.js","names":[],"sources":["../src/express.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type DrainPipelineOptions,\n  type ParsedError,\n  type PipelineDrainFn,\n  type RequestLogger,\n  type RequestLoggerOptions,\n  type StructuredError,\n  type StructuredErrorInput,\n} from 'autotel';\nimport {\n  createAdapterToolkit,\n  createRequestRunner,\n  createUseLogger,\n} from './core';\n\nexport interface ExpressRequestLike {\n  method?: string;\n  originalUrl?: string;\n  url?: string;\n  path?: string;\n  route?: { path?: string };\n  headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface ExpressResponseLike {\n  statusCode?: number;\n}\n\nexport type ExpressNext = (err?: unknown) => void;\n\nexport interface ExpressWithAutotelOptions {\n  spanName?: string | ((request: ExpressRequestLike) => string);\n  requestLoggerOptions?: RequestLoggerOptions;\n  enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;\n  /** Emit one wide event automatically when the handler settles. Default `true`. */\n  autoEmit?: boolean;\n}\n\nconst expressLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n  headers: ExpressRequestLike['headers'],\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  const value = headers[name] ?? headers[name.toLowerCase()];\n  if (Array.isArray(value)) return value[0];\n  return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n  request?: ExpressRequestLike,\n): Record<string, unknown> | undefined {\n  if (!request) return undefined;\n\n  const url = request.originalUrl ?? request.url;\n  const route = request.route?.path ?? request.path ?? url;\n  const requestId = headerValue(request.headers, 'x-request-id');\n\n  return {\n    ...(request.method ? { 'http.request.method': request.method } : {}),\n    ...(url ? { 'url.full': url } : {}),\n    ...(route ? { 'http.route': route } : {}),\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst baseUseLogger = createUseLogger<ExpressRequestLike>({\n  adapterName: 'express',\n  enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n  request?: ExpressRequestLike,\n  requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n  const stored = expressLoggerStorage.getStore();\n  if (stored) return stored;\n  return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(expressLoggerStorage);\n\n/**\n * Wrap an Express route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(req)`), and emits one wide event when\n * the handler settles. Thrown errors are recorded and forwarded to `next`.\n */\nexport function withAutotel<\n  TReq extends ExpressRequestLike,\n  TRes extends ExpressResponseLike,\n  TReturn,\n>(\n  handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>,\n  options?: ExpressWithAutotelOptions,\n): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined> {\n  return async (\n    req: TReq,\n    res: TRes,\n    next?: ExpressNext,\n  ): Promise<TReturn | undefined> => {\n    const spanName =\n      typeof options?.spanName === 'function'\n        ? options.spanName(req)\n        : (options?.spanName ?? `express.${req.method ?? 'request'}`);\n\n    try {\n      return await runRequest<TReturn>(\n        spanName,\n        (log) => {\n          const auto = enrichFromRequest(req);\n          if (auto && Object.keys(auto).length > 0) log.set(auto);\n          const custom = options?.enrich?.(req);\n          if (custom && Object.keys(custom).length > 0) log.set(custom);\n        },\n        () => handler(req, res, next),\n        {\n          requestLoggerOptions: options?.requestLoggerOptions,\n          autoEmit: options?.autoEmit,\n          finalize: () =>\n            res.statusCode\n              ? { 'http.response.status_code': res.statusCode }\n              : undefined,\n        },\n      );\n    } catch (error) {\n      if (typeof next === 'function') {\n        next(error);\n        return undefined;\n      }\n      throw error;\n    }\n  };\n}\n\nexport function createExpressAdapter(options?: ExpressWithAutotelOptions) {\n  return {\n    withAutotel: <\n      TReq extends ExpressRequestLike,\n      TRes extends ExpressResponseLike,\n      TReturn,\n    >(\n      handler: (\n        req: TReq,\n        res: TRes,\n        next?: ExpressNext,\n      ) => TReturn | Promise<TReturn>,\n    ) => withAutotel(handler, options),\n    useLogger,\n    parseError: (error: unknown): ParsedError => parseError(error),\n    createStructuredError: (input: StructuredErrorInput): StructuredError =>\n      createStructuredError(input),\n    createDrainPipeline: <T = unknown>(\n      drainOptions?: DrainPipelineOptions<T>,\n    ): ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>) =>\n      createDrainPipeline(drainOptions),\n  };\n}\n\nexport const expressToolkit = createAdapterToolkit<ExpressRequestLike>({\n  adapterName: 'express',\n  enrich: enrichFromRequest,\n});\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;AA0CA,MAAM,uBAAuB,IAAI,kBAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,MAAM,QAAQ,eAAe,QAAQ;CAC3C,MAAM,QAAQ,QAAQ,OAAO,QAAQ,QAAQ,QAAQ;CACrD,MAAM,YAAY,YAAY,QAAQ,SAAS,cAAc;CAE7D,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;EACjC,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgB,gBAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAa,oBAAoB,oBAAoB;;;;;;AAO3D,SAAgB,YAKd,SACA,SAC4E;CAC5E,OAAO,OACL,KACA,KACA,SACiC;EACjC,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,GAAG,IACnB,SAAS,YAAY,WAAW,IAAI,UAAU;EAErD,IAAI;GACF,OAAO,MAAM,WACX,WACC,QAAQ;IACP,MAAM,OAAO,kBAAkB,GAAG;IAClC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;IACtD,MAAM,SAAS,SAAS,SAAS,GAAG;IACpC,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;GAC9D,SACM,QAAQ,KAAK,KAAK,IAAI,GAC5B;IACE,sBAAsB,SAAS;IAC/B,UAAU,SAAS;IACnB,gBACE,IAAI,aACA,EAAE,6BAA6B,IAAI,WAAW,IAC9C;GACR,CACF;EACF,SAAS,OAAO;GACd,IAAI,OAAO,SAAS,YAAY;IAC9B,KAAK,KAAK;IACV;GACF;GACA,MAAM;EACR;CACF;AACF;AAEA,SAAgB,qBAAqB,SAAqC;CACxE,OAAO;EACL,cAKE,YAKG,YAAY,SAAS,OAAO;EACjC;EACA,aAAa,UAAgC,WAAW,KAAK;EAC7D,wBAAwB,UACtB,sBAAsB,KAAK;EAC7B,sBACE,iBAEA,oBAAoB,YAAY;CACpC;AACF;AAEA,MAAa,iBAAiB,qBAAyC;CACrE,aAAa;CACb,QAAQ;AACV,CAAC"}
+{"version":3,"file":"express.js","names":[],"sources":["../src/express.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type RequestLogger,\n  type RequestLoggerOptions,\n} from 'autotel';\nimport {\n  createRequestRunner,\n  createUseLogger,\n  toRouteAdapterOptions,\n  type RouteAdapterOptions,\n} from './core';\n\nexport interface ExpressRequestLike {\n  method?: string;\n  originalUrl?: string;\n  url?: string;\n  path?: string;\n  route?: { path?: string };\n  headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface ExpressResponseLike {\n  statusCode?: number;\n}\n\nexport type ExpressNext = (err?: unknown) => void;\n\nexport interface ExpressWithAutotelOptions extends RouteAdapterOptions {\n  spanName?: string | ((request: ExpressRequestLike) => string);\n  requestLoggerOptions?: RequestLoggerOptions;\n  enrichRequest?: (\n    request: ExpressRequestLike,\n  ) => Record<string, unknown> | undefined;\n  autoEmit?: boolean;\n}\n\nconst expressLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n  headers: ExpressRequestLike['headers'],\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  const value = headers[name] ?? headers[name.toLowerCase()];\n  if (Array.isArray(value)) return value[0];\n  return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n  request?: ExpressRequestLike,\n): Record<string, unknown> | undefined {\n  if (!request) return undefined;\n\n  const url = request.originalUrl ?? request.url;\n  const route = request.route?.path ?? request.path ?? url;\n  const requestId = headerValue(request.headers, 'x-request-id');\n\n  return {\n    ...(request.method ? { 'http.request.method': request.method } : {}),\n    ...(url ? { 'url.full': url } : {}),\n    ...(route ? { 'http.route': route } : {}),\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst baseUseLogger = createUseLogger<ExpressRequestLike>({\n  adapterName: 'express',\n  enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n  request?: ExpressRequestLike,\n  requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n  const stored = expressLoggerStorage.getStore();\n  if (stored) return stored;\n  return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(expressLoggerStorage);\n\n/**\n * Wrap an Express route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(req)`), and emits one wide event when\n * the handler settles. Thrown errors are recorded and forwarded to `next`.\n */\nexport function withAutotel<\n  TReq extends ExpressRequestLike,\n  TRes extends ExpressResponseLike,\n  TReturn,\n>(\n  handler: (\n    req: TReq,\n    res: TRes,\n    next?: ExpressNext,\n  ) => TReturn | Promise<TReturn>,\n  options?: ExpressWithAutotelOptions,\n): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined> {\n  return async (\n    req: TReq,\n    res: TRes,\n    next?: ExpressNext,\n  ): Promise<TReturn | undefined> => {\n    const spanName =\n      typeof options?.spanName === 'function'\n        ? options.spanName(req)\n        : (options?.spanName ?? `express.${req.method ?? 'request'}`);\n\n    const route =\n      req.route?.path ?? req.path ?? req.originalUrl ?? req.url ?? '/';\n\n    try {\n      return await runRequest<TReturn>(\n        spanName,\n        (log) => {\n          const auto = enrichFromRequest(req);\n          if (auto && Object.keys(auto).length > 0) log.set(auto);\n          const custom = options?.enrichRequest?.(req);\n          if (custom && Object.keys(custom).length > 0) log.set(custom);\n        },\n        () => handler(req, res, next),\n        {\n          ...toRouteAdapterOptions(options),\n          path: route,\n          requestLoggerOptions: options?.requestLoggerOptions,\n          autoEmit: options?.autoEmit,\n          finalize: () =>\n            res.statusCode\n              ? { 'http.response.status_code': res.statusCode }\n              : undefined,\n        },\n      );\n    } catch (error) {\n      if (typeof next === 'function') {\n        next(error);\n        return undefined;\n      }\n      throw error;\n    }\n  };\n}\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;AAuCA,MAAM,uBAAuB,IAAI,kBAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,MAAM,QAAQ,eAAe,QAAQ;CAC3C,MAAM,QAAQ,QAAQ,OAAO,QAAQ,QAAQ,QAAQ;CACrD,MAAM,YAAY,YAAY,QAAQ,SAAS,cAAc;CAE7D,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;EACjC,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgB,gBAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAa,oBAAoB,oBAAoB;;;;;;AAO3D,SAAgB,YAKd,SAKA,SAC4E;CAC5E,OAAO,OACL,KACA,KACA,SACiC;EACjC,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,GAAG,IACnB,SAAS,YAAY,WAAW,IAAI,UAAU;EAErD,MAAM,QACJ,IAAI,OAAO,QAAQ,IAAI,QAAQ,IAAI,eAAe,IAAI,OAAO;EAE/D,IAAI;GACF,OAAO,MAAM,WACX,WACC,QAAQ;IACP,MAAM,OAAO,kBAAkB,GAAG;IAClC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;IACtD,MAAM,SAAS,SAAS,gBAAgB,GAAG;IAC3C,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;GAC9D,SACM,QAAQ,KAAK,KAAK,IAAI,GAC5B;IACE,GAAG,sBAAsB,OAAO;IAChC,MAAM;IACN,sBAAsB,SAAS;IAC/B,UAAU,SAAS;IACnB,gBACE,IAAI,aACA,EAAE,6BAA6B,IAAI,WAAW,IAC9C;GACR,CACF;EACF,SAAS,OAAO;GACd,IAAI,OAAO,SAAS,YAAY;IAC9B,KAAK,KAAK;IACV;GACF;GACA,MAAM;EACR;CACF;AACF"}

package/dist/fastify.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_integration = require('./integration-guh7BHTF.cjs');
 const require_core = require('./core.cjs');
 let autotel = require("autotel");
 let node_async_hooks = require("node:async_hooks");
@@ -41,37 +42,25 @@ const runRequest = require_core.createRequestRunner(fastifyLoggerStorage);
 function withAutotel(handler, options) {
 	return (request, reply) => {
 		const spanName = typeof options?.spanName === "function" ? options.spanName(request) : options?.spanName ?? `fastify.${request.method ?? "request"}`;
+		const route = request.routeOptions?.url ?? request.routerPath ?? request.url ?? "/";
 		return runRequest(spanName, (log) => {
 			const auto = enrichFromRequest(request);
 			if (auto && Object.keys(auto).length > 0) log.set(auto);
-			const custom = options?.enrich?.(request);
+			const custom = options?.enrichRequest?.(request);
 			if (custom && Object.keys(custom).length > 0) log.set(custom);
 		}, () => handler(request, reply), {
+			...require_integration.toRouteAdapterOptions(options),
+			path: route,
 			requestLoggerOptions: options?.requestLoggerOptions,
 			autoEmit: options?.autoEmit,
 			finalize: () => reply.statusCode ? { "http.response.status_code": reply.statusCode } : void 0
 		});
 	};
 }
-function createFastifyAdapter(options) {
-	return {
-		withAutotel: (handler) => withAutotel(handler, options),
-		useLogger,
-		parseError: (error) => (0, autotel.parseError)(error),
-		createStructuredError: (input) => (0, autotel.createStructuredError)(input),
-		createDrainPipeline: (drainOptions) => (0, autotel.createDrainPipeline)(drainOptions)
-	};
-}
-const fastifyToolkit = require_core.createAdapterToolkit({
-	adapterName: "fastify",
-	enrich: enrichFromRequest
-});
 
 //#endregion
 exports.createDrainPipeline = autotel.createDrainPipeline;
-exports.createFastifyAdapter = createFastifyAdapter;
 exports.createStructuredError = autotel.createStructuredError;
-exports.fastifyToolkit = fastifyToolkit;
 exports.parseError = autotel.parseError;
 exports.useLogger = useLogger;
 exports.withAutotel = withAutotel;

package/dist/fastify.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"fastify.cjs","names":["AsyncLocalStorage","createUseLogger","createRequestRunner","createAdapterToolkit"],"sources":["../src/fastify.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type DrainPipelineOptions,\n  type ParsedError,\n  type PipelineDrainFn,\n  type RequestLogger,\n  type RequestLoggerOptions,\n  type StructuredError,\n  type StructuredErrorInput,\n} from 'autotel';\nimport {\n  createAdapterToolkit,\n  createRequestRunner,\n  createUseLogger,\n} from './core';\n\nexport interface FastifyRequestLike {\n  method?: string;\n  url?: string;\n  routeOptions?: { url?: string };\n  routerPath?: string;\n  id?: string;\n  headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface FastifyReplyLike {\n  statusCode?: number;\n}\n\nexport interface FastifyWithAutotelOptions {\n  spanName?: string | ((request: FastifyRequestLike) => string);\n  requestLoggerOptions?: RequestLoggerOptions;\n  enrich?: (request: FastifyRequestLike) => Record<string, unknown> | undefined;\n  /** Emit one wide event automatically when the handler settles. Default `true`. */\n  autoEmit?: boolean;\n}\n\nconst fastifyLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n  headers: FastifyRequestLike['headers'],\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  const value = headers[name] ?? headers[name.toLowerCase()];\n  if (Array.isArray(value)) return value[0];\n  return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n  request?: FastifyRequestLike,\n): Record<string, unknown> | undefined {\n  if (!request) return undefined;\n\n  const route = request.routeOptions?.url ?? request.routerPath ?? request.url;\n  const requestId = request.id ?? headerValue(request.headers, 'x-request-id');\n\n  return {\n    ...(request.method ? { 'http.request.method': request.method } : {}),\n    ...(request.url ? { 'url.full': request.url } : {}),\n    ...(route ? { 'http.route': route } : {}),\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst baseUseLogger = createUseLogger<FastifyRequestLike>({\n  adapterName: 'fastify',\n  enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n  request?: FastifyRequestLike,\n  requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n  const stored = fastifyLoggerStorage.getStore();\n  if (stored) return stored;\n  return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(fastifyLoggerStorage);\n\n/**\n * Wrap a Fastify route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(request)`), and emits one wide event\n * when the handler settles. Thrown errors are recorded, then rethrown for\n * Fastify's error handling.\n */\nexport function withAutotel<\n  TReq extends FastifyRequestLike,\n  TRes extends FastifyReplyLike,\n  TReturn,\n>(\n  handler: (request: TReq, reply: TRes) => TReturn | Promise<TReturn>,\n  options?: FastifyWithAutotelOptions,\n): (request: TReq, reply: TRes) => Promise<TReturn> {\n  return (request: TReq, reply: TRes): Promise<TReturn> => {\n    const spanName =\n      typeof options?.spanName === 'function'\n        ? options.spanName(request)\n        : (options?.spanName ?? `fastify.${request.method ?? 'request'}`);\n\n    return runRequest<TReturn>(\n      spanName,\n      (log) => {\n        const auto = enrichFromRequest(request);\n        if (auto && Object.keys(auto).length > 0) log.set(auto);\n        const custom = options?.enrich?.(request);\n        if (custom && Object.keys(custom).length > 0) log.set(custom);\n      },\n      () => handler(request, reply),\n      {\n        requestLoggerOptions: options?.requestLoggerOptions,\n        autoEmit: options?.autoEmit,\n        finalize: () =>\n          reply.statusCode\n            ? { 'http.response.status_code': reply.statusCode }\n            : undefined,\n      },\n    );\n  };\n}\n\nexport function createFastifyAdapter(options?: FastifyWithAutotelOptions) {\n  return {\n    withAutotel: <\n      TReq extends FastifyRequestLike,\n      TRes extends FastifyReplyLike,\n      TReturn,\n    >(\n      handler: (request: TReq, reply: TRes) => TReturn | Promise<TReturn>,\n    ) => withAutotel(handler, options),\n    useLogger,\n    parseError: (error: unknown): ParsedError => parseError(error),\n    createStructuredError: (input: StructuredErrorInput): StructuredError =>\n      createStructuredError(input),\n    createDrainPipeline: <T = unknown>(\n      drainOptions?: DrainPipelineOptions<T>,\n    ): ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>) =>\n      createDrainPipeline(drainOptions),\n  };\n}\n\nexport const fastifyToolkit = createAdapterToolkit<FastifyRequestLike>({\n  adapterName: 'fastify',\n  enrich: enrichFromRequest,\n});\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;AAwCA,MAAM,uBAAuB,IAAIA,mCAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,QAAQ,QAAQ,cAAc,OAAO,QAAQ,cAAc,QAAQ;CACzE,MAAM,YAAY,QAAQ,MAAM,YAAY,QAAQ,SAAS,cAAc;CAE3E,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,QAAQ,MAAM,EAAE,YAAY,QAAQ,IAAI,IAAI,CAAC;EACjD,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgBC,6BAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAaC,iCAAoB,oBAAoB;;;;;;;AAQ3D,SAAgB,YAKd,SACA,SACkD;CAClD,QAAQ,SAAe,UAAkC;EACvD,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,OAAO,IACvB,SAAS,YAAY,WAAW,QAAQ,UAAU;EAEzD,OAAO,WACL,WACC,QAAQ;GACP,MAAM,OAAO,kBAAkB,OAAO;GACtC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;GACtD,MAAM,SAAS,SAAS,SAAS,OAAO;GACxC,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;EAC9D,SACM,QAAQ,SAAS,KAAK,GAC5B;GACE,sBAAsB,SAAS;GAC/B,UAAU,SAAS;GACnB,gBACE,MAAM,aACF,EAAE,6BAA6B,MAAM,WAAW,IAChD;EACR,CACF;CACF;AACF;AAEA,SAAgB,qBAAqB,SAAqC;CACxE,OAAO;EACL,cAKE,YACG,YAAY,SAAS,OAAO;EACjC;EACA,aAAa,kCAA2C,KAAK;EAC7D,wBAAwB,6CACA,KAAK;EAC7B,sBACE,kDAEoB,YAAY;CACpC;AACF;AAEA,MAAa,iBAAiBC,kCAAyC;CACrE,aAAa;CACb,QAAQ;AACV,CAAC"}
+{"version":3,"file":"fastify.cjs","names":["AsyncLocalStorage","createUseLogger","createRequestRunner","toRouteAdapterOptions"],"sources":["../src/fastify.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n  createDrainPipeline,\n  createStructuredError,\n  parseError,\n  type RequestLogger,\n  type RequestLoggerOptions,\n} from 'autotel';\nimport {\n  createRequestRunner,\n  createUseLogger,\n  toRouteAdapterOptions,\n  type RouteAdapterOptions,\n} from './core';\n\nexport interface FastifyRequestLike {\n  method?: string;\n  url?: string;\n  routeOptions?: { url?: string };\n  routerPath?: string;\n  id?: string;\n  headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface FastifyReplyLike {\n  statusCode?: number;\n}\n\nexport interface FastifyWithAutotelOptions extends RouteAdapterOptions {\n  spanName?: string | ((request: FastifyRequestLike) => string);\n  requestLoggerOptions?: RequestLoggerOptions;\n  enrichRequest?: (\n    request: FastifyRequestLike,\n  ) => Record<string, unknown> | undefined;\n  autoEmit?: boolean;\n}\n\nconst fastifyLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n  headers: FastifyRequestLike['headers'],\n  name: string,\n): string | undefined {\n  if (!headers) return undefined;\n  const value = headers[name] ?? headers[name.toLowerCase()];\n  if (Array.isArray(value)) return value[0];\n  return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n  request?: FastifyRequestLike,\n): Record<string, unknown> | undefined {\n  if (!request) return undefined;\n\n  const route = request.routeOptions?.url ?? request.routerPath ?? request.url;\n  const requestId = request.id ?? headerValue(request.headers, 'x-request-id');\n\n  return {\n    ...(request.method ? { 'http.request.method': request.method } : {}),\n    ...(request.url ? { 'url.full': request.url } : {}),\n    ...(route ? { 'http.route': route } : {}),\n    ...(requestId ? { 'http.request.id': requestId } : {}),\n  };\n}\n\nconst baseUseLogger = createUseLogger<FastifyRequestLike>({\n  adapterName: 'fastify',\n  enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n  request?: FastifyRequestLike,\n  requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n  const stored = fastifyLoggerStorage.getStore();\n  if (stored) return stored;\n  return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(fastifyLoggerStorage);\n\n/**\n * Wrap a Fastify route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(request)`), and emits one wide event\n * when the handler settles. Thrown errors are recorded, then rethrown for\n * Fastify's error handling.\n */\nexport function withAutotel<\n  TReq extends FastifyRequestLike,\n  TRes extends FastifyReplyLike,\n  TReturn,\n>(\n  handler: (request: TReq, reply: TRes) => TReturn | Promise<TReturn>,\n  options?: FastifyWithAutotelOptions,\n): (request: TReq, reply: TRes) => Promise<TReturn> {\n  return (request: TReq, reply: TRes): Promise<TReturn> => {\n    const spanName =\n      typeof options?.spanName === 'function'\n        ? options.spanName(request)\n        : (options?.spanName ?? `fastify.${request.method ?? 'request'}`);\n\n    const route =\n      request.routeOptions?.url ?? request.routerPath ?? request.url ?? '/';\n\n    return runRequest<TReturn>(\n      spanName,\n      (log) => {\n        const auto = enrichFromRequest(request);\n        if (auto && Object.keys(auto).length > 0) log.set(auto);\n        const custom = options?.enrichRequest?.(request);\n        if (custom && Object.keys(custom).length > 0) log.set(custom);\n      },\n      () => handler(request, reply),\n      {\n        ...toRouteAdapterOptions(options),\n        path: route,\n        requestLoggerOptions: options?.requestLoggerOptions,\n        autoEmit: options?.autoEmit,\n        finalize: () =>\n          reply.statusCode\n            ? { 'http.response.status_code': reply.statusCode }\n            : undefined,\n      },\n    );\n  };\n}\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;;AAqCA,MAAM,uBAAuB,IAAIA,mCAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,QAAQ,QAAQ,cAAc,OAAO,QAAQ,cAAc,QAAQ;CACzE,MAAM,YAAY,QAAQ,MAAM,YAAY,QAAQ,SAAS,cAAc;CAE3E,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,QAAQ,MAAM,EAAE,YAAY,QAAQ,IAAI,IAAI,CAAC;EACjD,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgBC,6BAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAaC,iCAAoB,oBAAoB;;;;;;;AAQ3D,SAAgB,YAKd,SACA,SACkD;CAClD,QAAQ,SAAe,UAAkC;EACvD,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,OAAO,IACvB,SAAS,YAAY,WAAW,QAAQ,UAAU;EAEzD,MAAM,QACJ,QAAQ,cAAc,OAAO,QAAQ,cAAc,QAAQ,OAAO;EAEpE,OAAO,WACL,WACC,QAAQ;GACP,MAAM,OAAO,kBAAkB,OAAO;GACtC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;GACtD,MAAM,SAAS,SAAS,gBAAgB,OAAO;GAC/C,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;EAC9D,SACM,QAAQ,SAAS,KAAK,GAC5B;GACE,GAAGC,0CAAsB,OAAO;GAChC,MAAM;GACN,sBAAsB,SAAS;GAC/B,UAAU,SAAS;GACnB,gBACE,MAAM,aACF,EAAE,6BAA6B,MAAM,WAAW,IAChD;EACR,CACF;CACF;AACF"}