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

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

@@ -7,6 +7,7 @@ import { parse } from 'yaml';
 import { z } from 'zod';
 import * as fs from 'fs';
 import * as path2 from 'path';
+import * as TracerModule from 'effect/Tracer';
 import { Resource, Tracer as Tracer$1 } from '@effect/opentelemetry';
 import * as OtelApi from '@opentelemetry/api';
 import { ConsoleSpanExporter, SimpleSpanProcessor, BatchSpanProcessor, BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
@@ -728,9 +729,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) } : {}
       };
     }
   }
@@ -738,12 +739,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) {
@@ -751,15 +752,15 @@ function getGlobalProviderSetup() {
   }
   return _globalProviderSetup;
 }
-var currentSourceTrace, UnifiedTracingSupervisor, setupGlobalTracerProvider, _globalProviderSetup, createUnifiedTracingLayer, UnifiedTracingLive, enableOpSupervision, withUnifiedTracing, withAutoTracing, flushAndShutdown, forceFlush;
+var currentSourceLocation, UnifiedTracingSupervisor, setupGlobalTracerProvider, _globalProviderSetup, createUnifiedTracingLayer, UnifiedTracingLive, enableOpSupervision, withUnifiedTracing, withAutoTracing, flushAndShutdown, forceFlush;
 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 = GlobalValue.globalValue(
-      /* @__PURE__ */ Symbol.for("effect/FiberRef/currentSourceTrace"),
+    currentSourceLocation = GlobalValue.globalValue(
+      /* @__PURE__ */ Symbol.for("effect/FiberRef/currentSourceLocation"),
       () => FiberRef.unsafeMake(void 0)
     );
     UnifiedTracingSupervisor = class extends Supervisor.AbstractSupervisor {
@@ -825,9 +826,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}`
@@ -862,7 +865,7 @@ var init_unified_tracing_supervisor = __esm({
           return;
         }
         const nameOverride = FiberRefs.getOrDefault(fiberRefs, AutoTracingSpanName);
-        const sourceLocation = FiberRefs.getOrDefault(fiberRefs, currentSourceTrace);
+        const sourceLocation = FiberRefs.getOrDefault(fiberRefs, currentSourceLocation);
         const sourceKey = makeSourceKey(sourceLocation);
         logger.log(`@atrim/unified-tracing: onStart fiber ${fiberId} at ${sourceKey}`);
         let parentContext;
@@ -897,11 +900,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 (Option.isSome(parent)) {
@@ -970,6 +972,16 @@ var init_unified_tracing_supervisor = __esm({
         return OtelApi.ROOT_CONTEXT;
       }
       resolveParentContextFromFiberRefs(fiberRefs, context2, parent) {
+        const inheritedCtx = FiberRefs.getOrDefault(fiberRefs, TracerModule.currentOtelSpanContext);
+        if (inheritedCtx) {
+          const span = OtelApi.trace.getSpan(inheritedCtx);
+          if (span) {
+            logger.log(
+              `@atrim/unified-tracing: Using inherited OTel context from FiberRef - spanId=${span.spanContext().spanId}`
+            );
+          }
+          return inheritedCtx;
+        }
         const maybeParentSpan = Context.getOption(context2, Tracer.ParentSpan);
         if (Option.isSome(maybeParentSpan)) {
           const effectSpan = maybeParentSpan.value;
@@ -1101,7 +1113,12 @@ var init_unified_tracing_supervisor = __esm({
       const opSupervisionLayer = Layer.effectDiscard(
         Effect.patchRuntimeFlags(RuntimeFlagsPatch.enable(RuntimeFlags.OpSupervision))
       );
-      return Layer.mergeAll(Layer.discard(tracerWithResource), supervisorLayer, opSupervisionLayer);
+      return Layer.mergeAll(
+        Layer.discard(tracerWithResource),
+        Layer.enableSourceCapture,
+        supervisorLayer,
+        opSupervisionLayer
+      );
     };
     UnifiedTracingLive = Layer.suspend(
       () => createUnifiedTracingLayer()
@@ -1123,7 +1140,11 @@ var init_unified_tracing_supervisor = __esm({
       const opSupervisionLayer = Layer.effectDiscard(
         Effect.patchRuntimeFlags(RuntimeFlagsPatch.enable(RuntimeFlags.OpSupervision))
       );
-      const combinedLayer = Layer.mergeAll(supervisorLayer, opSupervisionLayer);
+      const combinedLayer = Layer.mergeAll(
+        supervisorLayer,
+        Layer.enableSourceCapture,
+        opSupervisionLayer
+      );
       const wrappedEffect = rootSpanName ? effect.pipe(Effect.withSpan(rootSpanName)) : effect;
       return wrappedEffect.pipe(Effect.provide(combinedLayer));
     };