azify-logger 1.0.54-test-3 → 1.0.55-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azify-logger",
-  "version": "1.0.54-test-3",
+  "version": "1.0.55-test",
   "description": "Azify Logger Client - Centralized logging for OpenSearch",
   "main": "index.js",
   "types": "index.d.ts",

package/register-http-client-early.js

@@ -155,8 +155,19 @@ try {
   }
 
   function patchUndiciExports(exports) {
+    if (!exports || typeof exports !== 'object') return
+    if (typeof exports.fetch === 'function' && typeof globalThis.fetch === 'function' && globalThis.fetch.__azifyLoggerFetchPatched) {
+      if (exports.fetch !== globalThis.fetch) {
+        exports.fetch = globalThis.fetch
+        httpLog('undici exports.fetch -> globalThis.fetch (body logging)')
+      }
+    }
     const hasRequest = exports && typeof exports.request === 'function' && !exports.request.__azifyPatched
-    const hasFetch = exports && typeof exports.fetch === 'function' && !exports.fetch.__azifyPatched
+    const hasFetch =
+      exports &&
+      typeof exports.fetch === 'function' &&
+      !exports.fetch.__azifyPatched &&
+      !exports.fetch.__azifyLoggerFetchPatched
     if (!exports || (!hasRequest && !hasFetch)) return
     const deps = loadStoreAndSampling()
     const noDeps = !deps
@@ -736,6 +747,7 @@ try {
   function patchGlobalFetch() {
     try {
       if (typeof globalThis.fetch !== 'function') return
+      if (globalThis.fetch.__azifyLoggerFetchPatched) return
       if (globalThis.fetch.__azifyPatched) return
       const deps = loadStoreAndSampling()
       if (!deps || deps.HTTP_CLIENT_MODE === 'off') return

package/register.js

@@ -1588,6 +1588,35 @@ try {
         return url
       }
 
+      const MAX_HTTP_BODY_CHARS = Math.min(
+        Math.max(parseInt(String(process.env.AZIFY_LOGGER_HTTP_BODY_MAX_CHARS || '5000'), 10) || 5000, 100),
+        100000
+      )
+      function clipHttpLogString(s) {
+        if (typeof s !== 'string') return s
+        return s.length > MAX_HTTP_BODY_CHARS ? s.slice(0, MAX_HTTP_BODY_CHARS) : s
+      }
+      function stringifyHttpBodyForLog(value) {
+        if (value == null) return null
+        try {
+          if (typeof value === 'string') {
+            return clipHttpLogString(value)
+          }
+          if (Buffer.isBuffer(value)) {
+            return clipHttpLogString(value.toString('utf8'))
+          }
+          if (value && typeof value.pipe === 'function') {
+            return '[Stream]'
+          }
+          if (typeof value === 'object') {
+            return clipHttpLogString(JSON.stringify(value))
+          }
+          return clipHttpLogString(String(value))
+        } catch (_) {
+          return '[unserializable]'
+        }
+      }
+
       const patchInstance = (instance) => {
         if (instance.__azifyLoggerPatched) {
           return instance
@@ -1631,6 +1660,11 @@ try {
               headers: config.headers
             }
 
+            const requestBodyString = stringifyHttpBodyForLog(config.data)
+            if (requestBodyString != null) {
+              requestMeta.requestBody = requestBodyString
+            }
+
             markSource(requestMeta, 'http-client')
             config.__azifyLogger = {
               meta: requestMeta,
@@ -1684,12 +1718,15 @@ try {
 
                 const stringifyBody = (value) => {
                   if (value == null) return null
-                  if (typeof value === 'string') return value
+                  if (typeof value === 'string') return clipHttpLogString(value)
+                  if (Buffer.isBuffer(value)) {
+                    return clipHttpLogString(value.toString('utf8'))
+                  }
                   try {
-                    return JSON.stringify(value)
+                    return clipHttpLogString(JSON.stringify(value))
                   } catch (_) {
                     try {
-                      return String(value)
+                      return clipHttpLogString(String(value))
                     } catch (_) {
                       return null
                     }
@@ -1698,17 +1735,16 @@ try {
 
                 if (marker && marker.meta) {
                   duration = Number((performance.now() - marker.start).toFixed(2))
-                  let responseBodyString = stringifyBody(response.data)
-                  if (typeof responseBodyString === 'string' && responseBodyString.length > 5000) {
-                    responseBodyString = responseBodyString.slice(0, 5000)
-                  }
+                  const responseBodyString = stringifyBody(response.data)
                   meta = {
                     ...marker.meta,
                     url: finalUrl,
                     statusCode: response.status,
                     responseTimeMs: duration,
-                    responseHeaders: response.headers,
-                    responseBody: responseBodyString
+                    responseHeaders: response.headers
+                  }
+                  if (responseBodyString != null) {
+                    meta.responseBody = responseBodyString
                   }
                 } else {
                   const requestHeaders = response.config?.headers || {}
@@ -1717,10 +1753,7 @@ try {
                   const spanId = requestHeaders['x-span-id'] || requestHeaders['X-Span-ID'] || randomBytes(8).toString('hex')
                   const parentSpanId = requestHeaders['x-parent-span-id'] || requestHeaders['X-Parent-Span-ID'] || ctx?.spanId || null
                   const requestId = requestHeaders['x-request-id'] || requestHeaders['X-Request-ID'] || ctx?.requestId || randomUUID()
-                  let responseBodyString = stringifyBody(response.data)
-                  if (typeof responseBodyString === 'string' && responseBodyString.length > 5000) {
-                    responseBodyString = responseBodyString.slice(0, 5000)
-                  }
+                  const responseBodyString = stringifyBody(response.data)
 
                   meta = {
                     traceId,
@@ -1731,8 +1764,10 @@ try {
                     url: finalUrl,
                     statusCode: response.status,
                     responseTimeMs: duration,
-                    responseHeaders: response.headers,
-                    responseBody: responseBodyString
+                    responseHeaders: response.headers
+                  }
+                  if (responseBodyString != null) {
+                    meta.responseBody = responseBodyString
                   }
                 }
 

package/scripts/redis-worker.js

@@ -254,6 +254,9 @@ function sanitizePayload(payload) {
     if (sanitized.meta.responseBody) {
       sanitized.meta.responseBody = sanitizeBody(sanitized.meta.responseBody)
     }
+    if (sanitized.meta.requestBody) {
+      sanitized.meta.requestBody = sanitizeBody(sanitized.meta.requestBody)
+    }
   }
   
   return sanitized