@monocle.sh/adonisjs-agent 1.2.2 → 1.3.0

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/_virtual/_rolldown/runtime.mjs

@@ -0,0 +1,28 @@
+import "node:module";
+//#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+//#endregion
+export { __exportAll, __reExport };

package/dist/index.d.mts

@@ -1,9 +1,7 @@
-import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig } from "./src/types/config.mjs";
 import { defineConfig } from "./src/define_config.mjs";
-import { SpanAllOptions, SpanOptions } from "./src/types/decorators.mjs";
 import { Monocle } from "./src/monocle.mjs";
 import { configure } from "./configure.mjs";
 import { extractTraceContext, getCurrentSpan, handleError, injectTraceContext, otelLoggingPreset, record, recordEvent, setAttributes } from "./helpers.mjs";
 import { span, spanAll } from "./decorators.mjs";
 import { destinations } from "@adonisjs/otel";
-export { type BatchConfig, type CliTracingConfig, type HostMetricsConfig, Monocle, type MonocleConfig, type SpanAllOptions, type SpanOptions, configure, defineConfig, destinations, extractTraceContext, getCurrentSpan, handleError, injectTraceContext, otelLoggingPreset, record, recordEvent, setAttributes, span, spanAll };
+export { Monocle, configure, defineConfig, destinations, extractTraceContext, getCurrentSpan, handleError, injectTraceContext, otelLoggingPreset, record, recordEvent, setAttributes, span, spanAll };

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

@@ -1,3 +1,4 @@
+import { buildHttpInstrumentationConfig } from "./http_instrumentation_config.mjs";
 import { destinations } from "@adonisjs/otel";
 //#region src/define_config.ts
 const DEFAULT_BATCH_CONFIG = {
@@ -6,46 +7,17 @@ const DEFAULT_BATCH_CONFIG = {
 	exportTimeoutMillis: 3e4,
 	maxQueueSize: 2048
 };
-/**
-* Extracts a header value from either ServerResponse (getHeader) or IncomingMessage (headers object).
-*/
-function getHeader(response, name) {
-	if ("getHeader" in response && typeof response.getHeader === "function") {
-		const value = response.getHeader(name);
-		if (typeof value === "string") return value;
-	}
-	if ("headers" in response && response.headers) {
-		const value = response.headers[name];
-		if (typeof value === "string") return value;
-	}
-}
-/**
-* Detects the connection type based on response headers.
-* Returns 'sse' for Server-Sent Events, 'websocket' for WebSocket upgrades,
-* or undefined for standard HTTP connections.
-*/
-function detectConnectionType(response) {
-	if (getHeader(response, "content-type")?.includes("text/event-stream")) return "sse";
-	if (getHeader(response, "upgrade")?.toLowerCase() === "websocket") return "websocket";
+function resolveSdkVersion() {
+	return "1.3.0";
 }
-/**
-* Creates a response hook that detects long-running HTTP connections
-* (SSE and WebSocket) and adds the `http.connection_type` attribute.
-*/
-function createConnectionTypeHook(userHook) {
-	return (span, response) => {
-		const connectionType = detectConnectionType(response);
-		if (connectionType) span.setAttribute("http.connection_type", connectionType);
-		userHook?.(span, response);
+function buildNodejsResourceAttributes() {
+	const attributes = {
+		"monocle.language.name": "javascript",
+		"monocle.framework.name": "adonisjs"
 	};
-}
-/**
-* Extracts the user-defined response hook from HTTP instrumentation config.
-*/
-function extractUserResponseHook(httpConfig) {
-	if (typeof httpConfig !== "object" || httpConfig === null) return;
-	if (!("responseHook" in httpConfig)) return;
-	return httpConfig.responseHook;
+	const sdkVersion = resolveSdkVersion();
+	if (sdkVersion) attributes["telemetry.sdk.version"] = sdkVersion;
+	return attributes;
 }
 /**
 * Define and validate Monocle agent configuration.
@@ -66,14 +38,14 @@ function defineConfig(config) {
 		...isDev ? devBatchConfig : DEFAULT_BATCH_CONFIG,
 		...config.batch
 	};
-	const httpConfig = config.instrumentations?.["@opentelemetry/instrumentation-http"];
-	const userResponseHook = extractUserResponseHook(httpConfig);
+	const httpInstrumentationConfig = buildHttpInstrumentationConfig(config);
+	const resourceAttributes = {
+		...buildNodejsResourceAttributes(),
+		...config.resourceAttributes
+	};
 	const instrumentations = {
 		...config.instrumentations,
-		"@opentelemetry/instrumentation-http": {
-			...typeof httpConfig === "object" && httpConfig !== null ? httpConfig : {},
-			responseHook: createConnectionTypeHook(userResponseHook)
-		}
+		"@opentelemetry/instrumentation-http": { ...httpInstrumentationConfig }
 	};
 	const headers = { "x-monocle-env": environment };
 	if (config.apiKey) headers["x-api-key"] = config.apiKey;
@@ -91,6 +63,7 @@ function defineConfig(config) {
 		...config,
 		endpoint,
 		environment,
+		resourceAttributes,
 		instrumentations,
 		destinations: {
 			...config.destinations,

package/dist/src/exception_reporter.mjs

@@ -1,5 +1,5 @@
-import is from "@sindresorhus/is";
 import { ExceptionReporter } from "@monocle.sh/otel-utils";
+import is from "@sindresorhus/is";
 //#region src/exception_reporter.ts
 /**
 * Convert any unknown error to an HttpError-like object.

package/dist/src/http_instrumentation_config.mjs

@@ -0,0 +1,196 @@
+import { HttpBodyCapture, HttpUrlSanitizer } from "@monocle.sh/otel-utils";
+//#region src/http_instrumentation_config.ts
+/**
+* Builds the effective HTTP instrumentation config used by the Adonis agent.
+*/
+var HttpInstrumentationConfigBuilder = class {
+	#config;
+	#httpConfig;
+	constructor(config) {
+		this.#config = config;
+		this.#httpConfig = this.#resolveHttpConfig();
+	}
+	/**
+	* Resolves the effective HTTP config, with low-level instrumentation overrides winning.
+	*/
+	#resolveHttpConfig() {
+		const topLevelHttpConfig = this.#config.http;
+		const instrumentationHttpConfig = this.#config.instrumentations?.["@opentelemetry/instrumentation-http"];
+		if (instrumentationHttpConfig?.enabled === false) return instrumentationHttpConfig;
+		if (typeof instrumentationHttpConfig === "object" && instrumentationHttpConfig !== null) {
+			if (topLevelHttpConfig === false) return instrumentationHttpConfig;
+			if (typeof topLevelHttpConfig !== "object" || topLevelHttpConfig === null) return instrumentationHttpConfig;
+			return {
+				...topLevelHttpConfig,
+				...instrumentationHttpConfig
+			};
+		}
+		if (topLevelHttpConfig === false) return topLevelHttpConfig;
+		if (typeof topLevelHttpConfig !== "object" || topLevelHttpConfig === null) return instrumentationHttpConfig;
+		return topLevelHttpConfig;
+	}
+	/**
+	* Reads custom URL sanitization rules from the effective config.
+	*/
+	#resolveHttpUrlConfig() {
+		if (typeof this.#httpConfig !== "object" || this.#httpConfig === null) return;
+		return this.#httpConfig.sanitizeUrls;
+	}
+	/**
+	* Reads custom body capture rules from the effective config.
+	*/
+	#resolveHttpBodyConfig() {
+		if (typeof this.#httpConfig !== "object" || this.#httpConfig === null) return;
+		return this.#httpConfig.captureBodies;
+	}
+	/**
+	* Determines whether HTTP instrumentation should remain enabled.
+	*/
+	#resolveEnabled() {
+		if (this.#httpConfig === false) return false;
+		if (typeof this.#httpConfig !== "object" || this.#httpConfig === null) return true;
+		if ("enabled" in this.#httpConfig && this.#httpConfig.enabled === false) return false;
+		return true;
+	}
+	/**
+	* Returns the object-shaped portion of the effective config for spreading into the final config.
+	*/
+	#getObjectConfig() {
+		if (typeof this.#httpConfig !== "object" || this.#httpConfig === null) return {};
+		return this.#httpConfig;
+	}
+	/**
+	* Extracts a user-defined request hook from the effective config.
+	*/
+	#extractUserRequestHook() {
+		if (typeof this.#httpConfig !== "object" || this.#httpConfig === null) return;
+		if (!("requestHook" in this.#httpConfig)) return;
+		return this.#httpConfig.requestHook;
+	}
+	/**
+	* Extracts a user-defined response hook from the effective config.
+	*/
+	#extractUserResponseHook() {
+		if (typeof this.#httpConfig !== "object" || this.#httpConfig === null) return;
+		if (!("responseHook" in this.#httpConfig)) return;
+		return this.#httpConfig.responseHook;
+	}
+	/**
+	* Extracts a user-defined custom-attributes hook from the effective config.
+	*/
+	#extractUserApplyCustomAttributesOnSpan() {
+		if (typeof this.#httpConfig !== "object" || this.#httpConfig === null) return;
+		if (!("applyCustomAttributesOnSpan" in this.#httpConfig)) return;
+		return this.#httpConfig.applyCustomAttributesOnSpan;
+	}
+	/**
+	* Extracts a header value from either ServerResponse or IncomingMessage.
+	*/
+	#getHeader(response, name) {
+		if ("getHeader" in response && typeof response.getHeader === "function") {
+			const value = response.getHeader(name);
+			if (typeof value === "string") return value;
+		}
+		if ("headers" in response && response.headers) {
+			const value = response.headers[name];
+			if (typeof value === "string") return value;
+		}
+	}
+	/**
+	* Detects whether the response is an SSE or websocket connection.
+	*/
+	#detectConnectionType(response) {
+		if (this.#getHeader(response, "content-type")?.includes("text/event-stream")) return "sse";
+		if (this.#getHeader(response, "upgrade")?.toLowerCase() === "websocket") return "websocket";
+	}
+	/**
+	* Builds the hook that tags long-lived HTTP connections.
+	*/
+	#createConnectionTypeHook(userHook) {
+		return (span, response) => {
+			const connectionType = this.#detectConnectionType(response);
+			if (connectionType) span.setAttribute("http.connection_type", connectionType);
+			userHook?.(span, response);
+		};
+	}
+	/**
+	* Builds the effective request hook with URL sanitization, body capture, and user hooks.
+	*/
+	#createRequestHook(options) {
+		const bodyCaptureHook = options.bodyCapture.createRequestHook();
+		if (!bodyCaptureHook && !options.userHook && !options.urlSanitizationEnabled) return;
+		return (span, request) => {
+			options.urlSanitizer.sanitizeSpanFromRequest({
+				span,
+				request
+			});
+			bodyCaptureHook?.(span, request);
+			options.userHook?.(span, request);
+		};
+	}
+	/**
+	* Builds the effective response hook with body capture and connection tagging.
+	*/
+	#createResponseHook(options) {
+		const bodyCaptureHook = options.bodyCapture.createResponseHook();
+		const connectionTypeHook = this.#createConnectionTypeHook(options.userHook);
+		if (!bodyCaptureHook && !options.userHook) return connectionTypeHook;
+		return (span, response) => {
+			bodyCaptureHook?.(span, response);
+			connectionTypeHook(span, response);
+		};
+	}
+	/**
+	* Builds the hook that flushes body capture before the span closes.
+	*/
+	#createApplyCustomAttributesOnSpan(options) {
+		return (span, request, response) => {
+			options.bodyCapture.applyCustomAttributesOnSpan({
+				span,
+				request,
+				response
+			});
+			options.userHook?.(span, request, response);
+		};
+	}
+	/**
+	* Produces the final HTTP instrumentation config consumed by Adonis OTel.
+	*/
+	build() {
+		const enabled = this.#resolveEnabled();
+		const baseConfig = this.#getObjectConfig();
+		if (!enabled) return {
+			...baseConfig,
+			enabled: false
+		};
+		const bodyCapture = new HttpBodyCapture(this.#resolveHttpBodyConfig());
+		const urlConfig = this.#resolveHttpUrlConfig();
+		const urlSanitizer = new HttpUrlSanitizer(urlConfig);
+		return {
+			...baseConfig,
+			enabled: true,
+			requestHook: this.#createRequestHook({
+				bodyCapture,
+				urlSanitizer,
+				urlSanitizationEnabled: urlConfig !== void 0,
+				userHook: this.#extractUserRequestHook()
+			}),
+			responseHook: this.#createResponseHook({
+				bodyCapture,
+				userHook: this.#extractUserResponseHook()
+			}),
+			applyCustomAttributesOnSpan: this.#createApplyCustomAttributesOnSpan({
+				bodyCapture,
+				userHook: this.#extractUserApplyCustomAttributesOnSpan()
+			})
+		};
+	}
+};
+/**
+* Builds the effective HTTP instrumentation config from top-level and low-level options.
+*/
+function buildHttpInstrumentationConfig(config) {
+	return new HttpInstrumentationConfigBuilder(config).build();
+}
+//#endregion
+export { buildHttpInstrumentationConfig };

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 { extractContextLines } from "@monocle.sh/otel-utils";
+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,7 @@
-import { BullMQInstrumentationConfig } from "@monocle.sh/instrumentation-bullmq";
+import { HttpBodyCaptureConfig, HttpUrlSanitizationConfig } from "@monocle.sh/otel-utils";
 import { BentoCacheInstrumentationConfig } from "@bentocache/otel/types";
-import { DestinationMap, OtelConfig } from "@adonisjs/otel/types";
+import { DestinationMap, HttpInstrumentationConfig, InstrumentationsConfig, OtelConfig } from "@adonisjs/otel/types";
+import { BullMQInstrumentationConfig } from "@monocle.sh/instrumentation-bullmq";
 
 //#region src/types/config.d.ts
 /**
@@ -103,7 +104,32 @@ interface AiInstrumentationConfig {
   recordOutputs?: boolean;
 }
 type BullMQAgentConfig = BullMQInstrumentationConfig;
-interface MonocleConfig extends Omit<OtelConfig, 'traceExporter' | 'metricExporter'> {
+/**
+ * Extended HTTP instrumentation config consumed by the Monocle agent.
+ */
+interface MonocleHttpInstrumentationConfig extends HttpInstrumentationConfig {
+  /**
+   * URL sanitization rules applied before HTTP spans are exported.
+   */
+  sanitizeUrls?: false | HttpUrlSanitizationConfig;
+  /**
+   * HTTP body capture rules for request and response payloads.
+   */
+  captureBodies?: false | HttpBodyCaptureConfig;
+}
+/**
+ * Instrumentation map extended with Monocle's HTTP instrumentation options.
+ */
+type BaseInstrumentationValue = NonNullable<InstrumentationsConfig>[string & {}];
+type MonocleInstrumentationsConfig = Omit<NonNullable<InstrumentationsConfig>, '@opentelemetry/instrumentation-http'> & {
+  '@opentelemetry/instrumentation-http'?: MonocleHttpInstrumentationConfig | {
+    enabled: false;
+  };
+  [key: string & {}]: BaseInstrumentationValue | MonocleHttpInstrumentationConfig | {
+    enabled: false;
+  } | undefined;
+};
+interface MonocleConfig extends Omit<OtelConfig, 'traceExporter' | 'metricExporter' | 'instrumentations'> {
   /**
    * Enable local DevTools mode.
    * Sends telemetry to Monocle DevTools (localhost:4200) with no compression.
@@ -137,6 +163,16 @@ interface MonocleConfig extends Omit<OtelConfig, 'traceExporter' | 'metricExport
    * Monocle destination is always injected automatically and cannot be removed.
    */
   destinations?: DestinationMap;
+  /**
+   * Instrumentation overrides and low-level escape hatches.
+   */
+  instrumentations?: MonocleInstrumentationsConfig;
+  /**
+   * High-level HTTP tracing configuration.
+   * This is the recommended way to configure ignored URLs, URL sanitization,
+   * and HTTP body capture.
+   */
+  http?: false | MonocleHttpInstrumentationConfig;
   /**
    * Host metrics configuration (CPU, Memory, Network, etc.).
    * Set to `false` to disable, or pass config object.
@@ -197,4 +233,4 @@ interface MonocleConfig extends Omit<OtelConfig, 'traceExporter' | 'metricExport
   ai?: false | AiInstrumentationConfig;
 }
 //#endregion
-export { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig };
+export { AiInstrumentationConfig, BatchConfig, BullMQAgentConfig, CacheInstrumentationConfig, CliTracingConfig, HostMetricsConfig, MailInstrumentationConfig, MonocleConfig, MonocleHttpInstrumentationConfig, MonocleInstrumentationsConfig, QueueInstrumentationConfig };

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

@@ -1,3 +1,12 @@
-import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig } from "./config.mjs";
+import { AiInstrumentationConfig, BatchConfig, BullMQAgentConfig, CacheInstrumentationConfig, CliTracingConfig, HostMetricsConfig, MailInstrumentationConfig, MonocleConfig, MonocleHttpInstrumentationConfig, MonocleInstrumentationsConfig, QueueInstrumentationConfig } from "./config.mjs";
+import { CaptureContext, CaptureExceptionContext, CaptureMessageContext, MessageLevel, MonocleUser } from "./monocle.mjs";
 import { SpanAllOptions, SpanOptions } from "./decorators.mjs";
-import { CaptureContext, CaptureExceptionContext, CaptureMessageContext, MessageLevel, MonocleUser } from "./monocle.mjs";
+export * from "@monocle.sh/otel-utils";
+
+//#region src/types/main.d.ts
+declare namespace main_d_exports {
+  export { AiInstrumentationConfig, BatchConfig, BullMQAgentConfig, CacheInstrumentationConfig, CaptureContext, CaptureExceptionContext, CaptureMessageContext, CliTracingConfig, HostMetricsConfig, MailInstrumentationConfig, MessageLevel, MonocleConfig, MonocleHttpInstrumentationConfig, MonocleInstrumentationsConfig, MonocleUser, QueueInstrumentationConfig, SpanAllOptions, SpanOptions };
+}
+import * as import__monocle_sh_otel_utils from "@monocle.sh/otel-utils";
+//#endregion
+export { import__monocle_sh_otel_utils as main_d_exports };

package/dist/stubs/config.stub

@@ -5,6 +5,11 @@ import { defineConfig } from '@monocle.sh/adonisjs-agent'
 import env from '#start/env'
 
 export default defineConfig({
+  /**
+   * Enable Monocle Studio for local development.
+   * @see https://docs.monocle.sh/studio/overview
+   */
+  dev: process.env.NODE_ENV === 'development',
   apiKey: env.get('MONOCLE_API_KEY'),
 
   serviceName: env.get('APP_NAME'),

package/dist/types.d.mts

@@ -1,5 +1,14 @@
-import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig } from "./src/types/config.mjs";
-import { SpanAllOptions, SpanOptions } from "./src/types/decorators.mjs";
+import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig, MonocleHttpInstrumentationConfig, MonocleInstrumentationsConfig } from "./src/types/config.mjs";
 import { MonocleUser } from "./src/types/monocle.mjs";
+import { SpanAllOptions, SpanOptions } from "./src/types/decorators.mjs";
+import { main_d_exports } from "./src/types/main.mjs";
 import { DestinationConfig, DestinationMap, DestinationSignal, DestinationSignals, HeadersCarrier, OtelLoggingPresetOptions, OtlpDestinationConfig, OtlpDestinationOptions, UserContextResult } from "@adonisjs/otel/types";
-export { type BatchConfig, type CliTracingConfig, type DestinationConfig, type DestinationMap, type DestinationSignal, type DestinationSignals, type HeadersCarrier, type HostMetricsConfig, type MonocleConfig, type MonocleUser, type OtelLoggingPresetOptions, type OtlpDestinationConfig, type OtlpDestinationOptions, type SpanAllOptions, type SpanOptions, type UserContextResult };
+type HttpBodyCaptureConfig = main_d_exports.HttpBodyCaptureConfig;
+type HttpBodyCaptureSideConfig = main_d_exports.HttpBodyCaptureSideConfig;
+type HttpBodyInfo = main_d_exports.HttpBodyInfo;
+type HttpBodyKind = main_d_exports.HttpBodyKind;
+type HttpBodyRedactionConfig = main_d_exports.HttpBodyRedactionConfig;
+type HttpBodyRedactor = main_d_exports.HttpBodyRedactor;
+type HttpUrlSanitizationConfig = main_d_exports.HttpUrlSanitizationConfig;
+type HttpUrlSanitizerHook = main_d_exports.HttpUrlSanitizerHook;
+export { type BatchConfig, type CliTracingConfig, type DestinationConfig, type DestinationMap, type DestinationSignal, type DestinationSignals, type HeadersCarrier, type HostMetricsConfig, type HttpBodyCaptureConfig, type HttpBodyCaptureSideConfig, type HttpBodyInfo, type HttpBodyKind, type HttpBodyRedactionConfig, type HttpBodyRedactor, type HttpUrlSanitizationConfig, type HttpUrlSanitizerHook, type MonocleConfig, type MonocleHttpInstrumentationConfig, type MonocleInstrumentationsConfig, type MonocleUser, type OtelLoggingPresetOptions, type OtlpDestinationConfig, type OtlpDestinationOptions, type SpanAllOptions, type SpanOptions, type UserContextResult };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monocle.sh/adonisjs-agent",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "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.2",
+    "@monocle.sh/otel-utils": "^1.1.0"
   },
   "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.