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

package/package.json

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

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

@@ -805,7 +805,18 @@ 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;
+      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) {
@@ -816,6 +827,9 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
     } 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,
       {
@@ -1225,7 +1239,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 effect.Layer.mergeAll(effect.Layer.discard(sdkLayer), supervisorLayer);
+      return supervisorLayer.pipe(effect.Layer.provideMerge(effect.Layer.discard(sdkLayer)));
     })
   );
 };