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

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

@@ -80,6 +80,53 @@ 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)
+ * 2. Fiber-level auto-tracing (via Supervisor)
+ *
+ * This gives you automatic spans for:
+ * - Every HTTP request (from Effect's platform middleware)
+ * - Every forked fiber (from our Supervisor)
+ *
+ * No manual Effect.withSpan() calls needed.
+ */
+declare const createCombinedTracingLayer: () => Layer.Layer<never>;
+/**
+ * Combined tracing layer providing both HTTP and fiber-level auto-tracing
+ *
+ * This is the **most comprehensive** tracing option. You get automatic spans for:
+ * - Every HTTP request (from Effect's @effect/platform middleware)
+ * - Every forked fiber (from our Supervisor)
+ *
+ * No manual Effect.withSpan() calls needed - everything is traced automatically.
+ *
+ * @example
+ * ```yaml
+ * # instrumentation.yaml
+ * effect:
+ *   auto_instrumentation:
+ *     enabled: true
+ *     granularity: fiber
+ *   exporter_config:
+ *     type: otlp
+ *     endpoint: http://localhost:4318
+ * ```
+ *
+ * @example
+ * ```typescript
+ * import { CombinedTracingLive } from '@atrim/instrument-node/effect/auto'
+ *
+ * const HttpLive = router.pipe(
+ *   HttpServer.serve(),
+ *   Layer.provide(ServerLive),
+ *   Layer.provide(CombinedTracingLive),
+ * )
+ *
+ * // Both HTTP requests AND forked fibers are auto-traced!
+ * ```
+ */
+declare const CombinedTracingLive: Layer.Layer<never>;
 
 /**
  * Auto-Tracing Supervisor for Effect-TS
@@ -434,4 +481,4 @@ declare function inferSpanName(fiberId: number, sourceInfo: SourceInfo | undefin
  */
 declare function sanitizeSpanName(name: string): string;
 
-export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, EffectTracingLive, FullAutoTracingLive, type SourceInfo, type TemplateVariables, createAutoTracingLayer, createAutoTracingSupervisor, createEffectTracingLayer, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
+export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, CombinedTracingLive, EffectTracingLive, FullAutoTracingLive, type SourceInfo, type TemplateVariables, createAutoTracingLayer, createAutoTracingSupervisor, createCombinedTracingLayer, createEffectTracingLayer, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };

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

@@ -80,6 +80,53 @@ 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)
+ * 2. Fiber-level auto-tracing (via Supervisor)
+ *
+ * This gives you automatic spans for:
+ * - Every HTTP request (from Effect's platform middleware)
+ * - Every forked fiber (from our Supervisor)
+ *
+ * No manual Effect.withSpan() calls needed.
+ */
+declare const createCombinedTracingLayer: () => Layer.Layer<never>;
+/**
+ * Combined tracing layer providing both HTTP and fiber-level auto-tracing
+ *
+ * This is the **most comprehensive** tracing option. You get automatic spans for:
+ * - Every HTTP request (from Effect's @effect/platform middleware)
+ * - Every forked fiber (from our Supervisor)
+ *
+ * No manual Effect.withSpan() calls needed - everything is traced automatically.
+ *
+ * @example
+ * ```yaml
+ * # instrumentation.yaml
+ * effect:
+ *   auto_instrumentation:
+ *     enabled: true
+ *     granularity: fiber
+ *   exporter_config:
+ *     type: otlp
+ *     endpoint: http://localhost:4318
+ * ```
+ *
+ * @example
+ * ```typescript
+ * import { CombinedTracingLive } from '@atrim/instrument-node/effect/auto'
+ *
+ * const HttpLive = router.pipe(
+ *   HttpServer.serve(),
+ *   Layer.provide(ServerLive),
+ *   Layer.provide(CombinedTracingLive),
+ * )
+ *
+ * // Both HTTP requests AND forked fibers are auto-traced!
+ * ```
+ */
+declare const CombinedTracingLive: Layer.Layer<never>;
 
 /**
  * Auto-Tracing Supervisor for Effect-TS
@@ -434,4 +481,4 @@ declare function inferSpanName(fiberId: number, sourceInfo: SourceInfo | undefin
  */
 declare function sanitizeSpanName(name: string): string;
 
-export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, EffectTracingLive, FullAutoTracingLive, type SourceInfo, type TemplateVariables, createAutoTracingLayer, createAutoTracingSupervisor, createEffectTracingLayer, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
+export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, CombinedTracingLive, EffectTracingLive, FullAutoTracingLive, type SourceInfo, type TemplateVariables, createAutoTracingLayer, createAutoTracingSupervisor, createCombinedTracingLayer, createEffectTracingLayer, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };

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

@@ -1,6 +1,6 @@
-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 { SimpleSpanProcessor, ConsoleSpanExporter, BatchSpanProcessor, BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import { BasicTracerProvider, SimpleSpanProcessor, ConsoleSpanExporter, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { FileSystem } from '@effect/platform/FileSystem';
 import * as HttpClient from '@effect/platform/HttpClient';
@@ -586,67 +586,6 @@ var loadFullConfig = (options) => Effect.gen(function* () {
   }
   return config;
 });
-
-// src/integrations/effect/auto/effect-tracing.ts
-var createEffectTracingLayer = () => {
-  return Layer.unwrapEffect(
-    Effect.gen(function* () {
-      const config = yield* loadFullConfig();
-      const serviceName = process.env.OTEL_SERVICE_NAME || "effect-service";
-      const serviceVersion = process.env.npm_package_version || "1.0.0";
-      const exporterConfig = config.effect?.exporter_config ?? {
-        type: "otlp",
-        processor: "batch"
-      };
-      logger.log("@atrim/auto-trace: Effect-native tracing enabled");
-      logger.log(`  Service: ${serviceName}`);
-      logger.log(`  Exporter: ${exporterConfig.type}`);
-      if (exporterConfig.type === "none") {
-        logger.log('@atrim/auto-trace: Exporter type is "none", using empty layer');
-        return Layer.empty;
-      }
-      const createSpanProcessor = () => {
-        if (exporterConfig.type === "console") {
-          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter with SimpleSpanProcessor");
-          return new SimpleSpanProcessor(new ConsoleSpanExporter());
-        }
-        const endpoint = exporterConfig.endpoint || process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
-        logger.log(`@atrim/auto-trace: Using OTLPTraceExporter (${endpoint})`);
-        const otlpConfig = {
-          url: `${endpoint}/v1/traces`
-        };
-        if (exporterConfig.headers) {
-          otlpConfig.headers = exporterConfig.headers;
-          logger.log(`@atrim/auto-trace: Using custom headers: ${Object.keys(exporterConfig.headers).join(", ")}`);
-        }
-        const exporter = new OTLPTraceExporter(otlpConfig);
-        if (exporterConfig.processor === "simple") {
-          logger.log("@atrim/auto-trace: Using SimpleSpanProcessor");
-          return new SimpleSpanProcessor(exporter);
-        }
-        const batchConfig = exporterConfig.batch ?? {
-          scheduled_delay_millis: 1e3,
-          max_export_batch_size: 100
-        };
-        logger.log("@atrim/auto-trace: Using BatchSpanProcessor");
-        return new BatchSpanProcessor(exporter, {
-          scheduledDelayMillis: batchConfig.scheduled_delay_millis,
-          maxExportBatchSize: batchConfig.max_export_batch_size
-        });
-      };
-      const sdkLayer = NodeSdk.layer(() => ({
-        resource: {
-          serviceName,
-          serviceVersion
-        },
-        spanProcessor: createSpanProcessor()
-      }));
-      logger.log("@atrim/auto-trace: NodeSdk layer created - HTTP requests will be auto-traced");
-      return Layer.discard(sdkLayer);
-    })
-  );
-};
-var EffectTracingLive = createEffectTracingLayer();
 var compiledRulesCache = /* @__PURE__ */ new WeakMap();
 function compileNamingRules(rules) {
   const cached = compiledRulesCache.get(rules);
@@ -841,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) {
@@ -852,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,
       {
@@ -1131,6 +1084,142 @@ var createFullAutoTracingLayer = () => {
 };
 var FullAutoTracingLive = createFullAutoTracingLayer();
 
-export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, EffectTracingLive, FullAutoTracingLive, createAutoTracingLayer, createAutoTracingSupervisor, createEffectTracingLayer, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
+// src/integrations/effect/auto/effect-tracing.ts
+var createEffectTracingLayer = () => {
+  return Layer.unwrapEffect(
+    Effect.gen(function* () {
+      const config = yield* loadFullConfig();
+      const serviceName = process.env.OTEL_SERVICE_NAME || "effect-service";
+      const serviceVersion = process.env.npm_package_version || "1.0.0";
+      const exporterConfig = config.effect?.exporter_config ?? {
+        type: "otlp",
+        processor: "batch"
+      };
+      logger.log("@atrim/auto-trace: Effect-native tracing enabled");
+      logger.log(`  Service: ${serviceName}`);
+      logger.log(`  Exporter: ${exporterConfig.type}`);
+      if (exporterConfig.type === "none") {
+        logger.log('@atrim/auto-trace: Exporter type is "none", using empty layer');
+        return Layer.empty;
+      }
+      const createSpanProcessor = () => {
+        if (exporterConfig.type === "console") {
+          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter with SimpleSpanProcessor");
+          return new SimpleSpanProcessor(new ConsoleSpanExporter());
+        }
+        const endpoint = exporterConfig.endpoint || process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
+        logger.log(`@atrim/auto-trace: Using OTLPTraceExporter (${endpoint})`);
+        const otlpConfig = {
+          url: `${endpoint}/v1/traces`
+        };
+        if (exporterConfig.headers) {
+          otlpConfig.headers = exporterConfig.headers;
+          logger.log(`@atrim/auto-trace: Using custom headers: ${Object.keys(exporterConfig.headers).join(", ")}`);
+        }
+        const exporter = new OTLPTraceExporter(otlpConfig);
+        if (exporterConfig.processor === "simple") {
+          logger.log("@atrim/auto-trace: Using SimpleSpanProcessor");
+          return new SimpleSpanProcessor(exporter);
+        }
+        const batchConfig = exporterConfig.batch ?? {
+          scheduled_delay_millis: 1e3,
+          max_export_batch_size: 100
+        };
+        logger.log("@atrim/auto-trace: Using BatchSpanProcessor");
+        return new BatchSpanProcessor(exporter, {
+          scheduledDelayMillis: batchConfig.scheduled_delay_millis,
+          maxExportBatchSize: batchConfig.max_export_batch_size
+        });
+      };
+      const sdkLayer = NodeSdk.layer(() => ({
+        resource: {
+          serviceName,
+          serviceVersion
+        },
+        spanProcessor: createSpanProcessor()
+      }));
+      logger.log("@atrim/auto-trace: NodeSdk layer created - HTTP requests will be auto-traced");
+      return Layer.discard(sdkLayer);
+    })
+  );
+};
+var EffectTracingLive = createEffectTracingLayer();
+var createCombinedTracingLayer = () => {
+  return Layer.unwrapEffect(
+    Effect.gen(function* () {
+      const config = yield* loadFullConfig();
+      const serviceName = process.env.OTEL_SERVICE_NAME || "effect-service";
+      const serviceVersion = process.env.npm_package_version || "1.0.0";
+      const exporterConfig = config.effect?.exporter_config ?? {
+        type: "otlp",
+        processor: "batch"
+      };
+      const autoConfig = config.effect?.auto_instrumentation ?? {
+        enabled: true,
+        granularity: "fiber",
+        span_naming: {
+          default: "effect.{function}",
+          infer_from_source: true,
+          rules: []
+        },
+        filter: { include: [], exclude: [] },
+        performance: { sampling_rate: 1, min_duration: "0ms", max_concurrent: 0 },
+        metadata: { fiber_info: true, source_location: true, parent_fiber: true }
+      };
+      logger.log("@atrim/auto-trace: Combined tracing enabled (HTTP + Fiber)");
+      logger.log(`  Service: ${serviceName}`);
+      logger.log(`  Exporter: ${exporterConfig.type}`);
+      if (exporterConfig.type === "none") {
+        logger.log('@atrim/auto-trace: Exporter type is "none", using empty layer');
+        return Layer.empty;
+      }
+      const createSpanProcessor = () => {
+        if (exporterConfig.type === "console") {
+          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter with SimpleSpanProcessor");
+          return new SimpleSpanProcessor(new ConsoleSpanExporter());
+        }
+        const endpoint = exporterConfig.endpoint || process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
+        logger.log(`@atrim/auto-trace: Using OTLPTraceExporter (${endpoint})`);
+        const otlpConfig = {
+          url: `${endpoint}/v1/traces`
+        };
+        if (exporterConfig.headers) {
+          otlpConfig.headers = exporterConfig.headers;
+          logger.log(`@atrim/auto-trace: Using custom headers: ${Object.keys(exporterConfig.headers).join(", ")}`);
+        }
+        const exporter = new OTLPTraceExporter(otlpConfig);
+        if (exporterConfig.processor === "simple") {
+          logger.log("@atrim/auto-trace: Using SimpleSpanProcessor");
+          return new SimpleSpanProcessor(exporter);
+        }
+        const batchConfig = exporterConfig.batch ?? {
+          scheduled_delay_millis: 1e3,
+          max_export_batch_size: 100
+        };
+        logger.log("@atrim/auto-trace: Using BatchSpanProcessor");
+        return new BatchSpanProcessor(exporter, {
+          scheduledDelayMillis: batchConfig.scheduled_delay_millis,
+          maxExportBatchSize: batchConfig.max_export_batch_size
+        });
+      };
+      const sdkLayer = NodeSdk.layer(() => ({
+        resource: {
+          serviceName,
+          serviceVersion
+        },
+        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 supervisorLayer.pipe(Layer.provideMerge(Layer.discard(sdkLayer)));
+    })
+  );
+};
+var CombinedTracingLive = createCombinedTracingLayer();
+
+export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, CombinedTracingLive, EffectTracingLive, FullAutoTracingLive, createAutoTracingLayer, createAutoTracingSupervisor, createCombinedTracingLayer, createEffectTracingLayer, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map