@atrim/instrument-node 0.5.1-dev.14fdea7.20260108232041 → 0.5.1-dev.14fdea7.20260109021657

package/target/dist/integrations/effect/auto/index.d.cts

@@ -166,17 +166,18 @@ declare class AutoTracingSupervisor extends Supervisor.AbstractSupervisor<void>
     private readonly fiberSpans;
     private readonly fiberStartTimes;
     private _tracer;
+    private readonly tracerProvider;
     private readonly includePatterns;
     private readonly excludePatterns;
     private activeFiberCount;
     private _rootSpan;
-    constructor(config: AutoInstrumentationConfig);
+    constructor(config: AutoInstrumentationConfig, tracerProvider?: OtelApi.TracerProvider);
     /**
      * Set the root span for parent context propagation
      */
     setRootSpan(span: OtelApi.Span): void;
     /**
-     * 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
      */
     private get tracer();
     /**
@@ -211,7 +212,7 @@ declare class AutoTracingSupervisor extends Supervisor.AbstractSupervisor<void>
 /**
  * Create a custom AutoTracingSupervisor with the given config
  */
-declare const createAutoTracingSupervisor: (config: AutoInstrumentationConfig) => AutoTracingSupervisor;
+declare const createAutoTracingSupervisor: (config: AutoInstrumentationConfig, tracerProvider?: OtelApi.TracerProvider) => AutoTracingSupervisor;
 /**
  * Layer that provides auto-tracing with custom configuration
  *

package/target/dist/integrations/effect/auto/index.d.ts

@@ -166,17 +166,18 @@ declare class AutoTracingSupervisor extends Supervisor.AbstractSupervisor<void>
     private readonly fiberSpans;
     private readonly fiberStartTimes;
     private _tracer;
+    private readonly tracerProvider;
     private readonly includePatterns;
     private readonly excludePatterns;
     private activeFiberCount;
     private _rootSpan;
-    constructor(config: AutoInstrumentationConfig);
+    constructor(config: AutoInstrumentationConfig, tracerProvider?: OtelApi.TracerProvider);
     /**
      * Set the root span for parent context propagation
      */
     setRootSpan(span: OtelApi.Span): void;
     /**
-     * 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
      */
     private get tracer();
     /**
@@ -211,7 +212,7 @@ declare class AutoTracingSupervisor extends Supervisor.AbstractSupervisor<void>
 /**
  * Create a custom AutoTracingSupervisor with the given config
  */
-declare const createAutoTracingSupervisor: (config: AutoInstrumentationConfig) => AutoTracingSupervisor;
+declare const createAutoTracingSupervisor: (config: AutoInstrumentationConfig, tracerProvider?: OtelApi.TracerProvider) => AutoTracingSupervisor;
 /**
  * Layer that provides auto-tracing with custom configuration
  *

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

@@ -1,5 +1,5 @@
-import { Data, Context, Effect, Layer, FiberRef, Option, Supervisor, FiberRefs, Exit } from 'effect';
-import { NodeSdk } from '@effect/opentelemetry';
+import { Data, Context, Effect, Layer, FiberRef, Option, Supervisor, FiberRefs, Tracer, Exit } from 'effect';
+import { NodeSdk, Tracer as Tracer$1 } from '@effect/opentelemetry';
 import { BasicTracerProvider, SimpleSpanProcessor, ConsoleSpanExporter, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { FileSystem } from '@effect/platform/FileSystem';
@@ -706,7 +706,7 @@ function sanitizeSpanName(name) {
 var AutoTracingEnabled = FiberRef.unsafeMake(true);
 var AutoTracingSpanName = FiberRef.unsafeMake(Option.none());
 var AutoTracingSupervisor = class extends Supervisor.AbstractSupervisor {
-  constructor(config) {
+  constructor(config, tracerProvider) {
     super();
     this.config = config;
     // WeakMap to associate fibers with their OTel spans
@@ -715,6 +715,8 @@ var AutoTracingSupervisor = class extends 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");
@@ -722,6 +724,10 @@ var AutoTracingSupervisor = class extends 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");
@@ -736,11 +742,17 @@ var AutoTracingSupervisor = class extends 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.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.trace.getTracer("@atrim/auto-trace", "1.0.0");
+      }
     }
     return this._tracer;
   }
@@ -754,9 +766,11 @@ var AutoTracingSupervisor = class extends 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 = 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;
@@ -780,7 +794,19 @@ var AutoTracingSupervisor = class extends Supervisor.AbstractSupervisor {
     }
     let parentContext = OtelApi.ROOT_CONTEXT;
     let parentFiberId;
-    if (Option.isSome(parent)) {
+    const maybeEffectParentSpan = Context.getOption(_context, Tracer.ParentSpan);
+    if (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.TraceFlags.SAMPLED : OtelApi.TraceFlags.NONE,
+        isRemote: false
+      };
+      const wrappedSpan = OtelApi.trace.wrapSpanContext(otelSpanContext);
+      parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, wrappedSpan);
+    } else if (Option.isSome(parent)) {
       parentFiberId = parent.value.id().id;
       const parentSpan = this.fiberSpans.get(parent.value);
       if (parentSpan) {
@@ -791,6 +817,9 @@ var AutoTracingSupervisor = class extends Supervisor.AbstractSupervisor {
     } else if (this._rootSpan) {
       parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, this._rootSpan);
     }
+    if (Option.isSome(parent)) {
+      parentFiberId = parent.value.id().id;
+    }
     const span = this.tracer.startSpan(
       spanName,
       {
@@ -799,6 +828,7 @@ var AutoTracingSupervisor = class extends 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++;
@@ -926,8 +956,8 @@ var AutoTracingSupervisor = class extends Supervisor.AbstractSupervisor {
     }
   }
 };
-var createAutoTracingSupervisor = (config) => {
-  return new AutoTracingSupervisor(config);
+var createAutoTracingSupervisor = (config, tracerProvider) => {
+  return new AutoTracingSupervisor(config, tracerProvider);
 };
 var createAutoTracingLayer = (options) => {
   return Layer.unwrapEffect(
@@ -1195,12 +1225,27 @@ var createCombinedTracingLayer = () => {
         },
         spanProcessor: createSpanProcessor()
       }));
-      const supervisor = createAutoTracingSupervisor(autoConfig);
-      const supervisorLayer = 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 Layer.mergeAll(Layer.discard(sdkLayer), supervisorLayer);
+      const supervisorLayer = Layer.unwrapScoped(
+        Effect.gen(function* () {
+          const tracerProvider = yield* Effect.serviceOption(Tracer$1.OtelTracerProvider);
+          if (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 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 Supervisor.addSupervisor(supervisor);
+          }
+        })
+      );
+      return supervisorLayer.pipe(Layer.provide(Layer.discard(sdkLayer)));
     })
   );
 };