@monocle.sh/adonisjs-agent 1.0.2 → 1.0.3

package/dist/src/define_config.mjs

@@ -20,13 +20,30 @@ function getHeader(response, name) {
 	}
 }
 /**
+* Returns the raw HTTP header string from a ServerResponse.
+* After `writeHead()` is called with inline headers, `getHeader()` returns
+* undefined. Node.js stores the serialized headers in `_header` which is
+* the only reliable way to read them after they've been flushed.
+*/
+function getRawHeader(response) {
+	const raw = response._header;
+	if (typeof raw === "string") return raw;
+}
+/**
 * Detects the connection type based on response headers.
 * Returns 'sse' for Server-Sent Events, 'websocket' for WebSocket upgrades,
 * or undefined for standard HTTP connections.
+*
+* Checks both `getHeader()` and the raw `_header` string to handle cases
+* where headers are passed inline to `writeHead()` (e.g. @hono/node-server).
 */
 function detectConnectionType(response) {
 	if (getHeader(response, "content-type")?.includes("text/event-stream")) return "sse";
 	if (getHeader(response, "upgrade")?.toLowerCase() === "websocket") return "websocket";
+	const raw = getRawHeader(response);
+	if (!raw) return;
+	if (raw.includes("text/event-stream")) return "sse";
+	if (raw.toLowerCase().includes("upgrade: websocket")) return "websocket";
 }
 /**
 * Creates a response hook that detects long-running HTTP connections

package/dist/src/instrumentations/mail/instrumentation.mjs

@@ -112,23 +112,34 @@ var MailInstrumentation = class extends InstrumentationBase {
 	}
 	/**
 	* Patches Mailer.prototype methods with tracing wrappers.
+	*
+	* Note: InstrumentationBase constructor calls enable() synchronously
+	* without awaiting (it ignores the returned Promise). Then instrumentMail()
+	* also calls `await enable()`. Setting `this.patched = true` before any
+	* `await` prevents the second call from double-patching the prototype,
+	* which would create duplicate spans for every email sent.
 	*/
 	async enable() {
 		if (this.patched) return;
+		this.patched = true;
 		const appRoot = this.getConfig().appRoot;
 		const require = createRequire(appRoot ? pathToFileURL(`${appRoot}/package.json`).href : import.meta.url);
 		let mailerPath;
 		try {
 			mailerPath = require.resolve("@adonisjs/mail");
 		} catch {
+			this.patched = false;
 			return;
 		}
-		this.mailerClass = (await import(pathToFileURL(mailerPath).href)).Mailer;
-		this.originalSendCompiled = this.mailerClass.prototype.sendCompiled;
-		this.originalSendLaterCompiled = this.mailerClass.prototype.sendLaterCompiled;
-		this.mailerClass.prototype.sendCompiled = this.#createSendCompiledWrapper(this.originalSendCompiled);
-		this.mailerClass.prototype.sendLaterCompiled = this.#createSendLaterCompiledWrapper(this.originalSendLaterCompiled);
-		this.patched = true;
+		try {
+			this.mailerClass = (await import(pathToFileURL(mailerPath).href)).Mailer;
+			this.originalSendCompiled = this.mailerClass.prototype.sendCompiled;
+			this.originalSendLaterCompiled = this.mailerClass.prototype.sendLaterCompiled;
+			this.mailerClass.prototype.sendCompiled = this.#createSendCompiledWrapper(this.originalSendCompiled);
+			this.mailerClass.prototype.sendLaterCompiled = this.#createSendLaterCompiledWrapper(this.originalSendLaterCompiled);
+		} catch {
+			this.patched = false;
+		}
 	}
 	/**
 	* Restores original Mailer.prototype methods.

package/dist/src/instrumentations/queue/instrumentation.mjs

@@ -11,21 +11,31 @@ import { pathToFileURL } from "node:url";
 async function instrumentQueue(config, appRoot) {
 	if (config.enabled === false) return void 0;
 	const appRequire = createRequire(appRoot ? pathToFileURL(`${appRoot}/package.json`).href : import.meta.url);
+	let queueOtelPath;
 	try {
-		appRequire.resolve("@boringnode/queue");
+		queueOtelPath = appRequire.resolve("@boringnode/queue/otel");
 	} catch {
-		return;
+		try {
+			queueOtelPath = appRequire.resolve("@adonisjs/queue/otel");
+		} catch {
+			return;
+		}
 	}
-	const { QueueInstrumentation } = await import("@boringnode/queue/otel");
+	const { QueueInstrumentation } = await import(pathToFileURL(queueOtelPath).href);
 	const instrumentation = new QueueInstrumentation({
 		executionSpanLinkMode: config.executionSpanLinkMode,
 		messagingSystem: config.messagingSystem
 	});
 	instrumentation.enable();
 	try {
-		const queueModule = await import("@boringnode/queue");
+		const queueModule = await import(pathToFileURL(appRequire.resolve("@boringnode/queue")).href);
 		instrumentation.manuallyRegister(queueModule);
-	} catch {}
+	} catch {
+		try {
+			const queueModule = await import(pathToFileURL(appRequire.resolve("@adonisjs/queue")).href);
+			instrumentation.manuallyRegister(queueModule);
+		} catch {}
+	}
 	return instrumentation;
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monocle.sh/adonisjs-agent",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Monocle agent for AdonisJS - sends telemetry to Monocle cloud",
   "keywords": [
     "adonisjs",