@fedify/fedify 1.3.0-dev.568 → 1.3.0-dev.569

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@fedify/fedify",
-    "version": "1.3.0-dev.568+35cde4e3",
+    "version": "1.3.0-dev.569+d97ee744",
     "license": "MIT",
     "exports": {
         ".": "./mod.ts",

package/esm/federation/middleware.js

@@ -11,6 +11,7 @@ import { hasSignature, signJsonLd } from "../sig/ld.js";
 import { getKeyOwner } from "../sig/owner.js";
 import { signObject } from "../sig/proof.js";
 import { lookupObject, traverseCollection, } from "../vocab/lookup.js";
+import { getTypeId } from "../vocab/type.js";
 import { Activity, CryptographicKey, Multikey, } from "../vocab/vocab.js";
 import { handleWebFinger } from "../webfinger/handler.js";
 import { buildCollectionSynchronizationHeader } from "./collection.js";
@@ -402,7 +403,29 @@ export class FederationImpl {
         }
         const callbacks = {
             dispatcher: async (context, identifier) => {
-                const actor = await dispatcher(context, identifier);
+                const actor = await this.#getTracer().startActiveSpan("activitypub.dispatch_actor", { kind: SpanKind.SERVER }, async (span) => {
+                    try {
+                        const actor = await dispatcher(context, identifier);
+                        span.setAttribute("activitypub.actor.id", (actor?.id ?? context.getActorUri(identifier)).href);
+                        if (actor == null) {
+                            span.setStatus({ code: SpanStatusCode.ERROR });
+                        }
+                        else {
+                            span.setAttribute("activitypub.actor.type", getTypeId(actor).href);
+                        }
+                        return actor;
+                    }
+                    catch (error) {
+                        span.setStatus({
+                            code: SpanStatusCode.ERROR,
+                            message: String(error),
+                        });
+                        throw error;
+                    }
+                    finally {
+                        span.end();
+                    }
+                });
                 if (actor == null)
                     return null;
                 const logger = getLogger(["fedify", "federation", "actor"]);
@@ -536,8 +559,22 @@ export class FederationImpl {
         };
         this.actorCallbacks = callbacks;
         const setters = {
-            setKeyPairsDispatcher(dispatcher) {
-                callbacks.keyPairsDispatcher = dispatcher;
+            setKeyPairsDispatcher: (dispatcher) => {
+                callbacks.keyPairsDispatcher = (ctx, identifier) => this.#getTracer().startActiveSpan("activitypub.dispatch_actor_key_pairs", { kind: SpanKind.SERVER }, async (span) => {
+                    try {
+                        return await dispatcher(ctx, identifier);
+                    }
+                    catch (e) {
+                        span.setStatus({
+                            code: SpanStatusCode.ERROR,
+                            message: String(e),
+                        });
+                        throw e;
+                    }
+                    finally {
+                        span.end();
+                    }
+                });
                 return setters;
             },
             mapHandle(mapper) {