@fedify/fedify 2.3.0-dev.1114 → 2.3.0-dev.1131

package/dist/{middleware-DlcecZMq.mjs → middleware-BB0IbDow.mjs}

@@ -2,25 +2,25 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-BT_F5748.mjs";
-import { n as version, t as name } from "./deno-CF3jMgip.mjs";
-import { i as isAbortError, n as getFederationMetrics, o as recordOutboxEnqueue, r as getRemoteHost, t as getDurationMs } from "./metrics-ek3ilf6c.mjs";
+import { n as version, t as name } from "./deno--CS-SBS9.mjs";
+import { a as instrumentDocumentLoader, d as recordInboxActivity, i as getRemoteHost, m as recordOutboxEnqueue, n as getDurationMs, o as isAbortError, p as recordOutboxActivity, r as getFederationMetrics, u as recordFanoutRecipients } from "./metrics-BTOMkW8C.mjs";
 import { t as formatAcceptSignature } from "./accept-CgDcxvjV.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-B4I8H5Lc.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BmOZYc-8.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-BENj6vQ4.mjs";
-import { n as kvCache } from "./kv-cache-DihufyAQ.mjs";
-import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-B5D5THhl.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DO810N24.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-Df3tMleh.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-IywnQdiX.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-k6huZLQL.mjs";
+import { n as kvCache } from "./kv-cache-q9Ec2ryS.mjs";
+import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-BGwiJpl3.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CIt4hvmM.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BNL8AC14.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-BgfyWv7b.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-BYlrRSmZ.mjs";
 import { t as getNodeInfo } from "./client-Bneh_DYR.mjs";
 import { t as nodeInfoToJson } from "./types-D09GN0uZ.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-YlEusQth.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-DckAhD27.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-Cc3DVAhE.mjs";
 import { t as KvKeyCache } from "./keycache-BeU0LCII.mjs";
 import { t as acceptsJsonLd } from "./negotiation-DDstyBvc.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-_VvV0h9f.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-CAYXdUTk.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-DJFpze7B.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
@@ -192,6 +192,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.UNSET,
 				message: `Activity ${activity.id?.href} has already been processed.`
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			return "alreadyProcessed";
 		}
 	}
@@ -201,6 +202,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			code: SpanStatusCode.ERROR,
 			message: "Missing actor."
 		});
+		recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 		return "missingActor";
 	}
 	span.setAttribute("activitypub.actor.id", activity.actorId.href);
@@ -236,6 +238,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			queue,
 			activityType: getTypeId(activity).href
 		}, 0);
+		recordInboxActivity(meterProvider, "queued", getTypeId(activity).href);
 		logger.info("Activity {activityId} is enqueued.", {
 			activityId: activity.id?.href,
 			activity: json,
@@ -255,6 +258,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.UNSET,
 				message: `Unsupported activity type: ${getTypeId(activity).href}`
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			span.end();
 			return "unsupportedActivity";
 		}
@@ -264,7 +268,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			const activityType = getTypeId(activity).href;
 			const started = performance.now();
 			try {
-				await listener(inboxContextFactory(recipient, json, activity?.id?.href, activityType), activity);
+				await listener(inboxContextFactory(recipient, json, activity.id?.href, activityType), activity);
 			} finally {
 				getFederationMetrics(meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
 			}
@@ -289,9 +293,11 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.ERROR,
 				message: String(error)
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			span.end();
 			return "error";
 		}
+		recordInboxActivity(meterProvider, "processed", getTypeId(activity).href);
 		if (cacheKey != null) await kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
 		logger.info("Activity {activityId} has been processed.", {
 			activityId: activity.id?.href,
@@ -1809,23 +1815,50 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 		const { allowPrivateAddress, userAgent } = options;
 		this.allowPrivateAddress = allowPrivateAddress ?? false;
-		this.documentLoaderFactory = options.documentLoaderFactory ?? ((opts) => {
-			return kvCache({
-				loader: getDocumentLoader({
-					allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
-					userAgent: opts?.userAgent ?? userAgent
-				}),
-				kv: options.kv,
-				prefix: this.kvPrefixes.remoteDocument
-			});
-		});
-		this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
-		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => getAuthenticatedDocumentLoader(identity, {
-			allowPrivateAddress,
-			userAgent,
+		const userDocumentLoaderFactory = options.documentLoaderFactory;
+		const userContextLoaderFactory = options.contextLoaderFactory;
+		const userAuthFactory = options.authenticatedDocumentLoaderFactory;
+		const builtinDocumentLoaderFactory = (opts) => kvCache({
+			loader: getDocumentLoader({
+				allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
+				userAgent: opts?.userAgent ?? userAgent
+			}),
+			kv: options.kv,
+			prefix: this.kvPrefixes.remoteDocument,
+			meterProvider: this._meterProvider,
+			kind: "object"
+		});
+		const builtinContextLoaderFactory = (opts) => kvCache({
+			loader: getDocumentLoader({
+				allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
+				userAgent: opts?.userAgent ?? userAgent
+			}),
+			kv: options.kv,
+			prefix: this.kvPrefixes.remoteDocument,
+			meterProvider: this._meterProvider,
+			kind: "context"
+		});
+		this.documentLoaderFactory = (opts) => instrumentDocumentLoader((userDocumentLoaderFactory ?? builtinDocumentLoaderFactory)(opts), {
+			meterProvider: this._meterProvider,
+			kind: "object",
+			cacheEnabled: userDocumentLoaderFactory == null ? true : void 0
+		});
+		const resolvedContextLoaderFactory = userContextLoaderFactory ?? userDocumentLoaderFactory ?? builtinContextLoaderFactory;
+		this.contextLoaderFactory = (opts) => instrumentDocumentLoader(resolvedContextLoaderFactory(opts), {
+			meterProvider: this._meterProvider,
+			kind: "context",
+			cacheEnabled: userContextLoaderFactory == null && userDocumentLoaderFactory == null ? true : void 0
+		});
+		this.authenticatedDocumentLoaderFactory = (identity, factoryOpts) => instrumentDocumentLoader(userAuthFactory != null ? userAuthFactory(identity, factoryOpts) : getAuthenticatedDocumentLoader(identity, {
+			allowPrivateAddress: factoryOpts?.allowPrivateAddress ?? allowPrivateAddress,
+			userAgent: factoryOpts?.userAgent ?? userAgent,
 			specDeterminer: new KvSpecDeterminer(this.kv, this.kvPrefixes.httpMessageSignaturesSpec, options.firstKnock),
 			tracerProvider: this.tracerProvider
-		}));
+		}), {
+			meterProvider: this._meterProvider,
+			kind: "object",
+			cacheEnabled: userAuthFactory == null ? false : void 0
+		});
 		this.userAgent = userAgent;
 		this.onOutboxError = options.onOutboxError;
 		this.permanentFailureStatusCodes = options.permanentFailureStatusCodes ?? [404, 410];
@@ -2135,6 +2168,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						});
 					}
 				}
+				recordOutboxActivity(this.meterProvider, "abandoned", message.activityType);
 				return;
 			}
 			if (this.outboxQueue?.nativeRetrial) {
@@ -2165,11 +2199,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 						queue: outboxQueue,
 						activityType: retryMessage.activityType
 					}, retryMessage.attempt);
+					recordOutboxActivity(this.meterProvider, "retried", retryMessage.activityType);
 				}
-			} else logger.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
-				...logData,
-				error
-			});
+			} else {
+				logger.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
+					...logData,
+					error
+				});
+				recordOutboxActivity(this.meterProvider, "abandoned", message.activityType);
+			}
 			return;
 		}
 		logger.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
@@ -2204,6 +2242,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					activity: message.activity,
 					recipient: message.identifier
 				});
+				recordInboxActivity(this.meterProvider, "rejected", activityType);
 				return;
 			}
 		}
@@ -2220,6 +2259,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					code: SpanStatusCode.ERROR,
 					message: `Unsupported activity type: ${activityType}`
 				});
+				recordInboxActivity(this.meterProvider, "rejected", activityType);
 				span.end();
 				return;
 			}
@@ -2232,6 +2272,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				} finally {
 					getFederationMetrics(this.meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
 				}
+				recordInboxActivity(this.meterProvider, "processed", activityType);
 			} catch (error) {
 				try {
 					await this.inboxErrorHandler?.(context, error);
@@ -2282,13 +2323,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 							queue: inboxQueue,
 							activityType
 						}, retryMessage.attempt);
+						recordInboxActivity(this.meterProvider, "retried", activityType);
 					}
-				} else logger.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
-					error,
-					activityId: activity.id?.href,
-					activity: message.activity,
-					recipient: message.identifier
-				});
+				} else {
+					logger.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
+						error,
+						activityId: activity.id?.href,
+						activity: message.activity,
+						recipient: message.identifier
+					});
+					recordInboxActivity(this.meterProvider, "abandoned", activityType);
+				}
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: String(error)
@@ -3128,6 +3173,7 @@ var ContextImpl = class ContextImpl {
 			contextLoader: options.contextLoader ?? this.contextLoader,
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
+			meterProvider: options.meterProvider ?? this.meterProvider,
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}
@@ -3315,6 +3361,7 @@ var ContextImpl = class ContextImpl {
 			queue: this.federation.fanoutQueue,
 			activityType: message.activityType
 		}, 0);
+		recordFanoutRecipients(this.federation.meterProvider, globalThis.Object.keys(message.inboxes).length, message.activityType);
 		return true;
 	}
 	async *getFollowers(identifier) {

package/dist/{middleware-EI7OU6BR.mjs → middleware-Dnql59Y8.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-DlcecZMq.mjs";
+import { n as FederationImpl } from "./middleware-BB0IbDow.mjs";
 export { FederationImpl };

package/dist/{middleware-CuZbBw-N.js → middleware-DtOddSVg.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { C as version, S as name, _ as recordOutboxEnqueue, a as verifyRequestDetailed, d as validateCryptoKey, f as getDurationMs, h as isAbortError, i as verifyRequest, m as getRemoteHost, n as parseRfc9421SignatureInput, o as exportJwk, p as getFederationMetrics, t as doubleKnock, u as importJwk, v as formatAcceptSignature } from "./http-CpzZ9zsb.js";
-import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-Vd8-1EWh.js";
+import { C as formatAcceptSignature, D as name, O as version, S as recordOutboxEnqueue, a as verifyRequestDetailed, b as recordInboxActivity, d as validateCryptoKey, f as getDurationMs, g as isAbortError, h as instrumentDocumentLoader, i as verifyRequest, m as getRemoteHost, n as parseRfc9421SignatureInput, o as exportJwk, p as getFederationMetrics, t as doubleKnock, u as importJwk, x as recordOutboxActivity, y as recordFanoutRecipients } from "./http-cqujdCRz.js";
+import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-DMGIjHYH.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-CAY3OdLq.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-Wc5ezcVW.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-pEejzYq4.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, metrics, propagation, trace } from "@opentelemetry/api";
@@ -817,6 +817,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.UNSET,
 				message: `Activity ${activity.id?.href} has already been processed.`
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			return "alreadyProcessed";
 		}
 	}
@@ -826,6 +827,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			code: SpanStatusCode.ERROR,
 			message: "Missing actor."
 		});
+		recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 		return "missingActor";
 	}
 	span.setAttribute("activitypub.actor.id", activity.actorId.href);
@@ -861,6 +863,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			queue,
 			activityType: getTypeId(activity).href
 		}, 0);
+		recordInboxActivity(meterProvider, "queued", getTypeId(activity).href);
 		logger.info("Activity {activityId} is enqueued.", {
 			activityId: activity.id?.href,
 			activity: json,
@@ -880,6 +883,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.UNSET,
 				message: `Unsupported activity type: ${getTypeId(activity).href}`
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			span.end();
 			return "unsupportedActivity";
 		}
@@ -889,7 +893,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			const activityType = getTypeId(activity).href;
 			const started = performance.now();
 			try {
-				await listener(inboxContextFactory(recipient, json, activity?.id?.href, activityType), activity);
+				await listener(inboxContextFactory(recipient, json, activity.id?.href, activityType), activity);
 			} finally {
 				getFederationMetrics(meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
 			}
@@ -914,9 +918,11 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.ERROR,
 				message: String(error)
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			span.end();
 			return "error";
 		}
+		recordInboxActivity(meterProvider, "processed", getTypeId(activity).href);
 		if (cacheKey != null) await kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
 		logger.info("Activity {activityId} has been processed.", {
 			activityId: activity.id?.href,
@@ -2907,23 +2913,50 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 		const { allowPrivateAddress, userAgent } = options;
 		this.allowPrivateAddress = allowPrivateAddress ?? false;
-		this.documentLoaderFactory = options.documentLoaderFactory ?? ((opts) => {
-			return kvCache({
-				loader: getDocumentLoader({
-					allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
-					userAgent: opts?.userAgent ?? userAgent
-				}),
-				kv: options.kv,
-				prefix: this.kvPrefixes.remoteDocument
-			});
+		const userDocumentLoaderFactory = options.documentLoaderFactory;
+		const userContextLoaderFactory = options.contextLoaderFactory;
+		const userAuthFactory = options.authenticatedDocumentLoaderFactory;
+		const builtinDocumentLoaderFactory = (opts) => kvCache({
+			loader: getDocumentLoader({
+				allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
+				userAgent: opts?.userAgent ?? userAgent
+			}),
+			kv: options.kv,
+			prefix: this.kvPrefixes.remoteDocument,
+			meterProvider: this._meterProvider,
+			kind: "object"
+		});
+		const builtinContextLoaderFactory = (opts) => kvCache({
+			loader: getDocumentLoader({
+				allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
+				userAgent: opts?.userAgent ?? userAgent
+			}),
+			kv: options.kv,
+			prefix: this.kvPrefixes.remoteDocument,
+			meterProvider: this._meterProvider,
+			kind: "context"
+		});
+		this.documentLoaderFactory = (opts) => instrumentDocumentLoader((userDocumentLoaderFactory ?? builtinDocumentLoaderFactory)(opts), {
+			meterProvider: this._meterProvider,
+			kind: "object",
+			cacheEnabled: userDocumentLoaderFactory == null ? true : void 0
+		});
+		const resolvedContextLoaderFactory = userContextLoaderFactory ?? userDocumentLoaderFactory ?? builtinContextLoaderFactory;
+		this.contextLoaderFactory = (opts) => instrumentDocumentLoader(resolvedContextLoaderFactory(opts), {
+			meterProvider: this._meterProvider,
+			kind: "context",
+			cacheEnabled: userContextLoaderFactory == null && userDocumentLoaderFactory == null ? true : void 0
 		});
-		this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
-		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => getAuthenticatedDocumentLoader(identity, {
-			allowPrivateAddress,
-			userAgent,
+		this.authenticatedDocumentLoaderFactory = (identity, factoryOpts) => instrumentDocumentLoader(userAuthFactory != null ? userAuthFactory(identity, factoryOpts) : getAuthenticatedDocumentLoader(identity, {
+			allowPrivateAddress: factoryOpts?.allowPrivateAddress ?? allowPrivateAddress,
+			userAgent: factoryOpts?.userAgent ?? userAgent,
 			specDeterminer: new KvSpecDeterminer(this.kv, this.kvPrefixes.httpMessageSignaturesSpec, options.firstKnock),
 			tracerProvider: this.tracerProvider
-		}));
+		}), {
+			meterProvider: this._meterProvider,
+			kind: "object",
+			cacheEnabled: userAuthFactory == null ? false : void 0
+		});
 		this.userAgent = userAgent;
 		this.onOutboxError = options.onOutboxError;
 		this.permanentFailureStatusCodes = options.permanentFailureStatusCodes ?? [404, 410];
@@ -3233,6 +3266,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						});
 					}
 				}
+				recordOutboxActivity(this.meterProvider, "abandoned", message.activityType);
 				return;
 			}
 			if (this.outboxQueue?.nativeRetrial) {
@@ -3263,11 +3297,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 						queue: outboxQueue,
 						activityType: retryMessage.activityType
 					}, retryMessage.attempt);
+					recordOutboxActivity(this.meterProvider, "retried", retryMessage.activityType);
 				}
-			} else logger.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
-				...logData,
-				error
-			});
+			} else {
+				logger.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
+					...logData,
+					error
+				});
+				recordOutboxActivity(this.meterProvider, "abandoned", message.activityType);
+			}
 			return;
 		}
 		logger.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
@@ -3302,6 +3340,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					activity: message.activity,
 					recipient: message.identifier
 				});
+				recordInboxActivity(this.meterProvider, "rejected", activityType);
 				return;
 			}
 		}
@@ -3318,6 +3357,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					code: SpanStatusCode.ERROR,
 					message: `Unsupported activity type: ${activityType}`
 				});
+				recordInboxActivity(this.meterProvider, "rejected", activityType);
 				span.end();
 				return;
 			}
@@ -3330,6 +3370,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				} finally {
 					getFederationMetrics(this.meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
 				}
+				recordInboxActivity(this.meterProvider, "processed", activityType);
 			} catch (error) {
 				try {
 					await this.inboxErrorHandler?.(context, error);
@@ -3380,13 +3421,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 							queue: inboxQueue,
 							activityType
 						}, retryMessage.attempt);
+						recordInboxActivity(this.meterProvider, "retried", activityType);
 					}
-				} else logger.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
-					error,
-					activityId: activity.id?.href,
-					activity: message.activity,
-					recipient: message.identifier
-				});
+				} else {
+					logger.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
+						error,
+						activityId: activity.id?.href,
+						activity: message.activity,
+						recipient: message.identifier
+					});
+					recordInboxActivity(this.meterProvider, "abandoned", activityType);
+				}
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: String(error)
@@ -4226,6 +4271,7 @@ var ContextImpl = class ContextImpl {
 			contextLoader: options.contextLoader ?? this.contextLoader,
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
+			meterProvider: options.meterProvider ?? this.meterProvider,
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}
@@ -4413,6 +4459,7 @@ var ContextImpl = class ContextImpl {
 			queue: this.federation.fanoutQueue,
 			activityType: message.activityType
 		}, 0);
+		recordFanoutRecipients(this.federation.meterProvider, globalThis.Object.keys(message.inboxes).length, message.activityType);
 		return true;
 	}
 	async *getFollowers(identifier) {

package/dist/{mod-BDhgfjP7.d.cts → mod-B0hW12_O.d.cts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { S as KeyCache } from "./http-D6aw3j2U.cjs";
+import { S as KeyCache } from "./http-VyDTd4G3.cjs";
 import { CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1 } from "@fedify/vocab";
 import { DocumentLoader } from "@fedify/vocab-runtime";
 import { MeterProvider, TracerProvider } from "@opentelemetry/api";

package/dist/{mod-B-Lin9Sy.d.ts → mod-COIAjwRS.d.ts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { S as KeyCache } from "./http-D6LP89UO.js";
+import { S as KeyCache } from "./http-lf8Hsd91.js";
 import { CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1 } from "@fedify/vocab";
 import { MeterProvider, TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader } from "@fedify/vocab-runtime";

package/dist/{mod-C6E8rkcz.d.ts → mod-CajNYYkt.d.ts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { Ct as WebFingerLinksDispatcher, et as ActorAliasMapper, l as RequestContext, nt as ActorHandleMapper, tt as ActorDispatcher } from "./context-cSUMk2da.js";
+import { J as ActorDispatcher, Y as ActorHandleMapper, gt as WebFingerLinksDispatcher, l as RequestContext, q as ActorAliasMapper } from "./context-Cq18Gplu.js";
 import { Span, Tracer } from "@opentelemetry/api";
 
 //#region src/federation/webfinger.d.ts

package/dist/{mod-DLrRb0dx.d.ts → mod-DFvNJcNb.d.ts}

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
-import { n as HttpMessageSignaturesSpecDeterminer } from "./http-D6LP89UO.js";
+import { n as HttpMessageSignaturesSpecDeterminer } from "./http-lf8Hsd91.js";
 import { n as KvStore, t as KvKey } from "./kv-D6hNiMTK.js";
-import { TracerProvider } from "@opentelemetry/api";
+import { MeterProvider, TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader, DocumentLoaderFactoryOptions } from "@fedify/vocab-runtime";
 
 //#region src/utils/docloader.d.ts
@@ -48,6 +48,37 @@ declare function getAuthenticatedDocumentLoader(identity: {
   tracerProvider
 }?: GetAuthenticatedDocumentLoaderOptions): DocumentLoader;
 //#endregion
+//#region src/federation/metrics.d.ts
+/**
+* The kind of remote ActivityPub lookup, recorded as
+* `activitypub.lookup.kind` on the public-key lookup and remote document
+* fetch metric families.
+*
+*  -  `public_key`: a public key lookup performed by `fetchKey` /
+*     `fetchKeyDetailed` (always recorded on `activitypub.key.lookup*`).
+*  -  `actor`: a document fetch whose resolved value is an Actor.  The
+*     bucket exists in the taxonomy for future actor-aware call sites;
+*     today, actor documents fetched through Fedify's generic document
+*     loader are still classified as `object` because the kind is decided
+*     at the loader boundary, before the response is parsed.
+*  -  `object`: a generic ActivityPub object fetch through Fedify's
+*     document loader.  This is the default classification for
+*     `documentLoader` invocations that do not match a more specific
+*     bucket.
+*  -  `context`: a JSON-LD `@context` document fetch through Fedify's
+*     context loader.
+*  -  `other`: a fetch that does not fit any of the above classifications.
+* @since 2.3.0
+*/
+type LookupKind = "public_key" | "actor" | "object" | "context" | "other";
+/**
+* The {@link LookupKind} values that can appear on remote document fetch
+* metrics.  `public_key` lookups are reported on the
+* `activitypub.key.lookup` metric family instead, so it is excluded here.
+* @since 2.3.0
+*/
+type DocumentFetchKind = Exclude<LookupKind, "public_key">;
+//#endregion
 //#region src/utils/kv-cache.d.ts
 /**
 * The parameters for {@link kvCache} function.
@@ -75,6 +106,24 @@ interface KvCacheParameters {
   * By default, 5 minutes for all URLs.
   */
   readonly rules?: readonly [string | URL | URLPattern, Temporal.Duration | Temporal.DurationLike][];
+  /**
+  * The OpenTelemetry meter provider used to record
+  * `activitypub.document.cache` measurements.  When omitted, the wrapper
+  * does not emit any metric measurements, preserving the previous
+  * unobserved-cache behavior.
+  * @since 2.3.0
+  */
+  readonly meterProvider?: MeterProvider;
+  /**
+  * The lookup kind to record on the `activitypub.lookup.kind` attribute of
+  * `activitypub.document.cache` measurements.  Defaults to `"object"` so
+  * the generic document loader case does not require an explicit option.
+  * Set to `"context"` for context-loader wrappers; the
+  * authenticated-loader path does not use `kvCache()` and is therefore
+  * out of scope.
+  * @since 2.3.0
+  */
+  readonly kind?: DocumentFetchKind;
 }
 /**
 * Decorates a {@link DocumentLoader} with a cache backed by a {@link KvStore}.
@@ -85,7 +134,9 @@ declare function kvCache({
   loader,
   kv,
   prefix,
-  rules
+  rules,
+  meterProvider,
+  kind
 }: KvCacheParameters): DocumentLoader;
 //#endregion
 export { getAuthenticatedDocumentLoader as n, kvCache as t };

package/dist/{mod-P9tE2WmM.d.cts → mod-DnzgcPcy.d.cts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { Ct as WebFingerLinksDispatcher, et as ActorAliasMapper, l as RequestContext, nt as ActorHandleMapper, tt as ActorDispatcher } from "./context-Ch-ZLyTQ.cjs";
+import { J as ActorDispatcher, Y as ActorHandleMapper, gt as WebFingerLinksDispatcher, l as RequestContext, q as ActorAliasMapper } from "./context-tc6VOOOL.cjs";
 import { Span, Tracer } from "@opentelemetry/api";
 
 //#region src/federation/webfinger.d.ts