@astroscope/opentelemetry 0.1.1 → 0.2.0

package/dist/chunk-UPNRPRAW.js

@@ -0,0 +1,72 @@
+// src/metrics.ts
+import { metrics, ValueType } from "@opentelemetry/api";
+var LIB_NAME = "@astroscope/opentelemetry";
+var httpRequestDuration = null;
+var httpActiveRequests = null;
+var fetchRequestDuration = null;
+function getHttpRequestDuration() {
+  if (!httpRequestDuration) {
+    const meter = metrics.getMeter(LIB_NAME);
+    httpRequestDuration = meter.createHistogram("http.server.request.duration", {
+      description: "Duration of HTTP server requests",
+      unit: "s",
+      valueType: ValueType.DOUBLE
+    });
+  }
+  return httpRequestDuration;
+}
+function getHttpActiveRequests() {
+  if (!httpActiveRequests) {
+    const meter = metrics.getMeter(LIB_NAME);
+    httpActiveRequests = meter.createUpDownCounter("http.server.active_requests", {
+      description: "Number of active HTTP server requests",
+      unit: "{request}",
+      valueType: ValueType.INT
+    });
+  }
+  return httpActiveRequests;
+}
+function getFetchRequestDuration() {
+  if (!fetchRequestDuration) {
+    const meter = metrics.getMeter(LIB_NAME);
+    fetchRequestDuration = meter.createHistogram("http.client.request.duration", {
+      description: "Duration of HTTP client requests (fetch)",
+      unit: "s",
+      valueType: ValueType.DOUBLE
+    });
+  }
+  return fetchRequestDuration;
+}
+function recordHttpRequestStart(attributes) {
+  const startTime = performance.now();
+  getHttpActiveRequests().add(1, {
+    "http.request.method": attributes.method,
+    "http.route": attributes.route
+  });
+  return () => {
+    getHttpActiveRequests().add(-1, {
+      "http.request.method": attributes.method,
+      "http.route": attributes.route
+    });
+  };
+}
+function recordHttpRequestDuration(attributes, durationMs) {
+  getHttpRequestDuration().record(durationMs / 1e3, {
+    "http.request.method": attributes.method,
+    "http.route": attributes.route,
+    "http.response.status_code": attributes.status
+  });
+}
+function recordFetchRequestDuration(attributes, durationMs) {
+  getFetchRequestDuration().record(durationMs / 1e3, {
+    "http.request.method": attributes.method,
+    "server.address": attributes.host,
+    "http.response.status_code": attributes.status
+  });
+}
+
+export {
+  recordHttpRequestStart,
+  recordHttpRequestDuration,
+  recordFetchRequestDuration
+};

package/dist/chunk-VHXZF2FP.js

@@ -0,0 +1,124 @@
+// src/middleware.ts
+import {
+  SpanKind,
+  SpanStatusCode,
+  context,
+  propagation,
+  trace
+} from "@opentelemetry/api";
+import { RPCType, setRPCMetadata } from "@opentelemetry/core";
+var LIB_NAME = "@astroscope/opentelemetry";
+var ACTIONS_PREFIX = "/_actions/";
+function matchesPattern(path, pattern) {
+  if ("pattern" in pattern) {
+    return pattern.pattern.test(path);
+  }
+  if ("prefix" in pattern) {
+    return path.startsWith(pattern.prefix);
+  }
+  return path === pattern.exact;
+}
+function shouldExclude(ctx, exclude) {
+  if (!exclude) return false;
+  if (typeof exclude === "function") {
+    return exclude(ctx);
+  }
+  const path = ctx.url.pathname;
+  return exclude.some((pattern) => matchesPattern(path, pattern));
+}
+function getClientIp(request) {
+  return request.headers.get("x-forwarded-for")?.split(",")[0].trim() ?? request.headers.get("x-real-ip") ?? request.headers.get("cf-connecting-ip") ?? // Cloudflare
+  void 0;
+}
+function createOpenTelemetryMiddleware(options = {}) {
+  const tracer = trace.getTracer(LIB_NAME);
+  return async (ctx, next) => {
+    if (shouldExclude(ctx, options.exclude)) {
+      return next();
+    }
+    const { request, url } = ctx;
+    const input = {
+      traceparent: request.headers.get("traceparent"),
+      tracestate: request.headers.get("tracestate")
+    };
+    const parentContext = propagation.extract(context.active(), input);
+    const clientIp = getClientIp(request);
+    const contentLength = request.headers.get("content-length");
+    const spanOptions = {
+      attributes: {
+        "http.request.method": request.method,
+        "url.full": request.url,
+        "url.path": url.pathname,
+        "url.query": url.search.slice(1),
+        // Remove leading "?"
+        "url.scheme": url.protocol.replace(":", ""),
+        "server.address": url.hostname,
+        "server.port": url.port ? parseInt(url.port) : url.protocol === "https:" ? 443 : 80,
+        "user_agent.original": request.headers.get("user-agent") ?? "",
+        ...contentLength && { "http.request.body.size": parseInt(contentLength) },
+        ...clientIp && { "client.address": clientIp }
+      },
+      kind: SpanKind.SERVER
+    };
+    const isAction = url.pathname.startsWith(ACTIONS_PREFIX);
+    const actionName = url.pathname.slice(ACTIONS_PREFIX.length).replace(/\/$/, "");
+    const spanName = isAction ? `ACTION ${actionName}` : `${request.method} ${url.pathname}`;
+    const span = tracer.startSpan(spanName, spanOptions, parentContext);
+    const spanContext = trace.setSpan(parentContext, span);
+    const rpcMetadata = { type: RPCType.HTTP, span };
+    return context.with(
+      setRPCMetadata(spanContext, rpcMetadata),
+      async () => {
+        const finalize = (status, responseSize) => {
+          span.setAttribute("http.response.status_code", status);
+          span.setAttribute("http.response.body.size", responseSize);
+          if (status >= 400) {
+            span.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: `HTTP ${status}`
+            });
+          } else {
+            span.setStatus({ code: SpanStatusCode.OK });
+          }
+          span.end();
+        };
+        try {
+          const response = await next();
+          if (!response.body) {
+            finalize(response.status, 0);
+            return response;
+          }
+          const [measureStream, clientStream] = response.body.tee();
+          let responseSize = 0;
+          (async () => {
+            const reader = measureStream.getReader();
+            try {
+              while (true) {
+                const { done, value } = await reader.read();
+                if (done) break;
+                responseSize += value.length;
+              }
+            } finally {
+              finalize(response.status, responseSize);
+            }
+          })();
+          return new Response(clientStream, {
+            status: response.status,
+            headers: response.headers
+          });
+        } catch (e) {
+          span.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: e instanceof Error ? e.message : "Unknown error"
+          });
+          span.end();
+          throw e;
+        }
+      }
+    );
+  };
+}
+
+export {
+  createOpenTelemetryMiddleware
+};

package/dist/chunk-WTUM3JRA.js

@@ -0,0 +1,155 @@
+import {
+  recordActionDuration,
+  recordHttpRequestDuration,
+  recordHttpRequestStart
+} from "./chunk-DPYEL3WF.js";
+
+// src/middleware.ts
+import {
+  SpanKind,
+  SpanStatusCode,
+  context,
+  propagation,
+  trace
+} from "@opentelemetry/api";
+import { RPCType, setRPCMetadata } from "@opentelemetry/core";
+var LIB_NAME = "@astroscope/opentelemetry";
+var ACTIONS_PREFIX = "/_actions/";
+function matchesPattern(path, pattern) {
+  if ("pattern" in pattern) {
+    return pattern.pattern.test(path);
+  }
+  if ("prefix" in pattern) {
+    return path.startsWith(pattern.prefix);
+  }
+  return path === pattern.exact;
+}
+function shouldExclude(ctx, exclude) {
+  if (!exclude) return false;
+  if (typeof exclude === "function") {
+    return exclude(ctx);
+  }
+  const path = ctx.url.pathname;
+  return exclude.some((pattern) => matchesPattern(path, pattern));
+}
+function getClientIp(request) {
+  return request.headers.get("x-forwarded-for")?.split(",")[0].trim() ?? request.headers.get("x-real-ip") ?? request.headers.get("cf-connecting-ip") ?? // Cloudflare
+  void 0;
+}
+function createOpenTelemetryMiddleware(options = {}) {
+  const tracer = trace.getTracer(LIB_NAME);
+  return async (ctx, next) => {
+    if (shouldExclude(ctx, options.exclude)) {
+      return next();
+    }
+    const { request, url } = ctx;
+    const input = {
+      traceparent: request.headers.get("traceparent"),
+      tracestate: request.headers.get("tracestate")
+    };
+    const parentContext = propagation.extract(context.active(), input);
+    const clientIp = getClientIp(request);
+    const contentLength = request.headers.get("content-length");
+    const spanOptions = {
+      attributes: {
+        "http.request.method": request.method,
+        "url.full": request.url,
+        "url.path": url.pathname,
+        "url.query": url.search.slice(1),
+        // Remove leading "?"
+        "url.scheme": url.protocol.replace(":", ""),
+        "server.address": url.hostname,
+        "server.port": url.port ? parseInt(url.port) : url.protocol === "https:" ? 443 : 80,
+        "user_agent.original": request.headers.get("user-agent") ?? "",
+        ...contentLength && { "http.request.body.size": parseInt(contentLength) },
+        ...clientIp && { "client.address": clientIp }
+      },
+      kind: SpanKind.SERVER
+    };
+    const isAction = url.pathname.startsWith(ACTIONS_PREFIX);
+    const actionName = url.pathname.slice(ACTIONS_PREFIX.length).replace(/\/$/, "");
+    const spanName = isAction ? `ACTION ${actionName}` : `${request.method} ${url.pathname}`;
+    const span = tracer.startSpan(spanName, spanOptions, parentContext);
+    const spanContext = trace.setSpan(parentContext, span);
+    const rpcMetadata = { type: RPCType.HTTP, span };
+    const metricsEnabled = options.metrics ?? false;
+    const startTime = metricsEnabled ? performance.now() : 0;
+    const endActiveRequest = metricsEnabled ? recordHttpRequestStart({ method: request.method, route: url.pathname }) : void 0;
+    return context.with(
+      setRPCMetadata(spanContext, rpcMetadata),
+      async () => {
+        const finalize = (status, responseSize) => {
+          span.setAttribute("http.response.status_code", status);
+          span.setAttribute("http.response.body.size", responseSize);
+          if (status >= 400) {
+            span.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: `HTTP ${status}`
+            });
+          } else {
+            span.setStatus({ code: SpanStatusCode.OK });
+          }
+          span.end();
+          if (metricsEnabled) {
+            endActiveRequest?.();
+            const duration = performance.now() - startTime;
+            recordHttpRequestDuration(
+              { method: request.method, route: url.pathname, status },
+              duration
+            );
+            if (isAction) {
+              recordActionDuration({ name: actionName, status }, duration);
+            }
+          }
+        };
+        try {
+          const response = await next();
+          if (!response.body) {
+            finalize(response.status, 0);
+            return response;
+          }
+          const [measureStream, clientStream] = response.body.tee();
+          let responseSize = 0;
+          (async () => {
+            const reader = measureStream.getReader();
+            try {
+              while (true) {
+                const { done, value } = await reader.read();
+                if (done) break;
+                responseSize += value.length;
+              }
+            } finally {
+              finalize(response.status, responseSize);
+            }
+          })();
+          return new Response(clientStream, {
+            status: response.status,
+            headers: response.headers
+          });
+        } catch (e) {
+          span.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: e instanceof Error ? e.message : "Unknown error"
+          });
+          span.end();
+          if (metricsEnabled) {
+            endActiveRequest?.();
+            const duration = performance.now() - startTime;
+            recordHttpRequestDuration(
+              { method: request.method, route: url.pathname, status: 500 },
+              duration
+            );
+            if (isAction) {
+              recordActionDuration({ name: actionName, status: 500 }, duration);
+            }
+          }
+          throw e;
+        }
+      }
+    );
+  };
+}
+
+export {
+  createOpenTelemetryMiddleware
+};

package/dist/fetch-55MNQVLN.js

@@ -0,0 +1,7 @@
+import {
+  instrumentFetch
+} from "./chunk-QIWOBUML.js";
+import "./chunk-UPNRPRAW.js";
+export {
+  instrumentFetch
+};

package/dist/fetch-FUKHXS77.js

@@ -0,0 +1,6 @@
+import {
+  instrumentFetch
+} from "./chunk-QTSNLOSC.js";
+export {
+  instrumentFetch
+};

package/dist/fetch-JGQFPQSL.js

@@ -0,0 +1,6 @@
+import {
+  instrumentFetch
+} from "./chunk-FEC4ETRL.js";
+export {
+  instrumentFetch
+};

package/dist/fetch-RERXGIJA.js

@@ -0,0 +1,7 @@
+import {
+  instrumentFetch
+} from "./chunk-BQFWPPEO.js";
+import "./chunk-DPYEL3WF.js";
+export {
+  instrumentFetch
+};

package/dist/fetch-SVGRNFLY.js

@@ -0,0 +1,7 @@
+import {
+  instrumentFetch
+} from "./chunk-CEPTXEJV.js";
+import "./chunk-DPYEL3WF.js";
+export {
+  instrumentFetch
+};

package/dist/index.d.ts

@@ -1,12 +1,6 @@
 import { APIContext, MiddlewareHandler, AstroIntegration } from 'astro';
+import { ExcludePattern } from '@astroscope/excludes';
 
-type ExcludePattern = {
-    pattern: RegExp;
-} | {
-    prefix: string;
-} | {
-    exact: string;
-};
 interface OpenTelemetryMiddlewareOptions {
     /**
      * Paths to exclude from tracing.
@@ -86,7 +80,7 @@ interface OpenTelemetryIntegrationOptions {
  * ```ts
  * // astro.config.ts
  * import { defineConfig } from "astro/config";
- * import { opentelemetry } from "@astroscope/opentelemetry";
+ * import opentelemetry from "@astroscope/opentelemetry";
  *
  * export default defineConfig({
  *   integrations: [opentelemetry()],
@@ -121,32 +115,4 @@ interface OpenTelemetryIntegrationOptions {
  */
 declare function opentelemetry(options?: OpenTelemetryIntegrationOptions): AstroIntegration;
 
-/**
- * Vite/Astro dev server paths - only relevant in development.
- */
-declare const DEV_EXCLUDES: ExcludePattern[];
-/**
- * Astro internal paths for static assets and image optimization.
- */
-declare const ASTRO_STATIC_EXCLUDES: ExcludePattern[];
-/**
- * Common static asset paths.
- */
-declare const STATIC_EXCLUDES: ExcludePattern[];
-/**
- * Recommended excludes for OpenTelemetry middleware.
- * Includes dev paths, Astro internals, and common static assets.
- *
- * @example
- * ```ts
- * createOpenTelemetryMiddleware({
- *   exclude: [
- *     ...RECOMMENDED_EXCLUDES,
- *     { exact: "/health" }, // your health endpoint
- *   ],
- * })
- * ```
- */
-declare const RECOMMENDED_EXCLUDES: ExcludePattern[];
-
-export { ASTRO_STATIC_EXCLUDES, DEV_EXCLUDES, type ExcludePattern, type OpenTelemetryIntegrationOptions, type OpenTelemetryMiddlewareOptions, RECOMMENDED_EXCLUDES, STATIC_EXCLUDES, createOpenTelemetryMiddleware, instrumentFetch, opentelemetry };
+export { type OpenTelemetryIntegrationOptions, type OpenTelemetryMiddlewareOptions, createOpenTelemetryMiddleware, opentelemetry as default, instrumentFetch };

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   createOpenTelemetryMiddleware
-} from "./chunk-PCCKGEEG.js";
+} from "./chunk-SNVIK2H6.js";
 import {
   instrumentFetch
 } from "./chunk-45TY3U7U.js";
@@ -9,33 +9,9 @@ import "./chunk-JU6FJKLT.js";
 // src/integration.ts
 import fs from "fs";
 import path from "path";
-
-// src/excludes.ts
-var DEV_EXCLUDES = [
-  { prefix: "/@id/" },
-  { prefix: "/@fs/" },
-  { prefix: "/@vite/" },
-  { prefix: "/src/" },
-  { prefix: "/node_modules/" }
-];
-var ASTRO_STATIC_EXCLUDES = [{ prefix: "/_astro/" }, { prefix: "/_image" }];
-var STATIC_EXCLUDES = [
-  { exact: "/favicon.ico" },
-  { exact: "/robots.txt" },
-  { exact: "/sitemap.xml" },
-  { exact: "/browserconfig.xml" },
-  { exact: "/manifest.json" },
-  { exact: "/manifest.webmanifest" },
-  { prefix: "/.well-known/" }
-];
-var RECOMMENDED_EXCLUDES = [...DEV_EXCLUDES, ...ASTRO_STATIC_EXCLUDES, ...STATIC_EXCLUDES];
-
-// src/integration.ts
+import { RECOMMENDED_EXCLUDES, serializeExcludePatterns } from "@astroscope/excludes";
 var VIRTUAL_MODULE_ID = "virtual:@astroscope/opentelemetry/config";
 var RESOLVED_VIRTUAL_MODULE_ID = `\0${VIRTUAL_MODULE_ID}`;
-function serializeExcludePatterns(patterns) {
-  return `[${patterns.map((p) => "pattern" in p ? `{ pattern: ${p.pattern.toString()} }` : JSON.stringify(p)).join(", ")}]`;
-}
 function opentelemetry(options = {}) {
   const httpConfig = options.instrumentations?.http ?? {
     enabled: true,
@@ -115,11 +91,7 @@ ${content}`
   };
 }
 export {
-  ASTRO_STATIC_EXCLUDES,
-  DEV_EXCLUDES,
-  RECOMMENDED_EXCLUDES,
-  STATIC_EXCLUDES,
   createOpenTelemetryMiddleware,
-  instrumentFetch,
-  opentelemetry
+  opentelemetry as default,
+  instrumentFetch
 };

package/dist/middleware-entrypoint.js

@@ -1,6 +1,6 @@
 import {
   createOpenTelemetryMiddleware
-} from "./chunk-PCCKGEEG.js";
+} from "./chunk-SNVIK2H6.js";
 import "./chunk-JU6FJKLT.js";
 
 // src/middleware-entrypoint.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroscope/opentelemetry",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "OpenTelemetry tracing middleware for Astro SSR",
   "type": "module",
   "main": "./dist/index.js",
@@ -61,6 +61,7 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
+    "@astroscope/excludes": "workspace:*",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^2.0.0",
     "astro": "^5.0.0"