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

package/esm/deno.js

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

package/esm/federation/handler.js

@@ -1,10 +1,13 @@
 import * as dntShim from "../_dnt.shims.js";
 import { getLogger } from "@logtape/logtape";
+import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { accepts } from "../deps/jsr.io/@std/http/1.0.11/negotiation.js";
+import metadata from "../deno.js";
 import { verifyRequest } from "../sig/http.js";
 import { detachSignature, verifyJsonLd } from "../sig/ld.js";
 import { doesActorOwnKey } from "../sig/owner.js";
 import { verifyObject } from "../sig/proof.js";
+import { getTypeId } from "../vocab/type.js";
 import { Activity, CryptographicKey, Link, Multikey, Object, OrderedCollection, OrderedCollectionPage, } from "../vocab/vocab.js";
 export function acceptsJsonLd(request) {
     const types = accepts(request);
@@ -68,21 +71,46 @@ export async function handleObject(request, { values, context, objectDispatcher,
         },
     });
 }
-export async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, onUnauthorized, onNotFound, onNotAcceptable, }) {
-    if (collectionCallbacks == null)
-        return await onNotFound(request);
+export function handleCollection(request, params) {
+    const name = params.name.trim().replace(/\s+/g, "_");
+    const tracerProvider = params.tracerProvider ?? trace.getTracerProvider();
+    const tracer = tracerProvider.getTracer(metadata.name, metadata.version);
     const url = new URL(request.url);
     const cursor = url.searchParams.get("cursor");
+    return tracer.startActiveSpan(cursor == null
+        ? `activitypub.dispatch_collection ${name}`
+        : `activitypub.dispatch_collection_page ${name}`, { kind: SpanKind.SERVER }, async (span) => {
+        try {
+            return await handleCollectionInternal(request, cursor, params, span);
+        }
+        catch (e) {
+            span.setStatus({ code: SpanStatusCode.ERROR, message: String(e) });
+            throw e;
+        }
+        finally {
+            span.end();
+        }
+    });
+}
+async function handleCollectionInternal(request, cursor, { name, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, onUnauthorized, onNotFound, onNotAcceptable, }, span) {
+    if (collectionCallbacks == null)
+        return await onNotFound(request);
     let collection;
     const baseUri = uriGetter(identifier);
     if (cursor == null) {
         const firstCursor = await collectionCallbacks.firstCursor?.(context, identifier);
         const totalItems = await collectionCallbacks.counter?.(context, identifier);
+        if (totalItems != null) {
+            span.setAttribute("activitypub.collection.total_items", Number(totalItems));
+        }
         if (firstCursor == null) {
             const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
-            if (page == null)
+            if (page == null) {
+                span.setStatus({ code: SpanStatusCode.ERROR });
                 return await onNotFound(request);
+            }
             const { items } = page;
+            span.setAttribute("fedify.collection.items", items.length);
             collection = new OrderedCollection({
                 id: baseUri,
                 totalItems: totalItems == null ? null : Number(totalItems),
@@ -107,12 +135,16 @@ export async function handleCollection(request, { name, identifier, uriGetter, f
         }
     }
     else {
+        span.setAttribute("fedify.collection.cursor", cursor);
         const uri = new URL(baseUri);
         uri.searchParams.set("cursor", cursor);
         const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
-        if (page == null)
+        if (page == null) {
+            span.setStatus({ code: SpanStatusCode.ERROR });
             return await onNotFound(request);
+        }
         const { items, prevCursor, nextCursor } = page;
+        span.setAttribute("fedify.collection.items", items.length);
         let prev = null;
         if (prevCursor != null) {
             prev = new URL(context.url);
@@ -142,6 +174,10 @@ export async function handleCollection(request, { name, identifier, uriGetter, f
             return await onUnauthorized(request);
         }
     }
+    if (collection.id != null) {
+        span.setAttribute("activitypub.collection.id", collection.id.href);
+    }
+    span.setAttribute("activitypub.collection.type", getTypeId(collection).href);
     const jsonLd = await collection.toJsonLd(context);
     return new Response(JSON.stringify(jsonLd), {
         headers: {

package/esm/federation/middleware.js

@@ -403,7 +403,10 @@ export class FederationImpl {
         }
         const callbacks = {
             dispatcher: async (context, identifier) => {
-                const actor = await this.#getTracer().startActiveSpan("activitypub.dispatch_actor", { kind: SpanKind.SERVER }, async (span) => {
+                const actor = await this.#getTracer().startActiveSpan("activitypub.dispatch_actor", {
+                    kind: SpanKind.SERVER,
+                    attributes: { "fedify.actor.identifier": identifier },
+                }, async (span) => {
                     try {
                         const actor = await dispatcher(context, identifier);
                         span.setAttribute("activitypub.actor.id", (actor?.id ?? context.getActorUri(identifier)).href);
@@ -560,7 +563,13 @@ export class FederationImpl {
         this.actorCallbacks = callbacks;
         const setters = {
             setKeyPairsDispatcher: (dispatcher) => {
-                callbacks.keyPairsDispatcher = (ctx, identifier) => this.#getTracer().startActiveSpan("activitypub.dispatch_actor_key_pairs", { kind: SpanKind.SERVER }, async (span) => {
+                callbacks.keyPairsDispatcher = (ctx, identifier) => this.#getTracer().startActiveSpan("activitypub.dispatch_actor_key_pairs", {
+                    kind: SpanKind.SERVER,
+                    attributes: {
+                        "activitypub.actor.id": ctx.getActorUri(identifier).href,
+                        "fedify.actor.identifier": identifier,
+                    },
+                }, async (span) => {
                     try {
                         return await dispatcher(ctx, identifier);
                     }
@@ -600,7 +609,41 @@ export class FederationImpl {
             throw new RouterError("Path for object dispatcher must have at least one variable.");
         }
         const callbacks = {
-            dispatcher,
+            dispatcher: (ctx, values) => {
+                const tracer = this.#getTracer();
+                return tracer.startActiveSpan("activitypub.dispatch_object", {
+                    kind: SpanKind.SERVER,
+                    attributes: {
+                        "fedify.object.type": cls.typeId.href,
+                        ...globalThis.Object.fromEntries(globalThis.Object.entries(values).map(([k, v]) => [
+                            `fedify.object.values.${k}`,
+                            v,
+                        ])),
+                    },
+                }, async (span) => {
+                    try {
+                        const object = await dispatcher(ctx, values);
+                        span.setAttribute("activitypub.object.id", (object?.id ?? ctx.getObjectUri(cls, values)).href);
+                        if (object == null) {
+                            span.setStatus({ code: SpanStatusCode.ERROR });
+                        }
+                        else {
+                            span.setAttribute("activitypub.object.type", getTypeId(object).href);
+                        }
+                        return object;
+                    }
+                    catch (e) {
+                        span.setStatus({
+                            code: SpanStatusCode.ERROR,
+                            message: String(e),
+                        });
+                        throw e;
+                    }
+                    finally {
+                        span.end();
+                    }
+                });
+            },
             parameters: variables,
         };
         this.objectCallbacks[cls.typeId.href] = callbacks;
@@ -1180,6 +1223,7 @@ export class FederationImpl {
                     uriGetter: context.getOutboxUri.bind(context),
                     context,
                     collectionCallbacks: this.outboxCallbacks,
+                    tracerProvider: this.tracerProvider,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1192,6 +1236,7 @@ export class FederationImpl {
                         uriGetter: context.getInboxUri.bind(context),
                         context,
                         collectionCallbacks: this.inboxCallbacks,
+                        tracerProvider: this.tracerProvider,
                         onUnauthorized,
                         onNotFound,
                         onNotAcceptable,
@@ -1239,6 +1284,7 @@ export class FederationImpl {
                     uriGetter: context.getFollowingUri.bind(context),
                     context,
                     collectionCallbacks: this.followingCallbacks,
+                    tracerProvider: this.tracerProvider,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1259,6 +1305,7 @@ export class FederationImpl {
                         ? ((i) => (i instanceof URL ? i.href : i.id?.href ?? "").startsWith(baseUrl))
                         : undefined,
                     collectionCallbacks: this.followersCallbacks,
+                    tracerProvider: this.tracerProvider,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1271,6 +1318,7 @@ export class FederationImpl {
                     uriGetter: context.getLikedUri.bind(context),
                     context,
                     collectionCallbacks: this.likedCallbacks,
+                    tracerProvider: this.tracerProvider,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1282,6 +1330,7 @@ export class FederationImpl {
                     uriGetter: context.getFeaturedUri.bind(context),
                     context,
                     collectionCallbacks: this.featuredCallbacks,
+                    tracerProvider: this.tracerProvider,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1293,6 +1342,7 @@ export class FederationImpl {
                     uriGetter: context.getFeaturedTagsUri.bind(context),
                     context,
                     collectionCallbacks: this.featuredTagsCallbacks,
+                    tracerProvider: this.tracerProvider,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,