autotel-cli 0.19.1 → 0.20.0

package/dist/index.js

@@ -370,9 +370,6 @@ function createCodeFile() {
 		backendImports: [],
 		pluginImports: [],
 		subscriberImports: [],
-		loggerImports: [],
-		loggerSetup: null,
-		loggerExpr: null,
 		autoInstrumentations: [],
 		backendConfig: null,
 		subscribersConfig: [],
@@ -380,23 +377,11 @@ function createCodeFile() {
 	};
 }
 /**
-* Wire Pino as the first-class autotel logger. Adds the import, the
-* `const logger = pino({...})` construction snippet, and sets the
-* `logger:` field on init().
+* Add a name to the autoInstrumentations allowlist. For a logger this is what
+* injects trace context: the app's own logger, created after init(), is
+* patched as it loads, so it is never passed to init().
 */
-function setPinoLogger(file) {
-	file.loggerImports.push({
-		source: "pino",
-		default: "pino"
-	});
-	file.loggerSetup = `const logger = pino({ name: 'app', level: process.env.LOG_LEVEL ?? 'info' });`;
-	file.loggerExpr = "logger";
-}
-/**
-* Add a logger to the autoInstrumentations array. For Winston/Bunyan this
-* enables OpenTelemetry contrib's trace-context injection.
-*/
-function addAutoInstrumentationLogger(file, name) {
+function addAutoInstrumentation(file, name) {
 	if (!file.autoInstrumentations.includes(name)) file.autoInstrumentations.push(name);
 }
 /**
@@ -502,17 +487,7 @@ function renderCodeFile(file) {
 		lines.push(renderImports(file.subscriberImports));
 		lines.push("");
 	}
-	if (file.loggerImports.length > 0) {
-		lines.push(SECTION_MARKER("LOGGER"));
-		lines.push(renderImports(file.loggerImports));
-		lines.push("");
-	}
-	if (file.loggerSetup !== null) {
-		lines.push(file.loggerSetup);
-		lines.push("");
-	}
 	lines.push("init({");
-	if (file.loggerExpr !== null) lines.push(`  logger: ${file.loggerExpr},`);
 	if (file.autoInstrumentations.length > 0) {
 		const list = file.autoInstrumentations.map((n) => `'${n}'`).join(", ");
 		lines.push(`  autoInstrumentations: [${list}],`);
@@ -2240,8 +2215,7 @@ function buildPlanFromDetection(opts) {
 		for (const pkg of p.packages.optional) prod.add(pkg);
 		for (const pkg of p.packages.devOnly) dev.add(pkg);
 	}
-	if (detection.primaryLogger === "pino") prod.add("pino");
-	if (detection.autoInstrumentedDeps.length > 0 || detection.autoInstrumentLoggers.length > 0 || detection.primaryLogger === "winston" || detection.primaryLogger === "bunyan") prod.add("@opentelemetry/auto-instrumentations-node");
+	if (detection.autoInstrumentedDeps.length > 0 || detection.autoInstrumentLoggers.length > 0 || detection.primaryLogger !== null) prod.add("@opentelemetry/auto-instrumentations-node");
 	const envVars = [];
 	const seenEnv = /* @__PURE__ */ new Set();
 	for (const p of presets) for (const ev of [...p.env.required, ...p.env.optional]) {
@@ -2496,7 +2470,7 @@ function renderPlanPreview(plan) {
 		const det = plan.detected;
 		const pkgList = det.packages.map((p) => `${p.name}@${p.version}`).join(", ");
 		lines.push(`${chalk.dim("Detected packages:")} ${pkgList || chalk.dim("(none)")}`);
-		if (det.primaryLogger !== null) lines.push(`${chalk.dim("Logger:")} ${chalk.bold(det.primaryLogger)} ${chalk.dim("(first-class)")}` + (det.autoInstrumentLoggers.length > 0 ? `, ${chalk.dim("+ auto-instrumented:")} ${det.autoInstrumentLoggers.join(", ")}` : ""));
+		if (det.primaryLogger !== null) lines.push(`${chalk.dim("Logger:")} ${chalk.bold(det.primaryLogger)} ${chalk.dim("(auto-instrumented)")}` + (det.autoInstrumentLoggers.length > 0 ? `, ${chalk.dim("+ auto-instrumented:")} ${det.autoInstrumentLoggers.join(", ")}` : ""));
 		if (det.autoInstrumentedDeps.length > 0) lines.push(`${chalk.dim("Covered by auto-instrumentations-node:")} ${det.autoInstrumentedDeps.join(", ")}`);
 		lines.push(`${chalk.dim("Backend:")} ${chalk.bold(det.backend.slug)} ${chalk.dim(`(${det.backend.source}${det.backend.detail ? `: ${det.backend.detail}` : ""})`)}`);
 		if (det.platform !== null) lines.push(`${chalk.dim("Platform:")} ${chalk.bold(det.platform)}`);
@@ -2759,6 +2733,15 @@ function isCI() {
 //#endregion
 //#region src/commands/init.ts
 /**
+* Detected deps whose auto-instrumentation goes by another name. `next` and
+* `fastify` have none in auto-instrumentations-node; http covers them.
+*/
+const DEP_INSTRUMENTATION = {
+	"@aws-sdk/client-s3": ["aws-sdk"],
+	next: [],
+	fastify: []
+};
+/**
 * Run the init command.
 *
 * Order of operations:
@@ -2973,8 +2956,14 @@ function applyPlan(args) {
 		source: "autotel",
 		specifiers: ["init"]
 	});
-	if (plan.detected?.primaryLogger === "pino") setPinoLogger(codeFile);
-	for (const l of plan.detected?.autoInstrumentLoggers ?? []) addAutoInstrumentationLogger(codeFile, l);
+	const detected = plan.detected;
+	const loggers = [...detected?.primaryLogger ? [detected.primaryLogger] : [], ...detected?.autoInstrumentLoggers ?? []];
+	const deps = detected?.autoInstrumentedDeps ?? [];
+	if (loggers.length > 0 || deps.length > 0) for (const name of [
+		"http",
+		...loggers,
+		...deps.flatMap((dep) => DEP_INSTRUMENTATION[dep] ?? [dep])
+	]) addAutoInstrumentation(codeFile, name);
 	for (const preset of presets) {
 		for (const imp of preset.imports) addImport(codeFile, imp, preset.type === "backend" || preset.type === "platform" ? "backend" : preset.type === "plugin" ? "plugin" : preset.type === "subscriber" ? "subscriber" : void 0);
 		if (preset.configBlock.section === "BACKEND_CONFIG") setBackendConfig(codeFile, preset.configBlock.code);
@@ -2999,8 +2988,7 @@ function applyPlan(args) {
 			...codeFile.imports,
 			...codeFile.backendImports,
 			...codeFile.pluginImports,
-			...codeFile.subscriberImports,
-			...codeFile.loggerImports
+			...codeFile.subscriberImports
 		].map((i) => i.source));
 		const addedAuto = diffAutoInstrumentations(parsed, codeFile.autoInstrumentations);
 		const contentChanged = existing !== newContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autotel-cli",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "description": "CLI for autotel - setup wizard, diagnostics, and incremental features",
   "type": "module",
   "bin": {