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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atrim/instrument-node",
-  "version": "0.7.1-dev.14fdea7.20260108224013",
+  "version": "0.7.1-dev.14fdea7.20260108231232",
   "description": "OpenTelemetry instrumentation for Node.js with centralized YAML configuration",
   "type": "module",
   "license": "MIT",

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

@@ -1,16 +1,17 @@
 'use strict';
 
 var effect = require('effect');
-var OtelApi = require('@opentelemetry/api');
+var opentelemetry = require('@effect/opentelemetry');
 var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var exporterTraceOtlpHttp = require('@opentelemetry/exporter-trace-otlp-http');
-var resources = require('@opentelemetry/resources');
-var semanticConventions = require('@opentelemetry/semantic-conventions');
 var FileSystem = require('@effect/platform/FileSystem');
 var HttpClient = require('@effect/platform/HttpClient');
 var HttpClientRequest = require('@effect/platform/HttpClientRequest');
 var yaml = require('yaml');
 var zod = require('zod');
+var OtelApi = require('@opentelemetry/api');
+var resources = require('@opentelemetry/resources');
+var semanticConventions = require('@opentelemetry/semantic-conventions');
 var path = require('path');
 
 function _interopNamespace(e) {
@@ -31,9 +32,9 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var OtelApi__namespace = /*#__PURE__*/_interopNamespace(OtelApi);
 var HttpClient__namespace = /*#__PURE__*/_interopNamespace(HttpClient);
 var HttpClientRequest__namespace = /*#__PURE__*/_interopNamespace(HttpClientRequest);
+var OtelApi__namespace = /*#__PURE__*/_interopNamespace(OtelApi);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 
 var __defProp = Object.defineProperty;
@@ -491,121 +492,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__namespace.basename(filePath, path__namespace.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");
@@ -726,6 +612,182 @@ 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);
+  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__namespace.basename(filePath, path__namespace.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 = effect.FiberRef.unsafeMake(true);
 var AutoTracingSpanName = effect.FiberRef.unsafeMake(effect.Option.none());
@@ -1101,9 +1163,11 @@ exports.AutoTracingEnabled = AutoTracingEnabled;
 exports.AutoTracingLive = AutoTracingLive;
 exports.AutoTracingSpanName = AutoTracingSpanName;
 exports.AutoTracingSupervisor = AutoTracingSupervisor;
+exports.EffectTracingLive = EffectTracingLive;
 exports.FullAutoTracingLive = FullAutoTracingLive;
 exports.createAutoTracingLayer = createAutoTracingLayer;
 exports.createAutoTracingSupervisor = createAutoTracingSupervisor;
+exports.createEffectTracingLayer = createEffectTracingLayer;
 exports.createFullAutoTracingLayer = createFullAutoTracingLayer;
 exports.defaultAutoTracingConfig = defaultAutoTracingConfig;
 exports.inferSpanName = inferSpanName;