@neat.is/core 0.4.2 → 0.4.3

package/dist/cli.js

@@ -752,41 +752,26 @@ export async function register() {
 }
 `;
 var NEXT_INSTRUMENTATION_NODE_TS = `${NEXT_INSTRUMENTATION_HEADER}
-// Loads .env.neat (OTEL_SERVICE_NAME, OTEL_EXPORTER_OTLP_ENDPOINT) before
-// the OTel SDK starts so the exporter target and service name are in scope.
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-import dotenv from 'dotenv'
+process.env.OTEL_SERVICE_NAME ||= '__PROJECT_NAME__'
+process.env.OTEL_EXPORTER_OTLP_ENDPOINT ||= 'http://localhost:4318'
+
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
 
-const here = path.dirname(fileURLToPath(import.meta.url))
-dotenv.config({ path: path.join(here, '.env.neat') })
-
-const sdk = new NodeSDK({
-  serviceName: process.env.OTEL_SERVICE_NAME,
-  instrumentations: [getNodeAutoInstrumentations()],
-})
-sdk.start()
+new NodeSDK({ instrumentations: [getNodeAutoInstrumentations()] }).start()
 `;
 var NEXT_INSTRUMENTATION_NODE_JS = `${NEXT_INSTRUMENTATION_HEADER}
-// Loads .env.neat (OTEL_SERVICE_NAME, OTEL_EXPORTER_OTLP_ENDPOINT) before
-// the OTel SDK starts so the exporter target and service name are in scope.
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-import dotenv from 'dotenv'
-import { NodeSDK } from '@opentelemetry/sdk-node'
-import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+process.env.OTEL_SERVICE_NAME ||= '__PROJECT_NAME__'
+process.env.OTEL_EXPORTER_OTLP_ENDPOINT ||= 'http://localhost:4318'
 
-const here = path.dirname(fileURLToPath(import.meta.url))
-dotenv.config({ path: path.join(here, '.env.neat') })
+const { NodeSDK } = require('@opentelemetry/sdk-node')
+const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
 
-const sdk = new NodeSDK({
-  serviceName: process.env.OTEL_SERVICE_NAME,
-  instrumentations: [getNodeAutoInstrumentations()],
-})
-sdk.start()
+new NodeSDK({ instrumentations: [getNodeAutoInstrumentations()] }).start()
 `;
+function renderNextInstrumentationNode(template, projectName) {
+  return template.replace(/__PROJECT_NAME__/g, projectName);
+}
 var FRAMEWORK_OTEL_INIT_HEADER = "// Generated by `neat init --apply` (ADR-074). OpenTelemetry SDK hook.";
 var FRAMEWORK_OTEL_INIT_TS_BODY = `${FRAMEWORK_OTEL_INIT_HEADER}
 // Loads .env.neat (OTEL_SERVICE_NAME, OTEL_EXPORTER_OTLP_ENDPOINT) before
@@ -1129,17 +1114,29 @@ function lineIsOtelInjection(line) {
   if (trimmed.length === 0) return false;
   return /(?:require\(|import\s+)['"]\.\/otel-init[^'"]*['"]/.test(trimmed);
 }
+async function detectsSrcLayout(serviceDir) {
+  const [hasSrcApp, hasSrcPages, hasRootApp, hasRootPages] = await Promise.all([
+    exists(path4.join(serviceDir, "src", "app")),
+    exists(path4.join(serviceDir, "src", "pages")),
+    exists(path4.join(serviceDir, "app")),
+    exists(path4.join(serviceDir, "pages"))
+  ]);
+  return (hasSrcApp || hasSrcPages) && !hasRootApp && !hasRootPages;
+}
 async function planNext(serviceDir, pkg, manifestPath, nextConfigPath, project) {
   const useTs = await isTypeScriptProject(serviceDir);
-  const instrumentationFile = path4.join(serviceDir, useTs ? "instrumentation.ts" : "instrumentation.js");
+  const srcLayout = await detectsSrcLayout(serviceDir);
+  const baseDir = srcLayout ? path4.join(serviceDir, "src") : serviceDir;
+  const instrumentationFile = path4.join(baseDir, useTs ? "instrumentation.ts" : "instrumentation.js");
   const instrumentationNodeFile = path4.join(
-    serviceDir,
+    baseDir,
     useTs ? "instrumentation.node.ts" : "instrumentation.node.js"
   );
-  const envNeatFile = path4.join(serviceDir, ".env.neat");
+  const envNeatFile = path4.join(baseDir, ".env.neat");
   const existingDeps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
   const dependencyEdits = [];
   for (const sdk of SDK_PACKAGES) {
+    if (sdk.name === "dotenv") continue;
     if (sdk.name in existingDeps) continue;
     dependencyEdits.push({
       file: manifestPath,
@@ -1148,6 +1145,7 @@ async function planNext(serviceDir, pkg, manifestPath, nextConfigPath, project)
       version: sdk.version
     });
   }
+  const projectName = envServiceName(pkg, serviceDir, project);
   const generatedFiles = [];
   if (!await exists(instrumentationFile)) {
     generatedFiles.push({
@@ -1159,14 +1157,17 @@ async function planNext(serviceDir, pkg, manifestPath, nextConfigPath, project)
   if (!await exists(instrumentationNodeFile)) {
     generatedFiles.push({
       file: instrumentationNodeFile,
-      contents: useTs ? NEXT_INSTRUMENTATION_NODE_TS : NEXT_INSTRUMENTATION_NODE_JS,
+      contents: renderNextInstrumentationNode(
+        useTs ? NEXT_INSTRUMENTATION_NODE_TS : NEXT_INSTRUMENTATION_NODE_JS,
+        projectName
+      ),
       skipIfExists: true
     });
   }
   if (!await exists(envNeatFile)) {
     generatedFiles.push({
       file: envNeatFile,
-      contents: renderEnvNeat(envServiceName(pkg, serviceDir, project)),
+      contents: renderEnvNeat(projectName),
       skipIfExists: true
     });
   }
@@ -1592,9 +1593,13 @@ function isAllowedWritePath(serviceDir, target) {
   if (base === "package.json") return true;
   if (base === ".env.neat") return true;
   if (/^otel-init\.(?:js|cjs|mjs|ts)$/.test(base)) return true;
-  if (/^instrumentation(?:\.node)?\.(?:js|cjs|mjs|ts)$/.test(base)) return true;
-  if (/^next\.config\.(?:js|mjs|ts)$/.test(base)) return true;
   const relPosix = rel.split(path4.sep).join("/");
+  if (/^instrumentation(?:\.node)?\.(?:js|cjs|mjs|ts)$/.test(base)) {
+    if (relPosix === base) return true;
+    if (relPosix === `src/${base}`) return true;
+    return false;
+  }
+  if (/^next\.config\.(?:js|mjs|ts)$/.test(base)) return true;
   if (relPosix === "app/otel.server.ts" || relPosix === "app/otel.server.js") return true;
   if (/^app\/entry\.server\.(?:tsx?|jsx?)$/.test(relPosix)) return true;
   if (relPosix === "src/otel-init.ts" || relPosix === "src/otel-init.js") return true;
@@ -3923,7 +3928,7 @@ async function runQueryVerb(cmd, parsed) {
   }
 }
 var entry = process.argv[1] ?? "";
-if (/[\\/]cli\.(?:cjs|js)$/.test(entry) || entry.endsWith("/cli") || entry.endsWith("/neat")) {
+if (/[\\/]cli\.(?:cjs|js)$/.test(entry) || entry.endsWith("/cli") || entry.endsWith("/neat") || entry.endsWith("/neat.is")) {
   main().catch((err) => {
     console.error(err);
     process.exit(1);