autotel 2.18.0 → 2.19.0

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/shutdown.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/**\n * Graceful shutdown with flush and cleanup\n */\n\nimport { getSdk, getLogger } from './init';\nimport { getEventQueue, resetEventQueue } from './track';\nimport { resetEvents } from './event';\nimport { resetMetrics } from './metric';\n\n/**\n * Flush all pending telemetry\n *\n * Flushes both events events and OpenTelemetry spans to their destinations.\n * Includes timeout protection to prevent hanging in serverless environments.\n *\n * Safe to call multiple times.\n *\n * @param options - Optional configuration\n * @param options.timeout - Timeout in milliseconds (default: 2000ms)\n * @param options.forShutdown - If true, permanently disables the events queue after flush (used internally by shutdown())\n *\n * @example Manual flush in serverless\n * ```typescript\n * import { flush } from 'autotel';\n *\n * export const handler = async (event) => {\n *   // ... process event\n *   await flush(); // Flush before function returns\n *   return result;\n * };\n * ```\n *\n * @example With custom timeout\n * ```typescript\n * await flush({ timeout: 5000 }); // 5 second timeout\n * ```\n */\nexport async function flush(options?: {\n  timeout?: number;\n  forShutdown?: boolean;\n}): Promise<void> {\n  const timeout = options?.timeout ?? 2000;\n  const forShutdown = options?.forShutdown ?? false;\n\n  const doFlush = async () => {\n    // Flush events queue (or shutdown queue when tearing down)\n    const eventsQueue = getEventQueue();\n    if (eventsQueue) {\n      if (forShutdown) {\n        await eventsQueue.shutdown();\n      } else {\n        await eventsQueue.flush();\n      }\n    }\n\n    // Flush OpenTelemetry spans\n    // This ensures spans are exported immediately, critical for serverless\n    const sdk = getSdk();\n    if (sdk) {\n      try {\n        // Type assertion needed as getTracerProvider is not in the public NodeSDK interface\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const sdkAny = sdk as any;\n        if (typeof sdkAny.getTracerProvider === 'function') {\n          const tracerProvider = sdkAny.getTracerProvider();\n          if (\n            tracerProvider &&\n            typeof tracerProvider.forceFlush === 'function'\n          ) {\n            await tracerProvider.forceFlush();\n          }\n        }\n      } catch {\n        // Ignore errors when accessing tracer provider (may not be available in test mocks)\n      }\n    }\n  };\n\n  // Add timeout protection to prevent hanging\n  let timeoutHandle: NodeJS.Timeout | undefined;\n  try {\n    await Promise.race([\n      doFlush().finally(() => {\n        // Clear timeout as soon as flush completes\n        if (timeoutHandle) {\n          clearTimeout(timeoutHandle);\n        }\n      }),\n      new Promise<void>((_, reject) => {\n        timeoutHandle = setTimeout(\n          () => reject(new Error('Flush timeout')),\n          timeout,\n        );\n        // Use unref() to allow Node to exit if flush completes first\n        // This prevents the 2s delay in serverless when flush succeeds immediately\n        timeoutHandle.unref();\n      }),\n    ]);\n  } catch (error) {\n    // Clear timeout on error too\n    if (timeoutHandle) {\n      clearTimeout(timeoutHandle);\n    }\n    const logger = getLogger();\n    logger.error(\n      {\n        err: error instanceof Error ? error : new Error(String(error)),\n      },\n      '[autotel] Flush error',\n    );\n    throw error;\n  }\n}\n\n/**\n * Shutdown telemetry and cleanup resources\n *\n * - Flushes all pending data\n * - Shuts down OpenTelemetry SDK\n * - Cleans up resources\n *\n * Call this before process exit.\n *\n * Always performs cleanup even if flush fails, preventing resource leaks\n * in serverless handlers or tests.\n *\n * @example Express server\n * ```typescript\n * const server = app.listen(3000)\n *\n * process.on('SIGTERM', async () => {\n *   await server.close()\n *   await shutdown()\n *   process.exit(0)\n * })\n * ```\n */\nexport async function shutdown(): Promise<void> {\n  const logger = getLogger();\n  let shutdownError: Error | null = null;\n\n  // Attempt to flush (with queue shutdown so new events are rejected), but continue with cleanup even if it fails\n  try {\n    await flush({ forShutdown: true });\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error));\n    shutdownError = err;\n    logger.error(\n      {\n        err,\n      },\n      '[autotel] Flush failed during shutdown, continuing cleanup',\n    );\n  }\n\n  // Always shutdown SDK and clean up resources\n  try {\n    // Shutdown OpenTelemetry SDK\n    const sdk = getSdk();\n    if (sdk) {\n      await sdk.shutdown();\n    }\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error));\n\n    // Ignore ECONNREFUSED errors - this happens when no OTLP endpoint was configured\n    // The SDK tries to flush exporters that don't exist, which is harmless\n    const isConnectionRefused =\n      typeof error === 'object' &&\n      error !== null &&\n      'code' in error &&\n      error.code === 'ECONNREFUSED';\n\n    if (!isConnectionRefused) {\n      // Only store/log non-connection errors\n      if (!shutdownError) {\n        shutdownError = err;\n      }\n      logger.error({ err }, '[autotel] SDK shutdown failed');\n    }\n  } finally {\n    // Clean up singleton Maps and queues to prevent memory leaks\n    // This runs even if SDK shutdown fails\n    const eventsQueue = getEventQueue();\n    if (eventsQueue && typeof eventsQueue.cleanup === 'function') {\n      eventsQueue.cleanup();\n    }\n    resetEvents();\n    resetMetrics();\n    resetEventQueue();\n  }\n\n  // Rethrow first error after cleanup completes\n  // This allows tests and CI to detect failures while still ensuring cleanup\n  if (shutdownError) {\n    throw shutdownError;\n  }\n}\n\n/**\n * Register automatic shutdown hooks for common signals\n *\n * Handles:\n * - SIGTERM (Docker/K8s graceful shutdown)\n * - SIGINT (Ctrl+C)\n *\n * @internal Called automatically on module load\n */\nfunction registerShutdownHooks(): void {\n  if (typeof process === 'undefined') return; // Not in Node.js\n\n  const signals: NodeJS.Signals[] = ['SIGTERM', 'SIGINT'];\n  let shuttingDown = false;\n\n  for (const signal of signals) {\n    process.on(signal, async () => {\n      if (shuttingDown) return; // Prevent double shutdown\n      shuttingDown = true;\n\n      if (process.env.NODE_ENV !== 'test') {\n        getLogger().info(\n          {},\n          `[autotel] Received ${signal}, flushing telemetry...`,\n        );\n      }\n\n      try {\n        await shutdown();\n      } catch (error) {\n        getLogger().error(\n          {\n            err: error instanceof Error ? error : undefined,\n          },\n          '[autotel] Error during shutdown',\n        );\n      } finally {\n        process.exit(0);\n      }\n    });\n  }\n}\n\n// Auto-register shutdown hooks\nregisterShutdownHooks();\n"]}
+{"version":3,"sources":["../src/shutdown.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/**\n * Graceful shutdown with flush and cleanup\n */\n\nimport { getSdk, getLogger } from './init';\nimport { getEventQueue, resetEventQueue } from './track';\nimport { resetEvents } from './event';\nimport { resetMetrics } from './metric';\n\n/**\n * Flush all pending telemetry\n *\n * Flushes both events events and OpenTelemetry spans to their destinations.\n * Includes timeout protection to prevent hanging in serverless environments.\n *\n * Safe to call multiple times.\n *\n * @param options - Optional configuration\n * @param options.timeout - Timeout in milliseconds (default: 2000ms)\n * @param options.forShutdown - If true, permanently disables the events queue after flush (used internally by shutdown())\n *\n * @example Manual flush in serverless\n * ```typescript\n * import { flush } from 'autotel';\n *\n * export const handler = async (event) => {\n *   // ... process event\n *   await flush(); // Flush before function returns\n *   return result;\n * };\n * ```\n *\n * @example With custom timeout\n * ```typescript\n * await flush({ timeout: 5000 }); // 5 second timeout\n * ```\n */\nexport async function flush(options?: {\n  timeout?: number;\n  forShutdown?: boolean;\n}): Promise<void> {\n  const timeout = options?.timeout ?? 2000;\n  const forShutdown = options?.forShutdown ?? false;\n\n  const doFlush = async () => {\n    // Flush events queue (or shutdown queue when tearing down)\n    const eventsQueue = getEventQueue();\n    if (eventsQueue) {\n      if (forShutdown) {\n        await eventsQueue.shutdown();\n      } else {\n        await eventsQueue.flush();\n      }\n    }\n\n    // Flush OpenTelemetry spans\n    // This ensures spans are exported immediately, critical for serverless\n    const sdk = getSdk();\n    if (sdk) {\n      try {\n        // Type assertion needed as getTracerProvider is not in the public NodeSDK interface\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const sdkAny = sdk as any;\n        if (typeof sdkAny.getTracerProvider === 'function') {\n          const tracerProvider = sdkAny.getTracerProvider();\n          if (\n            tracerProvider &&\n            typeof tracerProvider.forceFlush === 'function'\n          ) {\n            await tracerProvider.forceFlush();\n          }\n        }\n      } catch {\n        // Ignore errors when accessing tracer provider (may not be available in test mocks)\n      }\n    }\n  };\n\n  // Add timeout protection to prevent hanging\n  let timeoutHandle: NodeJS.Timeout | undefined;\n  try {\n    await Promise.race([\n      doFlush().finally(() => {\n        // Clear timeout as soon as flush completes\n        if (timeoutHandle) {\n          clearTimeout(timeoutHandle);\n        }\n      }),\n      new Promise<void>((_, reject) => {\n        timeoutHandle = setTimeout(\n          () => reject(new Error('Flush timeout')),\n          timeout,\n        );\n        // Use unref() to allow Node to exit if flush completes first\n        // This prevents the 2s delay in serverless when flush succeeds immediately\n        timeoutHandle.unref();\n      }),\n    ]);\n  } catch (error) {\n    // Clear timeout on error too\n    if (timeoutHandle) {\n      clearTimeout(timeoutHandle);\n    }\n    const logger = getLogger();\n    logger.error(\n      {\n        err: error instanceof Error ? error : new Error(String(error)),\n      },\n      '[autotel] Flush error',\n    );\n    throw error;\n  }\n}\n\n/**\n * Shutdown telemetry and cleanup resources\n *\n * - Flushes all pending data\n * - Shuts down OpenTelemetry SDK\n * - Cleans up resources\n *\n * Call this before process exit.\n *\n * Always performs cleanup even if flush fails, preventing resource leaks\n * in serverless handlers or tests.\n *\n * @example Express server\n * ```typescript\n * const server = app.listen(3000)\n *\n * process.on('SIGTERM', async () => {\n *   await server.close()\n *   await shutdown()\n *   process.exit(0)\n * })\n * ```\n */\nexport async function shutdown(): Promise<void> {\n  const logger = getLogger();\n  let shutdownError: Error | null = null;\n\n  // Attempt to flush (with queue shutdown so new events are rejected), but continue with cleanup even if it fails\n  try {\n    await flush({ forShutdown: true });\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error));\n    shutdownError = err;\n    logger.error(\n      {\n        err,\n      },\n      '[autotel] Flush failed during shutdown, continuing cleanup',\n    );\n  }\n\n  // Always shutdown SDK and clean up resources\n  try {\n    // Shutdown OpenTelemetry SDK\n    const sdk = getSdk();\n    if (sdk) {\n      await sdk.shutdown();\n    }\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error));\n\n    // Ignore ECONNREFUSED errors - this happens when no OTLP endpoint was configured\n    // The SDK tries to flush exporters that don't exist, which is harmless\n    const isConnectionRefused =\n      typeof error === 'object' &&\n      error !== null &&\n      'code' in error &&\n      error.code === 'ECONNREFUSED';\n\n    if (!isConnectionRefused) {\n      // Only store/log non-connection errors\n      if (!shutdownError) {\n        shutdownError = err;\n      }\n      logger.error({ err }, '[autotel] SDK shutdown failed');\n    }\n  } finally {\n    // Clean up singleton Maps and queues to prevent memory leaks\n    // This runs even if SDK shutdown fails\n    const eventsQueue = getEventQueue();\n    if (eventsQueue && typeof eventsQueue.cleanup === 'function') {\n      eventsQueue.cleanup();\n    }\n    resetEvents();\n    resetMetrics();\n    resetEventQueue();\n  }\n\n  // Rethrow first error after cleanup completes\n  // This allows tests and CI to detect failures while still ensuring cleanup\n  if (shutdownError) {\n    throw shutdownError;\n  }\n}\n\n/**\n * Register automatic shutdown hooks for common signals\n *\n * Handles:\n * - SIGTERM (Docker/K8s graceful shutdown)\n * - SIGINT (Ctrl+C)\n *\n * @internal Called automatically on module load\n */\nfunction registerShutdownHooks(): void {\n  if (typeof process === 'undefined') return; // Not in Node.js\n\n  const signals: NodeJS.Signals[] = ['SIGTERM', 'SIGINT'];\n  let shuttingDown = false;\n\n  for (const signal of signals) {\n    process.on(signal, async () => {\n      if (shuttingDown) return; // Prevent double shutdown\n      shuttingDown = true;\n\n      if (process.env.NODE_ENV !== 'test') {\n        getLogger().info(\n          {},\n          `[autotel] Received ${signal}, flushing telemetry...`,\n        );\n      }\n\n      try {\n        await shutdown();\n      } catch (error) {\n        getLogger().error(\n          {\n            err: error instanceof Error ? error : undefined,\n          },\n          '[autotel] Error during shutdown',\n        );\n      } finally {\n        process.exit(0);\n      }\n    });\n  }\n}\n\n// Auto-register shutdown hooks\nregisterShutdownHooks();\n"]}

package/dist/messaging.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkNWT5SYOX_cjs = require('./chunk-NWT5SYOX.cjs');
-require('./chunk-DWRTSOGR.cjs');
+var chunkBEVIAKTB_cjs = require('./chunk-BEVIAKTB.cjs');
+require('./chunk-XI5WPVR5.cjs');
 require('./chunk-W4EUTSB2.cjs');
 require('./chunk-5PZZHX4Y.cjs');
 require('./chunk-D5LMF53P.cjs');
@@ -25,15 +25,15 @@ require('./chunk-JEQ2X3Z6.cjs');
 
 Object.defineProperty(exports, "clearOrderingState", {
   enumerable: true,
-  get: function () { return chunkNWT5SYOX_cjs.clearOrderingState; }
+  get: function () { return chunkBEVIAKTB_cjs.clearOrderingState; }
 });
 Object.defineProperty(exports, "traceConsumer", {
   enumerable: true,
-  get: function () { return chunkNWT5SYOX_cjs.traceConsumer; }
+  get: function () { return chunkBEVIAKTB_cjs.traceConsumer; }
 });
 Object.defineProperty(exports, "traceProducer", {
   enumerable: true,
-  get: function () { return chunkNWT5SYOX_cjs.traceProducer; }
+  get: function () { return chunkBEVIAKTB_cjs.traceProducer; }
 });
 //# sourceMappingURL=messaging.cjs.map
 //# sourceMappingURL=messaging.cjs.map

package/dist/messaging.js

@@ -1,5 +1,5 @@
-export { clearOrderingState, traceConsumer, traceProducer } from './chunk-FMPBL2NF.js';
-import './chunk-QP5LVD4L.js';
+export { clearOrderingState, traceConsumer, traceProducer } from './chunk-XBVB3AFF.js';
+import './chunk-G47ZCJGW.js';
 import './chunk-SR35DG5A.js';
 import './chunk-HJPXNUZR.js';
 import './chunk-WD4RP6IV.js';

package/dist/semantic-conventions.cjs

@@ -0,0 +1,30 @@
+'use strict';
+
+var chunk2ZKEORFN_cjs = require('./chunk-2ZKEORFN.cjs');
+var chunkESMHTKLJ_cjs = require('./chunk-ESMHTKLJ.cjs');
+require('./chunk-JEQ2X3Z6.cjs');
+
+
+
+Object.defineProperty(exports, "httpRequestHeaderAttribute", {
+  enumerable: true,
+  get: function () { return chunk2ZKEORFN_cjs.httpRequestHeaderAttribute; }
+});
+Object.defineProperty(exports, "httpResponseHeaderAttribute", {
+  enumerable: true,
+  get: function () { return chunk2ZKEORFN_cjs.httpResponseHeaderAttribute; }
+});
+Object.defineProperty(exports, "HTTPAttributes", {
+  enumerable: true,
+  get: function () { return chunkESMHTKLJ_cjs.HTTPAttributes; }
+});
+Object.defineProperty(exports, "ServiceAttributes", {
+  enumerable: true,
+  get: function () { return chunkESMHTKLJ_cjs.ServiceAttributes; }
+});
+Object.defineProperty(exports, "URLAttributes", {
+  enumerable: true,
+  get: function () { return chunkESMHTKLJ_cjs.URLAttributes; }
+});
+//# sourceMappingURL=semantic-conventions.cjs.map
+//# sourceMappingURL=semantic-conventions.cjs.map

package/dist/semantic-conventions.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"semantic-conventions.cjs"}

package/dist/semantic-conventions.d.cts

@@ -0,0 +1,29 @@
+declare const HTTPAttributes: {
+    readonly connectionState: "http.connection.state";
+    readonly requestMethod: "http.request.method";
+    readonly requestMethodOriginal: "http.request.method_original";
+    readonly requestResendCount: "http.request.resend_count";
+    readonly requestSize: "http.request.size";
+    readonly requestBodySize: "http.request.body.size";
+    readonly responseSize: "http.response.size";
+    readonly responseBodySize: "http.response.body.size";
+    readonly responseStatusCode: "http.response.status_code";
+    readonly route: "http.route";
+};
+declare const ServiceAttributes: {
+    readonly name: "service.name";
+    readonly instance: "service.instance.id";
+    readonly version: "service.version";
+};
+declare const URLAttributes: {
+    readonly scheme: "url.scheme";
+    readonly full: "url.full";
+    readonly path: "url.path";
+    readonly query: "url.query";
+    readonly fragment: "url.fragment";
+};
+
+declare function httpRequestHeaderAttribute(name: string): string;
+declare function httpResponseHeaderAttribute(name: string): string;
+
+export { HTTPAttributes, ServiceAttributes, URLAttributes, httpRequestHeaderAttribute, httpResponseHeaderAttribute };

package/dist/semantic-conventions.d.ts

@@ -0,0 +1,29 @@
+declare const HTTPAttributes: {
+    readonly connectionState: "http.connection.state";
+    readonly requestMethod: "http.request.method";
+    readonly requestMethodOriginal: "http.request.method_original";
+    readonly requestResendCount: "http.request.resend_count";
+    readonly requestSize: "http.request.size";
+    readonly requestBodySize: "http.request.body.size";
+    readonly responseSize: "http.response.size";
+    readonly responseBodySize: "http.response.body.size";
+    readonly responseStatusCode: "http.response.status_code";
+    readonly route: "http.route";
+};
+declare const ServiceAttributes: {
+    readonly name: "service.name";
+    readonly instance: "service.instance.id";
+    readonly version: "service.version";
+};
+declare const URLAttributes: {
+    readonly scheme: "url.scheme";
+    readonly full: "url.full";
+    readonly path: "url.path";
+    readonly query: "url.query";
+    readonly fragment: "url.fragment";
+};
+
+declare function httpRequestHeaderAttribute(name: string): string;
+declare function httpResponseHeaderAttribute(name: string): string;
+
+export { HTTPAttributes, ServiceAttributes, URLAttributes, httpRequestHeaderAttribute, httpResponseHeaderAttribute };

package/dist/semantic-conventions.js

@@ -0,0 +1,5 @@
+export { httpRequestHeaderAttribute, httpResponseHeaderAttribute } from './chunk-7552UTQW.js';
+export { HTTPAttributes, ServiceAttributes, URLAttributes } from './chunk-4A53YIAX.js';
+import './chunk-DGUM43GV.js';
+//# sourceMappingURL=semantic-conventions.js.map
+//# sourceMappingURL=semantic-conventions.js.map

package/dist/semantic-conventions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"semantic-conventions.js"}

package/dist/semantic-helpers.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunk74L5DOB4_cjs = require('./chunk-74L5DOB4.cjs');
-require('./chunk-DWRTSOGR.cjs');
+var chunkXNBTEFRZ_cjs = require('./chunk-XNBTEFRZ.cjs');
+require('./chunk-XI5WPVR5.cjs');
 require('./chunk-W4EUTSB2.cjs');
 require('./chunk-5PZZHX4Y.cjs');
 require('./chunk-D5LMF53P.cjs');
@@ -25,19 +25,19 @@ require('./chunk-JEQ2X3Z6.cjs');
 
 Object.defineProperty(exports, "traceDB", {
   enumerable: true,
-  get: function () { return chunk74L5DOB4_cjs.traceDB; }
+  get: function () { return chunkXNBTEFRZ_cjs.traceDB; }
 });
 Object.defineProperty(exports, "traceHTTP", {
   enumerable: true,
-  get: function () { return chunk74L5DOB4_cjs.traceHTTP; }
+  get: function () { return chunkXNBTEFRZ_cjs.traceHTTP; }
 });
 Object.defineProperty(exports, "traceLLM", {
   enumerable: true,
-  get: function () { return chunk74L5DOB4_cjs.traceLLM; }
+  get: function () { return chunkXNBTEFRZ_cjs.traceLLM; }
 });
 Object.defineProperty(exports, "traceMessaging", {
   enumerable: true,
-  get: function () { return chunk74L5DOB4_cjs.traceMessaging; }
+  get: function () { return chunkXNBTEFRZ_cjs.traceMessaging; }
 });
 //# sourceMappingURL=semantic-helpers.cjs.map
 //# sourceMappingURL=semantic-helpers.cjs.map

package/dist/semantic-helpers.js

@@ -1,5 +1,5 @@
-export { traceDB, traceHTTP, traceLLM, traceMessaging } from './chunk-QKVQWGTF.js';
-import './chunk-QP5LVD4L.js';
+export { traceDB, traceHTTP, traceLLM, traceMessaging } from './chunk-5JLXDCL2.js';
+import './chunk-G47ZCJGW.js';
 import './chunk-SR35DG5A.js';
 import './chunk-HJPXNUZR.js';
 import './chunk-WD4RP6IV.js';

package/dist/webhook.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkDWRTSOGR_cjs = require('./chunk-DWRTSOGR.cjs');
+var chunkXI5WPVR5_cjs = require('./chunk-XI5WPVR5.cjs');
 require('./chunk-W4EUTSB2.cjs');
 require('./chunk-5PZZHX4Y.cjs');
 require('./chunk-D5LMF53P.cjs');
@@ -148,7 +148,7 @@ function createParkingLot(config) {
     },
     traceCallback(callbackConfig) {
       return (fnFactory) => {
-        return chunkDWRTSOGR_cjs.trace(
+        return chunkXI5WPVR5_cjs.trace(
           {
             name: callbackConfig.name,
             spanKind: api.SpanKind.SERVER

package/dist/webhook.js

@@ -1,4 +1,4 @@
-import { trace } from './chunk-QP5LVD4L.js';
+import { trace } from './chunk-G47ZCJGW.js';
 import './chunk-SR35DG5A.js';
 import './chunk-HJPXNUZR.js';
 import './chunk-WD4RP6IV.js';

package/dist/workflow-distributed.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkINJD3G4K_cjs = require('./chunk-INJD3G4K.cjs');
-var chunkDWRTSOGR_cjs = require('./chunk-DWRTSOGR.cjs');
+var chunkXI5WPVR5_cjs = require('./chunk-XI5WPVR5.cjs');
 require('./chunk-W4EUTSB2.cjs');
 require('./chunk-5PZZHX4Y.cjs');
 require('./chunk-D5LMF53P.cjs');
@@ -59,7 +59,7 @@ var WorkflowBaggage = chunkINJD3G4K_cjs.createSafeBaggageSchema(workflowBaggageF
 function traceDistributedWorkflow(config) {
   const spanName = `workflow.${config.name}`;
   return (fnFactory) => {
-    return chunkDWRTSOGR_cjs.trace(
+    return chunkXI5WPVR5_cjs.trace(
       { name: spanName, spanKind: api.SpanKind.INTERNAL },
       (baseCtx) => {
         return async (...args) => {
@@ -158,7 +158,7 @@ function traceDistributedWorkflow(config) {
 function traceDistributedStep(config) {
   const spanName = `workflow.step.${config.name}`;
   return (fnFactory) => {
-    return chunkDWRTSOGR_cjs.trace(
+    return chunkXI5WPVR5_cjs.trace(
       { name: spanName, spanKind: api.SpanKind.INTERNAL },
       (baseCtx) => {
         return async (...args) => {

package/dist/workflow-distributed.js

@@ -1,5 +1,5 @@
 import { createSafeBaggageSchema } from './chunk-4IFSYQVX.js';
-import { trace } from './chunk-QP5LVD4L.js';
+import { trace } from './chunk-G47ZCJGW.js';
 import './chunk-SR35DG5A.js';
 import './chunk-HJPXNUZR.js';
 import './chunk-WD4RP6IV.js';

package/dist/workflow.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkHZ23L5KR_cjs = require('./chunk-HZ23L5KR.cjs');
-require('./chunk-DWRTSOGR.cjs');
+var chunkLGT7XA5O_cjs = require('./chunk-LGT7XA5O.cjs');
+require('./chunk-XI5WPVR5.cjs');
 require('./chunk-W4EUTSB2.cjs');
 require('./chunk-5PZZHX4Y.cjs');
 require('./chunk-D5LMF53P.cjs');
@@ -25,19 +25,19 @@ require('./chunk-JEQ2X3Z6.cjs');
 
 Object.defineProperty(exports, "getCurrentWorkflowContext", {
   enumerable: true,
-  get: function () { return chunkHZ23L5KR_cjs.getCurrentWorkflowContext; }
+  get: function () { return chunkLGT7XA5O_cjs.getCurrentWorkflowContext; }
 });
 Object.defineProperty(exports, "isInWorkflow", {
   enumerable: true,
-  get: function () { return chunkHZ23L5KR_cjs.isInWorkflow; }
+  get: function () { return chunkLGT7XA5O_cjs.isInWorkflow; }
 });
 Object.defineProperty(exports, "traceStep", {
   enumerable: true,
-  get: function () { return chunkHZ23L5KR_cjs.traceStep; }
+  get: function () { return chunkLGT7XA5O_cjs.traceStep; }
 });
 Object.defineProperty(exports, "traceWorkflow", {
   enumerable: true,
-  get: function () { return chunkHZ23L5KR_cjs.traceWorkflow; }
+  get: function () { return chunkLGT7XA5O_cjs.traceWorkflow; }
 });
 //# sourceMappingURL=workflow.cjs.map
 //# sourceMappingURL=workflow.cjs.map

package/dist/workflow.js

@@ -1,5 +1,5 @@
-export { getCurrentWorkflowContext, isInWorkflow, traceStep, traceWorkflow } from './chunk-WC2AMGBX.js';
-import './chunk-QP5LVD4L.js';
+export { getCurrentWorkflowContext, isInWorkflow, traceStep, traceWorkflow } from './chunk-LCMARHLX.js';
+import './chunk-G47ZCJGW.js';
 import './chunk-SR35DG5A.js';
 import './chunk-HJPXNUZR.js';
 import './chunk-WD4RP6IV.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autotel",
-  "version": "2.18.0",
+  "version": "2.19.0",
   "description": "Write Once, Observe Anywhere",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -188,6 +188,11 @@
       "import": "./dist/workflow-distributed.js",
       "require": "./dist/workflow-distributed.cjs"
     },
+    "./semantic-conventions": {
+      "types": "./dist/semantic-conventions.d.ts",
+      "import": "./dist/semantic-conventions.js",
+      "require": "./dist/semantic-conventions.cjs"
+    },
     "./correlation-id": {
       "types": "./dist/correlation-id.d.ts",
       "import": "./dist/correlation-id.js",
@@ -229,7 +234,7 @@
     "@opentelemetry/sdk-node": "^0.211.0",
     "@opentelemetry/sdk-trace-base": "^2.5.0",
     "@opentelemetry/semantic-conventions": "^1.39.0",
-    "import-in-the-middle": "^2.0.6"
+    "import-in-the-middle": "^3.0.0"
   },
   "peerDependencies": {
     "@opentelemetry/auto-instrumentations-node": "^0.69.0",
@@ -242,8 +247,8 @@
     "@opentelemetry/resource-detector-gcp": "^0.46.0",
     "@opentelemetry/sdk-logs": "^0.211.0",
     "@opentelemetry/sdk-trace-node": "^2.5.0",
-    "@traceloop/node-server-sdk": "^0.22.6",
-    "pino": "^10.3.0",
+    "@traceloop/node-server-sdk": "^0.22.7",
+    "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "yaml": "^2.8.2"
   },
@@ -308,19 +313,19 @@
     "@total-typescript/ts-reset": "^0.6.1",
     "@total-typescript/tsconfig": "^1.0.4",
     "@types/eslint-config-prettier": "^6.11.3",
-    "@types/node": "^25.1.0",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
+    "@types/node": "^25.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.55.0",
+    "@typescript-eslint/parser": "^8.55.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-unicorn": "^62.0.0",
-    "pino": "^10.3.0",
+    "eslint-plugin-unicorn": "^63.0.0",
+    "pino": "^10.3.1",
     "prettier": "^3.8.1",
     "rimraf": "^6.1.2",
     "tsup": "^8.5.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0",
-    "vite-tsconfig-paths": "^6.0.5",
+    "typescript-eslint": "^8.55.0",
+    "vite-tsconfig-paths": "^6.1.0",
     "vitest": "^4.0.18",
     "vitest-mock-extended": "^3.1.0",
     "winston": "^3.19.0",

package/src/decorators.test.ts

@@ -1,47 +1,33 @@
-import { describe, it, expect, beforeEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { Trace } from './decorators';
-import { init } from './init';
 import { configure, resetConfig } from './config';
-import { InMemorySpanExporter } from './exporters';
-import { SimpleSpanProcessor } from './processors';
-import { trace as otelTrace } from '@opentelemetry/api';
-import { flush } from './shutdown';
-
-// Skipped: TypeScript 5+ decorators have limitations in vitest/esbuild/tsx test environments.
-// The decorators work correctly when compiled with tsc (verified in production), but
-// the test infrastructure doesn't properly export spans to InMemorySpanExporter.
-// Attempts to fix this have been unsuccessful - spans are not exported even with
-// proper tracer configuration, flushing, and SDK initialization delays.
-// Root cause: Decorator metadata/metadata reflection may not work correctly in the
-// test environment's transpilation pipeline, preventing spans from being created/exported.
-describe.skip('Decorators', () => {
+import { trace as otelTrace, SpanStatusCode } from '@opentelemetry/api';
+import {
+  BasicTracerProvider,
+  InMemorySpanExporter,
+  SimpleSpanProcessor,
+} from '@opentelemetry/sdk-trace-base';
+
+describe('Decorators', () => {
   let exporter: InMemorySpanExporter;
+  let provider: BasicTracerProvider;
 
-  beforeEach(async () => {
-    // Reset config to ensure clean state
+  beforeEach(() => {
     resetConfig();
 
-    // Clear any existing spans
     exporter = new InMemorySpanExporter();
-
-    // Initialize with in-memory exporter for testing
-    init({
-      service: 'test-decorators',
+    provider = new BasicTracerProvider({
       spanProcessors: [new SimpleSpanProcessor(exporter)],
-      metrics: false,
     });
 
-    // Wait a tick to ensure SDK is fully initialized
-    await new Promise((resolve) => setTimeout(resolve, 10));
+    otelTrace.setGlobalTracerProvider(provider);
+    const tracer = provider.getTracer('test-decorators');
+    configure({ tracer });
+  });
 
-    // Configure the tracer that decorators will use - get it from the global tracer provider
-    // This ensures decorators use the same tracer that's connected to our exporter
-    // After init(), the SDK registers itself as the global tracer provider
-    const tracerProvider = otelTrace.getTracerProvider();
-    const tracer = tracerProvider.getTracer('test-decorators', '1.0.0');
-    configure({
-      tracer,
-    });
+  afterEach(() => {
+    exporter.reset();
+    otelTrace.setGlobalTracerProvider(undefined as any);
   });
 
   describe('@Trace method decorator', () => {
@@ -58,9 +44,6 @@ describe.skip('Decorators', () => {
 
       expect(result).toEqual({ data: 'test' });
 
-      // Flush spans to ensure they're exported
-      await flush();
-
       const spans = exporter.getFinishedSpans();
       expect(spans).toHaveLength(1);
       expect(spans[0]?.name).toBe('getData');
@@ -77,8 +60,6 @@ describe.skip('Decorators', () => {
       const service = new TestService();
       await service.processData();
 
-      await flush();
-
       const spans = exporter.getFinishedSpans();
       expect(spans[0]?.name).toBe('custom.operation');
     });
@@ -94,8 +75,6 @@ describe.skip('Decorators', () => {
       const service = new TestService();
       await service.execute();
 
-      await flush();
-
       const spans = exporter.getFinishedSpans();
       expect(spans[0]?.name).toBe('test.method');
     });
@@ -109,7 +88,6 @@ describe.skip('Decorators', () => {
         // @ts-expect-error - Decorator type resolution issue in test environment, works in production
         @Trace()
         async createUser(data: { id: string }) {
-          // Access ctx via this.ctx
           const ctx = (this as unknown as WithTraceContext).ctx;
           if (ctx) {
             ctx.setAttribute('user.id', data.id);
@@ -121,8 +99,6 @@ describe.skip('Decorators', () => {
       const service = new TestService();
       await service.createUser({ id: '123' });
 
-      await flush();
-
       const spans = exporter.getFinishedSpans();
       expect(spans[0]?.attributes['user.id']).toBe('123');
     });
@@ -131,7 +107,6 @@ describe.skip('Decorators', () => {
       class TestService {
         @Trace()
         async simpleMethod() {
-          // No ctx access
           return 'result';
         }
       }
@@ -140,9 +115,6 @@ describe.skip('Decorators', () => {
       const result = await service.simpleMethod();
 
       expect(result).toBe('result');
-
-      await flush();
-
       expect(exporter.getFinishedSpans()).toHaveLength(1);
     });
 
@@ -171,33 +143,11 @@ describe.skip('Decorators', () => {
 
       const service = new TestService();
 
-      try {
-        await service.failingMethod();
-        expect.fail('Should have thrown an error');
-      } catch (error) {
-        expect(error).toBeInstanceOf(Error);
-        expect((error as Error).message).toBe('Test error');
-      }
-
-      // Wait a bit for span to be processed
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      await flush();
+      await expect(service.failingMethod()).rejects.toThrow('Test error');
 
       const spans = exporter.getFinishedSpans();
-      // For error cases, the span should still be created and exported
-      // If no spans are exported, the decorator might not be handling errors correctly
-      if (spans.length === 0) {
-        // This is a known limitation - decorators may not export spans for error cases in test environment
-        // The decorators work correctly in production (compiled with tsc)
-        expect(spans.length).toBeGreaterThanOrEqual(0); // Allow this test to pass for now
-      } else {
-        expect(spans).toHaveLength(1);
-        // Check status - OpenTelemetry status has code property
-        const status = spans[0]?.status;
-        expect(status).toBeDefined();
-        // Status code 2 = ERROR in OpenTelemetry
-        expect((status as { code: number }).code).toBe(2);
-      }
+      expect(spans).toHaveLength(1);
+      expect(spans[0]?.status.code).toBe(SpanStatusCode.ERROR);
     });
   });
 });

package/src/functional.test.ts

@@ -1025,12 +1025,7 @@ describe('Functional API', () => {
       expect(collector.getSpans()).toHaveLength(1);
     });
 
-    // TODO: Fix baggage propagation to nested trace() calls
-    // The inner trace creates a new span that doesn't properly inherit baggage
-    // from withBaggage() due to context storage synchronization issues.
-    // This was a false-positive before - the inner function wasn't being called
-    // because childCtx wasn't detected as a factory parameter.
-    it.skip('withBaggage should set baggage for child spans', async () => {
+    it('withBaggage should set baggage for child spans', async () => {
       const collector = createTraceCollector();
 
       await trace((ctx) => async () => {
@@ -1107,6 +1102,29 @@ describe('Functional API', () => {
       expect(collector.getSpans()).toHaveLength(1);
     });
 
+    it('withBaggage should not leak baggage after callback completes', async () => {
+      const collector = createTraceCollector();
+
+      await trace((ctx) => async () => {
+        expect(ctx.getBaggage('tenant.id')).toBeUndefined();
+
+        await withBaggage({
+          baggage: { 'tenant.id': 'tenant-456' },
+          fn: async () => {
+            expect(ctx.getBaggage('tenant.id')).toBe('tenant-456');
+          },
+        });
+
+        // Child spans created after withBaggage must not inherit scoped baggage.
+        // (Same-ctx after await may still see baggage due to async context propagation.)
+        await trace((childCtx) => async () => {
+          expect(childCtx.getBaggage('tenant.id')).toBeUndefined();
+        })();
+      })();
+
+      expect(collector.getSpans()).toHaveLength(2);
+    });
+
     it('ctx.getAllBaggage should return all baggage entries', async () => {
       const collector = createTraceCollector();
       const { context, propagation } = await import('@opentelemetry/api');