@atrim/instrument-node 0.7.2-dev.e12da4b.20260116190926 → 0.8.1-dev.ae570af.20260116211540

package/README.md

@@ -80,6 +80,45 @@ const process = Effect.gen(function* () {
 
 Available: `annotateUser`, `annotateBatch`, `annotateDataSize`, `annotateLLM`, `annotateQuery`, `annotateHttpRequest`, `annotateError`, `annotatePriority`, `annotateCache`
 
+### Operation Tracing (Automatic)
+
+Automatically trace `Effect.all`, `Effect.forEach`, and other operations without manual `Effect.withSpan()` calls:
+
+```typescript
+import { Effect } from 'effect'
+import { withOperationTracing } from '@atrim/instrument-node/effect/auto'
+
+const program = Effect.gen(function* () {
+  // Automatically creates span "effect.all (index.ts:42)" with item_count=3
+  yield* Effect.all([fetchUser(), fetchOrders(), fetchPrefs()])
+
+  // Automatically creates span "effect.forEach (index.ts:45)"
+  yield* Effect.forEach(items, processItem)
+}).pipe(withOperationTracing)
+
+await Effect.runPromise(program)
+```
+
+**What you get:**
+- Span name with source location: `effect.all (index.ts:42)`
+- Attributes: `effect.operation`, `effect.item_count`, `code.filepath`, `code.lineno`
+- Zero code changes to existing Effect code
+
+**Configuration (optional):**
+
+```yaml
+effect:
+  operation_tracing:
+    enabled: true
+    operations:
+      - name: all
+        include_count: true
+      - name: forEach
+        include_count: true
+```
+
+> **Note:** Requires `@clayroach/effect` fork with OperationMeta support. See [examples/effect-op-tracing](../../examples/effect-op-tracing/) for a complete example.
+
 ### Effect Fiber Metadata Extraction
 
 To add Effect fiber metadata (fiber ID, status, parent span info) to your spans, you must **explicitly call** the enrichment functions:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atrim/instrument-node",
-  "version": "0.7.2-dev.e12da4b.20260116190926",
+  "version": "0.8.1-dev.ae570af.20260116211540",
   "description": "OpenTelemetry instrumentation for Node.js with centralized YAML configuration",
   "type": "module",
   "license": "MIT",
@@ -89,7 +89,7 @@
     "tsx": "^4.7.0",
     "typescript": "^5.7.2",
     "vitest": "^4.0.16",
-    "@atrim/instrument-core": "0.6.0"
+    "@atrim/instrument-core": "0.7.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0",

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

@@ -14,7 +14,7 @@ var yaml = require('yaml');
 var zod = require('zod');
 var fs = require('fs');
 var path2 = require('path');
-var EffectTracer3 = require('effect/Tracer');
+var TracerModule = require('effect/Tracer');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -40,7 +40,7 @@ var HttpClientRequest__namespace = /*#__PURE__*/_interopNamespace(HttpClientRequ
 var yaml__namespace = /*#__PURE__*/_interopNamespace(yaml);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var path2__namespace = /*#__PURE__*/_interopNamespace(path2);
-var EffectTracer3__namespace = /*#__PURE__*/_interopNamespace(EffectTracer3);
+var TracerModule__namespace = /*#__PURE__*/_interopNamespace(TracerModule);
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -1573,6 +1573,8 @@ var SourceCaptureSupervisor = class extends effect.Supervisor.AbstractSupervisor
     this.config = config;
     // WeakMap to associate fibers with their OTel spans
     __publicField(this, "fiberSpans", /* @__PURE__ */ new WeakMap());
+    // WeakMap to associate fibers with their OTel contexts (for child fiber lookups)
+    __publicField(this, "fiberContexts", /* @__PURE__ */ new WeakMap());
     // WeakMap for fiber start times (for min_duration filtering)
     __publicField(this, "fiberStartTimes", /* @__PURE__ */ new WeakMap());
     // OpenTelemetry tracer - lazily initialized
@@ -1668,25 +1670,51 @@ var SourceCaptureSupervisor = class extends effect.Supervisor.AbstractSupervisor
     }
     let parentContext = OtelApi__namespace.ROOT_CONTEXT;
     let parentFiberId;
-    const maybeEffectParentSpan = effect.Context.getOption(_context, effect.Tracer.ParentSpan);
-    if (effect.Option.isSome(maybeEffectParentSpan)) {
-      const effectSpan = maybeEffectParentSpan.value;
-      logger.log(
-        `@atrim/source-capture: Found ParentSpan - traceId=${effectSpan.traceId}, spanId=${effectSpan.spanId}`
-      );
-      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) {
-        parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, parentSpan);
+    const inheritedOtelContext = effect.FiberRefs.getOrDefault(
+      fiberRefsValue,
+      TracerModule__namespace.currentOtelSpanContext
+    );
+    if (inheritedOtelContext) {
+      parentContext = inheritedOtelContext;
+      const inheritedSpan = OtelApi__namespace.trace.getSpan(inheritedOtelContext);
+      if (inheritedSpan) {
+        const spanCtx = inheritedSpan.spanContext();
+        logger.log(
+          `@atrim/source-capture: Using inherited OTel context - traceId=${spanCtx.traceId}, spanId=${spanCtx.spanId}`
+        );
+      }
+    } else {
+      const maybeEffectParentSpan = effect.Context.getOption(_context, effect.Tracer.ParentSpan);
+      if (effect.Option.isSome(maybeEffectParentSpan)) {
+        const effectSpan = maybeEffectParentSpan.value;
+        logger.log(
+          `@atrim/source-capture: Found ParentSpan - traceId=${effectSpan.traceId}, spanId=${effectSpan.spanId}`
+        );
+        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 parentOtelContext = this.fiberContexts.get(parent.value);
+        if (parentOtelContext) {
+          parentContext = parentOtelContext;
+          const parentSpan = OtelApi__namespace.trace.getSpan(parentOtelContext);
+          if (parentSpan) {
+            logger.log(
+              `@atrim/source-capture: Using parent fiber's OTel context - traceId=${parentSpan.spanContext().traceId}`
+            );
+          }
+        } else {
+          const parentSpan = this.fiberSpans.get(parent.value);
+          if (parentSpan) {
+            parentContext = OtelApi__namespace.trace.setSpan(OtelApi__namespace.ROOT_CONTEXT, parentSpan);
+          }
+        }
       }
     }
     if (effect.Option.isSome(parent)) {
@@ -1715,7 +1743,9 @@ var SourceCaptureSupervisor = class extends effect.Supervisor.AbstractSupervisor
       parentContext
     );
     logger.log(`@atrim/source-capture: Created span "${spanName}" for fiber ${fiberId}`);
+    const newContext = OtelApi__namespace.trace.setSpan(parentContext, span);
     this.fiberSpans.set(fiber, span);
+    this.fiberContexts.set(fiber, newContext);
     this.fiberStartTimes.set(fiber, process.hrtime.bigint());
     this.activeFiberCount++;
   }
@@ -1736,6 +1766,7 @@ var SourceCaptureSupervisor = class extends effect.Supervisor.AbstractSupervisor
       const minDuration = this.parseMinDuration(this.config.performance?.min_duration);
       if (minDuration > 0 && duration < minDuration) {
         this.fiberSpans.delete(fiber);
+        this.fiberContexts.delete(fiber);
         this.fiberStartTimes.delete(fiber);
         this.activeFiberCount--;
         return;
@@ -1753,6 +1784,7 @@ var SourceCaptureSupervisor = class extends effect.Supervisor.AbstractSupervisor
     span.end();
     logger.log(`@atrim/source-capture: Ended span for fiber ${fiberId}`);
     this.fiberSpans.delete(fiber);
+    this.fiberContexts.delete(fiber);
     this.fiberStartTimes.delete(fiber);
     this.activeFiberCount--;
   }
@@ -2010,7 +2042,7 @@ var OperationTracingSupervisor = class extends effect.Supervisor.AbstractSupervi
     }
     let parentContext = OtelApi__namespace.ROOT_CONTEXT;
     const fiberContext = fiber.currentContext;
-    const maybeEffectParentSpan = effect.Context.getOption(fiberContext, EffectTracer3__namespace.ParentSpan);
+    const maybeEffectParentSpan = effect.Context.getOption(fiberContext, TracerModule__namespace.ParentSpan);
     if (effect.Option.isSome(maybeEffectParentSpan)) {
       const effectSpan = maybeEffectParentSpan.value;
       parentContext = OtelApi__namespace.trace.setSpan(
@@ -2088,8 +2120,8 @@ var defaultOperations = [
   { name: "all", includeCount: true, includeStack: true },
   { name: "forEach", includeCount: true, includeStack: true }
 ];
-var makeOperationTracingLayer = (operations = defaultOperations) => {
-  const supervisor = new OperationTracingSupervisor(operations);
+var makeOperationTracingLayer = (operations = defaultOperations, spanNaming = defaultSpanNaming) => {
+  const supervisor = new OperationTracingSupervisor(operations, spanNaming);
   return effect.Supervisor.addSupervisor(supervisor);
 };
 var enableOpSupervision = (effect$1) => effect.Effect.withRuntimeFlagsPatch(effect$1, effect.RuntimeFlagsPatch.enable(effect.RuntimeFlags.OpSupervision));
@@ -2107,9 +2139,16 @@ var loadOperationTracingLayer = () => effect.Layer.unwrapEffect(
       logger.log("@atrim/operation-tracing: Operation tracing disabled in config");
       return effect.Layer.empty;
     }
+    const spanNaming = {
+      includeLocation: opTracingConfig?.span_naming?.include_location ?? true,
+      template: opTracingConfig?.span_naming?.template ?? "effect.{op} ({filename}:{line})"
+    };
+    logger.log(
+      `@atrim/operation-tracing: Span naming - includeLocation=${spanNaming.includeLocation}, template="${spanNaming.template}"`
+    );
     const operations = opTracingConfig?.operations ? opTracingConfig.operations.map((op) => ({
       name: op.name,
-      ...op.span_name && { spanName: op.span_name },
+      ...op.span_name && { spanNameTemplate: op.span_name },
       includeCount: op.include_count ?? true,
       includeStack: op.include_stack ?? true
     })) : defaultOperations;
@@ -2117,7 +2156,7 @@ var loadOperationTracingLayer = () => effect.Layer.unwrapEffect(
     logger.log(
       `@atrim/operation-tracing: Loaded ${operations.length} operation configs from ${source}`
     );
-    return makeOperationTracingLayer(operations);
+    return makeOperationTracingLayer(operations, spanNaming);
   })
 );
 var OperationTracingLive = loadOperationTracingLayer();