azify-logger 1.0.55 → 1.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azify-logger",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "Azify Logger Client - Centralized logging for OpenSearch",
   "main": "index.js",
   "types": "index.d.ts",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@azure/storage-blob": "^12.17.0",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "1.25.0",
-    "@opentelemetry/instrumentation-express": "0.52.0",
-    "@opentelemetry/instrumentation-http": "0.52.0",
-    "@opentelemetry/instrumentation-restify": "0.52.0",
-    "@opentelemetry/resources": "1.25.0",
-    "@opentelemetry/sdk-node": "0.52.0",
-    "@opentelemetry/sdk-trace-base": "1.25.0",
-    "@opentelemetry/semantic-conventions": "1.25.0",
+    "@opentelemetry/core": "^2.7.1",
+    "@opentelemetry/instrumentation-express": "^0.66.0",
+    "@opentelemetry/instrumentation-http": "^0.218.0",
+    "@opentelemetry/instrumentation-restify": "^0.63.0",
+    "@opentelemetry/resources": "^2.7.1",
+    "@opentelemetry/sdk-node": "^0.218.0",
+    "@opentelemetry/sdk-trace-base": "^2.7.1",
+    "@opentelemetry/semantic-conventions": "^1.41.1",
     "adm-zip": "^0.5.16",
     "archiver": "^4.0.2",
     "axios": "^1.7.9",
@@ -63,7 +63,7 @@
     "openid-client": "^5.7.1",
     "passport": "^0.7.0",
     "require-in-the-middle": "^7.4.0",
-    "uuid": "^9.0.1"
+    "uuid": "^11.1.1"
   },
   "peerDependencies": {
     "ioredis": "^5.8.0"
@@ -78,7 +78,8 @@
   },
   "overrides": {
     "semver": "^7.5.2",
-    "glob": "^13.0.0"
+    "glob": "^13.0.0",
+    "uuid": "^11.1.1"
   },
   "engines": {
     "node": ">=20 <=22"
@@ -111,6 +112,8 @@
     "queue/",
     "scripts/redis-worker.js",
     "streams/",
+    "utils/undiciLogBodies.js",
+    "utils/sanitizeSensitiveHttpBody.js",
     "package.json",
     "README.md"
   ]

package/register-http-client-early.js

@@ -11,6 +11,11 @@ try {
   const Module = require('module')
   const path = require('path')
   const EARLY_DIR = __dirname
+  const {
+    resolveUndiciRequestOpts,
+    serializeUndiciRequestBody,
+    restoreUndiciResponseBodyAfterReadForLog
+  } = require(path.join(EARLY_DIR, 'utils/undiciLogBodies'))
 
   function getOtelTraceContext() {
     try {
@@ -155,8 +160,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
@@ -188,26 +204,50 @@ try {
       const traceCtx = ctx || otelCtx
       const rawTraceId = traceCtx && traceCtx.traceId || (require('crypto').randomUUID && require('crypto').randomUUID())
       const traceId = typeof rawTraceId === 'string' ? toTraceIdHex(rawTraceId) : rawTraceId
+      const reqOpts = resolveUndiciRequestOpts(url, options)
+      const requestBodyStr = serializeUndiciRequestBody(reqOpts)
       const requestMeta = { traceId, spanId: (traceCtx && traceCtx.spanId) || null, parentSpanId: (traceCtx && traceCtx.parentSpanId) || null, requestId: (traceCtx && traceCtx.requestId) || null, method, url: urlStr }
+      if (requestBodyStr != null) requestMeta.requestBody = requestBodyStr
       markSource(requestMeta, 'http-client')
       const start = require('perf_hooks').performance.now()
       const skipLog = isLoggerUrl(urlStr)
       if (HTTP_CLIENT_MODE !== 'off' && !skipLog) send('info', `[REQUEST] ${method} ${urlStr}`, requestMeta)
       const wrappedCb = callback ? function (err, data) {
         const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-        if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
-          if (err) send('error', `[RESPONSE] ${method} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
-          else if (data) send('info', `[RESPONSE] ${method} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+        if (err) {
+          if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+            send('error', `[RESPONSE] ${method} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
+          }
+          return callback(err, data)
         }
-        return callback(err, data)
+        if (!data) return callback(err, data)
+        restoreUndiciResponseBodyAfterReadForLog(data).then(({ logStr, data: restored }) => {
+          if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+            const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+            if (logStr != null) meta.responseBody = logStr
+            send('info', `[RESPONSE] ${method} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+          }
+          return callback(null, restored)
+        }).catch(() => {
+          if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+            send('info', `[RESPONSE] ${method} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+          }
+          return callback(null, data)
+        })
       } : undefined
       if (wrappedCb) return origRequest.call(this, url, options, wrappedCb)
       const p = origRequest.call(this, url, options)
       if (p && typeof p.then === 'function') {
         return p.then(
-          (data) => {
+          async (data) => {
             const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-            if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) send('info', `[RESPONSE] ${method} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+            if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) {
+              const { logStr, data: restored } = await restoreUndiciResponseBodyAfterReadForLog(data)
+              const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+              if (logStr != null) meta.responseBody = logStr
+              send('info', `[RESPONSE] ${method} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+              return restored
+            }
             return data
           },
           (err) => {
@@ -233,25 +273,48 @@ try {
         const traceCtx = ctx || otelCtx
         const rawTraceId = (traceCtx && traceCtx.traceId) || (require('crypto').randomUUID && require('crypto').randomUUID())
         const traceId = typeof rawTraceId === 'string' ? toTraceIdHex(rawTraceId) : rawTraceId
+        const requestBodyStr = serializeUndiciRequestBody(opts || {})
         const requestMeta = { traceId, spanId: (traceCtx && traceCtx.spanId) || null, parentSpanId: (traceCtx && traceCtx.parentSpanId) || null, requestId: (traceCtx && traceCtx.requestId) || null, method: methodStr, url: urlStr }
+        if (requestBodyStr != null) requestMeta.requestBody = requestBodyStr
         markSource(requestMeta, 'http-client')
         const start = require('perf_hooks').performance.now()
         const skipLog = isLoggerUrl(urlStr)
         if (HTTP_CLIENT_MODE !== 'off' && !skipLog) send('info', `[REQUEST] ${methodStr} ${urlStr}`, requestMeta)
         const wrappedCb = typeof callback === 'function' ? function (err, data) {
           const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-          if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
-            if (err) send('error', `[RESPONSE] ${methodStr} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
-            else if (data) send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+          if (err) {
+            if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+              send('error', `[RESPONSE] ${methodStr} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
+            }
+            return callback(err, data)
           }
-          return callback(err, data)
+          if (!data) return callback(err, data)
+          restoreUndiciResponseBodyAfterReadForLog(data).then(({ logStr, data: restored }) => {
+            if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+              const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+              if (logStr != null) meta.responseBody = logStr
+              send('info', `[RESPONSE] ${methodStr} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+            }
+            return callback(null, restored)
+          }).catch(() => {
+            if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+              send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+            }
+            return callback(null, data)
+          })
         } : undefined
         const ret = wrappedCb ? origDisp.call(this, opts, wrappedCb) : origDisp.call(this, opts)
         if (ret && typeof ret.then === 'function' && !wrappedCb) {
           return ret.then(
-            (data) => {
+            async (data) => {
               const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-              if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+              if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) {
+                const { logStr, data: restored } = await restoreUndiciResponseBodyAfterReadForLog(data)
+                const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+                if (logStr != null) meta.responseBody = logStr
+                send('info', `[RESPONSE] ${methodStr} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+                return restored
+              }
               return data
             },
             (err) => {
@@ -312,25 +375,48 @@ try {
           const traceCtx = ctx || otelCtx
           const rawTraceId = (traceCtx && traceCtx.traceId) || (require('crypto').randomUUID && require('crypto').randomUUID())
           const traceId = typeof rawTraceId === 'string' ? (toTraceIdHex ? toTraceIdHex(rawTraceId) : rawTraceId) : rawTraceId
+          const requestBodyStr = serializeUndiciRequestBody(opts || {})
           const requestMeta = { traceId, spanId: (traceCtx && traceCtx.spanId) || null, parentSpanId: (traceCtx && traceCtx.parentSpanId) || null, requestId: (traceCtx && traceCtx.requestId) || null, method: methodStr, url: urlStr }
+          if (requestBodyStr != null) requestMeta.requestBody = requestBodyStr
           if (markSource) markSource(requestMeta, 'http-client')
           const start = require('perf_hooks').performance.now()
           const skipLog = isLoggerUrl(urlStr)
           if (HTTP_CLIENT_MODE !== 'off' && !skipLog) send('info', `[REQUEST] ${methodStr} ${urlStr}`, requestMeta)
           const wrappedCb = typeof callback === 'function' ? function (err, data) {
             const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-            if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
-              if (err) send('error', `[RESPONSE] ${methodStr} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
-              else if (data) send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+            if (err) {
+              if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+                send('error', `[RESPONSE] ${methodStr} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
+              }
+              return callback(err, data)
             }
-            return callback(err, data)
+            if (!data) return callback(err, data)
+            restoreUndiciResponseBodyAfterReadForLog(data).then(({ logStr, data: restored }) => {
+              if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+                const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+                if (logStr != null) meta.responseBody = logStr
+                send('info', `[RESPONSE] ${methodStr} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+              }
+              return callback(null, restored)
+            }).catch(() => {
+              if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+                send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+              }
+              return callback(null, data)
+            })
           } : undefined
           const ret = wrappedCb ? origReq.call(this, opts, wrappedCb) : origReq.call(this, opts)
           if (ret && typeof ret.then === 'function' && !wrappedCb) {
             return ret.then(
-              (data) => {
+              async (data) => {
                 const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-                if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+                if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) {
+                  const { logStr, data: restored } = await restoreUndiciResponseBodyAfterReadForLog(data)
+                  const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+                  if (logStr != null) meta.responseBody = logStr
+                  send('info', `[RESPONSE] ${methodStr} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+                  return restored
+                }
                 return data
               },
               (err) => {
@@ -390,25 +476,48 @@ try {
         const traceCtx = ctx || otelCtx
         const rawTraceId = (traceCtx && traceCtx.traceId) || (require('crypto').randomUUID && require('crypto').randomUUID())
         const traceId = typeof rawTraceId === 'string' ? (toTraceIdHex ? toTraceIdHex(rawTraceId) : rawTraceId) : rawTraceId
+        const requestBodyStr = serializeUndiciRequestBody(opts || {})
         const requestMeta = { traceId, spanId: (traceCtx && traceCtx.spanId) || null, parentSpanId: (traceCtx && traceCtx.parentSpanId) || null, requestId: (traceCtx && traceCtx.requestId) || null, method: methodStr, url: urlStr }
+        if (requestBodyStr != null) requestMeta.requestBody = requestBodyStr
         if (markSource) markSource(requestMeta, 'http-client')
         const start = require('perf_hooks').performance.now()
         const skipLog = isLoggerUrl(urlStr)
         if (HTTP_CLIENT_MODE !== 'off' && !skipLog) send('info', `[REQUEST] ${methodStr} ${urlStr}`, requestMeta)
         const wrappedCb = typeof callback === 'function' ? function (err, data) {
           const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-          if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
-            if (err) send('error', `[RESPONSE] ${methodStr} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
-            else if (data) send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+          if (err) {
+            if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+              send('error', `[RESPONSE] ${methodStr} ${urlStr} ERROR ${duration}ms`, { ...requestMeta, error: err && err.message, responseTimeMs: duration })
+            }
+            return callback(err, data)
           }
-          return callback(err, data)
+          if (!data) return callback(err, data)
+          restoreUndiciResponseBodyAfterReadForLog(data).then(({ logStr, data: restored }) => {
+            if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+              const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+              if (logStr != null) meta.responseBody = logStr
+              send('info', `[RESPONSE] ${methodStr} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+            }
+            return callback(null, restored)
+          }).catch(() => {
+            if (HTTP_CLIENT_MODE !== 'off' && !skipLog) {
+              send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+            }
+            return callback(null, data)
+          })
         } : undefined
         const ret = wrappedCb ? origReq.call(this, opts, wrappedCb) : origReq.call(this, opts)
         if (ret && typeof ret.then === 'function' && !wrappedCb) {
           return ret.then(
-            (data) => {
+            async (data) => {
               const duration = Number((require('perf_hooks').performance.now() - start).toFixed(2))
-              if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) send('info', `[RESPONSE] ${methodStr} ${urlStr} ${data.statusCode} ${duration}ms`, { ...requestMeta, statusCode: data.statusCode, responseTimeMs: duration })
+              if (HTTP_CLIENT_MODE !== 'off' && !skipLog && data) {
+                const { logStr, data: restored } = await restoreUndiciResponseBodyAfterReadForLog(data)
+                const meta = { ...requestMeta, statusCode: restored.statusCode, responseTimeMs: duration }
+                if (logStr != null) meta.responseBody = logStr
+                send('info', `[RESPONSE] ${methodStr} ${urlStr} ${restored.statusCode} ${duration}ms`, meta)
+                return restored
+              }
               return data
             },
             (err) => {
@@ -736,6 +845,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-otel.js

@@ -5,12 +5,12 @@ function normalizeServiceNameForTraces(s) {
 
 try {
   const { NodeSDK } = require('@opentelemetry/sdk-node')
-  const { AlwaysOnSampler } = require('@opentelemetry/core')
+  const { AlwaysOnSampler } = require('@opentelemetry/sdk-trace-base')
   const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http')
   const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express')
   const { RestifyInstrumentation } = require('@opentelemetry/instrumentation-restify')
-  const { Resource } = require('@opentelemetry/resources')
-  const { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } = require('@opentelemetry/semantic-conventions')
+  const { resourceFromAttributes } = require('@opentelemetry/resources')
+  const { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } = require('@opentelemetry/semantic-conventions')
 
   const rawName = process.env.APP_NAME || process.env.OTEL_SERVICE_NAME || process.env.SERVICE_NAME || 'app'
   const serviceName = normalizeServiceNameForTraces(rawName)
@@ -157,9 +157,9 @@ try {
   }
   
   const sdk = new NodeSDK({
-    resource: new Resource({
-      [SEMRESATTRS_SERVICE_NAME]: serviceName,
-      [SEMRESATTRS_SERVICE_VERSION]: serviceVersion
+    resource: resourceFromAttributes({
+      [ATTR_SERVICE_NAME]: serviceName,
+      [ATTR_SERVICE_VERSION]: serviceVersion
     }),
     spanProcessor,
     sampler: new AlwaysOnSampler(),