@monocle.sh/adonisjs-agent 1.2.1 → 1.2.3

package/LICENSE.md

@@ -0,0 +1,53 @@
+## Elastic License 2.0 (ELv2)
+
+### Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+### Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below.
+
+### Limitations
+
+You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.
+
+You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.
+
+You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor's trademarks is subject to applicable law.
+
+### Patents
+
+The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
+
+### Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
+
+If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
+
+### No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in these terms.
+
+### Termination
+
+If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
+
+### No Liability
+
+_As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim._
+
+### Definitions
+
+The **licensor** is the entity offering these terms, and the **software** is the software the licensor makes available under these terms, including any portion of it.
+
+**You** refers to the individual or entity agreeing to these terms.
+
+**Your company** is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. **Control** means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
+
+**Your licenses** are all the licenses granted to you for the software under these terms.
+
+**Use** means anything you do with the software requiring one of your licenses.
+
+**Trademark** means trademarks, service marks, and similar rights.

package/dist/monocle_provider.mjs

@@ -14,29 +14,30 @@ var OtelProvider = class {
 		this.app = app;
 	}
 	/**
-	* Hook into ExceptionHandler to record exceptions in spans.
+	* Hook into ExceptionHandler to record exceptions as LogRecords.
 	*
-	* We always record the exception on the span (for trace visibility), but we also
-	* add an attribute `monocle.exception.should_report` to indicate whether this
-	* exception should appear in the Exceptions dashboard.
+	* Our ExceptionReporter emits a structured LogRecord (with
+	* `monocle.log.source = 'exception_reporter'`) into otel_logs.
+	* The original report() also logs via Pino, which the OTEL Pino
+	* instrumentation converts to a second LogRecord. The `/logs`
+	* view filters out `monocle.log.source = 'exception_reporter'`
+	* entries since they already appear in `/exceptions`.
 	*
-	* This respects the AdonisJS `ignoreExceptions`, `ignoreStatuses`, and `ignoreCodes`
-	* configuration from the ExceptionHandler.
+	* This respects the AdonisJS `ignoreExceptions`, `ignoreStatuses`,
+	* and `ignoreCodes` configuration from the ExceptionHandler.
 	*/
 	#registerExceptionHandler() {
 		const originalReport = ExceptionHandler.prototype.report;
 		const reporter = new ExceptionReporter();
 		ExceptionHandler.macro("report", async function(error, ctx) {
 			const span = getCurrentSpan();
-			if (span) {
-				const httpError = toHttpError(error);
-				const shouldReport = this.shouldReport(httpError);
-				await reporter.report({
-					span,
-					error,
-					shouldReport
-				});
-			}
+			const httpError = toHttpError(error);
+			const shouldReport = this.shouldReport(httpError);
+			await reporter.report({
+				span,
+				error,
+				shouldReport
+			});
 			return originalReport.call(this, error, ctx);
 		});
 	}

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/dist/src/monocle.d.mts

@@ -7,19 +7,21 @@ import { CaptureExceptionContext, CaptureMessageContext, MessageLevel, MonocleUs
 declare class Monocle {
   #private;
   /**
-   * Capture an exception and record it on the current active span.
-   * If no span is active, the exception is silently ignored.
+   * Capture an exception and record it as a LogRecord.
+   * If a span is active, it is also marked with ERROR status.
+   *
+   * Works with or without an active span — exceptions in event
+   * handlers, cron jobs, or background tasks are no longer dropped.
    *
    * This method is async to allow for source context extraction.
    * You can choose to await it or fire-and-forget.
    */
   static captureException(error: unknown, ctx?: CaptureExceptionContext): Promise<void>;
   /**
-   * Capture a message and record it on the current active span.
-   * If no span is active, the message is silently ignored.
+   * Capture a message and record it as a LogRecord.
    *
-   * Messages are stored using the same format as exceptions for unified querying.
-   * They are identified by exception.type = 'CapturedMessage'.
+   * Messages are stored using the same format as exceptions for
+   * unified querying. They are identified by exception.type = 'CapturedMessage'.
    *
    * This method is async to allow for source context extraction.
    * You can choose to await it or fire-and-forget.

package/dist/src/monocle.mjs

@@ -1,9 +1,12 @@
 import { ExceptionReporter } from "./exception_reporter.mjs";
+import { randomUUID } from "node:crypto";
 import { trace } from "@opentelemetry/api";
+import { SeverityNumber, logs } from "@opentelemetry/api-logs";
 import { setUser } from "@adonisjs/otel/helpers";
 import { extractContextLines } from "@monocle.sh/otel-utils";
 //#region src/monocle.ts
 const DEFAULT_CONTEXT_LINES = 7;
+const LOGGER_NAME = "@monocle.sh/agent";
 /**
 * Internal patterns to filter from stack traces.
 * These are frames from the Monocle SDK itself.
@@ -17,11 +20,18 @@ const INTERNAL_FRAME_PATTERNS = [
 * Monocle helper class for manual instrumentation.
 */
 var Monocle = class {
+	static #buildUserAttributes(user) {
+		const attributes = {};
+		if (!user) return attributes;
+		if (user.id) attributes["user.id"] = user.id;
+		if (user.email) attributes["user.email"] = user.email;
+		if (user.name) attributes["user.name"] = user.name;
+		return attributes;
+	}
 	static #applyUserToSpan(span, user) {
 		if (!user) return;
-		if (user.id) span.setAttribute("user.id", user.id);
-		if (user.email) span.setAttribute("user.email", user.email);
-		if (user.name) span.setAttribute("user.name", user.name);
+		const attrs = this.#buildUserAttributes(user);
+		for (const [key, value] of Object.entries(attrs)) span.setAttribute(key, value);
 	}
 	static #buildContextAttributes(ctx) {
 		const attributes = {};
@@ -46,41 +56,43 @@ var Monocle = class {
 		}).join("\n");
 	}
 	/**
-	* Capture an exception and record it on the current active span.
-	* If no span is active, the exception is silently ignored.
+	* Capture an exception and record it as a LogRecord.
+	* If a span is active, it is also marked with ERROR status.
+	*
+	* Works with or without an active span — exceptions in event
+	* handlers, cron jobs, or background tasks are no longer dropped.
 	*
 	* This method is async to allow for source context extraction.
 	* You can choose to await it or fire-and-forget.
 	*/
 	static async captureException(error, ctx) {
 		const span = trace.getActiveSpan();
-		if (!span) return;
+		const extraAttributes = {
+			...this.#buildUserAttributes(ctx?.user),
+			...this.#buildContextAttributes(ctx)
+		};
+		if (span) this.#applyUserToSpan(span, ctx?.user);
 		await new ExceptionReporter().report({
 			span,
 			error,
-			shouldReport: true
+			shouldReport: true,
+			extraAttributes
 		});
-		this.#applyUserToSpan(span, ctx?.user);
-		const contextAttrs = this.#buildContextAttributes(ctx);
-		for (const [key, value] of Object.entries(contextAttrs)) span.setAttribute(key, value);
 	}
 	/**
-	* Capture a message and record it on the current active span.
-	* If no span is active, the message is silently ignored.
+	* Capture a message and record it as a LogRecord.
 	*
-	* Messages are stored using the same format as exceptions for unified querying.
-	* They are identified by exception.type = 'CapturedMessage'.
+	* Messages are stored using the same format as exceptions for
+	* unified querying. They are identified by exception.type = 'CapturedMessage'.
 	*
 	* This method is async to allow for source context extraction.
 	* You can choose to await it or fire-and-forget.
 	*/
 	static async captureMessage(message, levelOrContext) {
 		const span = trace.getActiveSpan();
-		if (!span) return;
 		const ctx = typeof levelOrContext === "string" ? { level: levelOrContext } : levelOrContext;
 		const level = ctx?.level ?? "info";
-		this.#applyUserToSpan(span, ctx?.user);
-		span.setAttribute("monocle.exception.should_report", true);
+		if (span) this.#applyUserToSpan(span, ctx?.user);
 		const syntheticError = new Error(message);
 		let frames = [];
 		if (syntheticError.stack) try {
@@ -91,11 +103,20 @@ var Monocle = class {
 			"exception.type": "CapturedMessage",
 			"exception.message": message,
 			"monocle.message.level": level,
+			"monocle.exception.should_report": "true",
+			...this.#buildUserAttributes(ctx?.user),
 			...this.#buildContextAttributes(ctx)
 		};
 		if (syntheticError.stack) attributes["exception.stacktrace"] = this.#filterInternalStack(syntheticError.stack);
 		if (frames.length > 0) attributes["monocle.exception.frames"] = JSON.stringify(frames);
-		span.addEvent("exception", attributes);
+		attributes["monocle.log.source"] = "exception_reporter";
+		attributes["monocle.exception.occurrence_id"] = randomUUID();
+		logs.getLogger(LOGGER_NAME).emit({
+			severityNumber: SeverityNumber.ERROR,
+			severityText: "ERROR",
+			body: message,
+			attributes
+		});
 	}
 	/**
 	* Set user information on the current active span.

package/dist/src/types/config.d.mts

@@ -1,6 +1,6 @@
-import { BullMQInstrumentationConfig } from "@monocle.sh/instrumentation-bullmq";
 import { BentoCacheInstrumentationConfig } from "@bentocache/otel/types";
 import { DestinationMap, OtelConfig } from "@adonisjs/otel/types";
+import { BullMQInstrumentationConfig } from "@monocle.sh/instrumentation-bullmq";
 
 //#region src/types/config.d.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monocle.sh/adonisjs-agent",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Monocle agent for AdonisJS - sends telemetry to Monocle cloud",
   "keywords": [
     "adonisjs",
@@ -9,13 +9,13 @@
     "opentelemetry",
     "tracing"
   ],
-  "homepage": "https://github.com/Julien-R44/monocle/tree/main/packages/agent",
+  "homepage": "https://github.com/monocle-sh/js/tree/main/packages/agents/adonisjs",
   "license": "ISC",
   "author": "Julien Ripouteau <julien@ripouteau.com>",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Julien-R44/monocle.git",
-    "directory": "packages/agent"
+    "url": "git+https://github.com/monocle-sh/js.git",
+    "directory": "packages/agents/adonisjs"
   },
   "files": [
     "dist"
@@ -41,32 +41,33 @@
   "dependencies": {
     "@adonisjs/otel": "^1.2.3",
     "@bentocache/otel": "^0.1.2",
-    "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^2.6.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.213.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.213.0",
+    "@opentelemetry/api": "^1.9.1",
+    "@opentelemetry/api-logs": "^0.214.0",
+    "@opentelemetry/core": "^2.6.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.214.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.214.0",
     "@opentelemetry/host-metrics": "^0.38.3",
-    "@opentelemetry/instrumentation": "^0.213.0",
-    "@opentelemetry/sdk-metrics": "^2.6.0",
-    "@opentelemetry/sdk-trace-base": "^2.6.0",
+    "@opentelemetry/instrumentation": "^0.214.0",
+    "@opentelemetry/sdk-metrics": "^2.6.1",
+    "@opentelemetry/sdk-trace-base": "^2.6.1",
     "@opentelemetry/semantic-conventions": "^1.40.0",
     "@sindresorhus/is": "^7.2.0",
     "error-stack-parser-es": "^1.0.5",
     "import-in-the-middle": "^3.0.0",
-    "@monocle.sh/instrumentation-bullmq": "^0.3.0",
-    "@monocle.sh/instrumentation-mcp": "^1.0.0",
-    "@monocle.sh/instrumentation-vercel-ai": "^1.1.0",
-    "@monocle.sh/otel-utils": "^1.0.1"
+    "@monocle.sh/instrumentation-bullmq": "^0.3.1",
+    "@monocle.sh/instrumentation-mcp": "^1.0.1",
+    "@monocle.sh/instrumentation-vercel-ai": "^1.1.1",
+    "@monocle.sh/otel-utils": "^1.0.2"
   },
   "devDependencies": {
-    "@adonisjs/core": "^7.1.1",
+    "@adonisjs/core": "^7.3.0",
     "@adonisjs/tsconfig": "^2.0.0",
     "@japa/assert": "^4.2.0",
     "@japa/file-system": "^3.0.0",
     "@japa/runner": "^5.3.0",
     "@japa/snapshot": "^2.0.10",
     "@poppinss/ts-exec": "^1.4.4",
-    "release-it": "^19.2.4"
+    "tsdown": "^0.21.7"
   },
   "peerDependencies": {
     "@adonisjs/core": "^6.2.0 || ^7.0.0",
@@ -81,8 +82,6 @@
     "build": "tsdown",
     "dev": "tsdown",
     "typecheck": "tsgo --noEmit",
-    "test": "node --import @poppinss/ts-exec bin/test.ts",
-    "quick:test": "node --import @poppinss/ts-exec bin/test.ts",
-    "release": "release-it"
+    "test": "node --import @poppinss/ts-exec bin/test.ts"
   }
 }

package/LICENSE

@@ -1,15 +0,0 @@
-ISC License
-
-Copyright (c) 2024-present, Julien Ripouteau
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.