@fedify/fedify 2.5.0-dev.2327 → 2.5.0-dev.2339

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-Dwkct8jJ.mjs";
+import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-BuC9-u1Z.mjs";
 import { FetchError } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";

package/dist/federation/middleware.test.mjs

@@ -16,18 +16,18 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { g as recordInboxActivity } from "../metrics-Dwkct8jJ.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-BzvgaYZi.mjs";
-import { a as signObject, s as verifyObject } from "../proof-CImybMS5.mjs";
-import { f as verifyRequest, l as signRequest } from "../http-DzBwbsDL.mjs";
+import { g as recordInboxActivity } from "../metrics-BuC9-u1Z.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-BiFf-T9F.mjs";
+import { a as signObject, s as verifyObject } from "../proof-vlRUtAdS.mjs";
+import { f as verifyRequest, l as signRequest } from "../http-BSmcgoaq.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-tMR7o09T.mjs";
-import { T as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BFr_zLaE.mjs";
-import { t as doesActorOwnKey } from "../owner-CGXm_YAa.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-_tslGlJv.mjs";
+import { T as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BBSxgV0Y.mjs";
+import { t as doesActorOwnKey } from "../owner-BsgoTcNb.mjs";
 import { t as CircuitBreaker } from "../circuit-breaker-XJ53md4S.mjs";
 import { t as TaskCodec } from "../codec-C6rTrpIp.mjs";
 import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-DW6YC_Pe.mjs";
-import { configure, reset } from "@logtape/logtape";
+import { configure, reset, withContext } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import * as vocab from "@fedify/vocab";
 import { Create, Note, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
@@ -38,6 +38,7 @@ import dns from "node:dns/promises";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
 import serialize from "json-canon";
 import { DataPointType, MeterProvider as MeterProvider$1, MetricReader } from "@opentelemetry/sdk-metrics";
+import { AsyncLocalStorage } from "node:async_hooks";
 //#region ../fixture/src/fixtures/example.com/create.json
 var create_default = {
 	"@context": "https://www.w3.org/ns/activitystreams",
@@ -5436,6 +5437,98 @@ test("FederationImpl.processQueuedTask() permanent failure", async (t) => {
 	});
 	esm_default.hardReset();
 });
+test("FederationImpl.processQueuedTask() aligns the LogTape context with the delivery span inside the outbox worker", async () => {
+	await withLogtapeLock(async () => {
+		esm_default.spyGlobal();
+		esm_default.post("https://example.com/inbox-queue-failing", {
+			status: 500,
+			body: "Internal Server Error"
+		});
+		const records = [];
+		await reset();
+		try {
+			await configure({
+				sinks: { buffer: (record) => records.push(record) },
+				filters: {},
+				loggers: [{
+					category: [],
+					sinks: ["buffer"],
+					lowestLevel: "debug"
+				}, {
+					category: ["logtape", "meta"],
+					sinks: []
+				}],
+				contextLocalStorage: new AsyncLocalStorage()
+			});
+			const [tracerProvider, exporter] = createTestTracerProvider();
+			const queuedMessages = [];
+			const federation = new FederationImpl({
+				kv: new MemoryKvStore(),
+				queue: {
+					enqueue(message, _options) {
+						queuedMessages.push(message);
+						return Promise.resolve();
+					},
+					listen(_handler, _options) {
+						return Promise.resolve();
+					}
+				},
+				allowPrivateAddress: true,
+				tracerProvider
+			});
+			const message = {
+				type: "outbox",
+				id: crypto.randomUUID(),
+				baseUrl: "https://example.com",
+				keys: [],
+				activity: {
+					"@context": "https://www.w3.org/ns/activitystreams",
+					type: "Create",
+					id: "https://example.com/activity/queue-failing",
+					actor: "https://example.com/users/alice",
+					object: {
+						type: "Note",
+						content: "test"
+					}
+				},
+				activityType: "https://www.w3.org/ns/activitystreams#Create",
+				inbox: "https://example.com/inbox-queue-failing",
+				sharedInbox: false,
+				started: (/* @__PURE__ */ new Date()).toISOString(),
+				attempt: 0,
+				headers: {},
+				traceContext: {}
+			};
+			await withContext({ batchId: "outer-batch" }, async () => {
+				await federation.processQueuedTask(void 0, message);
+			});
+			assertEquals(queuedMessages.length, 1);
+			const deliverySpan = exporter.getSpan("activitypub.send_activity");
+			assert(deliverySpan != null);
+			const deliveryCtx = deliverySpan.spanContext();
+			const workerSpan = exporter.getSpan("activitypub.outbox");
+			assert(workerSpan != null);
+			const workerCtx = workerSpan.spanContext();
+			assertNotEquals(deliveryCtx.spanId, workerCtx.spanId);
+			const deliveryLog = records.find((r) => String(r.rawMessage).startsWith("Failed to send activity {activityId} to {inbox} ({status}"));
+			assert(deliveryLog != null);
+			assertEquals(deliveryLog.properties.spanId, deliveryCtx.spanId);
+			assertEquals(deliveryLog.properties.traceId, deliveryCtx.traceId);
+			assertEquals(deliveryLog.properties.messageId, message.id);
+			assertEquals(deliveryLog.properties.batchId, "outer-batch");
+			const retryLog = records.find((r) => String(r.rawMessage).startsWith("Failed to send activity {activityId} to {inbox} (attempt"));
+			assert(retryLog != null);
+			assertEquals(retryLog.properties.spanId, workerCtx.spanId);
+			assertEquals(retryLog.properties.traceId, workerCtx.traceId);
+			assertNotEquals(retryLog.properties.spanId, deliveryCtx.spanId);
+			assertEquals(retryLog.properties.messageId, message.id);
+			assertEquals(retryLog.properties.batchId, "outer-batch");
+		} finally {
+			await reset();
+			esm_default.hardReset();
+		}
+	});
+});
 test("FederationImpl.processQueuedTask() circuit breaker", async (t) => {
 	esm_default.spyGlobal();
 	function setup(options, federationOptions = {}, queueOptions = {}) {

package/dist/federation/mod.cjs

@@ -1,6 +1,6 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_federation = require("../federation-BHOSHFCr.cjs");
+const require_federation = require("../federation-CV-CkIIZ.cjs");
 exports.CircuitBreaker = require_federation.CircuitBreaker;
 exports.InProcessMessageQueue = require_federation.InProcessMessageQueue;
 exports.MemoryKvStore = require_federation.MemoryKvStore;

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-vJzuhHEr.js";
+import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-CKEoEiBw.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";

package/dist/federation/outgoing-proof.test.mjs

@@ -7,12 +7,12 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-CfJ7MJmp.mjs";
-import { s as detachSignature } from "../ld-BzvgaYZi.mjs";
-import { a as signObject } from "../proof-CImybMS5.mjs";
+import { n as exportJwk } from "../key-DRLFC1um.mjs";
+import { s as detachSignature } from "../ld-BiFf-T9F.mjs";
+import { a as signObject } from "../proof-vlRUtAdS.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { C as getEmbeddedFirstGateway, S as getCompactRootId, c as assertPortableActorActivity, n as FederationImpl, o as createFederation, w as warnCompatibleIdsInJson } from "../middleware-BFr_zLaE.mjs";
-import { o as verifyCompoundPortableObjectProofs } from "../compound-proof-DML23ZA8.mjs";
+import { C as getEmbeddedFirstGateway, S as getCompactRootId, c as assertPortableActorActivity, n as FederationImpl, o as createFederation, w as warnCompatibleIdsInJson } from "../middleware-BBSxgV0Y.mjs";
+import { o as verifyCompoundPortableObjectProofs } from "../compound-proof-B6xZTnTr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Accept, Announce, Create, Follow, Note, Person } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/portable-actor.test.mjs

@@ -8,10 +8,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject, c as verifyPortableObjectProof } from "../proof-CImybMS5.mjs";
-import { f as verifyRequest, l as signRequest } from "../http-DzBwbsDL.mjs";
+import { a as signObject, c as verifyPortableObjectProof } from "../proof-vlRUtAdS.mjs";
+import { f as verifyRequest, l as signRequest } from "../http-BSmcgoaq.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BFr_zLaE.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BBSxgV0Y.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Note, Person, Tombstone, lookupObject } from "@fedify/vocab";

package/dist/federation/portable-chain.test.mjs

@@ -7,10 +7,10 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-CfJ7MJmp.mjs";
-import { c as verifyPortableObjectProof, s as verifyObject } from "../proof-CImybMS5.mjs";
+import { n as exportJwk } from "../key-DRLFC1um.mjs";
+import { c as verifyPortableObjectProof, s as verifyObject } from "../proof-vlRUtAdS.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-BFr_zLaE.mjs";
+import { n as FederationImpl } from "../middleware-BBSxgV0Y.mjs";
 import { Create, DataIntegrityProof, Note, OrderedCollection, Person, traverseCollection } from "@fedify/vocab";
 import { FetchError, encodeMultibase, exportDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-collection.test.mjs

@@ -7,11 +7,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject, c as verifyPortableObjectProof } from "../proof-CImybMS5.mjs";
+import { a as signObject, c as verifyPortableObjectProof } from "../proof-vlRUtAdS.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BFr_zLaE.mjs";
-import { t as verifyPortableObject } from "../portable-collection-DBAMRYNa.mjs";
-import { c as verifyServedPortableObjects } from "../compound-proof-DML23ZA8.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BBSxgV0Y.mjs";
+import { t as verifyPortableObject } from "../portable-collection-BiBpObws.mjs";
+import { c as verifyServedPortableObjects } from "../compound-proof-B6xZTnTr.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Create, Note, Object as Object$1, OrderedCollection, PUBLIC_COLLECTION, Person, Tombstone, lookupObject, traverseCollection } from "@fedify/vocab";

package/dist/federation/portable-delivery.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { i as rsaPrivateKey2, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl, r as InboxContextImpl } from "../middleware-BFr_zLaE.mjs";
-import { n as extractInboxes, t as SendActivityError } from "../send-oReIfAwd.mjs";
+import { n as FederationImpl, r as InboxContextImpl } from "../middleware-BBSxgV0Y.mjs";
+import { n as extractInboxes, t as SendActivityError } from "../send-D5aMlvJH.mjs";
 import { Create, Endpoints, Note, Person } from "@fedify/vocab";
 import { parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-gateway-keys.test.mjs

@@ -8,11 +8,11 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { r as getVerifiedKeyOwnerEvidence } from "../key-owner-evidence-APB6NpSk.mjs";
-import { p as signJsonLd } from "../ld-BzvgaYZi.mjs";
-import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-DzBwbsDL.mjs";
+import { p as signJsonLd } from "../ld-BiFf-T9F.mjs";
+import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-BSmcgoaq.mjs";
 import { a as rsaPrivateKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-BFr_zLaE.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CGXm_YAa.mjs";
+import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-BBSxgV0Y.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BsgoTcNb.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as KvKeyCache } from "../keycache-D-MNltOk.mjs";
 import { Create, CryptographicKey, Person } from "@fedify/vocab";

package/dist/federation/portable-inbox.test.mjs

@@ -8,11 +8,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { p as signJsonLd } from "../ld-BzvgaYZi.mjs";
-import { a as signObject } from "../proof-CImybMS5.mjs";
-import { l as signRequest, p as verifyRequestDetailed } from "../http-DzBwbsDL.mjs";
+import { p as signJsonLd } from "../ld-BiFf-T9F.mjs";
+import { a as signObject } from "../proof-vlRUtAdS.mjs";
+import { l as signRequest, p as verifyRequestDetailed } from "../http-BSmcgoaq.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-BFr_zLaE.mjs";
+import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-BBSxgV0Y.mjs";
 import { Create, CryptographicKey, Follow, Note, Person, Tombstone } from "@fedify/vocab";
 import { exportDidKey, formatIri, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-parse-uri.test.mjs

@@ -7,7 +7,7 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-BFr_zLaE.mjs";
+import { o as createFederation } from "../middleware-BBSxgV0Y.mjs";
 import { Note, Object as Object$1, Person } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";

package/dist/federation/portable-route-activity.test.mjs

@@ -6,9 +6,9 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject } from "../proof-CImybMS5.mjs";
+import { a as signObject } from "../proof-vlRUtAdS.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-BFr_zLaE.mjs";
+import { o as createFederation } from "../middleware-BBSxgV0Y.mjs";
 import { Create, Note } from "@fedify/vocab";
 import { exportDidKey, formatIri, parseIri, toCompatibleEf61Id } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable.test.mjs

@@ -8,10 +8,10 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject, c as verifyPortableObjectProof } from "../proof-CImybMS5.mjs";
-import { l as signRequest } from "../http-DzBwbsDL.mjs";
+import { a as signObject, c as verifyPortableObjectProof } from "../proof-vlRUtAdS.mjs";
+import { l as signRequest } from "../http-BSmcgoaq.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BFr_zLaE.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BBSxgV0Y.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Collection, Create, Note, Object as Object$1, PUBLIC_COLLECTION, Person, Tombstone, lookupObject } from "@fedify/vocab";
 import { exportDidKey, formatIri, parseIri, toCompatibleEf61Id } from "@fedify/vocab-runtime";

package/dist/federation/send.test.mjs

@@ -2,6 +2,7 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
+import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertGreaterOrEqual } from "../assert_greater_or_equal-BlafOF4-.mjs";
@@ -10,15 +11,18 @@ import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { f as verifyRequest } from "../http-DzBwbsDL.mjs";
+import { f as verifyRequest } from "../http-BSmcgoaq.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as doesActorOwnKey } from "../owner-CGXm_YAa.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-oReIfAwd.mjs";
+import { t as doesActorOwnKey } from "../owner-BsgoTcNb.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-D5aMlvJH.mjs";
+import { t as FedifySpanExporter } from "../exporter-DThFfe7P.mjs";
+import { configure, getLogger, reset, withContext } from "@logtape/logtape";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import dns from "node:dns/promises";
 import { AggregationTemporality, InMemoryMetricExporter, MeterProvider, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/federation/send.test.ts
 test("extractInboxes()", () => {
 	const recipients = [
@@ -451,6 +455,198 @@ test("sendActivity() records OpenTelemetry span events", async (t) => {
 		esm_default.hardReset();
 	});
 });
+function createActivity(id) {
+	return {
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Create",
+		id,
+		actor: "https://example.com/person"
+	};
+}
+function deliveryParams(activityId, inbox, tracerProvider) {
+	return {
+		activity: createActivity(activityId),
+		activityId,
+		activityType: "https://www.w3.org/ns/activitystreams#Create",
+		keys: [{
+			keyId: new URL("https://example.com/person#key"),
+			privateKey: rsaPrivateKey2
+		}],
+		inbox: new URL(inbox),
+		tracerProvider
+	};
+}
+test("sendActivity() aligns the LogTape context with its own span", async (t) => {
+	const [tracerProvider, exporter] = createTestTracerProvider();
+	esm_default.spyGlobal();
+	const records = [];
+	await reset();
+	try {
+		await configure({
+			sinks: { buffer: (record) => records.push(record) },
+			filters: {},
+			loggers: [{
+				category: [],
+				sinks: ["buffer"],
+				lowestLevel: "debug"
+			}, {
+				category: ["logtape", "meta"],
+				sinks: []
+			}],
+			contextLocalStorage: new AsyncLocalStorage()
+		});
+		const outerContext = {
+			requestId: "outer-request",
+			traceId: "outer0000000000000000000000sentinel",
+			spanId: "outer00000sentinel"
+		};
+		await t.step("a warning logged during a successful send matches the resulting TraceActivityRecord", async () => {
+			try {
+				esm_default.post("https://example.com/inbox-warn", { status: 202 });
+				await withContext({ requestId: "outer-request-warn" }, async () => {
+					await sendActivity({
+						...deliveryParams("https://example.com/activity/warn", "https://example.com/inbox-warn", tracerProvider),
+						keys: [{
+							keyId: ed25519Multikey.id,
+							privateKey: ed25519PrivateKey
+						}]
+					});
+				});
+				const span = exporter.getSpan("activitypub.send_activity");
+				assert(span != null);
+				const { traceId, spanId } = span.spanContext();
+				const fedifyExporter = new FedifySpanExporter(new MemoryKvStore());
+				await new Promise((resolve) => {
+					fedifyExporter.export([span], () => resolve());
+				});
+				const [record] = await fedifyExporter.getActivitiesByTraceId(traceId);
+				assert(record != null);
+				assertEquals(record.direction, "outbound");
+				assertEquals(record.spanId, spanId);
+				const warnLog = records.find((r) => String(r.rawMessage).startsWith("No supported key found to sign"));
+				assert(warnLog != null);
+				assertEquals(warnLog.properties.spanId, record.spanId);
+				assertEquals(warnLog.properties.traceId, record.traceId);
+				assertEquals(warnLog.properties.requestId, "outer-request-warn");
+			} finally {
+				exporter.clear();
+				records.length = 0;
+				esm_default.hardReset();
+				esm_default.spyGlobal();
+			}
+		});
+		await t.step("a failed delivery's error log matches its own span, and the outer context is restored once the rejection propagates", async () => {
+			try {
+				esm_default.post("https://example.com/inbox-failing", {
+					status: 500,
+					body: "Internal Server Error"
+				});
+				await withContext(outerContext, async () => {
+					await assertRejects(() => sendActivity(deliveryParams("https://example.com/activity/failing", "https://example.com/inbox-failing", tracerProvider)), SendActivityError);
+					getLogger([
+						"fedify",
+						"federation",
+						"send.test"
+					]).info("after failure");
+				});
+				const span = exporter.getSpan("activitypub.send_activity");
+				assert(span != null);
+				const { traceId, spanId } = span.spanContext();
+				const fedifyExporter = new FedifySpanExporter(new MemoryKvStore());
+				await new Promise((resolve) => {
+					fedifyExporter.export([span], () => resolve());
+				});
+				assertEquals(await fedifyExporter.getActivitiesByTraceId(traceId), []);
+				const failureLog = records.find((r) => String(r.rawMessage).startsWith("Failed to send activity {activityId} to {inbox} ({status}"));
+				assert(failureLog != null);
+				assertEquals(failureLog.properties.spanId, spanId);
+				assertEquals(failureLog.properties.traceId, traceId);
+				assertEquals(failureLog.properties.requestId, outerContext.requestId);
+				const afterLog = records.find((r) => r.rawMessage === "after failure");
+				assert(afterLog != null);
+				assertEquals(afterLog.properties.requestId, outerContext.requestId);
+				assertEquals(afterLog.properties.traceId, outerContext.traceId);
+				assertEquals(afterLog.properties.spanId, outerContext.spanId);
+			} finally {
+				exporter.clear();
+				records.length = 0;
+				esm_default.hardReset();
+				esm_default.spyGlobal();
+			}
+		});
+		await t.step("outer context is restored after a successful send", async () => {
+			try {
+				esm_default.post("https://example.com/inbox-ok", { status: 202 });
+				await withContext(outerContext, async () => {
+					await sendActivity(deliveryParams("https://example.com/activity/ok", "https://example.com/inbox-ok", tracerProvider));
+					getLogger([
+						"fedify",
+						"federation",
+						"send.test"
+					]).info("after success");
+				});
+				const span = exporter.getSpan("activitypub.send_activity");
+				assert(span != null);
+				const { spanId } = span.spanContext();
+				const afterLog = records.find((r) => r.rawMessage === "after success");
+				assert(afterLog != null);
+				assertNotEquals(afterLog.properties.spanId, spanId);
+				assertEquals(afterLog.properties.requestId, outerContext.requestId);
+				assertEquals(afterLog.properties.traceId, outerContext.traceId);
+				assertEquals(afterLog.properties.spanId, outerContext.spanId);
+			} finally {
+				exporter.clear();
+				records.length = 0;
+				esm_default.hardReset();
+				esm_default.spyGlobal();
+			}
+		});
+		await t.step("concurrent deliveries do not leak context into each other", async () => {
+			try {
+				let arrived = 0;
+				let release = () => {};
+				const gate = new Promise((resolve) => {
+					release = resolve;
+				});
+				const handler = () => async () => {
+					arrived++;
+					if (arrived >= 2) release();
+					await gate;
+					return {
+						status: 500,
+						body: "Internal Server Error"
+					};
+				};
+				esm_default.post("https://example.com/inbox-concurrent-a", handler());
+				esm_default.post("https://example.com/inbox-concurrent-b", handler());
+				const [resultA, resultB] = await Promise.allSettled([sendActivity(deliveryParams("https://example.com/activity/a", "https://example.com/inbox-concurrent-a", tracerProvider)).finally(release), sendActivity(deliveryParams("https://example.com/activity/b", "https://example.com/inbox-concurrent-b", tracerProvider)).finally(release)]);
+				assertEquals(resultA.status, "rejected");
+				assertEquals(resultB.status, "rejected");
+				const spans = exporter.getSpans("activitypub.send_activity");
+				assertEquals(spans.length, 2);
+				const spanA = spans.find((s) => s.attributes["activitypub.activity.id"] === "https://example.com/activity/a");
+				const spanB = spans.find((s) => s.attributes["activitypub.activity.id"] === "https://example.com/activity/b");
+				assert(spanA != null && spanB != null);
+				assertNotEquals(spanA.spanContext().spanId, spanB.spanContext().spanId);
+				const logA = records.find((r) => r.properties.activityId === "https://example.com/activity/a" && String(r.rawMessage).startsWith("Failed to send activity"));
+				const logB = records.find((r) => r.properties.activityId === "https://example.com/activity/b" && String(r.rawMessage).startsWith("Failed to send activity"));
+				assert(logA != null && logB != null);
+				assertEquals(logA.properties.spanId, spanA.spanContext().spanId);
+				assertEquals(logB.properties.spanId, spanB.spanContext().spanId);
+				assertEquals(logA.properties.traceId, spanA.spanContext().traceId);
+				assertEquals(logB.properties.traceId, spanB.spanContext().traceId);
+				assertNotEquals(logA.properties.spanId, logB.properties.spanId);
+			} finally {
+				exporter.clear();
+				records.length = 0;
+				esm_default.hardReset();
+			}
+		});
+	} finally {
+		await reset();
+		esm_default.hardReset();
+	}
+});
 test("sendActivity() records OpenTelemetry delivery metrics", async (t) => {
 	const [meterProvider, recorder] = createTestMeterProvider();
 	esm_default.spyGlobal();

package/dist/federation/tasks/enqueue.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
 import "../../testing-t8xDeJZ5.mjs";
-import { o as createFederation } from "../../middleware-BFr_zLaE.mjs";
+import { o as createFederation } from "../../middleware-BBSxgV0Y.mjs";
 import { n as ParallelMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { delay } from "es-toolkit";

package/dist/federation/tasks/tasks.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
 import "../../testing-t8xDeJZ5.mjs";
-import { o as createFederation } from "../../middleware-BFr_zLaE.mjs";
-import { r as createFederationBuilder } from "../../builder-D1OTD3--.mjs";
+import { o as createFederation } from "../../middleware-BBSxgV0Y.mjs";
+import { r as createFederationBuilder } from "../../builder-4z5McYcY.mjs";
 import { t as TaskCodec } from "../../codec-C6rTrpIp.mjs";
 import { t as InProcessMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-DLaPDeOv.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-BE3xoktR.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -6,7 +6,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-BFr_zLaE.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-BBSxgV0Y.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { parseIri } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, test } from "@fedify/fixture";