@fedify/vocab-runtime 2.0.0-pr.479.1922 → 2.0.0-pr.490.2

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.0-pr.479.1922+564a1890",
+  "version": "2.0.0-pr.490.2+99a396d5",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"
@@ -12,7 +12,6 @@
     "url": "https://hongminhee.org/"
   },
   "imports": {
-    "@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
     "asn1js": "npm:asn1js@^3.0.6",
     "byte-encodings": "npm:byte-encodings@^1.0.11",
     "fetch-mock": "npm:fetch-mock@^12.5.4",

package/dist/mod.cjs

@@ -22,6 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 const __logtape_logtape = __toESM(require("@logtape/logtape"));
+const __opentelemetry_api = __toESM(require("@opentelemetry/api"));
 const node_process = __toESM(require("node:process"));
 const node_dns_promises = __toESM(require("node:dns/promises"));
 const node_net = __toESM(require("node:net"));
@@ -4178,6 +4179,42 @@ const preloadedContexts = {
 };
 var contexts_default = preloadedContexts;
 
+//#endregion
+//#region deno.json
+var name = "@fedify/vocab-runtime";
+var version = "2.0.0-pr.490.2+99a396d5";
+var license = "MIT";
+var exports$1 = { ".": "./src/mod.ts" };
+var description = "Runtime library for @fedify/vocab";
+var author = {
+	"name": "Hong Minhee",
+	"email": "hong@minhee.org",
+	"url": "https://hongminhee.org/"
+};
+var imports = {
+	"asn1js": "npm:asn1js@^3.0.6",
+	"byte-encodings": "npm:byte-encodings@^1.0.11",
+	"fetch-mock": "npm:fetch-mock@^12.5.4",
+	"multicodec": "npm:multicodec@^3.2.1",
+	"pkijs": "npm:pkijs@^3.2.5"
+};
+var exclude = ["dist", "node_modules"];
+var tasks = {
+	"check": "deno fmt --check && deno lint && deno check src/*.ts",
+	"test": "deno test"
+};
+var deno_default = {
+	name,
+	version,
+	license,
+	exports: exports$1,
+	description,
+	author,
+	imports,
+	exclude,
+	tasks
+};
+
 //#endregion
 //#region src/link.ts
 const parametersNeedLowerCase = ["rel", "type"];
@@ -4360,43 +4397,6 @@ var HttpHeaderLink = class HttpHeaderLink {
 	}
 };
 
-//#endregion
-//#region deno.json
-var name = "@fedify/vocab-runtime";
-var version = "2.0.0-pr.479.1922+564a1890";
-var license = "MIT";
-var exports$1 = { ".": "./src/mod.ts" };
-var description = "Runtime library for @fedify/vocab";
-var author = {
-	"name": "Hong Minhee",
-	"email": "hong@minhee.org",
-	"url": "https://hongminhee.org/"
-};
-var imports = {
-	"@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
-	"asn1js": "npm:asn1js@^3.0.6",
-	"byte-encodings": "npm:byte-encodings@^1.0.11",
-	"fetch-mock": "npm:fetch-mock@^12.5.4",
-	"multicodec": "npm:multicodec@^3.2.1",
-	"pkijs": "npm:pkijs@^3.2.5"
-};
-var exclude = ["dist", "node_modules"];
-var tasks = {
-	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"test": "deno test"
-};
-var deno_default = {
-	name,
-	version,
-	license,
-	exports: exports$1,
-	description,
-	author,
-	imports,
-	exclude,
-	tasks
-};
-
 //#endregion
 //#region src/request.ts
 /**
@@ -4636,6 +4636,8 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
+	const tracerProvider = __opentelemetry_api.trace.getTracerProvider();
+	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
 	async function load(url, options) {
 		options?.signal?.throwIfAborted();
 		if (!skipPreloadedContexts && url in contexts_default) {
@@ -4655,14 +4657,38 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 			});
 			throw error;
 		}
-		const request = createActivityPubRequest(url, { userAgent });
-		logRequest(logger, request);
-		const response = await fetch(request, {
-			redirect: "manual",
-			signal: options?.signal
+		return await tracer.startActiveSpan("activitypub.fetch_document", {
+			kind: __opentelemetry_api.SpanKind.CLIENT,
+			attributes: { "url.full": url }
+		}, async (span) => {
+			try {
+				const request = createActivityPubRequest(url, { userAgent });
+				logRequest(logger, request);
+				const response = await fetch(request, {
+					redirect: "manual",
+					signal: options?.signal
+				});
+				span.setAttribute("http.response.status_code", response.status);
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
+					const redirectUrl = response.headers.get("Location");
+					span.setAttribute("http.redirect.url", redirectUrl);
+					return await load(redirectUrl, options);
+				}
+				const result = await getRemoteDocument(url, response, load);
+				span.setAttribute("docloader.document_url", result.documentUrl);
+				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
+				return result;
+			} catch (error) {
+				span.recordException(error);
+				span.setStatus({
+					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					message: String(error)
+				});
+				throw error;
+			} finally {
+				span.end();
+			}
 		});
-		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return load(response.headers.get("Location"), options);
-		return getRemoteDocument(url, response, load);
 	}
 	return load;
 }

package/dist/mod.js

@@ -1,4 +1,5 @@
 import { getLogger } from "@logtape/logtape";
+import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import process from "node:process";
 import { lookup } from "node:dns/promises";
 import { isIP } from "node:net";
@@ -4155,6 +4156,42 @@ const preloadedContexts = {
 };
 var contexts_default = preloadedContexts;
 
+//#endregion
+//#region deno.json
+var name = "@fedify/vocab-runtime";
+var version = "2.0.0-pr.490.2+99a396d5";
+var license = "MIT";
+var exports = { ".": "./src/mod.ts" };
+var description = "Runtime library for @fedify/vocab";
+var author = {
+	"name": "Hong Minhee",
+	"email": "hong@minhee.org",
+	"url": "https://hongminhee.org/"
+};
+var imports = {
+	"asn1js": "npm:asn1js@^3.0.6",
+	"byte-encodings": "npm:byte-encodings@^1.0.11",
+	"fetch-mock": "npm:fetch-mock@^12.5.4",
+	"multicodec": "npm:multicodec@^3.2.1",
+	"pkijs": "npm:pkijs@^3.2.5"
+};
+var exclude = ["dist", "node_modules"];
+var tasks = {
+	"check": "deno fmt --check && deno lint && deno check src/*.ts",
+	"test": "deno test"
+};
+var deno_default = {
+	name,
+	version,
+	license,
+	exports,
+	description,
+	author,
+	imports,
+	exclude,
+	tasks
+};
+
 //#endregion
 //#region src/link.ts
 const parametersNeedLowerCase = ["rel", "type"];
@@ -4337,43 +4374,6 @@ var HttpHeaderLink = class HttpHeaderLink {
 	}
 };
 
-//#endregion
-//#region deno.json
-var name = "@fedify/vocab-runtime";
-var version = "2.0.0-pr.479.1922+564a1890";
-var license = "MIT";
-var exports = { ".": "./src/mod.ts" };
-var description = "Runtime library for @fedify/vocab";
-var author = {
-	"name": "Hong Minhee",
-	"email": "hong@minhee.org",
-	"url": "https://hongminhee.org/"
-};
-var imports = {
-	"@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
-	"asn1js": "npm:asn1js@^3.0.6",
-	"byte-encodings": "npm:byte-encodings@^1.0.11",
-	"fetch-mock": "npm:fetch-mock@^12.5.4",
-	"multicodec": "npm:multicodec@^3.2.1",
-	"pkijs": "npm:pkijs@^3.2.5"
-};
-var exclude = ["dist", "node_modules"];
-var tasks = {
-	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"test": "deno test"
-};
-var deno_default = {
-	name,
-	version,
-	license,
-	exports,
-	description,
-	author,
-	imports,
-	exclude,
-	tasks
-};
-
 //#endregion
 //#region src/request.ts
 /**
@@ -4613,6 +4613,8 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
+	const tracerProvider = trace.getTracerProvider();
+	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
 	async function load(url, options) {
 		options?.signal?.throwIfAborted();
 		if (!skipPreloadedContexts && url in contexts_default) {
@@ -4632,14 +4634,38 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 			});
 			throw error;
 		}
-		const request = createActivityPubRequest(url, { userAgent });
-		logRequest(logger, request);
-		const response = await fetch(request, {
-			redirect: "manual",
-			signal: options?.signal
+		return await tracer.startActiveSpan("activitypub.fetch_document", {
+			kind: SpanKind.CLIENT,
+			attributes: { "url.full": url }
+		}, async (span) => {
+			try {
+				const request = createActivityPubRequest(url, { userAgent });
+				logRequest(logger, request);
+				const response = await fetch(request, {
+					redirect: "manual",
+					signal: options?.signal
+				});
+				span.setAttribute("http.response.status_code", response.status);
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
+					const redirectUrl = response.headers.get("Location");
+					span.setAttribute("http.redirect.url", redirectUrl);
+					return await load(redirectUrl, options);
+				}
+				const result = await getRemoteDocument(url, response, load);
+				span.setAttribute("docloader.document_url", result.documentUrl);
+				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
+				return result;
+			} catch (error) {
+				span.recordException(error);
+				span.setStatus({
+					code: SpanStatusCode.ERROR,
+					message: String(error)
+				});
+				throw error;
+			} finally {
+				span.end();
+			}
 		});
-		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return load(response.headers.get("Location"), options);
-		return getRemoteDocument(url, response, load);
 	}
 	return load;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.0-pr.479.1922+564a1890",
+  "version": "2.0.0-pr.490.2+99a396d5",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -55,8 +55,9 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@logtape/logtape": "^1.1.1",
+    "@logtape/logtape": "^1.2.2",
     "@multiformats/base-x": "^4.0.1",
+    "@opentelemetry/api": "^1.9.0",
     "asn1js": "^3.0.6",
     "byte-encodings": "^1.0.11",
     "multicodec": "^3.2.1",

package/src/docloader.ts

@@ -1,4 +1,6 @@
 import { getLogger } from "@logtape/logtape";
+import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import metadata from "../deno.json" with { type: "json" };
 import preloadedContexts from "./contexts.ts";
 import { HttpHeaderLink } from "./link.ts";
 import {
@@ -266,6 +268,9 @@ export function getDocumentLoader(
   { allowPrivateAddress, skipPreloadedContexts, userAgent }:
     GetDocumentLoaderOptions = {},
 ): DocumentLoader {
+  const tracerProvider = trace.getTracerProvider();
+  const tracer = tracerProvider.getTracer(metadata.name, metadata.version);
+
   async function load(
     url: string,
     options?: DocumentLoaderOptions,
@@ -289,23 +294,56 @@ export function getDocumentLoader(
         throw error;
       }
     }
-    const request = createActivityPubRequest(url, { userAgent });
-    logRequest(logger, request);
-    const response = await fetch(request, {
-      // Since Bun has a bug that ignores the `Request.redirect` option,
-      // to work around it we specify `redirect: "manual"` here too:
-      // https://github.com/oven-sh/bun/issues/10754
-      redirect: "manual",
-      signal: options?.signal,
-    });
-    // Follow redirects manually to get the final URL:
-    if (
-      response.status >= 300 && response.status < 400 &&
-      response.headers.has("Location")
-    ) {
-      return load(response.headers.get("Location")!, options);
-    }
-    return getRemoteDocument(url, response, load);
+
+    return await tracer.startActiveSpan(
+      "activitypub.fetch_document",
+      {
+        kind: SpanKind.CLIENT,
+        attributes: {
+          "url.full": url,
+        },
+      },
+      async (span) => {
+        try {
+          const request = createActivityPubRequest(url, { userAgent });
+          logRequest(logger, request);
+          const response = await fetch(request, {
+            // Since Bun has a bug that ignores the `Request.redirect` option,
+            // to work around it we specify `redirect: "manual"` here too:
+            // https://github.com/oven-sh/bun/issues/10754
+            redirect: "manual",
+            signal: options?.signal,
+          });
+          span.setAttribute("http.response.status_code", response.status);
+
+          // Follow redirects manually to get the final URL:
+          if (
+            response.status >= 300 && response.status < 400 &&
+            response.headers.has("Location")
+          ) {
+            const redirectUrl = response.headers.get("Location")!;
+            span.setAttribute("http.redirect.url", redirectUrl);
+            return await load(redirectUrl, options);
+          }
+
+          const result = await getRemoteDocument(url, response, load);
+          span.setAttribute("docloader.document_url", result.documentUrl);
+          if (result.contextUrl != null) {
+            span.setAttribute("docloader.context_url", result.contextUrl);
+          }
+          return result;
+        } catch (error) {
+          span.recordException(error as Error);
+          span.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: String(error),
+          });
+          throw error;
+        } finally {
+          span.end();
+        }
+      },
+    );
   }
   return load;
 }