azify-logger 1.0.54-test → 1.0.54-test-2

package/package.json

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

package/register-http-client-early.js

@@ -37,6 +37,45 @@ try {
     return a === b || a.startsWith(b + '/')
   }
 
+  /** undici.request(url, opts) / request(opts) — muitas chamadas não trazem origin; path pode ser URL absoluta ou só path + hostname. */
+  function resolveUrlStrFromUndiciRequestArgs(url, options) {
+    const opts = (typeof url === 'object' && url !== null && !(url instanceof URL)) ? url : options
+    const urlArg = (typeof url === 'string' || (url && (url.href || url instanceof URL))) ? url : (opts && (opts.url || opts.uri))
+    if (typeof urlArg === 'string') return urlArg
+    if (urlArg && typeof urlArg.href === 'string') return urlArg.href
+    if (urlArg && typeof urlArg.toString === 'function') return urlArg.toString()
+    if (opts && typeof opts.origin === 'string' && opts.path != null) {
+      return opts.origin + (String(opts.path).startsWith('/') ? '' : '/') + String(opts.path)
+    }
+    if (opts && typeof opts.path === 'string' && /^https?:\/\//i.test(opts.path)) {
+      return opts.path
+    }
+    if (opts && (opts.hostname || opts.host)) {
+      const h = String(opts.hostname || String(opts.host || '').split(':')[0]).trim()
+      if (h) {
+        const proto = (opts.protocol && String(opts.protocol).replace(/:$/, '')) || 'https'
+        const pnum = opts.port != null && opts.port !== '' ? Number(opts.port) : NaN
+        const port = !Number.isNaN(pnum) && pnum !== 80 && pnum !== 443 ? ':' + pnum : ''
+        const p = opts.path != null ? String(opts.path) : '/'
+        return proto + '://' + h + port + (p.startsWith('/') ? p : '/' + p)
+      }
+    }
+    return 'unknown'
+  }
+
+  function resolveUrlStrFromDispatcherOpts(opts) {
+    if (!opts || typeof opts !== 'object') return 'unknown'
+    const origin = (opts.origin) || ''
+    const pathPart = opts.path != null ? opts.path : '/'
+    const pathStr = String(pathPart)
+    if (/^https?:\/\//i.test(pathStr)) return pathStr
+    if (origin) return origin + (pathStr.startsWith('/') ? pathStr : '/' + pathStr)
+    if (opts.hostname || opts.host) {
+      return resolveUrlStrFromUndiciRequestArgs(null, opts)
+    }
+    return 'unknown'
+  }
+
   function send(level, message, meta) {
     try {
       const msgStr = String(message)
@@ -118,12 +157,7 @@ try {
     exports.request = function (url, options, callback) {
       const opts = (typeof url === 'object' && url !== null && !(url instanceof URL)) ? url : options
       const method = ((opts && opts.method) || 'GET').toUpperCase()
-      let urlStr = 'unknown'
-      const urlArg = (typeof url === 'string' || (url && (url.href || url instanceof URL))) ? url : (opts && (opts.url || opts.uri))
-      if (typeof urlArg === 'string') urlStr = urlArg
-      else if (urlArg && typeof urlArg.href === 'string') urlStr = urlArg.href
-      else if (urlArg && typeof urlArg.toString === 'function') urlStr = urlArg.toString()
-      else if (opts && typeof opts.origin === 'string' && opts.path != null) urlStr = opts.origin + (String(opts.path).startsWith('/') ? '' : '/') + String(opts.path)
+      const urlStr = resolveUrlStrFromUndiciRequestArgs(url, options)
       if (process.env.AZIFY_LOGGER_DEBUG === '1') { try { process.stderr.write('[AZIFY-PATCH] undici.request ' + method + ' ' + urlStr.slice(0, 80) + '\n') } catch (_) {} }
       const _ep = process.env.AZIFY_DEBUG_LOG_PATH
       if (_ep) { try { require('fs').appendFileSync(_ep, new Date().toISOString() + ' [AZIFY] WRAPPER exports.request ' + method + ' ' + urlStr.slice(0, 100) + '\n') } catch (_) {} }
@@ -174,9 +208,7 @@ try {
       const origDisp = proto.request
       proto.request = function (opts, callback) {
         const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-        const origin = (opts && opts.origin) || ''
-        const path = (opts && opts.path) != null ? opts.path : '/'
-        const urlStr = origin ? (origin + (path.startsWith('/') ? path : '/' + path)) : 'unknown'
+        const urlStr = resolveUrlStrFromDispatcherOpts(opts)
         httpLog('WRAPPER Dispatcher.request ' + methodStr + ' ' + urlStr.slice(0, 80))
         const ctx = getRequestContext() || getLastJobContext()
         const otelCtx = getOtelTraceContext()
@@ -255,9 +287,7 @@ try {
         if (typeof origReq !== 'function') return d
         d.request = function (opts, callback) {
           const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-          const origin = (opts && opts.origin) || ''
-          const pathPart = (opts && opts.path) != null ? opts.path : '/'
-          const urlStr = origin ? (origin + (pathPart.startsWith('/') ? pathPart : '/' + pathPart)) : 'unknown'
+          const urlStr = resolveUrlStrFromDispatcherOpts(opts)
           httpLog('WRAPPER getGlobalDispatcher().request ' + methodStr + ' ' + urlStr.slice(0, 80))
           const ctx = getRequestContext ? getRequestContext() : (getLastJobContext ? getLastJobContext() : null)
           const otelCtx = getOtelTraceContext()
@@ -333,9 +363,7 @@ try {
       const HTTP_CLIENT_MODE = deps ? deps.HTTP_CLIENT_MODE : 'all'
       d.request = function (opts, callback) {
         const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-        const origin = (opts && opts.origin) || ''
-        const pathPart = (opts && opts.path) != null ? opts.path : '/'
-        const urlStr = origin ? (origin + (pathPart.startsWith('/') ? pathPart : '/' + pathPart)) : 'unknown'
+        const urlStr = resolveUrlStrFromDispatcherOpts(opts)
         httpLog('WRAPPER globalThis.dispatcher.request ' + methodStr + ' ' + urlStr.slice(0, 80))
         const _dp = process.env.AZIFY_DEBUG_LOG_PATH
         if (_dp) { try { require('fs').appendFileSync(_dp, new Date().toISOString() + ' [AZIFY] WRAPPER globalDispatcher.request ' + methodStr + ' ' + urlStr.slice(0, 100) + '\n') } catch (_) {} }
@@ -608,14 +636,12 @@ try {
             const RequestHandler = mod.exports.RequestHandler
             mod.exports = function wrappedApiRequest(opts, callback) {
               const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-              const urlPart = (opts && opts.origin) ? String(opts.origin).slice(0, 80) : (opts && opts.path) || ''
+              const urlStr = resolveUrlStrFromDispatcherOpts(opts)
+              const urlPart = urlStr !== 'unknown' ? urlStr.slice(0, 80) : ((opts && opts.origin) ? String(opts.origin).slice(0, 80) : (opts && opts.path) || '')
               if (HTTP_DEBUG) try { process.stderr.write('[AZIFY-PATCH] api-request ' + methodStr + ' ' + urlPart + '\n') } catch (_) {}
               if (HTTP_VERBOSE || HTTP_DEBUG) {
                 try { process.stderr.write('[AZIFY] HTTP wrapper api-request ' + methodStr + ' ' + urlPart + '\n') } catch (_) {}
               }
-              const origin = (opts && opts.origin) || ''
-              const pathPart = (opts && opts.path) != null ? opts.path : '/'
-              const urlStr = origin ? (origin + (pathPart.startsWith('/') ? pathPart : '/' + pathPart)) : 'unknown'
               httpLog('WRAPPER api-request ' + methodStr + ' ' + urlStr.slice(0, 80))
               const ctx = getRequestContext() || getLastJobContext()
               const otelCtx = getOtelTraceContext()

package/register.js

@@ -10,7 +10,12 @@ try {
   }
   const ModuleForRequire = require('module')
   const nodeRequireOriginal = ModuleForRequire.prototype.require
-  const bunyan = require('bunyan')
+  let bunyan = null
+  try {
+    bunyan = require('bunyan')
+  } catch (_) {
+    /* bunyan é opcional; sem ele o patch Bunyan não aplica, mas HTTP/Pino/axios devem continuar */
+  }
   const createBunyanStream = require('./streams/bunyan')
   const { createHttpLoggerTransport } = require('./streams/httpQueue')
   const { getRequestContext } = require('./store')
@@ -146,7 +151,6 @@ try {
   const debug = process.env.AZIFY_LOGGER_DEBUG === '1'
   const httpVerbose = process.env.AZIFY_LOGGER_HTTP_VERBOSE === '1'
 
-  /** Quando o patch não consegue ler a URL dos args (undici/http), meta.url fica 'unknown', mas a mensagem ainda traz a URL. */
   function extractUrlFromReqResMessage(msgStr) {
     const s = String(msgStr)
     const m1 = s.match(/\[(?:REQUEST|RESPONSE)\]\s+\S+\s+(https?:\/\/\S+)/i)
@@ -156,6 +160,8 @@ try {
     return null
   }
 
+  const OPAQUE_NO_URL = 'https://opaque.invalid/azify-logger-no-url'
+
   function sendOutboundLog(level, message, meta) {
     try {
       const msgStr = String(message)
@@ -168,13 +174,10 @@ try {
           String(u).toLowerCase() === 'unknown'
         if (badUrl) {
           const fromMsg = extractUrlFromReqResMessage(msgStr)
-          if (fromMsg) {
-            meta = { ...meta, url: fromMsg }
-          }
+          meta = fromMsg ? { ...meta, url: fromMsg } : { ...meta, url: OPAQUE_NO_URL }
         }
       }
       if (isReqRes && meta && meta.url && isLoggerApiCall({ url: meta.url })) return
-      if (isReqRes && meta && (meta.url === 'unknown' || !String(meta.url || '').trim() || String(meta.url).toLowerCase() === 'unknown')) return
       const source = meta && meta.__source
       if (debug && source === 'pino-stdout') {
         if (debug) try { process.stderr.write('[azify-logger] SENDOUTBOUND_ENTER level=' + level + ' source=' + source + ' msg=' + msgStr.slice(0, 60) + '\n') } catch (_) {}
@@ -387,22 +390,24 @@ try {
     return false
   }
 
-  const originalCreate = bunyan.createLogger
-  bunyan.createLogger = function patchedCreateLogger(options) {
-    const logger = originalCreate.call(bunyan, options)
-    try {
-      const level = process.env.AZIFY_LOG_LEVEL || (options && options.level) || 'info'
-      const loggerUrl = process.env.AZIFY_LOGGER_URL
-      const serviceName = process.env.APP_NAME || (options && options.name)
-      const environment = process.env.NODE_ENV
-
-      logger.addStream({
-        level,
-        type: 'raw',
-        stream: createBunyanStream({ loggerUrl, serviceName, environment })
-      })
-    } catch (_) {}
-    return logger
+  if (bunyan && typeof bunyan.createLogger === 'function') {
+    const originalCreate = bunyan.createLogger
+    bunyan.createLogger = function patchedCreateLogger(options) {
+      const logger = originalCreate.call(bunyan, options)
+      try {
+        const level = process.env.AZIFY_LOG_LEVEL || (options && options.level) || 'info'
+        const loggerUrl = process.env.AZIFY_LOGGER_URL
+        const serviceName = process.env.APP_NAME || (options && options.name)
+        const environment = process.env.NODE_ENV
+
+        logger.addStream({
+          level,
+          type: 'raw',
+          stream: createBunyanStream({ loggerUrl, serviceName, environment })
+        })
+      } catch (_) {}
+      return logger
+    }
   }
 
   const getOtelTraceContext = () => {