@monocle.sh/adonisjs-agent 1.0.2 → 1.1.0

package/dist/ai.d.mts

@@ -0,0 +1,2 @@
+import { getConversationId, withConversationId } from "@monocle.sh/instrumentation-vercel-ai";
+export { getConversationId, withConversationId };

package/dist/ai.mjs

@@ -0,0 +1,2 @@
+import { getConversationId, withConversationId } from "@monocle.sh/instrumentation-vercel-ai";
+export { getConversationId, withConversationId };

package/dist/decorators.d.mts

@@ -1,14 +1,6 @@
-import { Attributes } from "@opentelemetry/api";
+import { SpanAllOptions, SpanOptions } from "./src/types/decorators.mjs";
 
 //#region src/decorators.d.ts
-interface SpanOptions {
-  name?: string;
-  attributes?: Attributes;
-}
-interface SpanAllOptions {
-  prefix?: string;
-  attributes?: Attributes;
-}
 /**
  * Decorator to create a span around a method.
  *
@@ -80,4 +72,4 @@ declare function span(options?: SpanOptions): (target: any, propertyKey: string,
  */
 declare function spanAll(options?: SpanAllOptions): <T extends new (...args: any[]) => any>(constructor: T) => T;
 //#endregion
-export { SpanAllOptions, SpanOptions, span, spanAll };
+export { span, spanAll };

package/dist/index.d.mts

@@ -1,8 +1,9 @@
-import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig } from "./src/types.mjs";
+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 { SpanAllOptions, SpanOptions, span, spanAll } from "./decorators.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 };

package/dist/init.mjs

@@ -23,6 +23,22 @@ async function init(dirname) {
 	const config = await loadConfig(join(dirname, "config/monocle.js"));
 	if (!config) return;
 	if (!OtelManager.isEnabled(config)) return;
+	/**
+	* AI SDK Instrumentation (Vercel AI SDK)
+	*
+	* Uses import-in-the-middle to hook the `ai` module BEFORE it's loaded.
+	* Must be registered before OtelManager.create() so the hook is in place.
+	* The SpanProcessor is added via config.spanProcessors.
+	*/
+	if (config.ai !== false) try {
+		const { VercelAiInstrumentation, VercelAiSpanProcessor } = await import("@monocle.sh/instrumentation-vercel-ai");
+		const aiOpts = typeof config.ai === "object" ? config.ai : {};
+		new VercelAiInstrumentation({
+			recordInputs: aiOpts.recordInputs,
+			recordOutputs: aiOpts.recordOutputs
+		}).enable();
+		config.spanProcessors = [...config.spanProcessors ?? [], new VercelAiSpanProcessor()];
+	} catch {}
 	const manager = OtelManager.create(config);
 	manager?.start();
 	const shutdown = async () => {
@@ -87,6 +103,18 @@ async function init(dirname) {
 		await instrumentQueue(queueConfig ?? { enabled: true }, dirname);
 	}
 	/**
+	* BullMQ Instrumentation
+	*
+	* Automatically instruments bullmq if installed.
+	* Creates PRODUCER spans for dispatch and CONSUMER spans for execution,
+	* with configurable span link mode and queue time calculation.
+	*/
+	const bullmqConfig = config.bullmq;
+	if (bullmqConfig !== false) {
+		const { instrumentBullMQ } = await import("./src/instrumentations/bullmq/instrumentation.mjs");
+		await instrumentBullMQ(bullmqConfig);
+	}
+	/**
 	* Cache Instrumentation
 	*
 	* Automatically instruments @adonisjs/cache (bentocache) if installed.

package/dist/src/define_config.d.mts

@@ -1,4 +1,4 @@
-import { MonocleConfig } from "./types.mjs";
+import { MonocleConfig } from "./types/config.mjs";
 
 //#region src/define_config.d.ts
 /**

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

@@ -0,0 +1,15 @@
+//#region src/instrumentations/bullmq/instrumentation.ts
+/**
+* Auto-instruments BullMQ with OpenTelemetry spans for job
+* dispatch (PRODUCER) and execution (CONSUMER).
+*
+* Does nothing if `@monocle.sh/instrumentation-bullmq` is not installed.
+*/
+async function instrumentBullMQ(config) {
+	try {
+		const { BullMQInstrumentation } = await import("@monocle.sh/instrumentation-bullmq");
+		new BullMQInstrumentation(config).enable();
+	} catch {}
+}
+//#endregion
+export { instrumentBullMQ };

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

@@ -1,28 +1,6 @@
-import { UserContextResult } from "@adonisjs/otel/types";
+import { CaptureExceptionContext, CaptureMessageContext, MessageLevel, MonocleUser } from "./types/monocle.mjs";
 
 //#region src/monocle.d.ts
-type MessageLevel = 'debug' | 'info' | 'log' | 'warning' | 'error' | 'fatal';
-interface CaptureContext {
-  user?: {
-    id: string;
-    email?: string;
-    name?: string;
-  };
-  tags?: Record<string, string>;
-  extra?: Record<string, unknown>;
-}
-interface CaptureMessageContext extends CaptureContext {
-  level?: MessageLevel;
-}
-type CaptureExceptionContext = CaptureContext;
-/**
- * User information for tracing. When displayed in the Monocle UI,
- * `name` takes priority over `email` as the display label, with
- * `email` used as fallback.
- */
-interface MonocleUser extends UserContextResult {
-  name?: string;
-}
 /**
  * Monocle helper class for manual instrumentation.
  */
@@ -55,4 +33,4 @@ declare class Monocle {
   static setUser(user: MonocleUser): void;
 }
 //#endregion
-export { Monocle, MonocleUser };
+export { Monocle };

package/dist/src/{types.d.mts → types/config.d.mts}

@@ -1,7 +1,8 @@
+import { BullMQInstrumentationConfig } from "@monocle.sh/instrumentation-bullmq";
 import { BentoCacheInstrumentationConfig } from "@bentocache/otel/types";
 import { DestinationMap, OtelConfig } from "@adonisjs/otel/types";
 
-//#region src/types.d.ts
+//#region src/types/config.d.ts
 /**
  * Configuration for cache instrumentation
  */
@@ -86,6 +87,22 @@ interface BatchConfig {
    */
   maxQueueSize?: number;
 }
+/**
+ * Configuration for AI SDK instrumentation
+ */
+interface AiInstrumentationConfig {
+  /**
+   * Record prompt/input data in span attributes.
+   * @default true
+   */
+  recordInputs?: boolean;
+  /**
+   * Record response/output data in span attributes.
+   * @default true
+   */
+  recordOutputs?: boolean;
+}
+type BullMQAgentConfig = BullMQInstrumentationConfig;
 interface MonocleConfig extends Omit<OtelConfig, 'traceExporter' | 'metricExporter'> {
   /**
    * Your Monocle API key. If not provided, telemetry will be disabled.
@@ -158,6 +175,20 @@ interface MonocleConfig extends Omit<OtelConfig, 'traceExporter' | 'metricExport
    * @default { enabled: true }
    */
   queue?: false | QueueInstrumentationConfig;
+  /**
+   * BullMQ instrumentation configuration.
+   * Automatically instruments BullMQ if installed.
+   * Set to `false` to disable.
+   * @default { enabled: true }
+   */
+  bullmq?: false | BullMQAgentConfig;
+  /**
+   * AI SDK instrumentation configuration.
+   * Automatically instruments the Vercel AI SDK (`ai` package) if installed.
+   * Set to `false` to disable.
+   * @default { enabled: true }
+   */
+  ai?: false | AiInstrumentationConfig;
 }
 //#endregion
 export { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig };

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

@@ -0,0 +1,13 @@
+import { Attributes } from "@opentelemetry/api";
+
+//#region src/types/decorators.d.ts
+interface SpanOptions {
+  name?: string;
+  attributes?: Attributes;
+}
+interface SpanAllOptions {
+  prefix?: string;
+  attributes?: Attributes;
+}
+//#endregion
+export { SpanAllOptions, SpanOptions };

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

@@ -0,0 +1,3 @@
+import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig } from "./config.mjs";
+import { SpanAllOptions, SpanOptions } from "./decorators.mjs";
+import { CaptureContext, CaptureExceptionContext, CaptureMessageContext, MessageLevel, MonocleUser } from "./monocle.mjs";

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

@@ -0,0 +1,27 @@
+import { UserContextResult } from "@adonisjs/otel/types";
+
+//#region src/types/monocle.d.ts
+type MessageLevel = 'debug' | 'info' | 'log' | 'warning' | 'error' | 'fatal';
+interface CaptureContext {
+  user?: {
+    id: string;
+    email?: string;
+    name?: string;
+  };
+  tags?: Record<string, string>;
+  extra?: Record<string, unknown>;
+}
+interface CaptureMessageContext extends CaptureContext {
+  level?: MessageLevel;
+}
+type CaptureExceptionContext = CaptureContext;
+/**
+ * User information for tracing. When displayed in the Monocle UI,
+ * `name` takes priority over `email` as the display label, with
+ * `email` used as fallback.
+ */
+interface MonocleUser extends UserContextResult {
+  name?: string;
+}
+//#endregion
+export { CaptureContext, CaptureExceptionContext, CaptureMessageContext, MessageLevel, MonocleUser };

package/dist/types.d.mts

@@ -1,5 +1,5 @@
-import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig } from "./src/types.mjs";
-import { MonocleUser } from "./src/monocle.mjs";
-import { SpanAllOptions, SpanOptions } from "./decorators.mjs";
+import { BatchConfig, CliTracingConfig, HostMetricsConfig, MonocleConfig } from "./src/types/config.mjs";
+import { SpanAllOptions, SpanOptions } from "./src/types/decorators.mjs";
+import { MonocleUser } from "./src/types/monocle.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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monocle.sh/adonisjs-agent",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Monocle agent for AdonisJS - sends telemetry to Monocle cloud",
   "keywords": [
     "adonisjs",
@@ -24,6 +24,7 @@
   "types": "./dist/index.d.mts",
   "exports": {
     ".": "./dist/index.mjs",
+    "./ai": "./dist/ai.mjs",
     "./decorators": "./dist/decorators.mjs",
     "./helpers": "./dist/helpers.mjs",
     "./init": "./dist/init.mjs",
@@ -52,8 +53,10 @@
     "@sindresorhus/is": "^7.2.0",
     "error-stack-parser-es": "^1.0.5",
     "import-in-the-middle": "^3.0.0",
+    "@monocle.sh/instrumentation-bullmq": "^0.2.0",
     "@monocle.sh/instrumentation-mcp": "^1.0.0",
-    "@monocle.sh/otel-utils": "^1.0.0"
+    "@monocle.sh/instrumentation-vercel-ai": "^1.1.0",
+    "@monocle.sh/otel-utils": "^1.0.1"
   },
   "devDependencies": {
     "@adonisjs/core": "^7.1.1",