@astroscope/opentelemetry 0.1.0 → 0.1.1

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

@@ -1,15 +1,9 @@
 import {
   recordFetchRequestDuration
-} from "./chunk-DPYEL3WF.js";
+} from "./chunk-JU6FJKLT.js";
 
 // src/fetch.ts
-import {
-  SpanKind,
-  SpanStatusCode,
-  context,
-  propagation,
-  trace
-} from "@opentelemetry/api";
+import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 var LIB_NAME = "@astroscope/opentelemetry";
 function instrumentFetch() {
   const originalFetch = globalThis.fetch;

package/dist/{chunk-DPYEL3WF.js → chunk-JU6FJKLT.js}

@@ -1,5 +1,5 @@
 // src/metrics.ts
-import { metrics, ValueType } from "@opentelemetry/api";
+import { ValueType, metrics } from "@opentelemetry/api";
 var LIB_NAME = "@astroscope/opentelemetry";
 var httpRequestDuration = null;
 var httpActiveRequests = null;
@@ -50,7 +50,6 @@ function getActionDuration() {
   return actionDuration;
 }
 function recordHttpRequestStart(attributes) {
-  const startTime = performance.now();
   getHttpActiveRequests().add(1, {
     "http.request.method": attributes.method,
     "http.route": attributes.route

package/dist/{chunk-7RBJ7XB3.js → chunk-PCCKGEEG.js}

@@ -2,16 +2,10 @@ import {
   recordActionDuration,
   recordHttpRequestDuration,
   recordHttpRequestStart
-} from "./chunk-DPYEL3WF.js";
+} from "./chunk-JU6FJKLT.js";
 
 // src/middleware.ts
-import {
-  SpanKind,
-  SpanStatusCode,
-  context,
-  propagation,
-  trace
-} from "@opentelemetry/api";
+import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { RPCType, setRPCMetadata } from "@opentelemetry/core";
 var LIB_NAME = "@astroscope/opentelemetry";
 var ACTIONS_PREFIX = "/_actions/";
@@ -29,11 +23,10 @@ function shouldExclude(ctx, exclude) {
   if (typeof exclude === "function") {
     return exclude(ctx);
   }
-  const path = ctx.url.pathname;
-  return exclude.some((pattern) => matchesPattern(path, pattern));
+  return exclude.some((pattern) => matchesPattern(ctx.url.pathname, 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
+  return request.headers.get("x-forwarded-for")?.split(",")[0].trim() ?? request.headers.get("x-real-ip") ?? request.headers.get("cf-connecting-ip") ?? // no native ip address access in Astro available
   void 0;
 }
 function createOpenTelemetryMiddleware(options = {}) {
@@ -42,21 +35,18 @@ function createOpenTelemetryMiddleware(options = {}) {
     if (shouldExclude(ctx, options.exclude)) {
       return next();
     }
+    const startTime = performance.now();
     const { request, url } = ctx;
-    const input = {
-      traceparent: request.headers.get("traceparent"),
-      tracestate: request.headers.get("tracestate")
-    };
+    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 clientIp = getClientIp(request);
     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,
@@ -72,76 +62,66 @@ function createOpenTelemetryMiddleware(options = {}) {
     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) {
+    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: e instanceof Error ? e.message : "Unknown error"
+            message: `HTTP ${status}`
           });
-          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);
+        } 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);
           }
-          throw e;
+        })();
+        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;
       }
-    );
+    });
   };
 }
 

package/dist/fetch-Z2DBQPE2.js

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

package/dist/index.js

@@ -1,10 +1,10 @@
 import {
   createOpenTelemetryMiddleware
-} from "./chunk-7RBJ7XB3.js";
+} from "./chunk-PCCKGEEG.js";
 import {
   instrumentFetch
-} from "./chunk-BQFWPPEO.js";
-import "./chunk-DPYEL3WF.js";
+} from "./chunk-45TY3U7U.js";
+import "./chunk-JU6FJKLT.js";
 
 // src/integration.ts
 import fs from "fs";
@@ -18,10 +18,7 @@ var DEV_EXCLUDES = [
   { prefix: "/src/" },
   { prefix: "/node_modules/" }
 ];
-var ASTRO_STATIC_EXCLUDES = [
-  { prefix: "/_astro/" },
-  { prefix: "/_image" }
-];
+var ASTRO_STATIC_EXCLUDES = [{ prefix: "/_astro/" }, { prefix: "/_image" }];
 var STATIC_EXCLUDES = [
   { exact: "/favicon.ico" },
   { exact: "/robots.txt" },
@@ -31,26 +28,13 @@ var STATIC_EXCLUDES = [
   { exact: "/manifest.webmanifest" },
   { prefix: "/.well-known/" }
 ];
-var RECOMMENDED_EXCLUDES = [
-  ...DEV_EXCLUDES,
-  ...ASTRO_STATIC_EXCLUDES,
-  ...STATIC_EXCLUDES
-];
+var RECOMMENDED_EXCLUDES = [...DEV_EXCLUDES, ...ASTRO_STATIC_EXCLUDES, ...STATIC_EXCLUDES];
 
 // src/integration.ts
 var VIRTUAL_MODULE_ID = "virtual:@astroscope/opentelemetry/config";
-var RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
+var RESOLVED_VIRTUAL_MODULE_ID = `\0${VIRTUAL_MODULE_ID}`;
 function serializeExcludePatterns(patterns) {
-  const items = patterns.map((p) => {
-    if ("pattern" in p) {
-      return `{ pattern: ${p.pattern.toString()} }`;
-    } else if ("prefix" in p) {
-      return `{ prefix: ${JSON.stringify(p.prefix)} }`;
-    } else {
-      return `{ exact: ${JSON.stringify(p.exact)} }`;
-    }
-  });
-  return `[${items.join(", ")}]`;
+  return `[${patterns.map((p) => "pattern" in p ? `{ pattern: ${p.pattern.toString()} }` : JSON.stringify(p)).join(", ")}]`;
 }
 function opentelemetry(options = {}) {
   const httpConfig = options.instrumentations?.http ?? {
@@ -64,12 +48,7 @@ function opentelemetry(options = {}) {
   return {
     name: "@astroscope/opentelemetry",
     hooks: {
-      "astro:config:setup": ({
-        command,
-        updateConfig,
-        logger,
-        addMiddleware
-      }) => {
+      "astro:config:setup": ({ command, updateConfig, logger, addMiddleware }) => {
         isBuild = command === "build";
         if (httpConfig.enabled) {
           addMiddleware({
@@ -93,7 +72,6 @@ function opentelemetry(options = {}) {
                   }
                 }
               },
-              // Only add fetch instrumentation plugin if enabled
               ...fetchConfig.enabled ? [
                 {
                   name: "@astroscope/opentelemetry/fetch",
@@ -101,7 +79,7 @@ function opentelemetry(options = {}) {
                     if (isBuild) return;
                     server.httpServer?.once("listening", async () => {
                       try {
-                        const { instrumentFetch: instrumentFetch2 } = await import("./fetch-RERXGIJA.js");
+                        const { instrumentFetch: instrumentFetch2 } = await import("./fetch-Z2DBQPE2.js");
                         instrumentFetch2();
                         logger.info("fetch instrumentation enabled");
                       } catch (error) {
@@ -118,15 +96,14 @@ function opentelemetry(options = {}) {
                     if (!outDir) return;
                     const entryPath = path.join(outDir, "entry.mjs");
                     if (!fs.existsSync(entryPath)) return;
-                    let content = fs.readFileSync(entryPath, "utf-8");
-                    const instrumentCode = `import { instrumentFetch } from '@astroscope/opentelemetry';
+                    const content = fs.readFileSync(entryPath, "utf-8");
+                    fs.writeFileSync(
+                      entryPath,
+                      `import { instrumentFetch } from '@astroscope/opentelemetry';
 instrumentFetch();
-`;
-                    content = instrumentCode + content;
-                    fs.writeFileSync(entryPath, content);
-                    logger.info(
-                      "injected fetch instrumentation into entry.mjs"
+${content}`
                     );
+                    logger.info("injected fetch instrumentation into entry.mjs");
                   }
                 }
               ] : []

package/dist/middleware-entrypoint.js

@@ -1,13 +1,11 @@
 import {
   createOpenTelemetryMiddleware
-} from "./chunk-7RBJ7XB3.js";
-import "./chunk-DPYEL3WF.js";
+} from "./chunk-PCCKGEEG.js";
+import "./chunk-JU6FJKLT.js";
 
 // src/middleware-entrypoint.ts
 import { excludePatterns } from "virtual:@astroscope/opentelemetry/config";
-var onRequest = createOpenTelemetryMiddleware({
-  exclude: excludePatterns
-});
+var onRequest = createOpenTelemetryMiddleware({ exclude: excludePatterns });
 export {
   onRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroscope/opentelemetry",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OpenTelemetry tracing middleware for Astro SSR",
   "type": "module",
   "main": "./dist/index.js",
@@ -55,14 +55,14 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^1.30.0",
+    "@opentelemetry/core": "^2.2.0",
     "astro": "^5.1.0",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/core": "^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-CEPTXEJV.js

@@ -1,89 +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";
-var metricsEnabled = false;
-function instrumentFetch(options) {
-  metricsEnabled = options?.metrics ?? false;
-  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 = metricsEnabled ? performance.now() : 0;
-    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();
-      if (metricsEnabled) {
-        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();
-      if (metricsEnabled) {
-        recordFetchRequestDuration(
-          { method: request.method, host: url.hostname, status: 0 },
-          performance.now() - startTime
-        );
-      }
-      throw error;
-    }
-  }
-  globalThis.fetch = Object.assign(instrumentedFetch, originalFetch);
-}
-
-export {
-  instrumentFetch
-};

package/dist/chunk-FEC4ETRL.js

@@ -1,70 +0,0 @@
-// 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);
-    }
-    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();
-      return response;
-    } catch (error) {
-      span.setStatus({
-        code: SpanStatusCode.ERROR,
-        message: error instanceof Error ? error.message : "Unknown error"
-      });
-      span.end();
-      throw error;
-    }
-  }
-  globalThis.fetch = Object.assign(instrumentedFetch, originalFetch);
-}
-
-export {
-  instrumentFetch
-};