@deeptracer/core 0.3.0 → 0.4.1

package/dist/{chunk-BRUVRV5O.js → chunk-YBQXVNNR.js}

@@ -1,47 +1,22 @@
 // src/version.ts
-var SDK_VERSION = "0.3.0";
+var SDK_VERSION = "0.4.1";
 var SDK_NAME = "core";
 
-// src/batcher.ts
-var Batcher = class {
-  constructor(config, onFlush) {
-    this.onFlush = onFlush;
-    this.batchSize = config.batchSize ?? 50;
-    this.flushIntervalMs = config.flushIntervalMs ?? 5e3;
-    this.startTimer();
-  }
-  buffer = [];
-  timer = null;
-  batchSize;
-  flushIntervalMs;
-  add(entry) {
-    this.buffer.push(entry);
-    if (this.buffer.length >= this.batchSize) {
-      this.flush();
-    }
-  }
-  flush() {
-    if (this.buffer.length === 0) return;
-    const entries = [...this.buffer];
-    this.buffer = [];
-    this.onFlush(entries);
-  }
-  startTimer() {
-    this.timer = setInterval(() => this.flush(), this.flushIntervalMs);
-  }
-  async destroy() {
-    if (this.timer) clearInterval(this.timer);
-    this.timer = null;
-    this.flush();
-  }
-};
-
 // src/transport.ts
 var Transport = class {
   constructor(config) {
     this.config = config;
+    if (config.secretKey?.startsWith("dt_secret_") && typeof globalThis.window !== "undefined") {
+      console.error(
+        "[@deeptracer/core] WARNING: `secretKey` (dt_secret_...) detected in a browser bundle. This exposes your server key to end users. Use `publicKey` (dt_public_...) for client-side code."
+      );
+    }
   }
   inFlightRequests = /* @__PURE__ */ new Set();
+  /** Resolve the auth key: prefer secretKey (server), fall back to publicKey (client). */
+  get authKey() {
+    return this.config.secretKey ?? this.config.publicKey ?? "";
+  }
   /**
    * Send a request with automatic retry and exponential backoff.
    * Retries up to `maxRetries` times on network errors and 5xx responses.
@@ -55,7 +30,7 @@ var Transport = class {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
-            Authorization: `Bearer ${this.config.apiKey}`,
+            Authorization: `Bearer ${this.authKey}`,
             "x-deeptracer-sdk": `${SDK_NAME}/${SDK_VERSION}`
           },
           body: JSON.stringify(body)
@@ -79,9 +54,7 @@ var Transport = class {
           await this.sleep(this.jitter(baseDelays[attempt]));
           continue;
         }
-        console.warn(
-          `[@deeptracer/core] Failed to send ${label} (exhausted ${maxRetries} retries)`
-        );
+        console.warn(`[@deeptracer/core] Failed to send ${label} (exhausted ${maxRetries} retries)`);
       }
     }
   }
@@ -102,7 +75,6 @@ var Transport = class {
     const p = this.sendWithRetry(
       `${this.config.endpoint}/ingest/logs`,
       {
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment,
         logs
@@ -117,7 +89,6 @@ var Transport = class {
       `${this.config.endpoint}/ingest/errors`,
       {
         ...error,
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment
       },
@@ -131,7 +102,6 @@ var Transport = class {
       `${this.config.endpoint}/ingest/traces`,
       {
         ...span,
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment
       },
@@ -145,7 +115,6 @@ var Transport = class {
       `${this.config.endpoint}/ingest/llm`,
       {
         ...report,
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment
       },
@@ -169,6 +138,40 @@ var Transport = class {
   }
 };
 
+// src/batcher.ts
+var Batcher = class {
+  constructor(config, onFlush) {
+    this.onFlush = onFlush;
+    this.batchSize = config.batchSize ?? 50;
+    this.flushIntervalMs = config.flushIntervalMs ?? 5e3;
+    this.startTimer();
+  }
+  buffer = [];
+  timer = null;
+  batchSize;
+  flushIntervalMs;
+  add(entry) {
+    this.buffer.push(entry);
+    if (this.buffer.length >= this.batchSize) {
+      this.flush();
+    }
+  }
+  flush() {
+    if (this.buffer.length === 0) return;
+    const entries = [...this.buffer];
+    this.buffer = [];
+    this.onFlush(entries);
+  }
+  startTimer() {
+    this.timer = setInterval(() => this.flush(), this.flushIntervalMs);
+  }
+  async destroy() {
+    if (this.timer) clearInterval(this.timer);
+    this.timer = null;
+    this.flush();
+  }
+};
+
 // src/state.ts
 function createLoggerState(maxBreadcrumbs) {
   return {
@@ -179,6 +182,17 @@ function createLoggerState(maxBreadcrumbs) {
     maxBreadcrumbs
   };
 }
+function cloneState(state) {
+  return {
+    user: state.user ? { ...state.user } : null,
+    tags: { ...state.tags },
+    contexts: Object.fromEntries(
+      Object.entries(state.contexts).map(([k, v]) => [k, { ...v }])
+    ),
+    breadcrumbs: [...state.breadcrumbs],
+    maxBreadcrumbs: state.maxBreadcrumbs
+  };
+}
 function addBreadcrumb(state, breadcrumb) {
   state.breadcrumbs.push(breadcrumb);
   if (state.breadcrumbs.length > state.maxBreadcrumbs) {
@@ -187,11 +201,33 @@ function addBreadcrumb(state, breadcrumb) {
 }
 
 // src/logger.ts
+var LOG_LEVEL_VALUES = {
+  debug: 0,
+  info: 1,
+  warn: 2,
+  error: 3
+};
 function generateId() {
   const bytes = new Uint8Array(8);
   crypto.getRandomValues(bytes);
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
+function generateTraceId() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+}
+function parseTraceparent(header) {
+  const parts = header.trim().split("-");
+  if (parts.length !== 4) return null;
+  const [version, traceId, parentId, flags] = parts;
+  if (version !== "00") return null;
+  if (traceId.length !== 32 || !/^[0-9a-f]{32}$/.test(traceId)) return null;
+  if (parentId.length !== 16 || !/^[0-9a-f]{16}$/.test(parentId)) return null;
+  if (flags.length !== 2 || !/^[0-9a-f]{2}$/.test(flags)) return null;
+  if (/^0+$/.test(traceId) || /^0+$/.test(parentId)) return null;
+  return { traceId, parentId, flags };
+}
 var _originalConsole = {
   log: console.log,
   info: console.info,
@@ -202,6 +238,7 @@ var _originalConsole = {
 var Logger = class _Logger {
   batcher;
   transport;
+  effectiveLevel;
   contextName;
   config;
   state;
@@ -211,6 +248,17 @@ var Logger = class _Logger {
     this.contextName = contextName;
     this.requestMeta = requestMeta;
     this.state = state ?? createLoggerState(config.maxBreadcrumbs ?? 20);
+    if (!config.secretKey && !config.publicKey) {
+      _originalConsole.error(
+        "[@deeptracer/core] No `secretKey` or `publicKey` provided. Events will not be authenticated."
+      );
+    }
+    if (!config.endpoint) {
+      _originalConsole.error(
+        "[@deeptracer/core] No `endpoint` provided. Events will not be sent."
+      );
+    }
+    this.effectiveLevel = LOG_LEVEL_VALUES[config.level ?? (config.environment === "production" ? "info" : "debug")];
     this.transport = new Transport(config);
     this.batcher = new Batcher(
       { batchSize: config.batchSize, flushIntervalMs: config.flushIntervalMs },
@@ -224,7 +272,8 @@ var Logger = class _Logger {
   // ---------------------------------------------------------------------------
   /**
    * Set the current user context. Attached to all subsequent logs, errors, spans, and LLM reports.
-   * Shared across all child loggers (withContext, forRequest).
+   * Only affects this logger instance — child loggers created via `withContext()` or `forRequest()`
+   * have their own independent state.
    *
    * @example
    * ```ts
@@ -346,26 +395,13 @@ var Logger = class _Logger {
       };
     }
     metadata = this.mergeStateMetadata(metadata);
-    const entry = {
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      level,
-      message,
-      metadata,
-      context: this.contextName,
-      trace_id: this.requestMeta?.trace_id,
-      span_id: this.requestMeta?.span_id,
-      request_id: this.requestMeta?.request_id,
-      vercel_id: this.requestMeta?.vercel_id
-    };
-    const hookResult = this.applyBeforeSend({ type: "log", data: entry });
-    if (hookResult === null) return;
-    const finalEntry = hookResult.data;
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     if (this.config.debug) {
       const prefix = this.contextName ? `[${this.contextName}]` : "";
       const lvl = level.toUpperCase().padEnd(5);
       const consoleFn = level === "error" ? _originalConsole.error : level === "warn" ? _originalConsole.warn : level === "debug" ? _originalConsole.debug : _originalConsole.log;
-      if (finalEntry.metadata) {
-        consoleFn(`${lvl} ${prefix} ${message}`, finalEntry.metadata);
+      if (metadata) {
+        consoleFn(`${lvl} ${prefix} ${message}`, metadata);
       } else {
         consoleFn(`${lvl} ${prefix} ${message}`);
       }
@@ -373,9 +409,23 @@ var Logger = class _Logger {
     addBreadcrumb(this.state, {
       type: "log",
       message: `[${level}] ${message}`,
-      timestamp: entry.timestamp
+      timestamp
     });
-    this.batcher.add(finalEntry);
+    if (LOG_LEVEL_VALUES[level] < this.effectiveLevel) return;
+    const entry = {
+      timestamp,
+      level,
+      message,
+      metadata,
+      context: this.contextName,
+      trace_id: this.requestMeta?.trace_id,
+      span_id: this.requestMeta?.span_id,
+      request_id: this.requestMeta?.request_id,
+      vercel_id: this.requestMeta?.vercel_id
+    };
+    const hookResult = this.applyBeforeSend({ type: "log", data: entry });
+    if (hookResult === null) return;
+    this.batcher.add(hookResult.data);
   }
   /** Log a debug message. */
   debug(message, dataOrError, error) {
@@ -396,22 +446,37 @@ var Logger = class _Logger {
   // ---------------------------------------------------------------------------
   // Child loggers
   // ---------------------------------------------------------------------------
-  /** Create a context-scoped logger. All logs include the context name. Shares state with parent. */
+  /** Create a context-scoped logger. All logs include the context name. Gets an independent copy of state. */
   withContext(name) {
-    return new _Logger(this.config, name, this.requestMeta, this.state);
+    return new _Logger(this.config, name, this.requestMeta, cloneState(this.state));
   }
-  /** Create a request-scoped logger that extracts trace context from headers. Shares state with parent. */
+  /** Create a request-scoped logger that extracts trace context from headers. Gets an independent copy of state. */
   forRequest(request) {
-    const vercelId = request.headers.get("x-vercel-id") || void 0;
+    let traceId;
+    let spanId;
+    const traceparent = request.headers.get("traceparent");
+    if (traceparent) {
+      const parsed = parseTraceparent(traceparent);
+      if (parsed) {
+        traceId = parsed.traceId;
+        spanId = parsed.parentId;
+      }
+    }
+    traceId = traceId || request.headers.get("x-trace-id") || void 0;
+    spanId = spanId || request.headers.get("x-span-id") || void 0;
     const requestId = request.headers.get("x-request-id") || void 0;
-    const traceId = request.headers.get("x-trace-id") || void 0;
-    const spanId = request.headers.get("x-span-id") || void 0;
-    return new _Logger(this.config, this.contextName, {
-      trace_id: traceId,
-      span_id: spanId,
-      request_id: requestId || (vercelId ? vercelId.split("::").pop() : void 0),
-      vercel_id: vercelId
-    }, this.state);
+    const vercelId = request.headers.get("x-vercel-id") || void 0;
+    return new _Logger(
+      this.config,
+      this.contextName,
+      {
+        trace_id: traceId,
+        span_id: spanId,
+        request_id: requestId || (vercelId ? vercelId.split("::").pop() : void 0),
+        vercel_id: vercelId
+      },
+      cloneState(this.state)
+    );
   }
   // ---------------------------------------------------------------------------
   // Error capture
@@ -430,7 +495,8 @@ var Logger = class _Logger {
     const enrichedContext = { ...context?.context };
     if (this.state.user) enrichedContext.user = this.state.user;
     if (Object.keys(this.state.tags).length > 0) enrichedContext._tags = { ...this.state.tags };
-    if (Object.keys(this.state.contexts).length > 0) enrichedContext._contexts = { ...this.state.contexts };
+    if (Object.keys(this.state.contexts).length > 0)
+      enrichedContext._contexts = { ...this.state.contexts };
     const report = {
       error_message: err.message,
       stack_trace: err.stack || "",
@@ -511,7 +577,7 @@ var Logger = class _Logger {
   }
   /** Start a span with manual lifecycle. You must call span.end(). */
   startInactiveSpan(operation) {
-    const traceId = this.requestMeta?.trace_id || generateId();
+    const traceId = this.requestMeta?.trace_id || generateTraceId();
     const parentSpanId = this.requestMeta?.span_id || "";
     const spanId = generateId();
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
@@ -551,10 +617,16 @@ var Logger = class _Logger {
         const childLogger = new _Logger(this.config, this.contextName, childMeta, this.state);
         return childLogger.startInactiveSpan(childOp);
       },
-      getHeaders: () => ({
-        "x-trace-id": traceId,
-        "x-span-id": spanId
-      })
+      getHeaders: () => {
+        const headers = {
+          "x-trace-id": traceId,
+          "x-span-id": spanId
+        };
+        if (/^[0-9a-f]{32}$/.test(traceId)) {
+          headers.traceparent = `00-${traceId}-${spanId}-01`;
+        }
+        return headers;
+      }
     };
     return span;
   }
@@ -595,6 +667,8 @@ function createLogger(config) {
 export {
   SDK_VERSION,
   SDK_NAME,
+  Transport,
+  parseTraceparent,
   _originalConsole,
   Logger,
   createLogger

package/dist/index.cjs

@@ -62,15 +62,24 @@ var Batcher = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.3.0";
+var SDK_VERSION = "0.4.1";
 var SDK_NAME = "core";
 
 // src/transport.ts
 var Transport = class {
   constructor(config) {
     this.config = config;
+    if (config.secretKey?.startsWith("dt_secret_") && typeof globalThis.window !== "undefined") {
+      console.error(
+        "[@deeptracer/core] WARNING: `secretKey` (dt_secret_...) detected in a browser bundle. This exposes your server key to end users. Use `publicKey` (dt_public_...) for client-side code."
+      );
+    }
   }
   inFlightRequests = /* @__PURE__ */ new Set();
+  /** Resolve the auth key: prefer secretKey (server), fall back to publicKey (client). */
+  get authKey() {
+    return this.config.secretKey ?? this.config.publicKey ?? "";
+  }
   /**
    * Send a request with automatic retry and exponential backoff.
    * Retries up to `maxRetries` times on network errors and 5xx responses.
@@ -84,7 +93,7 @@ var Transport = class {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
-            Authorization: `Bearer ${this.config.apiKey}`,
+            Authorization: `Bearer ${this.authKey}`,
             "x-deeptracer-sdk": `${SDK_NAME}/${SDK_VERSION}`
           },
           body: JSON.stringify(body)
@@ -108,9 +117,7 @@ var Transport = class {
           await this.sleep(this.jitter(baseDelays[attempt]));
           continue;
         }
-        console.warn(
-          `[@deeptracer/core] Failed to send ${label} (exhausted ${maxRetries} retries)`
-        );
+        console.warn(`[@deeptracer/core] Failed to send ${label} (exhausted ${maxRetries} retries)`);
       }
     }
   }
@@ -131,7 +138,6 @@ var Transport = class {
     const p = this.sendWithRetry(
       `${this.config.endpoint}/ingest/logs`,
       {
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment,
         logs
@@ -146,7 +152,6 @@ var Transport = class {
       `${this.config.endpoint}/ingest/errors`,
       {
         ...error,
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment
       },
@@ -160,7 +165,6 @@ var Transport = class {
       `${this.config.endpoint}/ingest/traces`,
       {
         ...span,
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment
       },
@@ -174,7 +178,6 @@ var Transport = class {
       `${this.config.endpoint}/ingest/llm`,
       {
         ...report,
-        product: this.config.product,
         service: this.config.service,
         environment: this.config.environment
       },
@@ -208,6 +211,17 @@ function createLoggerState(maxBreadcrumbs) {
     maxBreadcrumbs
   };
 }
+function cloneState(state) {
+  return {
+    user: state.user ? { ...state.user } : null,
+    tags: { ...state.tags },
+    contexts: Object.fromEntries(
+      Object.entries(state.contexts).map(([k, v]) => [k, { ...v }])
+    ),
+    breadcrumbs: [...state.breadcrumbs],
+    maxBreadcrumbs: state.maxBreadcrumbs
+  };
+}
 function addBreadcrumb(state, breadcrumb) {
   state.breadcrumbs.push(breadcrumb);
   if (state.breadcrumbs.length > state.maxBreadcrumbs) {
@@ -216,11 +230,33 @@ function addBreadcrumb(state, breadcrumb) {
 }
 
 // src/logger.ts
+var LOG_LEVEL_VALUES = {
+  debug: 0,
+  info: 1,
+  warn: 2,
+  error: 3
+};
 function generateId() {
   const bytes = new Uint8Array(8);
   crypto.getRandomValues(bytes);
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
+function generateTraceId() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+}
+function parseTraceparent(header) {
+  const parts = header.trim().split("-");
+  if (parts.length !== 4) return null;
+  const [version, traceId, parentId, flags] = parts;
+  if (version !== "00") return null;
+  if (traceId.length !== 32 || !/^[0-9a-f]{32}$/.test(traceId)) return null;
+  if (parentId.length !== 16 || !/^[0-9a-f]{16}$/.test(parentId)) return null;
+  if (flags.length !== 2 || !/^[0-9a-f]{2}$/.test(flags)) return null;
+  if (/^0+$/.test(traceId) || /^0+$/.test(parentId)) return null;
+  return { traceId, parentId, flags };
+}
 var _originalConsole = {
   log: console.log,
   info: console.info,
@@ -231,6 +267,7 @@ var _originalConsole = {
 var Logger = class _Logger {
   batcher;
   transport;
+  effectiveLevel;
   contextName;
   config;
   state;
@@ -240,6 +277,17 @@ var Logger = class _Logger {
     this.contextName = contextName;
     this.requestMeta = requestMeta;
     this.state = state ?? createLoggerState(config.maxBreadcrumbs ?? 20);
+    if (!config.secretKey && !config.publicKey) {
+      _originalConsole.error(
+        "[@deeptracer/core] No `secretKey` or `publicKey` provided. Events will not be authenticated."
+      );
+    }
+    if (!config.endpoint) {
+      _originalConsole.error(
+        "[@deeptracer/core] No `endpoint` provided. Events will not be sent."
+      );
+    }
+    this.effectiveLevel = LOG_LEVEL_VALUES[config.level ?? (config.environment === "production" ? "info" : "debug")];
     this.transport = new Transport(config);
     this.batcher = new Batcher(
       { batchSize: config.batchSize, flushIntervalMs: config.flushIntervalMs },
@@ -253,7 +301,8 @@ var Logger = class _Logger {
   // ---------------------------------------------------------------------------
   /**
    * Set the current user context. Attached to all subsequent logs, errors, spans, and LLM reports.
-   * Shared across all child loggers (withContext, forRequest).
+   * Only affects this logger instance — child loggers created via `withContext()` or `forRequest()`
+   * have their own independent state.
    *
    * @example
    * ```ts
@@ -375,26 +424,13 @@ var Logger = class _Logger {
       };
     }
     metadata = this.mergeStateMetadata(metadata);
-    const entry = {
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      level,
-      message,
-      metadata,
-      context: this.contextName,
-      trace_id: this.requestMeta?.trace_id,
-      span_id: this.requestMeta?.span_id,
-      request_id: this.requestMeta?.request_id,
-      vercel_id: this.requestMeta?.vercel_id
-    };
-    const hookResult = this.applyBeforeSend({ type: "log", data: entry });
-    if (hookResult === null) return;
-    const finalEntry = hookResult.data;
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     if (this.config.debug) {
       const prefix = this.contextName ? `[${this.contextName}]` : "";
       const lvl = level.toUpperCase().padEnd(5);
       const consoleFn = level === "error" ? _originalConsole.error : level === "warn" ? _originalConsole.warn : level === "debug" ? _originalConsole.debug : _originalConsole.log;
-      if (finalEntry.metadata) {
-        consoleFn(`${lvl} ${prefix} ${message}`, finalEntry.metadata);
+      if (metadata) {
+        consoleFn(`${lvl} ${prefix} ${message}`, metadata);
       } else {
         consoleFn(`${lvl} ${prefix} ${message}`);
       }
@@ -402,9 +438,23 @@ var Logger = class _Logger {
     addBreadcrumb(this.state, {
       type: "log",
       message: `[${level}] ${message}`,
-      timestamp: entry.timestamp
+      timestamp
     });
-    this.batcher.add(finalEntry);
+    if (LOG_LEVEL_VALUES[level] < this.effectiveLevel) return;
+    const entry = {
+      timestamp,
+      level,
+      message,
+      metadata,
+      context: this.contextName,
+      trace_id: this.requestMeta?.trace_id,
+      span_id: this.requestMeta?.span_id,
+      request_id: this.requestMeta?.request_id,
+      vercel_id: this.requestMeta?.vercel_id
+    };
+    const hookResult = this.applyBeforeSend({ type: "log", data: entry });
+    if (hookResult === null) return;
+    this.batcher.add(hookResult.data);
   }
   /** Log a debug message. */
   debug(message, dataOrError, error) {
@@ -425,22 +475,37 @@ var Logger = class _Logger {
   // ---------------------------------------------------------------------------
   // Child loggers
   // ---------------------------------------------------------------------------
-  /** Create a context-scoped logger. All logs include the context name. Shares state with parent. */
+  /** Create a context-scoped logger. All logs include the context name. Gets an independent copy of state. */
   withContext(name) {
-    return new _Logger(this.config, name, this.requestMeta, this.state);
+    return new _Logger(this.config, name, this.requestMeta, cloneState(this.state));
   }
-  /** Create a request-scoped logger that extracts trace context from headers. Shares state with parent. */
+  /** Create a request-scoped logger that extracts trace context from headers. Gets an independent copy of state. */
   forRequest(request) {
-    const vercelId = request.headers.get("x-vercel-id") || void 0;
+    let traceId;
+    let spanId;
+    const traceparent = request.headers.get("traceparent");
+    if (traceparent) {
+      const parsed = parseTraceparent(traceparent);
+      if (parsed) {
+        traceId = parsed.traceId;
+        spanId = parsed.parentId;
+      }
+    }
+    traceId = traceId || request.headers.get("x-trace-id") || void 0;
+    spanId = spanId || request.headers.get("x-span-id") || void 0;
     const requestId = request.headers.get("x-request-id") || void 0;
-    const traceId = request.headers.get("x-trace-id") || void 0;
-    const spanId = request.headers.get("x-span-id") || void 0;
-    return new _Logger(this.config, this.contextName, {
-      trace_id: traceId,
-      span_id: spanId,
-      request_id: requestId || (vercelId ? vercelId.split("::").pop() : void 0),
-      vercel_id: vercelId
-    }, this.state);
+    const vercelId = request.headers.get("x-vercel-id") || void 0;
+    return new _Logger(
+      this.config,
+      this.contextName,
+      {
+        trace_id: traceId,
+        span_id: spanId,
+        request_id: requestId || (vercelId ? vercelId.split("::").pop() : void 0),
+        vercel_id: vercelId
+      },
+      cloneState(this.state)
+    );
   }
   // ---------------------------------------------------------------------------
   // Error capture
@@ -459,7 +524,8 @@ var Logger = class _Logger {
     const enrichedContext = { ...context?.context };
     if (this.state.user) enrichedContext.user = this.state.user;
     if (Object.keys(this.state.tags).length > 0) enrichedContext._tags = { ...this.state.tags };
-    if (Object.keys(this.state.contexts).length > 0) enrichedContext._contexts = { ...this.state.contexts };
+    if (Object.keys(this.state.contexts).length > 0)
+      enrichedContext._contexts = { ...this.state.contexts };
     const report = {
       error_message: err.message,
       stack_trace: err.stack || "",
@@ -540,7 +606,7 @@ var Logger = class _Logger {
   }
   /** Start a span with manual lifecycle. You must call span.end(). */
   startInactiveSpan(operation) {
-    const traceId = this.requestMeta?.trace_id || generateId();
+    const traceId = this.requestMeta?.trace_id || generateTraceId();
     const parentSpanId = this.requestMeta?.span_id || "";
     const spanId = generateId();
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
@@ -580,10 +646,16 @@ var Logger = class _Logger {
         const childLogger = new _Logger(this.config, this.contextName, childMeta, this.state);
         return childLogger.startInactiveSpan(childOp);
       },
-      getHeaders: () => ({
-        "x-trace-id": traceId,
-        "x-span-id": spanId
-      })
+      getHeaders: () => {
+        const headers = {
+          "x-trace-id": traceId,
+          "x-span-id": spanId
+        };
+        if (/^[0-9a-f]{32}$/.test(traceId)) {
+          headers.traceparent = `00-${traceId}-${spanId}-01`;
+        }
+        return headers;
+      }
     };
     return span;
   }