@atrim/instrument-node 0.7.0-14fdea7-20260108231930 → 0.7.0-14fdea7-20260108235538

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

@@ -1,4 +1,4 @@
-import { Data, Context, Effect, Layer, FiberRef, Option, Supervisor, FiberRefs, Exit } from 'effect';
+import { Data, Context, Effect, Layer, FiberRef, Option, Supervisor, FiberRefs, Tracer, Exit } from 'effect';
 import { NodeSdk } from '@effect/opentelemetry';
 import { BasicTracerProvider, SimpleSpanProcessor, ConsoleSpanExporter, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
@@ -780,7 +780,18 @@ 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;
+      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 +802,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,
       {
@@ -1200,7 +1214,7 @@ var createCombinedTracingLayer = () => {
       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);
+      return supervisorLayer.pipe(Layer.provideMerge(Layer.discard(sdkLayer)));
     })
   );
 };