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

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

@@ -3,6 +3,84 @@ import * as OtelApi from '@opentelemetry/api';
 import { AutoInstrumentationConfig, InstrumentationConfig } from '@atrim/instrument-core';
 export { AutoInstrumentationConfig } from '@atrim/instrument-core';
 
+/**
+ * Effect-Native Tracing Layer
+ *
+ * Uses @effect/opentelemetry's NodeSdk.layer for proper Effect integration.
+ * This provides automatic HTTP request tracing and Effect.withSpan() support.
+ *
+ * Requires @effect/opentelemetry peer dependency to be installed.
+ */
+
+/**
+ * Create a layer that provides Effect-native tracing via NodeSdk.layer
+ *
+ * This integrates with Effect's built-in tracing system, which means:
+ * - HTTP requests are automatically traced by @effect/platform
+ * - Effect.withSpan() creates proper OTel spans
+ * - Parent-child span relationships work correctly
+ * - No need to fork fibers for tracing to work
+ *
+ * Configuration is loaded from instrumentation.yaml (exporter_config section).
+ *
+ * @example
+ * ```typescript
+ * import { EffectTracingLive } from '@atrim/instrument-node/effect/auto'
+ *
+ * // HTTP requests automatically traced!
+ * const HttpLive = router.pipe(
+ *   HttpServer.serve(),
+ *   Layer.provide(ServerLive),
+ *   Layer.provide(EffectTracingLive),
+ * )
+ * ```
+ */
+declare const createEffectTracingLayer: () => Layer.Layer<never>;
+/**
+ * Effect-native tracing layer using @effect/opentelemetry
+ *
+ * This is the **recommended** layer for Effect HTTP applications. It provides:
+ * - Automatic HTTP request tracing (built into @effect/platform)
+ * - Full Effect.withSpan() support for manual spans
+ * - Proper parent-child span relationships
+ * - No need to fork fibers manually
+ *
+ * Configuration is loaded from your instrumentation.yaml file.
+ *
+ * @example
+ * ```yaml
+ * # instrumentation.yaml
+ * effect:
+ *   exporter_config:
+ *     type: otlp        # or 'console' for dev
+ *     endpoint: http://localhost:4318
+ *     headers:
+ *       x-api-key: your-key
+ *     processor: batch   # or 'simple' for immediate export
+ * ```
+ *
+ * @example
+ * ```typescript
+ * import { EffectTracingLive } from '@atrim/instrument-node/effect/auto'
+ * import { HttpRouter, HttpServer } from "@effect/platform"
+ * import { NodeHttpServer, NodeRuntime } from "@effect/platform-node"
+ *
+ * const router = HttpRouter.empty.pipe(
+ *   HttpRouter.get("/", Effect.succeed(HttpServerResponse.text("Hello!"))),
+ * )
+ *
+ * const HttpLive = router.pipe(
+ *   HttpServer.serve(),
+ *   Layer.provide(NodeHttpServer.layer(createServer, { port: 3000 })),
+ *   Layer.provide(EffectTracingLive),  // <- Just add this!
+ * )
+ *
+ * NodeRuntime.runMain(Layer.launch(HttpLive))
+ * // All HTTP requests now automatically traced!
+ * ```
+ */
+declare const EffectTracingLive: Layer.Layer<never>;
+
 /**
  * Auto-Tracing Supervisor for Effect-TS
  *
@@ -356,4 +434,4 @@ declare function inferSpanName(fiberId: number, sourceInfo: SourceInfo | undefin
  */
 declare function sanitizeSpanName(name: string): string;
 
-export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, FullAutoTracingLive, type SourceInfo, type TemplateVariables, createAutoTracingLayer, createAutoTracingSupervisor, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
+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 };

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

@@ -3,6 +3,84 @@ import * as OtelApi from '@opentelemetry/api';
 import { AutoInstrumentationConfig, InstrumentationConfig } from '@atrim/instrument-core';
 export { AutoInstrumentationConfig } from '@atrim/instrument-core';
 
+/**
+ * Effect-Native Tracing Layer
+ *
+ * Uses @effect/opentelemetry's NodeSdk.layer for proper Effect integration.
+ * This provides automatic HTTP request tracing and Effect.withSpan() support.
+ *
+ * Requires @effect/opentelemetry peer dependency to be installed.
+ */
+
+/**
+ * Create a layer that provides Effect-native tracing via NodeSdk.layer
+ *
+ * This integrates with Effect's built-in tracing system, which means:
+ * - HTTP requests are automatically traced by @effect/platform
+ * - Effect.withSpan() creates proper OTel spans
+ * - Parent-child span relationships work correctly
+ * - No need to fork fibers for tracing to work
+ *
+ * Configuration is loaded from instrumentation.yaml (exporter_config section).
+ *
+ * @example
+ * ```typescript
+ * import { EffectTracingLive } from '@atrim/instrument-node/effect/auto'
+ *
+ * // HTTP requests automatically traced!
+ * const HttpLive = router.pipe(
+ *   HttpServer.serve(),
+ *   Layer.provide(ServerLive),
+ *   Layer.provide(EffectTracingLive),
+ * )
+ * ```
+ */
+declare const createEffectTracingLayer: () => Layer.Layer<never>;
+/**
+ * Effect-native tracing layer using @effect/opentelemetry
+ *
+ * This is the **recommended** layer for Effect HTTP applications. It provides:
+ * - Automatic HTTP request tracing (built into @effect/platform)
+ * - Full Effect.withSpan() support for manual spans
+ * - Proper parent-child span relationships
+ * - No need to fork fibers manually
+ *
+ * Configuration is loaded from your instrumentation.yaml file.
+ *
+ * @example
+ * ```yaml
+ * # instrumentation.yaml
+ * effect:
+ *   exporter_config:
+ *     type: otlp        # or 'console' for dev
+ *     endpoint: http://localhost:4318
+ *     headers:
+ *       x-api-key: your-key
+ *     processor: batch   # or 'simple' for immediate export
+ * ```
+ *
+ * @example
+ * ```typescript
+ * import { EffectTracingLive } from '@atrim/instrument-node/effect/auto'
+ * import { HttpRouter, HttpServer } from "@effect/platform"
+ * import { NodeHttpServer, NodeRuntime } from "@effect/platform-node"
+ *
+ * const router = HttpRouter.empty.pipe(
+ *   HttpRouter.get("/", Effect.succeed(HttpServerResponse.text("Hello!"))),
+ * )
+ *
+ * const HttpLive = router.pipe(
+ *   HttpServer.serve(),
+ *   Layer.provide(NodeHttpServer.layer(createServer, { port: 3000 })),
+ *   Layer.provide(EffectTracingLive),  // <- Just add this!
+ * )
+ *
+ * NodeRuntime.runMain(Layer.launch(HttpLive))
+ * // All HTTP requests now automatically traced!
+ * ```
+ */
+declare const EffectTracingLive: Layer.Layer<never>;
+
 /**
  * Auto-Tracing Supervisor for Effect-TS
  *
@@ -356,4 +434,4 @@ declare function inferSpanName(fiberId: number, sourceInfo: SourceInfo | undefin
  */
 declare function sanitizeSpanName(name: string): string;
 
-export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, FullAutoTracingLive, type SourceInfo, type TemplateVariables, createAutoTracingLayer, createAutoTracingSupervisor, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
+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 };

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

@@ -1,14 +1,15 @@
 import { Data, Context, Effect, Layer, FiberRef, Option, Supervisor, FiberRefs, Exit } from 'effect';
-import * as OtelApi from '@opentelemetry/api';
-import { BasicTracerProvider, SimpleSpanProcessor, BatchSpanProcessor, ConsoleSpanExporter } from '@opentelemetry/sdk-trace-base';
+import { NodeSdk } from '@effect/opentelemetry';
+import { SimpleSpanProcessor, ConsoleSpanExporter, BatchSpanProcessor, BasicTracerProvider } 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 { 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;
@@ -466,121 +467,6 @@ var Logger = class {
   }
 };
 var logger = new Logger();
-var compiledRulesCache = /* @__PURE__ */ new WeakMap();
-function compileNamingRules(rules) {
-  const cached = compiledRulesCache.get(rules);
-  if (cached) return cached;
-  const compiled = rules.map((rule) => ({
-    original: rule,
-    filePattern: rule.match.file ? new RegExp(rule.match.file) : void 0,
-    functionPattern: rule.match.function ? new RegExp(rule.match.function) : void 0,
-    modulePattern: rule.match.module ? new RegExp(rule.match.module) : void 0
-  }));
-  compiledRulesCache.set(rules, compiled);
-  return compiled;
-}
-function extractModuleName(filePath) {
-  const basename2 = path.basename(filePath, path.extname(filePath));
-  return basename2.replace(/\.(service|controller|handler|util|helper|model|repo|repository)$/i, "").replace(/(Service|Controller|Handler|Util|Helper|Model|Repo|Repository)$/i, "");
-}
-function applyTemplate(template, variables, matchGroups) {
-  let result = template;
-  for (const [key, value] of Object.entries(variables)) {
-    result = result.replace(new RegExp(`\\{${key}\\}`, "g"), value);
-  }
-  if (matchGroups) {
-    result = result.replace(
-      /\{match:(\w+):(\d+)\}/g,
-      (_fullMatch, field, index) => {
-        const groups = matchGroups.get(field);
-        const idx = parseInt(index, 10);
-        if (groups && groups[idx]) {
-          return groups[idx];
-        }
-        return "";
-      }
-    );
-  }
-  return result;
-}
-function findMatchingRule(sourceInfo, config) {
-  const rules = config.span_naming?.rules;
-  if (!rules || rules.length === 0) return void 0;
-  const compiledRules = compileNamingRules(rules);
-  for (const rule of compiledRules) {
-    const matchGroups = /* @__PURE__ */ new Map();
-    let allMatched = true;
-    if (rule.filePattern) {
-      if (sourceInfo?.file) {
-        const match = sourceInfo.file.match(rule.filePattern);
-        if (match) {
-          matchGroups.set("file", match.slice(1));
-        } else {
-          allMatched = false;
-        }
-      } else {
-        allMatched = false;
-      }
-    }
-    if (rule.functionPattern && allMatched) {
-      if (sourceInfo?.function) {
-        const match = sourceInfo.function.match(rule.functionPattern);
-        if (match) {
-          matchGroups.set("function", match.slice(1));
-        } else {
-          allMatched = false;
-        }
-      } else {
-        allMatched = false;
-      }
-    }
-    if (rule.modulePattern && allMatched) {
-      const moduleName = sourceInfo?.file ? extractModuleName(sourceInfo.file) : "";
-      if (moduleName) {
-        const match = moduleName.match(rule.modulePattern);
-        if (match) {
-          matchGroups.set("module", match.slice(1));
-        } else {
-          allMatched = false;
-        }
-      } else {
-        allMatched = false;
-      }
-    }
-    if (allMatched) {
-      return { rule, matchGroups };
-    }
-  }
-  return void 0;
-}
-function inferSpanName(fiberId, sourceInfo, config) {
-  const variables = {
-    fiber_id: String(fiberId),
-    function: sourceInfo?.function || "anonymous",
-    module: sourceInfo?.file ? extractModuleName(sourceInfo.file) : "unknown",
-    file: sourceInfo?.file || "unknown",
-    line: sourceInfo?.line ? String(sourceInfo.line) : "0",
-    operator: "gen"
-    // Default operator, could be enhanced with more context
-  };
-  const match = findMatchingRule(sourceInfo, config);
-  if (match) {
-    return applyTemplate(match.rule.original.name, variables, match.matchGroups);
-  }
-  const defaultTemplate = config.span_naming?.default || "effect.fiber.{fiber_id}";
-  return applyTemplate(defaultTemplate, variables);
-}
-function sanitizeSpanName(name) {
-  if (!name) return "effect.fiber.unknown";
-  let sanitized = name.replace(/[^a-zA-Z0-9._-]/g, "_");
-  sanitized = sanitized.replace(/_+/g, "_");
-  sanitized = sanitized.replace(/^_+|_+$/g, "");
-  if (!sanitized) return "effect.fiber.unknown";
-  if (sanitized.length > 256) {
-    sanitized = sanitized.substring(0, 256);
-  }
-  return sanitized;
-}
 async function loadFromFile(filePath) {
   const { readFile } = await import('fs/promises');
   const content = await readFile(filePath, "utf-8");
@@ -701,6 +587,182 @@ 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);
+  if (cached) return cached;
+  const compiled = rules.map((rule) => ({
+    original: rule,
+    filePattern: rule.match.file ? new RegExp(rule.match.file) : void 0,
+    functionPattern: rule.match.function ? new RegExp(rule.match.function) : void 0,
+    modulePattern: rule.match.module ? new RegExp(rule.match.module) : void 0
+  }));
+  compiledRulesCache.set(rules, compiled);
+  return compiled;
+}
+function extractModuleName(filePath) {
+  const basename2 = path.basename(filePath, path.extname(filePath));
+  return basename2.replace(/\.(service|controller|handler|util|helper|model|repo|repository)$/i, "").replace(/(Service|Controller|Handler|Util|Helper|Model|Repo|Repository)$/i, "");
+}
+function applyTemplate(template, variables, matchGroups) {
+  let result = template;
+  for (const [key, value] of Object.entries(variables)) {
+    result = result.replace(new RegExp(`\\{${key}\\}`, "g"), value);
+  }
+  if (matchGroups) {
+    result = result.replace(
+      /\{match:(\w+):(\d+)\}/g,
+      (_fullMatch, field, index) => {
+        const groups = matchGroups.get(field);
+        const idx = parseInt(index, 10);
+        if (groups && groups[idx]) {
+          return groups[idx];
+        }
+        return "";
+      }
+    );
+  }
+  return result;
+}
+function findMatchingRule(sourceInfo, config) {
+  const rules = config.span_naming?.rules;
+  if (!rules || rules.length === 0) return void 0;
+  const compiledRules = compileNamingRules(rules);
+  for (const rule of compiledRules) {
+    const matchGroups = /* @__PURE__ */ new Map();
+    let allMatched = true;
+    if (rule.filePattern) {
+      if (sourceInfo?.file) {
+        const match = sourceInfo.file.match(rule.filePattern);
+        if (match) {
+          matchGroups.set("file", match.slice(1));
+        } else {
+          allMatched = false;
+        }
+      } else {
+        allMatched = false;
+      }
+    }
+    if (rule.functionPattern && allMatched) {
+      if (sourceInfo?.function) {
+        const match = sourceInfo.function.match(rule.functionPattern);
+        if (match) {
+          matchGroups.set("function", match.slice(1));
+        } else {
+          allMatched = false;
+        }
+      } else {
+        allMatched = false;
+      }
+    }
+    if (rule.modulePattern && allMatched) {
+      const moduleName = sourceInfo?.file ? extractModuleName(sourceInfo.file) : "";
+      if (moduleName) {
+        const match = moduleName.match(rule.modulePattern);
+        if (match) {
+          matchGroups.set("module", match.slice(1));
+        } else {
+          allMatched = false;
+        }
+      } else {
+        allMatched = false;
+      }
+    }
+    if (allMatched) {
+      return { rule, matchGroups };
+    }
+  }
+  return void 0;
+}
+function inferSpanName(fiberId, sourceInfo, config) {
+  const variables = {
+    fiber_id: String(fiberId),
+    function: sourceInfo?.function || "anonymous",
+    module: sourceInfo?.file ? extractModuleName(sourceInfo.file) : "unknown",
+    file: sourceInfo?.file || "unknown",
+    line: sourceInfo?.line ? String(sourceInfo.line) : "0",
+    operator: "gen"
+    // Default operator, could be enhanced with more context
+  };
+  const match = findMatchingRule(sourceInfo, config);
+  if (match) {
+    return applyTemplate(match.rule.original.name, variables, match.matchGroups);
+  }
+  const defaultTemplate = config.span_naming?.default || "effect.fiber.{fiber_id}";
+  return applyTemplate(defaultTemplate, variables);
+}
+function sanitizeSpanName(name) {
+  if (!name) return "effect.fiber.unknown";
+  let sanitized = name.replace(/[^a-zA-Z0-9._-]/g, "_");
+  sanitized = sanitized.replace(/_+/g, "_");
+  sanitized = sanitized.replace(/^_+|_+$/g, "");
+  if (!sanitized) return "effect.fiber.unknown";
+  if (sanitized.length > 256) {
+    sanitized = sanitized.substring(0, 256);
+  }
+  return sanitized;
+}
+
 // src/integrations/effect/auto/supervisor.ts
 var AutoTracingEnabled = FiberRef.unsafeMake(true);
 var AutoTracingSpanName = FiberRef.unsafeMake(Option.none());
@@ -1069,6 +1131,6 @@ var createFullAutoTracingLayer = () => {
 };
 var FullAutoTracingLive = createFullAutoTracingLayer();
 
-export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, FullAutoTracingLive, createAutoTracingLayer, createAutoTracingSupervisor, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
+export { AutoTracingConfig, AutoTracingConfigLayer, AutoTracingConfigLive, AutoTracingEnabled, AutoTracingLive, AutoTracingSpanName, AutoTracingSupervisor, EffectTracingLive, FullAutoTracingLive, createAutoTracingLayer, createAutoTracingSupervisor, createEffectTracingLayer, createFullAutoTracingLayer, defaultAutoTracingConfig, inferSpanName, loadAutoTracingConfig, loadAutoTracingConfigSync, sanitizeSpanName, setSpanName, withAutoTracing, withoutAutoTracing };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map