@atrim/instrument-node 0.9.1-dev.2a45310.20260120032104 → 0.10.0

package/target/dist/integrations/effect/auto/index.cjs

@@ -8,6 +8,7 @@ var yaml = require('yaml');
 var zod = require('zod');
 var fs = require('fs');
 var path2 = require('path');
+var TracerModule = require('effect/Tracer');
 var opentelemetry = require('@effect/opentelemetry');
 var OtelApi = require('@opentelemetry/api');
 var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
@@ -38,6 +39,7 @@ var HttpClientRequest__namespace = /*#__PURE__*/_interopNamespace(HttpClientRequ
 var yaml__namespace = /*#__PURE__*/_interopNamespace(yaml);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var path2__namespace = /*#__PURE__*/_interopNamespace(path2);
+var TracerModule__namespace = /*#__PURE__*/_interopNamespace(TracerModule);
 var OtelApi__namespace = /*#__PURE__*/_interopNamespace(OtelApi);
 
 var __defProp = Object.defineProperty;
@@ -754,9 +756,9 @@ function parseSourceLocation(stack) {
     const match = line.match(/at\s+(?:.*?\s+\()?(.+):(\d+):(\d+)\)?/);
     if (match && match[1] && match[2]) {
       return {
-        path: match[1],
+        file: match[1],
         line: parseInt(match[2], 10),
-        column: match[3] ? parseInt(match[3], 10) : 0
+        ...match[3] ? { column: parseInt(match[3], 10) } : {}
       };
     }
   }
@@ -764,12 +766,12 @@ function parseSourceLocation(stack) {
 }
 function makeSourceKey(source) {
   if (!source) return "unknown";
-  return `${source.path}:${source.line}`;
+  return `${source.file}:${source.line}`;
 }
 function formatLocation(source) {
   if (!source) return "unknown";
-  const filename = source.path.split("/").pop() ?? source.path;
-  return source.label ? `${filename}:${source.line} (${source.label})` : `${filename}:${source.line}`;
+  const filename = source.file.split("/").pop() ?? source.file;
+  return `${filename}:${source.line}`;
 }
 function getGlobalProviderSetup() {
   if (_globalProviderSetup === void 0) {
@@ -777,15 +779,15 @@ function getGlobalProviderSetup() {
   }
   return _globalProviderSetup;
 }
-var currentSourceTrace; exports.UnifiedTracingSupervisor = void 0; var setupGlobalTracerProvider, _globalProviderSetup; exports.createUnifiedTracingLayer = void 0; exports.UnifiedTracingLive = void 0; exports.enableOpSupervision = void 0; exports.withUnifiedTracing = void 0; exports.withAutoTracing = void 0; exports.flushAndShutdown = void 0; exports.forceFlush = void 0;
+var currentSourceLocation; exports.UnifiedTracingSupervisor = void 0; var setupGlobalTracerProvider, _globalProviderSetup; exports.createUnifiedTracingLayer = void 0; exports.UnifiedTracingLive = void 0; exports.enableOpSupervision = void 0; exports.withUnifiedTracing = void 0; exports.withAutoTracing = void 0; exports.flushAndShutdown = void 0; exports.forceFlush = void 0;
 var init_unified_tracing_supervisor = __esm({
   "src/integrations/effect/auto/unified-tracing-supervisor.ts"() {
     init_dist();
     init_config();
     init_span_control();
     init_span_control();
-    currentSourceTrace = effect.GlobalValue.globalValue(
-      /* @__PURE__ */ Symbol.for("effect/FiberRef/currentSourceTrace"),
+    currentSourceLocation = effect.GlobalValue.globalValue(
+      /* @__PURE__ */ Symbol.for("effect/FiberRef/currentSourceLocation"),
       () => effect.FiberRef.unsafeMake(void 0)
     );
     exports.UnifiedTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
@@ -851,9 +853,11 @@ var init_unified_tracing_supervisor = __esm({
           span.setAttribute("effect.item_count", meta.count);
         }
         if (opConfig.includeStack && location) {
-          span.setAttribute("code.filepath", location.path);
+          span.setAttribute("code.filepath", location.file);
           span.setAttribute("code.lineno", location.line);
-          span.setAttribute("code.column", location.column);
+          if (location.column !== void 0) {
+            span.setAttribute("code.column", location.column);
+          }
         }
         logger.log(
           `@atrim/unified-tracing: Created operation span "${spanName}" spanId=${span.spanContext().spanId}`
@@ -888,7 +892,7 @@ var init_unified_tracing_supervisor = __esm({
           return;
         }
         const nameOverride = effect.FiberRefs.getOrDefault(fiberRefs, exports.AutoTracingSpanName);
-        const sourceLocation = effect.FiberRefs.getOrDefault(fiberRefs, currentSourceTrace);
+        const sourceLocation = effect.FiberRefs.getOrDefault(fiberRefs, currentSourceLocation);
         const sourceKey = makeSourceKey(sourceLocation);
         logger.log(`@atrim/unified-tracing: onStart fiber ${fiberId} at ${sourceKey}`);
         let parentContext;
@@ -923,11 +927,10 @@ var init_unified_tracing_supervisor = __esm({
         span.setAttribute("effect.auto_traced", true);
         span.setAttribute("effect.fiber.id", fiberId);
         if (sourceLocation) {
-          span.setAttribute("code.filepath", sourceLocation.path);
+          span.setAttribute("code.filepath", sourceLocation.file);
           span.setAttribute("code.lineno", sourceLocation.line);
-          span.setAttribute("code.column", sourceLocation.column);
-          if (sourceLocation.label) {
-            span.setAttribute("code.function", sourceLocation.label);
+          if (sourceLocation.column !== void 0) {
+            span.setAttribute("code.column", sourceLocation.column);
           }
         }
         if (effect.Option.isSome(parent)) {
@@ -996,6 +999,16 @@ var init_unified_tracing_supervisor = __esm({
         return OtelApi__namespace.ROOT_CONTEXT;
       }
       resolveParentContextFromFiberRefs(fiberRefs, context2, parent) {
+        const inheritedCtx = effect.FiberRefs.getOrDefault(fiberRefs, TracerModule__namespace.currentOtelSpanContext);
+        if (inheritedCtx) {
+          const span = OtelApi__namespace.trace.getSpan(inheritedCtx);
+          if (span) {
+            logger.log(
+              `@atrim/unified-tracing: Using inherited OTel context from FiberRef - spanId=${span.spanContext().spanId}`
+            );
+          }
+          return inheritedCtx;
+        }
         const maybeParentSpan = effect.Context.getOption(context2, effect.Tracer.ParentSpan);
         if (effect.Option.isSome(maybeParentSpan)) {
           const effectSpan = maybeParentSpan.value;
@@ -1127,7 +1140,12 @@ var init_unified_tracing_supervisor = __esm({
       const opSupervisionLayer = effect.Layer.effectDiscard(
         effect.Effect.patchRuntimeFlags(effect.RuntimeFlagsPatch.enable(effect.RuntimeFlags.OpSupervision))
       );
-      return effect.Layer.mergeAll(effect.Layer.discard(tracerWithResource), supervisorLayer, opSupervisionLayer);
+      return effect.Layer.mergeAll(
+        effect.Layer.discard(tracerWithResource),
+        effect.Layer.enableSourceCapture,
+        supervisorLayer,
+        opSupervisionLayer
+      );
     };
     exports.UnifiedTracingLive = effect.Layer.suspend(
       () => exports.createUnifiedTracingLayer()
@@ -1149,7 +1167,11 @@ var init_unified_tracing_supervisor = __esm({
       const opSupervisionLayer = effect.Layer.effectDiscard(
         effect.Effect.patchRuntimeFlags(effect.RuntimeFlagsPatch.enable(effect.RuntimeFlags.OpSupervision))
       );
-      const combinedLayer = effect.Layer.mergeAll(supervisorLayer, opSupervisionLayer);
+      const combinedLayer = effect.Layer.mergeAll(
+        supervisorLayer,
+        effect.Layer.enableSourceCapture,
+        opSupervisionLayer
+      );
       const wrappedEffect = rootSpanName ? effect$1.pipe(effect.Effect.withSpan(rootSpanName)) : effect$1;
       return wrappedEffect.pipe(effect.Effect.provide(combinedLayer));
     };