@obtrace/browser 2.4.1 → 2.5.0

package/dist/browser/index.js

@@ -13,7 +13,6 @@ import { installResourceTiming } from "./resources";
 import { installLongTaskDetection } from "./longtasks";
 import { installMemoryTracking } from "./memory";
 import { installOfflineSupport } from "./offline";
-import { installSupabaseFetchInterceptor } from "./supabase-intercept";
 const instances = new Set();
 const replayBuffers = new Set();
 let currentUser = null;
@@ -216,7 +215,9 @@ export function initBrowserSDK(config) {
     cleanups.push(installResourceTiming(meter));
     cleanups.push(installLongTaskDetection(tracer));
     cleanups.push(installMemoryTracking(meter));
-    cleanups.push(installSupabaseFetchInterceptor(tracer, replay.sessionId));
+    // supabase-intercept removed: child spans are now created inside
+    // FetchInstrumentation's applyCustomAttributesOnSpan callback so all
+    // spans share the same traceId (single connected trace per request).
     if (config.captureConsole !== false) {
         cleanups.push(installConsoleCapture(tracer, logger, replay.sessionId));
     }

package/dist/browser_entry.bundle.js

@@ -29722,13 +29722,59 @@ function setupOtelWeb(config) {
   });
   const ingestPattern = new RegExp(`^${baseUrl.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`);
   const instrumentations = [];
-  const applySupabaseAttrs = (span, req, _result) => {
+  const sessionId = config.sessionId || "";
+  const applySupabaseAttrs = (parentSpan, req, result2) => {
     try {
       const url = typeof req === "string" ? req : req instanceof URL ? req.href : req?.url || "";
       const method = req?.method || "GET";
-      if (url && isSupabaseURL(url)) {
-        enrichSupabaseSpan(span, url, method);
-      }
+      if (!url || !isSupabaseURL(url)) return;
+      enrichSupabaseSpan(parentSpan, url, method);
+      if (sessionId) parentSpan.setAttribute("session.id", sessionId);
+      const parsed = parseSupabaseURL(url, method);
+      if (!parsed) return;
+      const status = typeof result2?.status === "number" ? result2.status : 0;
+      const t = trace.getTracer("@obtrace/sdk-browser", "2.4.0");
+      const synth = { "session.id": sessionId, "supabase.ref": parsed.ref, "span.synthetic": "true" };
+      const parentCtx = trace.setSpan(context.active(), parentSpan);
+      context.with(parentCtx, () => {
+        const gw = t.startSpan("supabase.gateway", {
+          attributes: { ...synth, "http.method": method.toUpperCase(), "http.status_code": status, "peer.service": "supabase.kong" }
+        });
+        const gwCtx = trace.setSpan(context.active(), gw);
+        context.with(gwCtx, () => {
+          if (parsed.service === "postgrest") {
+            const db2 = t.startSpan("supabase.db.query", {
+              attributes: { ...synth, "db.system": "postgresql", "db.operation": parsed.operation, "db.sql.table": parsed.table, "db.statement": parsed.detail, "peer.service": "supabase.postgresql" }
+            });
+            db2.setStatus({ code: status >= 400 ? SpanStatusCode.ERROR : SpanStatusCode.OK });
+            db2.end();
+          }
+          if (parsed.service === "auth") {
+            const auth = t.startSpan("supabase.auth." + parsed.operation, {
+              attributes: { ...synth, "auth.operation": parsed.operation, "peer.service": "supabase.gotrue" }
+            });
+            auth.setStatus({ code: status >= 400 ? SpanStatusCode.ERROR : SpanStatusCode.OK });
+            auth.end();
+          }
+          if (parsed.service === "storage") {
+            const stor = t.startSpan("supabase.storage." + parsed.operation, {
+              attributes: { ...synth, "storage.operation": parsed.operation, "peer.service": "supabase.storage" }
+            });
+            stor.setStatus({ code: status >= 400 ? SpanStatusCode.ERROR : SpanStatusCode.OK });
+            stor.end();
+          }
+          if (parsed.service === "edge-function") {
+            const fnName = parsed.operation.replace("invoke:", "");
+            const fn = t.startSpan("supabase.function." + fnName, {
+              attributes: { ...synth, "faas.name": fnName, "faas.trigger": "http", "peer.service": "supabase.edge-runtime" }
+            });
+            fn.setStatus({ code: status >= 400 ? SpanStatusCode.ERROR : SpanStatusCode.OK });
+            fn.end();
+          }
+        });
+        gw.setStatus({ code: status >= 400 ? SpanStatusCode.ERROR : SpanStatusCode.OK });
+        gw.end();
+      });
     } catch {
     }
   };
@@ -30429,127 +30475,6 @@ function installMemoryTracking(meter) {
   return () => clearInterval(timer);
 }
 
-// src/browser/supabase-intercept.ts
-function installSupabaseFetchInterceptor(tracer, sessionId) {
-  if (typeof window === "undefined" || typeof window.fetch === "undefined") return () => {
-  };
-  const originalFetch = window.fetch;
-  window.fetch = async function(input2, init) {
-    const url = typeof input2 === "string" ? input2 : input2 instanceof URL ? input2.href : input2 instanceof Request ? input2.url : "";
-    if (!url || !isSupabaseURL(url)) {
-      return originalFetch.call(this, input2, init);
-    }
-    const method = init?.method || (input2 instanceof Request ? input2.method : "GET") || "GET";
-    const parsed = parseSupabaseURL(url, method);
-    if (!parsed) {
-      return originalFetch.call(this, input2, init);
-    }
-    const rootSpan = tracer.startSpan(`supabase.${parsed.service} ${parsed.detail}`, {
-      attributes: {
-        "supabase.ref": parsed.ref,
-        "supabase.service": parsed.service,
-        "supabase.operation": parsed.operation,
-        "supabase.detail": parsed.detail,
-        "http.method": method.toUpperCase(),
-        "http.url": url.split("?")[0],
-        "peer.service": `supabase.${parsed.service}`,
-        "session.id": sessionId,
-        ...parsed.service === "postgrest" ? {
-          "db.system": "postgresql",
-          "db.operation": parsed.operation,
-          "db.sql.table": parsed.table
-        } : {}
-      }
-    });
-    const rootCtx = trace.setSpan(context.active(), rootSpan);
-    const startMs = performance.now();
-    try {
-      const response = await originalFetch.call(this, input2, init);
-      const durationMs = performance.now() - startMs;
-      rootSpan.setAttribute("http.status_code", response.status);
-      rootSpan.setAttribute("supabase.duration_ms", Math.round(durationMs));
-      context.with(rootCtx, () => {
-        createChildSpans(tracer, parsed, method, response.status, durationMs, sessionId);
-      });
-      if (response.status >= 400) {
-        rootSpan.setStatus({ code: SpanStatusCode.ERROR, message: `HTTP ${response.status}` });
-        addBreadcrumb({ timestamp: Date.now(), category: "supabase", message: `${parsed.detail} \u2192 ${response.status}`, level: "error" });
-      } else {
-        rootSpan.setStatus({ code: SpanStatusCode.OK });
-        addBreadcrumb({ timestamp: Date.now(), category: "supabase", message: `${parsed.detail} \u2192 ${response.status} (${Math.round(durationMs)}ms)`, level: "info" });
-      }
-      rootSpan.end();
-      return response;
-    } catch (err) {
-      rootSpan.setStatus({ code: SpanStatusCode.ERROR, message: err instanceof Error ? err.message : "fetch failed" });
-      if (err instanceof Error) rootSpan.recordException(err);
-      rootSpan.end();
-      addBreadcrumb({ timestamp: Date.now(), category: "supabase", message: `${parsed.detail} \u2192 FAILED`, level: "error" });
-      throw err;
-    }
-  };
-  return () => {
-    window.fetch = originalFetch;
-  };
-}
-function createChildSpans(tracer, parsed, method, status, _durationMs, sessionId) {
-  const synth = { "session.id": sessionId, "supabase.ref": parsed.ref, "span.synthetic": "true" };
-  const gatewaySpan = tracer.startSpan("supabase.gateway", {
-    attributes: {
-      ...synth,
-      "http.method": method.toUpperCase(),
-      "http.status_code": status,
-      "peer.service": "supabase.kong"
-    }
-  });
-  const gatewayCtx = trace.setSpan(context.active(), gatewaySpan);
-  context.with(gatewayCtx, () => {
-    if (parsed.service === "postgrest") {
-      const dbSpan = tracer.startSpan("supabase.db.query", {
-        attributes: {
-          ...synth,
-          "db.system": "postgresql",
-          "db.operation": parsed.operation,
-          "db.sql.table": parsed.table,
-          "db.statement": parsed.detail,
-          "peer.service": "supabase.postgresql"
-        }
-      });
-      if (status >= 400) dbSpan.setStatus({ code: SpanStatusCode.ERROR, message: `HTTP ${status}` });
-      else dbSpan.setStatus({ code: SpanStatusCode.OK });
-      dbSpan.end();
-    }
-    if (parsed.service === "auth") {
-      const authSpan = tracer.startSpan("supabase.auth." + parsed.operation, {
-        attributes: { ...synth, "auth.operation": parsed.operation, "peer.service": "supabase.gotrue" }
-      });
-      if (status >= 400) authSpan.setStatus({ code: SpanStatusCode.ERROR, message: `HTTP ${status}` });
-      else authSpan.setStatus({ code: SpanStatusCode.OK });
-      authSpan.end();
-    }
-    if (parsed.service === "storage") {
-      const storageSpan = tracer.startSpan("supabase.storage." + parsed.operation, {
-        attributes: { ...synth, "storage.operation": parsed.operation, "peer.service": "supabase.storage" }
-      });
-      if (status >= 400) storageSpan.setStatus({ code: SpanStatusCode.ERROR, message: `HTTP ${status}` });
-      else storageSpan.setStatus({ code: SpanStatusCode.OK });
-      storageSpan.end();
-    }
-    if (parsed.service === "edge-function") {
-      const fnName = parsed.operation.replace("invoke:", "");
-      const fnSpan = tracer.startSpan("supabase.function." + fnName, {
-        attributes: { ...synth, "faas.name": fnName, "faas.trigger": "http", "peer.service": "supabase.edge-runtime" }
-      });
-      if (status >= 400) fnSpan.setStatus({ code: SpanStatusCode.ERROR, message: `HTTP ${status}` });
-      else fnSpan.setStatus({ code: SpanStatusCode.OK });
-      fnSpan.end();
-    }
-  });
-  if (status >= 400) gatewaySpan.setStatus({ code: SpanStatusCode.ERROR, message: `HTTP ${status}` });
-  else gatewaySpan.setStatus({ code: SpanStatusCode.OK });
-  gatewaySpan.end();
-}
-
 // src/browser/index.ts
 var instances = /* @__PURE__ */ new Set();
 var replayBuffers = /* @__PURE__ */ new Set();
@@ -30727,7 +30652,6 @@ function initBrowserSDK(config) {
   cleanups.push(installResourceTiming(meter));
   cleanups.push(installLongTaskDetection(tracer));
   cleanups.push(installMemoryTracking(meter));
-  cleanups.push(installSupabaseFetchInterceptor(tracer, replay.sessionId));
   if (config.captureConsole !== false) {
     cleanups.push(installConsoleCapture(tracer, logger, replay.sessionId));
   }