@neat.is/core 0.4.6 → 0.4.7

package/dist/cli.js

@@ -41,7 +41,7 @@ import {
   setStatus,
   startPersistLoop,
   startStalenessLoop
-} from "./chunk-RBWL4HRB.js";
+} from "./chunk-7FTK47JQ.js";
 import {
   startOtelGrpcReceiver
 } from "./chunk-3QCRUEQD.js";
@@ -693,38 +693,119 @@ import path4 from "path";
 
 // src/installers/templates.ts
 var OTEL_INIT_HEADER = "// Generated by `neat init --apply` (ADR-069). OpenTelemetry auto-instrumentation hook.";
+var OTEL_INIT_STAMP = "// neat-template-version: 2 \u2014 file-first call-site capture (ADR-089).";
+function neatCallsiteProcessorSource(ts) {
+  const stackT = ts ? ": string" : "";
+  const spanT = ts ? ": any" : "";
+  const strOpt = ts ? ": string | undefined" : "";
+  return `function __neatPickUserFrame(stack${stackT}) {
+  const lines = String(stack || '').split('\\n')
+  for (let i = 0; i < lines.length; i++) {
+    const raw = lines[i].trim()
+    if (raw.indexOf('at ') !== 0) continue
+    if (raw.indexOf('node_modules') !== -1) continue
+    if (raw.indexOf('@opentelemetry') !== -1) continue
+    if (raw.indexOf('node:') !== -1) continue
+    if (raw.indexOf('NeatCallSiteSpanProcessor') !== -1) continue
+    const bodyText = raw.slice(3)
+    const loc = bodyText.match(/:(\\d+):(\\d+)\\)?$/)
+    if (!loc) continue
+    const paren = bodyText.lastIndexOf('(')
+    let filepath${strOpt}
+    let fn${strOpt}
+    if (paren !== -1) {
+      fn = bodyText.slice(0, paren).trim()
+      if (fn.indexOf('async ') === 0) fn = fn.slice(6)
+      if (fn.indexOf('new ') === 0) fn = fn.slice(4)
+      filepath = bodyText.slice(paren + 1, bodyText.length - loc[0].length)
+    } else {
+      filepath = bodyText.slice(0, bodyText.length - loc[0].length)
+    }
+    if (filepath.indexOf('file://') === 0) filepath = filepath.slice(7)
+    if (!filepath) continue
+    return { filepath: filepath, lineno: Number(loc[1]), function: fn || undefined }
+  }
+  return null
+}
+
+class NeatCallSiteSpanProcessor {
+  onStart(span${spanT}) {
+    if (!span || (span.kind !== 2 && span.kind !== 3)) return
+    const frame = __neatPickUserFrame(new Error().stack)
+    if (!frame) return
+    span.setAttribute('code.filepath', frame.filepath)
+    if (typeof frame.lineno === 'number') span.setAttribute('code.lineno', frame.lineno)
+    if (frame.function) span.setAttribute('code.function', frame.function)
+  }
+  onEnd() {}
+  forceFlush() { return Promise.resolve() }
+  shutdown() { return Promise.resolve() }
+}`;
+}
+var CALLSITE_PROCESSOR_JS = neatCallsiteProcessorSource(false);
+var CALLSITE_PROCESSOR_TS = neatCallsiteProcessorSource(true);
+function neatRegisterCallsiteSource(ts) {
+  const providerT = ts ? ": any" : "";
+  return `try {
+  const provider${providerT} = trace.getTracerProvider()
+  const delegate = provider && typeof provider.getDelegate === 'function' ? provider.getDelegate() : provider
+  if (delegate && typeof delegate.addSpanProcessor === 'function') {
+    delegate.addSpanProcessor(new NeatCallSiteSpanProcessor())
+  }
+} catch {
+  // capture is best-effort; span export is unaffected
+}`;
+}
 var OTEL_INIT_CJS = `${OTEL_INIT_HEADER}
+${OTEL_INIT_STAMP}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 
 const { NodeSDK } = require('@opentelemetry/sdk-node')
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
+const { trace } = require('@opentelemetry/api')
+
+${CALLSITE_PROCESSOR_JS}
 
 const instrumentations = [getNodeAutoInstrumentations()]
 __INSTRUMENTATION_BLOCK__
-new NodeSDK({ instrumentations }).start()
+const sdk = new NodeSDK({ instrumentations })
+sdk.start()
+${neatRegisterCallsiteSource(false)}
 `;
 var OTEL_INIT_ESM = `${OTEL_INIT_HEADER}
+${OTEL_INIT_STAMP}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+import { trace } from '@opentelemetry/api'
+
+${CALLSITE_PROCESSOR_JS}
 
 const instrumentations = [getNodeAutoInstrumentations()]
 __INSTRUMENTATION_BLOCK__
-new NodeSDK({ instrumentations }).start()
+const sdk = new NodeSDK({ instrumentations })
+sdk.start()
+${neatRegisterCallsiteSource(false)}
 `;
 var OTEL_INIT_TS = `${OTEL_INIT_HEADER}
+${OTEL_INIT_STAMP}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+import { trace } from '@opentelemetry/api'
+
+${CALLSITE_PROCESSOR_TS}
 
 const instrumentations = [getNodeAutoInstrumentations()]
 __INSTRUMENTATION_BLOCK__
-new NodeSDK({ instrumentations }).start()
+const sdk = new NodeSDK({ instrumentations })
+sdk.start()
+${neatRegisterCallsiteSource(true)}
 `;
 function renderNodeOtelInit(template, serviceName, projectName, registrations = []) {
   const block = registrations.length === 0 ? "" : `
@@ -948,6 +1029,23 @@ async function exists(p) {
     return false;
   }
 }
+async function readFileMaybe(p) {
+  try {
+    return await fs4.readFile(p, "utf8");
+  } catch {
+    return null;
+  }
+}
+async function planOtelInitGeneration(file, contents) {
+  const existing = await readFileMaybe(file);
+  if (existing === null) {
+    return { file, contents, skipIfExists: true };
+  }
+  if (existing.includes(OTEL_INIT_HEADER) && !existing.includes(OTEL_INIT_STAMP)) {
+    return { file, contents, skipIfExists: false };
+  }
+  return null;
+}
 async function detect(serviceDir) {
   const pkg = await readPackageJson(serviceDir);
   return pkg !== null && typeof pkg.name === "string";
@@ -1678,18 +1776,11 @@ async function plan(serviceDir, opts) {
   const projectName = projectToken(pkg, serviceDir, project);
   const registrations = nonBundled.map((i) => i.registration);
   const generatedFiles = [];
-  if (!await exists(otelInitFile)) {
-    generatedFiles.push({
-      file: otelInitFile,
-      contents: renderNodeOtelInit(
-        otelInitContents(flavor),
-        svcName,
-        projectName,
-        registrations
-      ),
-      skipIfExists: true
-    });
-  }
+  const otelInitGen = await planOtelInitGeneration(
+    otelInitFile,
+    renderNodeOtelInit(otelInitContents(flavor), svcName, projectName, registrations)
+  );
+  if (otelInitGen) generatedFiles.push(otelInitGen);
   if (!await exists(envNeatFile)) {
     generatedFiles.push({
       file: envNeatFile,