@0xchain/telemetry 1.1.0-beta.18 → 1.1.0-beta.19

package/dist/instrumentation.js

@@ -1,8 +1,8 @@
-import { startTelemetry as a } from "./index.js";
-const o = async (t) => {
-  const e = typeof t == "function" ? await t() : t;
-  await a(e ?? {});
+import { startTelemetry } from "./index.js";
+const registerTelemetry = async (configOrProvider) => {
+  const resolvedConfig = typeof configOrProvider === "function" ? await configOrProvider() : configOrProvider;
+  await startTelemetry(resolvedConfig ?? {});
 };
 export {
-  o as registerTelemetry
+  registerTelemetry
 };

package/dist/middleware.js

@@ -1,29 +1,43 @@
-import { NextRequest as w, NextResponse as i } from "next/server";
-import { c as g } from "./ignore-CMi2r3b2.js";
-const h = {
+import { NextRequest, NextResponse } from "next/server";
+import { c as createIgnoreMatcher } from "./ignore-BvHZTNsF.js";
+const defaultTelemetryMiddlewareConfig = {
   matcher: [
     "/((?!_next/static|_next/image|favicon.ico|robots.txt|sitemap.xml|.*\\.(?:css|js|mjs|cjs|png|jpg|jpeg|gif|svg|ico|webp|avif|woff|woff2|ttf|eot|map|txt|xml)).*)"
   ]
-}, l = (r, s = {}) => {
-  const p = g(s.ignore), d = (s.requestStartHeader ?? "x-telemetry-start").toLowerCase(), n = (s.userTypeHeader ?? "x-telemetry-user-type").toLowerCase(), a = s.resolveUserType;
-  return async (e, o) => {
-    const f = e.nextUrl.pathname;
-    if (p(f, e.method))
-      return r(e, o);
-    const t = new Headers(e.headers), c = (a == null ? void 0 : a(e)) || t.get(n);
-    c && t.set(n, c), t.set(d, String(Date.now()));
-    const x = new w(e, {
-      headers: t
-    }), m = await r(x, o);
-    return m || i.next({
-      request: {
-        headers: t
-      }
+};
+const withTelemetryMiddleware = (middleware, options = {}) => {
+  const shouldIgnore = createIgnoreMatcher(options.ignore);
+  const requestStartHeader = (options.requestStartHeader ?? "x-telemetry-start").toLowerCase();
+  const userTypeHeader = (options.userTypeHeader ?? "x-telemetry-user-type").toLowerCase();
+  const resolveUserType = options.resolveUserType;
+  return async (request, event) => {
+    const pathname = request.nextUrl.pathname;
+    if (shouldIgnore(pathname, request.method)) {
+      return middleware(request, event);
+    }
+    const headers = new Headers(request.headers);
+    const userType = resolveUserType?.(request) || headers.get(userTypeHeader);
+    if (userType) headers.set(userTypeHeader, userType);
+    headers.set(requestStartHeader, String(Date.now()));
+    const wrappedRequest = new NextRequest(request, {
+      headers
     });
+    const response = await middleware(wrappedRequest, event);
+    if (!response) {
+      return NextResponse.next({
+        request: {
+          headers
+        }
+      });
+    }
+    return response;
   };
-}, T = (r = {}) => l(() => i.next(), r);
+};
+const createTelemetryMiddleware = (options = {}) => {
+  return withTelemetryMiddleware(() => NextResponse.next(), options);
+};
 export {
-  T as createTelemetryMiddleware,
-  h as defaultTelemetryMiddlewareConfig,
-  l as withTelemetryMiddleware
+  createTelemetryMiddleware,
+  defaultTelemetryMiddlewareConfig,
+  withTelemetryMiddleware
 };

package/dist/next.js

@@ -1,29 +1,43 @@
-import { NextRequest as w, NextResponse as i } from "next/server";
-import { c as g } from "./ignore-CMi2r3b2.js";
-const h = {
+import { NextRequest, NextResponse } from "next/server";
+import { c as createIgnoreMatcher } from "./ignore-BvHZTNsF.js";
+const defaultTelemetryMiddlewareConfig = {
   matcher: [
     "/((?!_next/static|_next/image|favicon.ico|robots.txt|sitemap.xml|.*\\.(?:css|js|mjs|cjs|png|jpg|jpeg|gif|svg|ico|webp|avif|woff|woff2|ttf|eot|map|txt|xml)).*)"
   ]
-}, l = (r, s = {}) => {
-  const p = g(s.ignore), d = (s.requestStartHeader ?? "x-telemetry-start").toLowerCase(), n = (s.userTypeHeader ?? "x-telemetry-user-type").toLowerCase(), a = s.resolveUserType;
-  return async (e, o) => {
-    const f = e.nextUrl.pathname;
-    if (p(f, e.method))
-      return r(e, o);
-    const t = new Headers(e.headers), c = (a == null ? void 0 : a(e)) || t.get(n);
-    c && t.set(n, c), t.set(d, String(Date.now()));
-    const x = new w(e, {
-      headers: t
-    }), m = await r(x, o);
-    return m || i.next({
-      request: {
-        headers: t
-      }
+};
+const withTelemetryMiddleware = (middleware, options = {}) => {
+  const shouldIgnore = createIgnoreMatcher(options.ignore);
+  const requestStartHeader = (options.requestStartHeader ?? "x-telemetry-start").toLowerCase();
+  const userTypeHeader = (options.userTypeHeader ?? "x-telemetry-user-type").toLowerCase();
+  const resolveUserType = options.resolveUserType;
+  return async (request, event) => {
+    const pathname = request.nextUrl.pathname;
+    if (shouldIgnore(pathname, request.method)) {
+      return middleware(request, event);
+    }
+    const headers = new Headers(request.headers);
+    const userType = resolveUserType?.(request) || headers.get(userTypeHeader);
+    if (userType) headers.set(userTypeHeader, userType);
+    headers.set(requestStartHeader, String(Date.now()));
+    const wrappedRequest = new NextRequest(request, {
+      headers
     });
+    const response = await middleware(wrappedRequest, event);
+    if (!response) {
+      return NextResponse.next({
+        request: {
+          headers
+        }
+      });
+    }
+    return response;
   };
-}, T = (r = {}) => l(() => i.next(), r);
+};
+const createTelemetryMiddleware = (options = {}) => {
+  return withTelemetryMiddleware(() => NextResponse.next(), options);
+};
 export {
-  T as createTelemetryMiddleware,
-  h as defaultTelemetryMiddlewareConfig,
-  l as withTelemetryMiddleware
+  createTelemetryMiddleware,
+  defaultTelemetryMiddlewareConfig,
+  withTelemetryMiddleware
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/telemetry",
-  "version": "1.1.0-beta.18",
+  "version": "1.1.0-beta.19",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -35,18 +35,35 @@
     "dist",
     "!**/*.tsbuildinfo"
   ],
-  "dependencies": {
+  "peerDependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/instrumentation-http": "0.211.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.211.0",
-    "@opentelemetry/instrumentation-undici": "0.21.0",
-    "@opentelemetry/otlp-exporter-base": "0.211.0",
-    "@opentelemetry/resources": "2.5.0",
-    "@opentelemetry/sdk-node": "0.211.0",
-    "@opentelemetry/sdk-trace-base": "2.5.0",
-    "@opentelemetry/semantic-conventions": "1.39.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.212.0",
+    "@opentelemetry/instrumentation-http": "0.212.0",
+    "@opentelemetry/instrumentation-undici": "0.22.0",
+    "@opentelemetry/otlp-exporter-base": "0.212.0",
+    "@opentelemetry/resources": "2.5.1",
+    "@opentelemetry/sdk-node": "0.212.0",
+    "@opentelemetry/sdk-trace-base": "2.5.1",
+    "@opentelemetry/semantic-conventions": "1.40.0",
     "next": "16.1.6"
   },
+  "devDependencies": {
+    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.212.0",
+    "@opentelemetry/instrumentation-http": "0.212.0",
+    "@opentelemetry/instrumentation-undici": "0.22.0",
+    "@opentelemetry/otlp-exporter-base": "0.212.0",
+    "@opentelemetry/resources": "2.5.1",
+    "@opentelemetry/sdk-node": "0.212.0",
+    "@opentelemetry/sdk-trace-base": "2.5.1",
+    "@opentelemetry/semantic-conventions": "1.40.0",
+    "next": "16.1.6"
+  },
+  "nx": {
+    "tags": [
+      "type:util"
+    ]
+  },
   "publishConfig": {
     "access": "public"
   }

package/dist/ignore-CMi2r3b2.js

@@ -1,114 +0,0 @@
-const x = [
-  // 健康检查 & 监控
-  "/health",
-  "/api/health",
-  "/metrics",
-  "/api/metrics",
-  "/readyz",
-  "/livez",
-  "/monitoring",
-  // Next.js 内部路由
-  "/_next",
-  "/__nextjs_",
-  // Next.js App Router 元数据路由
-  "/opengraph-image",
-  "/twitter-image",
-  "/icon",
-  "/apple-icon",
-  // Vercel 内部路由
-  "/_vercel",
-  // 静态资源 & SEO
-  "/favicon.ico",
-  "/robots.txt",
-  "/sitemap.xml",
-  "/manifest.json",
-  "/manifest.webmanifest",
-  "/.well-known",
-  // 认证回调（NextAuth.js）
-  "/api/auth"
-], w = [
-  // Next.js 内部服务端操作（非 HTTP 请求，由 Next.js OTel 自动产生）
-  /^NextNodeServer\./,
-  /^NextServer\./,
-  /^BaseServer\./,
-  /^AppRender\./,
-  /^AppRouteRouteHandlers\./,
-  // Next.js 中间件执行 span（如 "middleware GET /path"）
-  /^middleware /i,
-  // Next.js 元数据解析
-  /^resolveMetadata$/,
-  /^generateMetadata$/
-], f = [
-  ".css",
-  ".js",
-  ".mjs",
-  ".cjs",
-  ".png",
-  ".jpg",
-  ".jpeg",
-  ".gif",
-  ".svg",
-  ".ico",
-  ".webp",
-  ".avif",
-  ".woff",
-  ".woff2",
-  ".ttf",
-  ".eot",
-  ".map",
-  ".txt",
-  ".xml"
-], h = {
-  paths: x,
-  extensions: f,
-  methods: ["HEAD", "OPTIONS"],
-  spanNames: w
-}, C = (e) => e.map((s) => {
-  const t = s.trim().toLowerCase();
-  return t && (t.startsWith(".") ? t : `.${t}`);
-}), E = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), m = (e, s) => {
-  if (e instanceof RegExp)
-    return e.test(s);
-  const t = e.trim();
-  if (!t) return !1;
-  if (t.includes("*")) {
-    const o = `^${E(t).replace(/\\\*\\\*/g, ".*").replace(/\\\*/g, "[^/]*")}$`;
-    return new RegExp(o).test(s);
-  }
-  return s === t ? !0 : t.endsWith("/") ? s.startsWith(t) : s.startsWith(`${t}/`) || s.startsWith(t);
-}, $ = (e, s) => {
-  const t = s.toLowerCase();
-  return e.some((n) => n && t.endsWith(n));
-}, j = (e) => {
-  var o;
-  if (!e) return "default";
-  if ((o = e.paths) == null ? void 0 : o.some((a) => a instanceof RegExp)) return null;
-  const t = (e.paths ?? []).map(String).sort().join(","), n = (e.extensions ?? []).map((a) => a.toLowerCase()).sort().join(","), p = (e.methods ?? []).map((a) => a.toUpperCase()).sort().join(",");
-  return `p:${t}|e:${n}|m:${p}`;
-}, i = /* @__PURE__ */ new Map(), v = 16, N = (e) => {
-  var t;
-  const s = (t = e == null ? void 0 : e.spanNames) != null && t.length ? e.spanNames : h.spanNames;
-  return (n) => !n || !s.length ? !1 : s.some((p) => m(p, n));
-}, R = (e) => {
-  var a, l, c;
-  const s = j(e);
-  if (s) {
-    const r = i.get(s);
-    if (r) return r;
-  }
-  const t = (a = e == null ? void 0 : e.paths) != null && a.length ? e.paths : h.paths, n = (l = e == null ? void 0 : e.extensions) != null && l.length ? C(e.extensions) : h.extensions, p = (c = e == null ? void 0 : e.methods) != null && c.length ? e.methods.map((r) => r.toUpperCase()) : h.methods, o = (r, u) => u && p.includes(u.toUpperCase()) ? !0 : r ? $(n, r) ? !0 : t.some((d) => m(d, r)) : !1;
-  if (s) {
-    if (i.size >= v) {
-      const r = i.keys().next().value;
-      r && i.delete(r);
-    }
-    i.set(s, o);
-  }
-  return o;
-};
-export {
-  N as a,
-  R as c,
-  h as d,
-  m
-};