@atrim/instrument-node 0.7.1-dev.14fdea7.20260109021705 → 0.7.1-dev.764c183.20260110203528

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

@@ -82,7 +82,7 @@ declare const createEffectTracingLayer: () => Layer.Layer<never>;
 declare const EffectTracingLive: Layer.Layer<never>;
 /**
  * Create a combined layer that provides both:
- * 1. Effect-native HTTP tracing (via NodeSdk.layer)
+ * 1. Effect-native HTTP tracing (via Effect's Tracer + global OTel provider)
  * 2. Fiber-level auto-tracing (via Supervisor)
  *
  * This gives you automatic spans for:
@@ -90,6 +90,14 @@ declare const EffectTracingLive: Layer.Layer<never>;
  * - Every forked fiber (from our Supervisor)
  *
  * No manual Effect.withSpan() calls needed.
+ *
+ * ARCHITECTURE NOTE:
+ * Unlike EffectTracingLive which uses NodeSdk.layer (scoped provider),
+ * CombinedTracingLive uses a single GLOBAL TracerProvider so that both
+ * Effect's Tracer and our Supervisor use the same provider and exporter.
+ *
+ * This solves the dual-provider problem where HTTP spans and fiber spans
+ * would otherwise go to different exporters.
  */
 declare const createCombinedTracingLayer: () => Layer.Layer<never>;
 /**
@@ -192,6 +200,10 @@ declare class AutoTracingSupervisor extends Supervisor.AbstractSupervisor<void>
      * Called when a fiber completes (success or failure)
      */
     onEnd<A, E>(exit: Exit.Exit<A, E>, fiber: Fiber.RuntimeFiber<A, E>): void;
+    /**
+     * Get attributes for span links from config
+     */
+    private getLinkAttributes;
     /**
      * Check if a span name should be traced based on filter patterns
      */
@@ -388,6 +400,13 @@ declare const AutoTracingConfig_base: Context.TagClass<AutoTracingConfig, "AutoT
             name: string;
         }[];
     };
+    span_relationships: {
+        type: "parent-child" | "span-links" | "both";
+        link_attributes?: {
+            "link.type": string;
+            custom?: Record<string, string> | undefined;
+        } | undefined;
+    };
     performance: {
         sampling_rate: number;
         min_duration: string;

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

@@ -82,7 +82,7 @@ declare const createEffectTracingLayer: () => Layer.Layer<never>;
 declare const EffectTracingLive: Layer.Layer<never>;
 /**
  * Create a combined layer that provides both:
- * 1. Effect-native HTTP tracing (via NodeSdk.layer)
+ * 1. Effect-native HTTP tracing (via Effect's Tracer + global OTel provider)
  * 2. Fiber-level auto-tracing (via Supervisor)
  *
  * This gives you automatic spans for:
@@ -90,6 +90,14 @@ declare const EffectTracingLive: Layer.Layer<never>;
  * - Every forked fiber (from our Supervisor)
  *
  * No manual Effect.withSpan() calls needed.
+ *
+ * ARCHITECTURE NOTE:
+ * Unlike EffectTracingLive which uses NodeSdk.layer (scoped provider),
+ * CombinedTracingLive uses a single GLOBAL TracerProvider so that both
+ * Effect's Tracer and our Supervisor use the same provider and exporter.
+ *
+ * This solves the dual-provider problem where HTTP spans and fiber spans
+ * would otherwise go to different exporters.
  */
 declare const createCombinedTracingLayer: () => Layer.Layer<never>;
 /**
@@ -192,6 +200,10 @@ declare class AutoTracingSupervisor extends Supervisor.AbstractSupervisor<void>
      * Called when a fiber completes (success or failure)
      */
     onEnd<A, E>(exit: Exit.Exit<A, E>, fiber: Fiber.RuntimeFiber<A, E>): void;
+    /**
+     * Get attributes for span links from config
+     */
+    private getLinkAttributes;
     /**
      * Check if a span name should be traced based on filter patterns
      */
@@ -388,6 +400,13 @@ declare const AutoTracingConfig_base: Context.TagClass<AutoTracingConfig, "AutoT
             name: string;
         }[];
     };
+    span_relationships: {
+        type: "parent-child" | "span-links" | "both";
+        link_attributes?: {
+            "link.type": string;
+            custom?: Record<string, string> | undefined;
+        } | undefined;
+    };
     performance: {
         sampling_rate: number;
         min_duration: string;

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

@@ -1,15 +1,15 @@
 import { Data, Context, Effect, Layer, FiberRef, Option, Supervisor, FiberRefs, Tracer, Exit } from 'effect';
-import { NodeSdk, Tracer as Tracer$1 } from '@effect/opentelemetry';
+import { NodeSdk, Resource, 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 { resourceFromAttributes } from '@opentelemetry/resources';
+import { ATTR_SERVICE_VERSION, ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
+import * as OtelApi from '@opentelemetry/api';
 import { FileSystem } from '@effect/platform/FileSystem';
 import * as HttpClient from '@effect/platform/HttpClient';
 import * as HttpClientRequest from '@effect/platform/HttpClientRequest';
 import { parse } from 'yaml';
 import { z } from 'zod';
-import * as OtelApi from '@opentelemetry/api';
-import { resourceFromAttributes } from '@opentelemetry/resources';
-import { ATTR_SERVICE_VERSION, ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 import * as path from 'path';
 
 var __defProp = Object.defineProperty;
@@ -82,6 +82,25 @@ var AutoInstrumentationConfigSchema = z.object({
     // Naming rules (first match wins)
     rules: z.array(SpanNamingRuleSchema).default([])
   }).default({}),
+  // Span relationship configuration for forked fibers
+  // Controls how child fiber spans relate to their parent/forking context
+  span_relationships: z.object({
+    // Relationship type between forked fiber spans and their parent context
+    // - 'parent-child': Use parent-child relationship (default, traditional tracing)
+    //   Parent span shows child as nested. Works well with most observability tools.
+    // - 'span-links': Use span links (semantically correct for async forks per OTel spec)
+    //   Fibers get independent traces linked to parent. Better for long-running fibers.
+    // - 'both': Create parent-child AND add span links
+    //   Maximum visibility but may create redundant data.
+    type: z.enum(["parent-child", "span-links", "both"]).default("parent-child"),
+    // Custom attributes to add to span links (only used when type includes links)
+    link_attributes: z.object({
+      // Link type identifier
+      "link.type": z.string().default("fork"),
+      // Custom attributes (key-value pairs)
+      custom: z.record(z.string()).optional()
+    }).optional()
+  }).default({}),
   // Pattern-based filtering
   filter: z.object({
     // Only trace spans matching these patterns (empty = trace all)
@@ -525,6 +544,9 @@ var defaultAutoTracingConfig = {
     infer_from_source: true,
     rules: []
   },
+  span_relationships: {
+    type: "parent-child"
+  },
   filter: {
     include: [],
     exclude: []
@@ -792,42 +814,85 @@ var AutoTracingSupervisor = class extends Supervisor.AbstractSupervisor {
     if (!this.shouldTrace(spanName)) {
       return;
     }
+    const relationshipType = this.config.span_relationships?.type ?? "parent-child";
+    const useParentChild = relationshipType === "parent-child" || relationshipType === "both";
+    const useSpanLinks = relationshipType === "span-links" || relationshipType === "both";
     let parentContext = OtelApi.ROOT_CONTEXT;
     let parentFiberId;
+    let spanLinks = [];
     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)}...`);
+      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);
+      if (useParentChild) {
+        const wrappedSpan = OtelApi.trace.wrapSpanContext(otelSpanContext);
+        parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, wrappedSpan);
+      }
+      if (useSpanLinks) {
+        const linkAttributes = this.getLinkAttributes();
+        spanLinks.push({
+          context: otelSpanContext,
+          attributes: linkAttributes
+        });
+        logger.log(`@atrim/auto-trace: Added span link to parent (${relationshipType})`);
+      }
     } else if (Option.isSome(parent)) {
       parentFiberId = parent.value.id().id;
       const parentSpan = this.fiberSpans.get(parent.value);
       if (parentSpan) {
-        parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, parentSpan);
+        if (useParentChild) {
+          parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, parentSpan);
+        }
+        if (useSpanLinks) {
+          const linkAttributes = this.getLinkAttributes();
+          spanLinks.push({
+            context: parentSpan.spanContext(),
+            attributes: linkAttributes
+          });
+        }
       } else if (this._rootSpan) {
-        parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, this._rootSpan);
+        if (useParentChild) {
+          parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, this._rootSpan);
+        }
+        if (useSpanLinks) {
+          const linkAttributes = this.getLinkAttributes();
+          spanLinks.push({
+            context: this._rootSpan.spanContext(),
+            attributes: linkAttributes
+          });
+        }
       }
     } else if (this._rootSpan) {
-      parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, this._rootSpan);
+      if (useParentChild) {
+        parentContext = OtelApi.trace.setSpan(OtelApi.ROOT_CONTEXT, this._rootSpan);
+      }
+      if (useSpanLinks) {
+        const linkAttributes = this.getLinkAttributes();
+        spanLinks.push({
+          context: this._rootSpan.spanContext(),
+          attributes: linkAttributes
+        });
+      }
     }
     if (Option.isSome(parent)) {
       parentFiberId = parent.value.id().id;
     }
-    const span = this.tracer.startSpan(
-      spanName,
-      {
-        kind: OtelApi.SpanKind.INTERNAL,
-        attributes: this.getInitialAttributes(fiber, sourceInfo, parentFiberId)
-      },
-      parentContext
-    );
+    const spanOptions = {
+      kind: OtelApi.SpanKind.INTERNAL,
+      attributes: this.getInitialAttributes(fiber, sourceInfo, parentFiberId)
+    };
+    if (spanLinks.length > 0) {
+      spanOptions.links = spanLinks;
+    }
+    const span = this.tracer.startSpan(spanName, spanOptions, 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());
@@ -837,8 +902,12 @@ var AutoTracingSupervisor = class extends Supervisor.AbstractSupervisor {
    * Called when a fiber completes (success or failure)
    */
   onEnd(exit, fiber) {
+    logger.log(`@atrim/auto-trace: onEnd called for fiber ${fiber.id().id}`);
     const span = this.fiberSpans.get(fiber);
     if (!span) {
+      logger.log(
+        `@atrim/auto-trace: No span found for fiber ${fiber.id().id} (skipped or filtered)`
+      );
       return;
     }
     const startTime = this.fiberStartTimes.get(fiber);
@@ -862,10 +931,26 @@ var AutoTracingSupervisor = class extends Supervisor.AbstractSupervisor {
       span.setAttribute("effect.fiber.failed", true);
     }
     span.end();
+    logger.log(`@atrim/auto-trace: Ended span for fiber ${fiber.id().id}`);
     this.fiberSpans.delete(fiber);
     this.fiberStartTimes.delete(fiber);
     this.activeFiberCount--;
   }
+  /**
+   * Get attributes for span links from config
+   */
+  getLinkAttributes() {
+    const linkConfig = this.config.span_relationships?.link_attributes;
+    const attrs = {
+      "link.type": linkConfig?.["link.type"] ?? "fork"
+    };
+    if (linkConfig?.custom) {
+      for (const [key, value] of Object.entries(linkConfig.custom)) {
+        attrs[key] = value;
+      }
+    }
+    return attrs;
+  }
   /**
    * Check if a span name should be traced based on filter patterns
    */
@@ -1037,7 +1122,9 @@ var createExporterLayer = (exporterConfig, serviceName, serviceVersion) => {
     };
     if (config.headers) {
       exporterConfig2.headers = config.headers;
-      logger.log(`@atrim/auto-trace: Using custom headers: ${Object.keys(config.headers).join(", ")}`);
+      logger.log(
+        `@atrim/auto-trace: Using custom headers: ${Object.keys(config.headers).join(", ")}`
+      );
     }
     return new OTLPTraceExporter(exporterConfig2);
   };
@@ -1130,7 +1217,9 @@ var createEffectTracingLayer = () => {
         };
         if (exporterConfig.headers) {
           otlpConfig.headers = exporterConfig.headers;
-          logger.log(`@atrim/auto-trace: Using custom headers: ${Object.keys(exporterConfig.headers).join(", ")}`);
+          logger.log(
+            `@atrim/auto-trace: Using custom headers: ${Object.keys(exporterConfig.headers).join(", ")}`
+          );
         }
         const exporter = new OTLPTraceExporter(otlpConfig);
         if (exporterConfig.processor === "simple") {
@@ -1178,6 +1267,9 @@ var createCombinedTracingLayer = () => {
           infer_from_source: true,
           rules: []
         },
+        span_relationships: {
+          type: "parent-child"
+        },
         filter: { include: [], exclude: [] },
         performance: { sampling_rate: 1, min_duration: "0ms", max_concurrent: 0 },
         metadata: { fiber_info: true, source_location: true, parent_fiber: true }
@@ -1189,10 +1281,10 @@ var createCombinedTracingLayer = () => {
         logger.log('@atrim/auto-trace: Exporter type is "none", using empty layer');
         return Layer.empty;
       }
-      const createSpanProcessor = () => {
+      const createSpanExporter = () => {
         if (exporterConfig.type === "console") {
-          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter with SimpleSpanProcessor");
-          return new SimpleSpanProcessor(new ConsoleSpanExporter());
+          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter");
+          return new ConsoleSpanExporter();
         }
         const endpoint = exporterConfig.endpoint || process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
         logger.log(`@atrim/auto-trace: Using OTLPTraceExporter (${endpoint})`);
@@ -1201,10 +1293,15 @@ var createCombinedTracingLayer = () => {
         };
         if (exporterConfig.headers) {
           otlpConfig.headers = exporterConfig.headers;
-          logger.log(`@atrim/auto-trace: Using custom headers: ${Object.keys(exporterConfig.headers).join(", ")}`);
+          logger.log(
+            `@atrim/auto-trace: Using custom headers: ${Object.keys(exporterConfig.headers).join(", ")}`
+          );
         }
-        const exporter = new OTLPTraceExporter(otlpConfig);
-        if (exporterConfig.processor === "simple") {
+        return new OTLPTraceExporter(otlpConfig);
+      };
+      const createSpanProcessor = () => {
+        const exporter = createSpanExporter();
+        if (exporterConfig.processor === "simple" || exporterConfig.type === "console") {
           logger.log("@atrim/auto-trace: Using SimpleSpanProcessor");
           return new SimpleSpanProcessor(exporter);
         }
@@ -1218,34 +1315,31 @@ var createCombinedTracingLayer = () => {
           maxExportBatchSize: batchConfig.max_export_batch_size
         });
       };
-      const sdkLayer = NodeSdk.layer(() => ({
-        resource: {
-          serviceName,
-          serviceVersion
-        },
-        spanProcessor: createSpanProcessor()
-      }));
-      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);
-          }
+      const globalProviderLayer = Layer.effectDiscard(
+        Effect.sync(() => {
+          const provider = new BasicTracerProvider({
+            resource: resourceFromAttributes({
+              [ATTR_SERVICE_NAME]: serviceName,
+              [ATTR_SERVICE_VERSION]: serviceVersion
+            }),
+            spanProcessors: [createSpanProcessor()]
+          });
+          OtelApi.trace.setGlobalTracerProvider(provider);
+          logger.log("@atrim/auto-trace: Global TracerProvider registered");
         })
       );
-      return supervisorLayer.pipe(Layer.provide(Layer.discard(sdkLayer)));
+      const resourceLayer = Resource.layer({
+        serviceName,
+        serviceVersion
+      });
+      const effectTracerLayer = Tracer$1.layerGlobal;
+      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 (global provider)");
+      logger.log("  - Forked fibers: auto-traced via Supervisor (global provider)");
+      const tracerWithResource = effectTracerLayer.pipe(Layer.provide(resourceLayer));
+      return Layer.mergeAll(globalProviderLayer, Layer.discard(tracerWithResource), supervisorLayer);
     })
   );
 };