@astroscope/opentelemetry 0.2.1 → 0.2.2

package/README.md

@@ -1,6 +1,6 @@
 # @astroscope/opentelemetry
 
-OpenTelemetry support for Astro SSR.
+OpenTelemetry for Astro — tracing, metrics, and component instrumentation that works in dev mode. No monkey-patching required.
 
 ## Examples
 

package/dist/{chunk-45TY3U7U.js → chunk-A7VHVQTG.js}

@@ -5,20 +5,31 @@ import {
 // src/fetch.ts
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 var LIB_NAME = "@astroscope/opentelemetry";
+var INSTRUMENTED = /* @__PURE__ */ Symbol.for("@astroscope/opentelemetry/fetch");
 function instrumentFetch() {
+  if (globalThis.fetch[INSTRUMENTED]) {
+    return;
+  }
   const originalFetch = globalThis.fetch;
   async function instrumentedFetch(input, init) {
     const tracer = trace.getTracer(LIB_NAME);
     const activeContext = context.active();
-    const request = new Request(input, init);
-    const url = new URL(request.url);
+    let url;
+    let method;
+    if (input instanceof Request) {
+      url = new URL(input.url);
+      method = input.method;
+    } else {
+      url = new URL(input.toString(), globalThis.location?.href);
+      method = init?.method ?? "GET";
+    }
     const span = tracer.startSpan(
-      `FETCH ${request.method}`,
+      `FETCH ${method}`,
       {
         kind: SpanKind.CLIENT,
         attributes: {
-          "http.request.method": request.method,
-          "url.full": request.url,
+          "http.request.method": method,
+          "url.full": url.href,
           "url.path": url.pathname,
           "url.scheme": url.protocol.replace(":", ""),
           "server.address": url.hostname,
@@ -27,20 +38,23 @@ function instrumentFetch() {
       },
       activeContext
     );
-    const headers = new Headers(request.headers);
     const carrier = {};
     propagation.inject(trace.setSpan(activeContext, span), carrier);
+    const existingHeaders = init?.headers ?? (input instanceof Request ? input.headers : void 0);
+    const headers = new Headers(existingHeaders);
     for (const [key, value] of Object.entries(carrier)) {
       headers.set(key, value);
     }
+    const hasBody = init?.body !== void 0 || input instanceof Request && input.body !== null;
+    const newInit = {
+      ...init,
+      headers,
+      // required in node.js 18.13+
+      ...hasBody && { duplex: "half" }
+    };
     const startTime = performance.now();
     try {
-      const response = await originalFetch(request.url, {
-        ...init,
-        method: request.method,
-        headers,
-        body: request.body
-      });
+      const response = await originalFetch(input, newInit);
       span.setAttribute("http.response.status_code", response.status);
       if (response.status >= 400) {
         span.setStatus({
@@ -52,7 +66,7 @@ function instrumentFetch() {
       }
       span.end();
       recordFetchRequestDuration(
-        { method: request.method, host: url.hostname, status: response.status },
+        { method, host: url.hostname, status: response.status },
         performance.now() - startTime
       );
       return response;
@@ -62,13 +76,11 @@ function instrumentFetch() {
         message: error instanceof Error ? error.message : "Unknown error"
       });
       span.end();
-      recordFetchRequestDuration(
-        { method: request.method, host: url.hostname, status: 0 },
-        performance.now() - startTime
-      );
+      recordFetchRequestDuration({ method, host: url.hostname, status: 0 }, performance.now() - startTime);
       throw error;
     }
   }
+  instrumentedFetch[INSTRUMENTED] = true;
   globalThis.fetch = Object.assign(instrumentedFetch, originalFetch);
 }
 

package/dist/{chunk-LT23L3YD.js → chunk-OIBEYPAM.js}

@@ -5,9 +5,9 @@ import {
 } from "./chunk-JU6FJKLT.js";
 
 // src/middleware.ts
+import { shouldExclude } from "@astroscope/excludes";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { RPCType, setRPCMetadata } from "@opentelemetry/core";
-import { shouldExclude } from "@astroscope/excludes";
 var LIB_NAME = "@astroscope/opentelemetry";
 var ACTIONS_PREFIX = "/_actions/";
 function getClientIp(request) {
@@ -21,7 +21,7 @@ function createOpenTelemetryMiddleware(options = {}) {
       return next();
     }
     const startTime = performance.now();
-    const { request, url } = ctx;
+    const { request, url, routePattern } = ctx;
     const input = { traceparent: request.headers.get("traceparent"), tracestate: request.headers.get("tracestate") };
     const parentContext = propagation.extract(context.active(), input);
     const contentLength = request.headers.get("content-length");
@@ -29,6 +29,7 @@ function createOpenTelemetryMiddleware(options = {}) {
     const spanOptions = {
       attributes: {
         "http.request.method": request.method,
+        "http.route": routePattern,
         "url.full": request.url,
         "url.path": url.pathname,
         "url.query": url.search.slice(1),
@@ -43,11 +44,11 @@ function createOpenTelemetryMiddleware(options = {}) {
     };
     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 spanName = isAction ? `ACTION ${actionName}` : `${request.method} ${routePattern}`;
     const span = tracer.startSpan(spanName, spanOptions, parentContext);
     const spanContext = trace.setSpan(parentContext, span);
     const rpcMetadata = { type: RPCType.HTTP, span };
-    const endActiveRequest = recordHttpRequestStart({ method: request.method, route: url.pathname });
+    const endActiveRequest = recordHttpRequestStart({ method: request.method, route: routePattern });
     return context.with(setRPCMetadata(spanContext, rpcMetadata), async () => {
       const finalize = (status, responseSize) => {
         span.setAttribute("http.response.status_code", status);
@@ -63,7 +64,7 @@ function createOpenTelemetryMiddleware(options = {}) {
         span.end();
         endActiveRequest();
         const duration = performance.now() - startTime;
-        recordHttpRequestDuration({ method: request.method, route: url.pathname, status }, duration);
+        recordHttpRequestDuration({ method: request.method, route: routePattern, status }, duration);
         if (isAction) {
           recordActionDuration({ name: actionName, status }, duration);
         }
@@ -100,7 +101,7 @@ function createOpenTelemetryMiddleware(options = {}) {
         span.end();
         endActiveRequest();
         const duration = performance.now() - startTime;
-        recordHttpRequestDuration({ method: request.method, route: url.pathname, status: 500 }, duration);
+        recordHttpRequestDuration({ method: request.method, route: routePattern, status: 500 }, duration);
         if (isAction) {
           recordActionDuration({ name: actionName, status: 500 }, duration);
         }

package/dist/{fetch-Z2DBQPE2.js → fetch-PVKAGUFE.js}

@@ -1,6 +1,6 @@
 import {
   instrumentFetch
-} from "./chunk-45TY3U7U.js";
+} from "./chunk-A7VHVQTG.js";
 import "./chunk-JU6FJKLT.js";
 export {
   instrumentFetch

package/dist/index.d.ts

@@ -6,7 +6,7 @@ interface OpenTelemetryMiddlewareOptions {
      * Paths to exclude from tracing.
      * Can be an array of patterns or a function that returns true to exclude.
      */
-    exclude?: ExcludePattern[] | ((context: APIContext) => boolean);
+    exclude?: ExcludePattern[] | ((context: APIContext) => boolean) | undefined;
 }
 
 /**
@@ -58,16 +58,16 @@ interface OpenTelemetryIntegrationOptions {
          */
         http?: {
             enabled: boolean;
-            exclude?: ExcludePattern[];
-        };
+            exclude?: ExcludePattern[] | undefined;
+        } | undefined;
         /**
          * Fetch outgoing request instrumentation.
          * @default { enabled: true }
          */
         fetch?: {
             enabled: boolean;
-        };
-    };
+        } | undefined;
+    } | undefined;
 }
 /**
  * Astro integration for OpenTelemetry instrumentation.

package/dist/index.js

@@ -1,9 +1,9 @@
 import {
   createOpenTelemetryMiddleware
-} from "./chunk-SNVIK2H6.js";
+} from "./chunk-OIBEYPAM.js";
 import {
   instrumentFetch
-} from "./chunk-45TY3U7U.js";
+} from "./chunk-A7VHVQTG.js";
 import "./chunk-JU6FJKLT.js";
 
 // src/integration.ts
@@ -55,7 +55,7 @@ function opentelemetry(options = {}) {
                     if (isBuild) return;
                     server.httpServer?.once("listening", async () => {
                       try {
-                        const { instrumentFetch: instrumentFetch2 } = await import("./fetch-Z2DBQPE2.js");
+                        const { instrumentFetch: instrumentFetch2 } = await import("./fetch-PVKAGUFE.js");
                         instrumentFetch2();
                         logger.info("fetch instrumentation enabled");
                       } catch (error) {

package/dist/middleware-entrypoint.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astroscope/opentelemetry",
-  "version": "0.2.1",
-  "description": "OpenTelemetry tracing middleware for Astro SSR",
+  "version": "0.2.2",
+  "description": "OpenTelemetry for Astro — tracing, metrics, and component instrumentation that works in dev mode",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -55,13 +55,13 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^2.2.0",
-    "astro": "^5.1.0",
+    "@opentelemetry/core": "^2.3.0",
+    "astro": "^5.16.9",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@astroscope/excludes": "^0.1.0",
+    "@astroscope/excludes": "^0.1.2",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^2.0.0",
     "astro": "^5.0.0"

package/dist/chunk-63MOS4WA.js

@@ -1,146 +0,0 @@
-import {
-  recordHttpRequestDuration,
-  recordHttpRequestStart
-} from "./chunk-UPNRPRAW.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?.();
-            recordHttpRequestDuration(
-              { method: request.method, route: url.pathname, status },
-              performance.now() - startTime
-            );
-          }
-        };
-        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?.();
-            recordHttpRequestDuration(
-              { method: request.method, route: url.pathname, status: 500 },
-              performance.now() - startTime
-            );
-          }
-          throw e;
-        }
-      }
-    );
-  };
-}
-
-export {
-  createOpenTelemetryMiddleware
-};

package/dist/chunk-7RBJ7XB3.js

@@ -1,150 +0,0 @@
-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 startTime = performance.now();
-    const endActiveRequest = recordHttpRequestStart({ method: request.method, route: url.pathname });
-    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();
-          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();
-          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/chunk-BQFWPPEO.js

@@ -1,83 +0,0 @@
-import {
-  recordFetchRequestDuration
-} from "./chunk-DPYEL3WF.js";
-
-// src/fetch.ts
-import {
-  SpanKind,
-  SpanStatusCode,
-  context,
-  propagation,
-  trace
-} from "@opentelemetry/api";
-var LIB_NAME = "@astroscope/opentelemetry";
-function instrumentFetch() {
-  const originalFetch = globalThis.fetch;
-  async function instrumentedFetch(input, init) {
-    const tracer = trace.getTracer(LIB_NAME);
-    const activeContext = context.active();
-    const request = new Request(input, init);
-    const url = new URL(request.url);
-    const span = tracer.startSpan(
-      `FETCH ${request.method}`,
-      {
-        kind: SpanKind.CLIENT,
-        attributes: {
-          "http.request.method": request.method,
-          "url.full": request.url,
-          "url.path": url.pathname,
-          "url.scheme": url.protocol.replace(":", ""),
-          "server.address": url.hostname,
-          "server.port": url.port ? parseInt(url.port) : url.protocol === "https:" ? 443 : 80
-        }
-      },
-      activeContext
-    );
-    const headers = new Headers(request.headers);
-    const carrier = {};
-    propagation.inject(trace.setSpan(activeContext, span), carrier);
-    for (const [key, value] of Object.entries(carrier)) {
-      headers.set(key, value);
-    }
-    const startTime = performance.now();
-    try {
-      const response = await originalFetch(request.url, {
-        ...init,
-        method: request.method,
-        headers,
-        body: request.body
-      });
-      span.setAttribute("http.response.status_code", response.status);
-      if (response.status >= 400) {
-        span.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: `HTTP ${response.status}`
-        });
-      } else {
-        span.setStatus({ code: SpanStatusCode.OK });
-      }
-      span.end();
-      recordFetchRequestDuration(
-        { method: request.method, host: url.hostname, status: response.status },
-        performance.now() - startTime
-      );
-      return response;
-    } catch (error) {
-      span.setStatus({
-        code: SpanStatusCode.ERROR,
-        message: error instanceof Error ? error.message : "Unknown error"
-      });
-      span.end();
-      recordFetchRequestDuration(
-        { method: request.method, host: url.hostname, status: 0 },
-        performance.now() - startTime
-      );
-      throw error;
-    }
-  }
-  globalThis.fetch = Object.assign(instrumentedFetch, originalFetch);
-}
-
-export {
-  instrumentFetch
-};