@atrim/instrument-node 0.7.1-dev.14fdea7.20260108231415 → 0.7.1-dev.14fdea7.20260108232436

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atrim/instrument-node",
-  "version": "0.7.1-dev.14fdea7.20260108231415",
+  "version": "0.7.1-dev.14fdea7.20260108232436",
   "description": "OpenTelemetry instrumentation for Node.js with centralized YAML configuration",
   "type": "module",
   "license": "MIT",
@@ -66,7 +66,6 @@
     "@opentelemetry/sdk-node": "^0.208.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/sdk-trace-node": "^2.2.0",
-    "@opentelemetry/sdk-trace-web": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.38.0",
     "yaml": "^2.3.0",
     "zod": "^3.22.0"

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

@@ -611,67 +611,6 @@ var loadFullConfig = (options) => effect.Effect.gen(function* () {
   }
   return config;
 });
-
-// src/integrations/effect/auto/effect-tracing.ts
-var createEffectTracingLayer = () => {
-  return effect.Layer.unwrapEffect(
-    effect.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 effect.Layer.empty;
-      }
-      const createSpanProcessor = () => {
-        if (exporterConfig.type === "console") {
-          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter with SimpleSpanProcessor");
-          return new sdkTraceBase.SimpleSpanProcessor(new sdkTraceBase.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 exporterTraceOtlpHttp.OTLPTraceExporter(otlpConfig);
-        if (exporterConfig.processor === "simple") {
-          logger.log("@atrim/auto-trace: Using SimpleSpanProcessor");
-          return new sdkTraceBase.SimpleSpanProcessor(exporter);
-        }
-        const batchConfig = exporterConfig.batch ?? {
-          scheduled_delay_millis: 1e3,
-          max_export_batch_size: 100
-        };
-        logger.log("@atrim/auto-trace: Using BatchSpanProcessor");
-        return new sdkTraceBase.BatchSpanProcessor(exporter, {
-          scheduledDelayMillis: batchConfig.scheduled_delay_millis,
-          maxExportBatchSize: batchConfig.max_export_batch_size
-        });
-      };
-      const sdkLayer = opentelemetry.NodeSdk.layer(() => ({
-        resource: {
-          serviceName,
-          serviceVersion
-        },
-        spanProcessor: createSpanProcessor()
-      }));
-      logger.log("@atrim/auto-trace: NodeSdk layer created - HTTP requests will be auto-traced");
-      return effect.Layer.discard(sdkLayer);
-    })
-  );
-};
-var EffectTracingLive = createEffectTracingLayer();
 var compiledRulesCache = /* @__PURE__ */ new WeakMap();
 function compileNamingRules(rules) {
   const cached = compiledRulesCache.get(rules);
@@ -871,11 +810,21 @@ var AutoTracingSupervisor = class extends effect.Supervisor.AbstractSupervisor {
       const parentSpan = this.fiberSpans.get(parent.value);
       if (parentSpan) {
         parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, parentSpan);
+      } else {
+        const activeSpan = OtelApi__namespace.trace.getSpan(OtelApi__namespace.context.active());
+        if (activeSpan) {
+          parentContext = OtelApi__namespace.context.active();
+        } else if (this._rootSpan) {
+          parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, this._rootSpan);
+        }
+      }
+    } else {
+      const activeSpan = OtelApi__namespace.trace.getSpan(OtelApi__namespace.context.active());
+      if (activeSpan) {
+        parentContext = OtelApi__namespace.context.active();
       } else if (this._rootSpan) {
         parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, this._rootSpan);
       }
-    } else if (this._rootSpan) {
-      parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, this._rootSpan);
     }
     const span = this.tracer.startSpan(
       spanName,
@@ -1156,6 +1105,142 @@ var createFullAutoTracingLayer = () => {
 };
 var FullAutoTracingLive = createFullAutoTracingLayer();
 
+// src/integrations/effect/auto/effect-tracing.ts
+var createEffectTracingLayer = () => {
+  return effect.Layer.unwrapEffect(
+    effect.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 effect.Layer.empty;
+      }
+      const createSpanProcessor = () => {
+        if (exporterConfig.type === "console") {
+          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter with SimpleSpanProcessor");
+          return new sdkTraceBase.SimpleSpanProcessor(new sdkTraceBase.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 exporterTraceOtlpHttp.OTLPTraceExporter(otlpConfig);
+        if (exporterConfig.processor === "simple") {
+          logger.log("@atrim/auto-trace: Using SimpleSpanProcessor");
+          return new sdkTraceBase.SimpleSpanProcessor(exporter);
+        }
+        const batchConfig = exporterConfig.batch ?? {
+          scheduled_delay_millis: 1e3,
+          max_export_batch_size: 100
+        };
+        logger.log("@atrim/auto-trace: Using BatchSpanProcessor");
+        return new sdkTraceBase.BatchSpanProcessor(exporter, {
+          scheduledDelayMillis: batchConfig.scheduled_delay_millis,
+          maxExportBatchSize: batchConfig.max_export_batch_size
+        });
+      };
+      const sdkLayer = opentelemetry.NodeSdk.layer(() => ({
+        resource: {
+          serviceName,
+          serviceVersion
+        },
+        spanProcessor: createSpanProcessor()
+      }));
+      logger.log("@atrim/auto-trace: NodeSdk layer created - HTTP requests will be auto-traced");
+      return effect.Layer.discard(sdkLayer);
+    })
+  );
+};
+var EffectTracingLive = createEffectTracingLayer();
+var createCombinedTracingLayer = () => {
+  return effect.Layer.unwrapEffect(
+    effect.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 effect.Layer.empty;
+      }
+      const createSpanProcessor = () => {
+        if (exporterConfig.type === "console") {
+          logger.log("@atrim/auto-trace: Using ConsoleSpanExporter with SimpleSpanProcessor");
+          return new sdkTraceBase.SimpleSpanProcessor(new sdkTraceBase.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 exporterTraceOtlpHttp.OTLPTraceExporter(otlpConfig);
+        if (exporterConfig.processor === "simple") {
+          logger.log("@atrim/auto-trace: Using SimpleSpanProcessor");
+          return new sdkTraceBase.SimpleSpanProcessor(exporter);
+        }
+        const batchConfig = exporterConfig.batch ?? {
+          scheduled_delay_millis: 1e3,
+          max_export_batch_size: 100
+        };
+        logger.log("@atrim/auto-trace: Using BatchSpanProcessor");
+        return new sdkTraceBase.BatchSpanProcessor(exporter, {
+          scheduledDelayMillis: batchConfig.scheduled_delay_millis,
+          maxExportBatchSize: batchConfig.max_export_batch_size
+        });
+      };
+      const sdkLayer = opentelemetry.NodeSdk.layer(() => ({
+        resource: {
+          serviceName,
+          serviceVersion
+        },
+        spanProcessor: createSpanProcessor()
+      }));
+      const supervisor = createAutoTracingSupervisor(autoConfig);
+      const supervisorLayer = effect.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(effect.Layer.provideMerge(effect.Layer.discard(sdkLayer)));
+    })
+  );
+};
+var CombinedTracingLive = createCombinedTracingLayer();
+
 exports.AutoTracingConfig = AutoTracingConfig;
 exports.AutoTracingConfigLayer = AutoTracingConfigLayer;
 exports.AutoTracingConfigLive = AutoTracingConfigLive;
@@ -1163,10 +1248,12 @@ exports.AutoTracingEnabled = AutoTracingEnabled;
 exports.AutoTracingLive = AutoTracingLive;
 exports.AutoTracingSpanName = AutoTracingSpanName;
 exports.AutoTracingSupervisor = AutoTracingSupervisor;
+exports.CombinedTracingLive = CombinedTracingLive;
 exports.EffectTracingLive = EffectTracingLive;
 exports.FullAutoTracingLive = FullAutoTracingLive;
 exports.createAutoTracingLayer = createAutoTracingLayer;
 exports.createAutoTracingSupervisor = createAutoTracingSupervisor;
+exports.createCombinedTracingLayer = createCombinedTracingLayer;
 exports.createEffectTracingLayer = createEffectTracingLayer;
 exports.createFullAutoTracingLayer = createFullAutoTracingLayer;
 exports.defaultAutoTracingConfig = defaultAutoTracingConfig;