@atrim/instrument-node 0.7.1-dev.14fdea7.20260108232436 → 0.7.1-dev.14fdea7.20260109021705

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atrim/instrument-node",
-  "version": "0.7.1-dev.14fdea7.20260108232436",
+  "version": "0.7.1-dev.14fdea7.20260109021705",
   "description": "OpenTelemetry instrumentation for Node.js with centralized YAML configuration",
   "type": "module",
   "license": "MIT",

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

@@ -731,7 +731,7 @@ function sanitizeSpanName(name) {
 var AutoTracingEnabled = effect.FiberRef.unsafeMake(true);
 var AutoTracingSpanName = effect.FiberRef.unsafeMake(effect.Option.none());
 var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
-  constructor(config) {
+  constructor(config, tracerProvider) {
     super();
     this.config = config;
     // WeakMap to associate fibers with their OTel spans
@@ -740,6 +740,8 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
     __publicField(this, "fiberStartTimes", /* @__PURE__ */ new WeakMap());
     // OpenTelemetry tracer - lazily initialized
     __publicField(this, "_tracer", null);
+    // Optional TracerProvider (if provided, use this instead of global)
+    __publicField(this, "tracerProvider", null);
     // Compiled filter patterns
     __publicField(this, "includePatterns");
     __publicField(this, "excludePatterns");
@@ -747,6 +749,10 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
     __publicField(this, "activeFiberCount", 0);
     // Root span for parent context (set by withAutoTracing)
     __publicField(this, "_rootSpan", null);
+    if (tracerProvider) {
+      this.tracerProvider = tracerProvider;
+      logger.log("@atrim/auto-trace: Using provided TracerProvider");
+    }
     this.includePatterns = (config.filter?.include || []).map((p) => new RegExp(p));
     this.excludePatterns = (config.filter?.exclude || []).map((p) => new RegExp(p));
     logger.log("@atrim/auto-trace: Supervisor initialized");
@@ -761,11 +767,17 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
     this._rootSpan = span;
   }
   /**
-   * Get the tracer lazily - this allows time for the NodeSdk layer to register the global provider
+   * Get the tracer lazily - uses provided TracerProvider if available, otherwise uses global
    */
   get tracer() {
     if (!this._tracer) {
-      this._tracer = OtelApi__namespace.trace.getTracer("@atrim/auto-trace", "1.0.0");
+      if (this.tracerProvider) {
+        logger.log("@atrim/auto-trace: Getting tracer from provided TracerProvider");
+        this._tracer = this.tracerProvider.getTracer("@atrim/auto-trace", "1.0.0");
+      } else {
+        logger.log("@atrim/auto-trace: Getting tracer from global API");
+        this._tracer = OtelApi__namespace.trace.getTracer("@atrim/auto-trace", "1.0.0");
+      }
     }
     return this._tracer;
   }
@@ -779,9 +791,11 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
    * Called when a fiber starts executing
    */
   onStart(_context, _effect, parent, fiber) {
+    logger.log(`@atrim/auto-trace: onStart called for fiber ${fiber.id().id}`);
     const fiberRefsValue = fiber.getFiberRefs();
     const enabled = effect.FiberRefs.getOrDefault(fiberRefsValue, AutoTracingEnabled);
     if (!enabled) {
+      logger.log(`@atrim/auto-trace: Auto-tracing disabled for fiber ${fiber.id().id}`);
       return;
     }
     const samplingRate = this.config.performance?.sampling_rate ?? 1;
@@ -805,26 +819,31 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
     }
     let parentContext = OtelApi__namespace.ROOT_CONTEXT;
     let parentFiberId;
-    if (effect.Option.isSome(parent)) {
+    const maybeEffectParentSpan = effect.Context.getOption(_context, effect.Tracer.ParentSpan);
+    if (effect.Option.isSome(maybeEffectParentSpan)) {
+      const effectSpan = maybeEffectParentSpan.value;
+      logger.log(`@atrim/auto-trace: Found ParentSpan - traceId=${effectSpan.traceId.slice(0, 8)}..., spanId=${effectSpan.spanId.slice(0, 8)}...`);
+      const otelSpanContext = {
+        traceId: effectSpan.traceId,
+        spanId: effectSpan.spanId,
+        traceFlags: effectSpan.sampled ? OtelApi__namespace.TraceFlags.SAMPLED : OtelApi__namespace.TraceFlags.NONE,
+        isRemote: false
+      };
+      const wrappedSpan = OtelApi__namespace.trace.wrapSpanContext(otelSpanContext);
+      parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, wrappedSpan);
+    } else if (effect.Option.isSome(parent)) {
       parentFiberId = parent.value.id().id;
       const parentSpan = this.fiberSpans.get(parent.value);
       if (parentSpan) {
         parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, parentSpan);
-      } else {
-        const activeSpan = OtelApi__namespace.trace.getSpan(OtelApi__namespace.context.active());
-        if (activeSpan) {
-          parentContext = OtelApi__namespace.context.active();
-        } else if (this._rootSpan) {
-          parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, this._rootSpan);
-        }
-      }
-    } else {
-      const activeSpan = OtelApi__namespace.trace.getSpan(OtelApi__namespace.context.active());
-      if (activeSpan) {
-        parentContext = OtelApi__namespace.context.active();
       } else if (this._rootSpan) {
         parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, this._rootSpan);
       }
+    } else if (this._rootSpan) {
+      parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, this._rootSpan);
+    }
+    if (effect.Option.isSome(parent)) {
+      parentFiberId = parent.value.id().id;
     }
     const span = this.tracer.startSpan(
       spanName,
@@ -834,6 +853,7 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
       },
       parentContext
     );
+    logger.log(`@atrim/auto-trace: Created span "${spanName}" for fiber ${fiber.id().id}`);
     this.fiberSpans.set(fiber, span);
     this.fiberStartTimes.set(fiber, process.hrtime.bigint());
     this.activeFiberCount++;
@@ -961,8 +981,8 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
     }
   }
 };
-var createAutoTracingSupervisor = (config) => {
-  return new AutoTracingSupervisor(config);
+var createAutoTracingSupervisor = (config, tracerProvider) => {
+  return new AutoTracingSupervisor(config, tracerProvider);
 };
 var createAutoTracingLayer = (options) => {
   return effect.Layer.unwrapEffect(
@@ -1230,12 +1250,27 @@ var createCombinedTracingLayer = () => {
         },
         spanProcessor: createSpanProcessor()
       }));
-      const supervisor = createAutoTracingSupervisor(autoConfig);
-      const supervisorLayer = effect.Supervisor.addSupervisor(supervisor);
-      logger.log("@atrim/auto-trace: Combined layer created");
-      logger.log("  - HTTP requests: auto-traced via Effect platform");
-      logger.log("  - Forked fibers: auto-traced via Supervisor");
-      return supervisorLayer.pipe(effect.Layer.provideMerge(effect.Layer.discard(sdkLayer)));
+      const supervisorLayer = effect.Layer.unwrapScoped(
+        effect.Effect.gen(function* () {
+          const tracerProvider = yield* effect.Effect.serviceOption(opentelemetry.Tracer.OtelTracerProvider);
+          if (effect.Option.isSome(tracerProvider)) {
+            logger.log("@atrim/auto-trace: Got TracerProvider from NodeSdk layer");
+            const supervisor = createAutoTracingSupervisor(autoConfig, tracerProvider.value);
+            logger.log("@atrim/auto-trace: Combined layer created");
+            logger.log("  - HTTP requests: auto-traced via Effect platform");
+            logger.log("  - Forked fibers: auto-traced via Supervisor");
+            return effect.Supervisor.addSupervisor(supervisor);
+          } else {
+            logger.log("@atrim/auto-trace: WARNING: No TracerProvider found, creating supervisor without it");
+            const supervisor = createAutoTracingSupervisor(autoConfig);
+            logger.log("@atrim/auto-trace: Combined layer created (fallback)");
+            logger.log("  - HTTP requests: auto-traced via Effect platform");
+            logger.log("  - Forked fibers: auto-traced via Supervisor");
+            return effect.Supervisor.addSupervisor(supervisor);
+          }
+        })
+      );
+      return supervisorLayer.pipe(effect.Layer.provide(effect.Layer.discard(sdkLayer)));
     })
   );
 };