@obsrviq/tracker 0.7.0 → 0.7.1

package/dist/index.js

@@ -837,16 +837,36 @@ function hostAllowed(hostname, hosts) {
   }
   return false;
 }
-function injectFetchTrace(input, init, header) {
+function traceIdOf(header) {
+  if (!header) return null;
+  const parts = header.split("-");
+  return parts.length >= 2 && /^[0-9a-f]{32}$/.test(parts[1]) ? parts[1] : null;
+}
+function existingFetchTraceparent(input, init) {
+  const hasInitHeaders = !!init && "headers" in init && init.headers != null;
+  const src = hasInitHeaders ? init.headers : input instanceof Request ? input.headers : void 0;
+  if (!src) return null;
+  try {
+    return new Headers(src).get("traceparent");
+  } catch {
+    return null;
+  }
+}
+function applyFetchTrace(input, init) {
+  const existing = existingFetchTraceparent(input, init);
+  if (existing) {
+    return { input, init, traceId: traceIdOf(existing) ?? "" };
+  }
+  const tr = newTrace();
   const hasInitHeaders = !!init && "headers" in init && init.headers != null;
   if (input instanceof Request && !hasInitHeaders) {
     const h2 = new Headers(input.headers);
-    if (!h2.has("traceparent")) h2.set("traceparent", header);
-    return { input: new Request(input, { headers: h2 }), init };
+    h2.set("traceparent", tr.header);
+    return { input: new Request(input, { headers: h2 }), init, traceId: tr.traceId };
   }
   const h = new Headers(init?.headers ?? void 0);
-  if (!h.has("traceparent")) h.set("traceparent", header);
-  return { input, init: { ...init || {}, headers: h } };
+  h.set("traceparent", tr.header);
+  return { input, init: { ...init || {}, headers: h }, traceId: tr.traceId };
 }
 
 // src/network.ts
@@ -1102,11 +1122,10 @@ function wrapFetch(ctx, tr, emitNet) {
     let traceId;
     if (traceTarget(rawUrl, ctx.config)) {
       try {
-        const tr2 = newTrace();
-        const inj = injectFetchTrace(input, init, tr2.header);
+        const inj = applyFetchTrace(input, init);
         input = inj.input;
         init = inj.init;
-        traceId = tr2.traceId;
+        traceId = inj.traceId || void 0;
       } catch {
       }
     }
@@ -1216,9 +1235,14 @@ function wrapXhr(ctx, tr, emitNet) {
       if (ctx.config.captureNetworkBodies) meta.body = stringifyBody(body);
       if (traceTarget(meta.rawUrl, ctx.config)) {
         try {
-          const tr2 = newTrace();
-          this.setRequestHeader("traceparent", tr2.header);
-          meta.traceId = tr2.traceId;
+          const appSet = meta.reqHeaders["traceparent"];
+          if (appSet) {
+            meta.traceId = traceIdOf(appSet) ?? void 0;
+          } else {
+            const tr2 = newTrace();
+            this.setRequestHeader("traceparent", tr2.header);
+            meta.traceId = tr2.traceId;
+          }
         } catch {
         }
       }