@monocle.sh/adonisjs-agent 1.2.1 → 1.2.2

package/dist/src/define_config.mjs

@@ -52,7 +52,7 @@ function extractUserResponseHook(httpConfig) {
 * Returns undefined if no API key is provided (telemetry will be disabled).
 */
 function defineConfig(config) {
-	const isDev = config.dev ?? process.env.NODE_ENV === "development";
+	const isDev = config.dev;
 	if (!isDev && !config.apiKey) return;
 	if (isDev) process.env.OTEL_EXPORTER_OTLP_PROTOCOL = "http/json";
 	const endpoint = isDev ? config.endpoint || "http://localhost:4200" : config.endpoint || "https://ingest.monocle.sh";

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

@@ -5,6 +5,7 @@ import { SpanKind, SpanStatusCode, context, trace } from "@opentelemetry/api";
 import { pathToFileURL } from "node:url";
 import { InstrumentationBase } from "@opentelemetry/instrumentation";
 //#region src/instrumentations/mail/instrumentation.ts
+const mailerPatchState = Symbol("monocle.mail.patchState");
 /**
 * OpenTelemetry instrumentation for AdonisJS Mail.
 *
@@ -54,10 +55,16 @@ var MailInstrumentation = class extends InstrumentationBase {
 		};
 	}
 	/**
+	* Apply attributes to a span.
+	*/
+	setSpanAttributes(span, attributes) {
+		for (const [key, value] of Object.entries(attributes)) span.setAttribute(key, value);
+	}
+	/**
 	* Wraps an async function with an OpenTelemetry span.
 	*/
 	async wrapWithSpan(options) {
-		const { spanName, attributes, fn, onSuccess } = options;
+		const { spanName, attributes, fn, onSuccess, onSettled } = options;
 		const span = this.tracer.startSpan(spanName, {
 			kind: SpanKind.CLIENT,
 			attributes
@@ -77,6 +84,7 @@ var MailInstrumentation = class extends InstrumentationBase {
 				});
 				throw error;
 			} finally {
+				await onSettled?.(span);
 				span.end();
 			}
 		});
@@ -93,6 +101,9 @@ var MailInstrumentation = class extends InstrumentationBase {
 				fn: () => original.call(this, mail, sendConfig),
 				onSuccess: (span, response) => {
 					if (response?.messageId) span.setAttribute(EmailAttributes.MESSAGE_ID, response.messageId);
+				},
+				onSettled: (span) => {
+					instrumentation.setSpanAttributes(span, instrumentation.extractMessageAttributes(mail.message, this.name, "send"));
 				}
 			});
 		};
@@ -111,6 +122,28 @@ var MailInstrumentation = class extends InstrumentationBase {
 		};
 	}
 	/**
+	* Patch a Mailer class prototype with tracing wrappers.
+	*/
+	patchMailerClass(mailerClass) {
+		const patchedMailerClass = mailerClass;
+		const existingPatch = patchedMailerClass.prototype[mailerPatchState];
+		this.mailerClass = mailerClass;
+		this.patched = true;
+		if (existingPatch) {
+			this.originalSendCompiled = existingPatch.sendCompiled;
+			this.originalSendLaterCompiled = existingPatch.sendLaterCompiled;
+			return;
+		}
+		this.originalSendCompiled = patchedMailerClass.prototype.sendCompiled;
+		this.originalSendLaterCompiled = patchedMailerClass.prototype.sendLaterCompiled;
+		patchedMailerClass.prototype[mailerPatchState] = {
+			sendCompiled: this.originalSendCompiled,
+			sendLaterCompiled: this.originalSendLaterCompiled
+		};
+		patchedMailerClass.prototype.sendCompiled = this.#createSendCompiledWrapper(this.originalSendCompiled);
+		patchedMailerClass.prototype.sendLaterCompiled = this.#createSendLaterCompiledWrapper(this.originalSendLaterCompiled);
+	}
+	/**
 	* Patches Mailer.prototype methods with tracing wrappers.
 	*
 	* Note: InstrumentationBase constructor calls enable() synchronously
@@ -132,11 +165,8 @@ var MailInstrumentation = class extends InstrumentationBase {
 			return;
 		}
 		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);
+			const mailModule = await import(pathToFileURL(mailerPath).href);
+			this.patchMailerClass(mailModule.Mailer);
 		} catch {
 			this.patched = false;
 		}
@@ -146,8 +176,13 @@ var MailInstrumentation = class extends InstrumentationBase {
 	*/
 	disable() {
 		if (!this.patched || !this.mailerClass) return;
-		if (this.originalSendCompiled) this.mailerClass.prototype.sendCompiled = this.originalSendCompiled;
-		if (this.originalSendLaterCompiled) this.mailerClass.prototype.sendLaterCompiled = this.originalSendLaterCompiled;
+		const patchedMailerClass = this.mailerClass;
+		const existingPatch = patchedMailerClass.prototype[mailerPatchState];
+		if (existingPatch?.sendCompiled) patchedMailerClass.prototype.sendCompiled = existingPatch.sendCompiled;
+		else if (this.originalSendCompiled) this.mailerClass.prototype.sendCompiled = this.originalSendCompiled;
+		if (existingPatch?.sendLaterCompiled) patchedMailerClass.prototype.sendLaterCompiled = existingPatch.sendLaterCompiled;
+		else if (this.originalSendLaterCompiled) this.mailerClass.prototype.sendLaterCompiled = this.originalSendLaterCompiled;
+		delete patchedMailerClass.prototype[mailerPatchState];
 		this.patched = false;
 		this.mailerClass = void 0;
 		this.originalSendCompiled = void 0;

package/package.json

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