@jaypie/express 1.2.22 → 1.2.24

package/dist/esm/index.js

@@ -5,7 +5,7 @@ import { force, envBoolean, JAYPIE, HTTP, getHeaderFrom, jaypieHandler } from '@
 import expressCors from 'cors';
 import { loadEnvSecrets, getContentTypeForFormat, formatStreamError } from '@jaypie/aws';
 import { log, redactAuth } from '@jaypie/logger';
-import { hasDatadogEnv, submitMetric, DATADOG } from '@jaypie/datadog';
+import { hasDatadogEnv, submitMetric, DATADOG, loadDatadogApiKey } from '@jaypie/datadog';
 
 //
 //
@@ -1863,6 +1863,10 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
         //
         // Build a request-local setup list to avoid mutating the shared array
         const requestSetup = [];
+        // Load the Datadog LLM Observability API key into the environment when enabled
+        requestSetup.push(async () => {
+            await loadDatadogApiKey();
+        });
         // Load secrets into process.env if configured
         if (secrets && secrets.length > 0) {
             const secretsToLoad = secrets;
@@ -2022,19 +2026,37 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
             res: summarizeResponse(res, extras),
         });
         // Construct normalized path for reporting and metrics
-        let path = (req.baseUrl || "") + (req.url || "");
-        if (!path.startsWith("/")) {
-            path = "/" + path;
+        let pathWithQuery = (req.baseUrl || "") + (req.url || "");
+        if (!pathWithQuery.startsWith("/")) {
+            pathWithQuery = "/" + pathWithQuery;
         }
+        const queryIndex = pathWithQuery.indexOf("?");
+        let path = queryIndex >= 0 ? pathWithQuery.slice(0, queryIndex) : pathWithQuery;
+        const rawQuery = queryIndex >= 0 ? pathWithQuery.slice(queryIndex + 1) : "";
         if (path.length > 1 && path.endsWith("/")) {
             path = path.slice(0, -1);
         }
         // Replace UUIDs with :id for better aggregation
         path = path.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ":id");
+        // Normalize query params (sort alphabetically for stable aggregation)
+        let query = "";
+        if (rawQuery) {
+            const params = new URLSearchParams(rawQuery);
+            params.sort();
+            query = params.toString();
+        }
+        // Capture request content metadata
+        const headers = req.headers || {};
+        const contentType = String(headers["content-type"] || "");
+        const contentLengthHeader = headers["content-length"];
+        const contentLength = contentLengthHeader ? Number(contentLengthHeader) : 0;
         // Add request data to session report
         logger$1.report({
             method: req.method,
             path,
+            query,
+            contentType,
+            contentLength,
             status: String(res.statusCode),
         });
         // Submit metric if Datadog is configured