azify-logger 1.0.44 → 1.0.45

package/sampling.js

@@ -45,7 +45,7 @@ const sourceSampleRates = {
 }
 
 const shouldSample = (level, source) => {
-  if (source === 'http-client') {
+  if (source === 'http-client' || source === 'pino-stdout') {
     return true
   }
   const key = typeof level === 'string' ? level.toLowerCase() : 'info'

package/server.js

@@ -227,6 +227,7 @@ async function ensureIndexTemplate() {
               userAgent: { type: 'text' },
               environment: { type: 'keyword' },
               hostname: { type: 'keyword' },
+              source: { type: 'keyword' },
               responseBody: { type: 'text' },
               error: {
                 properties: {
@@ -238,7 +239,7 @@ async function ensureIndexTemplate() {
             }
           }
       },
-      priority: 500
+      priority: 1000
     })
   } catch (error) {
   }
@@ -1836,21 +1837,55 @@ async function handleLog(req, res) {
     ))
   )
 
-  if (shouldFilterLog) {
+  const isRequestOrResponse = messageLower.includes('[request]') || messageLower.includes('[response]')
+  const isAzifyHttpClientLog = (meta && meta.source === 'http-client') || isRequestOrResponse
+  if (!isAzifyHttpClientLog && shouldFilterLog) {
     return res.json({ success: true, message: 'Log filtrado' })
   }
+  if (isRequestOrResponse && process.env.AZIFY_LOGGER_DEBUG === '1') {
+    console.log('[azify-logger][server] REQUEST/RESPONSE received:', (typeof message === 'string' ? message : '').slice(0, 80))
+  }
+  if (isRequestOrResponse && meta && typeof meta === 'object' && meta.source !== 'http-client') {
+    meta = { ...meta, source: 'http-client' }
+  }
 
   const requestId = meta && meta.requestId
 
+  function toTraceIdHex32(val) {
+    if (val == null || typeof val !== 'string') return null
+    const hex = String(val).replace(/[^0-9a-fA-F]/g, '').slice(0, 32)
+    return hex ? hex.padStart(32, '0').slice(0, 32) : null
+  }
+
   let traceContext = null
 
   if (meta && meta.traceId && meta.spanId) {
-    traceContext = {
-      traceId: meta.traceId,
-      spanId: meta.spanId,
-      parentSpanId: meta.parentSpanId || null
+    const tid = toTraceIdHex32(meta.traceId)
+    if (tid) {
+      traceContext = {
+        traceId: tid,
+        spanId: String(meta.spanId).slice(0, 16),
+        parentSpanId: meta.parentSpanId != null && meta.parentSpanId !== '' ? String(meta.parentSpanId) : null
+      }
     }
-  } else {
+  }
+
+  if (!traceContext && typeof message === 'string' && /traceId/i.test(message)) {
+    const m = message.match(/"traceId"\s*:\s*"([^"]+)"/)
+    const s = message.match(/"spanId"\s*:\s*"([^"]+)"/)
+    if (m && m[1]) {
+      const tid = toTraceIdHex32(m[1])
+      if (tid) {
+        traceContext = {
+          traceId: tid,
+          spanId: (s && s[1]) ? String(s[1]).slice(0, 16) : generateSpanId(),
+          parentSpanId: null
+        }
+      }
+    }
+  }
+
+  if (!traceContext) {
     try {
       const extractedCtx = propagation.extract(context.active(), req.headers, {
         get (carrier, key) {
@@ -1867,8 +1902,8 @@ async function handleLog(req, res) {
       const spanContext = (span && span.spanContext && span.spanContext()) || null
       if (spanContext && spanContext.traceId && spanContext.spanId) {
         traceContext = {
-          traceId: spanContext.traceId,
-          spanId: spanContext.spanId,
+          traceId: toTraceIdHex32(spanContext.traceId) || String(spanContext.traceId).replace(/-/g, '').padStart(32, '0').slice(0, 32),
+          spanId: String(spanContext.spanId).slice(0, 16),
           parentSpanId: null
         }
       }
@@ -1991,6 +2026,16 @@ async function handleLog(req, res) {
             value = truncateBody(value, false)
           }
           logEntry[key] = value
+        } else if (key === 'error') {
+          if (value != null && typeof value === 'object' && !Array.isArray(value) && (value.message != null || value.stack != null || value.name != null)) {
+            logEntry.error = {
+              message: value.message != null ? String(value.message) : '',
+              stack: value.stack != null ? String(value.stack) : undefined,
+              name: value.name != null ? String(value.name) : undefined
+            }
+          } else if (value != null) {
+            logEntry.error = { message: String(value) }
+          }
         } else {
           logEntry[key] = value
         }
@@ -1999,6 +2044,7 @@ async function handleLog(req, res) {
   }
 
   logEntry.message = message
+  if (isRequestOrResponse) logEntry.source = 'http-client'
 
   const osUrl = process.env.OPENSEARCH_URL || 'http://localhost:9200'
   const appName = logEntry.appName || logEntry.service?.name || 'unknown'
@@ -2029,8 +2075,17 @@ const _logDedupeBucketMs = 80
 
 function _logDedupeKey(serviceName, logEntry) {
   const msg = typeof logEntry.message === 'string' ? logEntry.message.substring(0, 500) : String(logEntry.message || '')
+  const msgLower = msg.toLowerCase()
+  const isReqRes = msgLower.includes('[request]') || msgLower.includes('[response]')
   const traceId = logEntry.traceId != null ? String(logEntry.traceId).trim() : ''
   const spanId = logEntry.spanId != null ? String(logEntry.spanId).trim() : ''
+  if (isReqRes) {
+    const kind = msgLower.includes('[request]') ? 'REQUEST' : 'RESPONSE'
+    if (traceId && spanId) return `r|${serviceName}|${traceId}|${spanId}|${kind}`
+    const ts = logEntry['@timestamp'] != null ? Number(logEntry['@timestamp']) : Date.now()
+    const bucket = Math.floor(ts / _logDedupeBucketMs) * _logDedupeBucketMs
+    return `r|${serviceName}|${bucket}|${kind}`
+  }
   if (traceId && spanId) return `t|${serviceName}|${traceId}|${spanId}|${msg}`
   const requestId = (logEntry.requestId != null ? String(logEntry.requestId).trim() : '') || ''
   if (!requestId) return null
@@ -2059,6 +2114,12 @@ function _enqueueOpenSearchWrite(osUrl, indexName, logEntry, serviceName) {
     if (expiry != null && expiry > now) return
     _logDedupeSeen.set(key, now + _logDedupeWindowMs)
   }
+  if (process.env.AZIFY_LOGGER_DEBUG === '1') {
+    const msg = typeof logEntry.message === 'string' ? logEntry.message : ''
+    if (msg.toLowerCase().includes('[request]') || msg.toLowerCase().includes('[response]')) {
+      console.log('[azify-logger][server] REQUEST/RESPONSE enqueued for OpenSearch:', msg.slice(0, 70))
+    }
+  }
   _openSearchWriteQueue.push({ osUrl, indexName, logEntry, serviceName })
   _drainOpenSearchQueue()
 }
@@ -2081,11 +2142,17 @@ function _drainOpenSearchQueue() {
     })
       .then(() => {
         _openSearchFailuresInRow = 0
+        if (process.env.AZIFY_LOGGER_DEBUG === '1') {
+          const msg = typeof job.logEntry.message === 'string' ? job.logEntry.message : ''
+          if (msg.toLowerCase().includes('[request]') || msg.toLowerCase().includes('[response]')) {
+            console.log('[azify-logger][server] REQUEST/RESPONSE written to OpenSearch index=', job.indexName, 'msg=', msg.slice(0, 60))
+          }
+        }
         const SETUP_THROTTLE_MS = 10 * 60 * 1000
         if (!handleLog._lastSetupTime) handleLog._lastSetupTime = new Map()
         const last = handleLog._lastSetupTime.get(job.serviceName) || 0
         const now = Date.now()
-        const shouldRunSetup = job.serviceName !== 'unknown' && job.serviceName !== 'unknown-service' && (now - last >= SETUP_THROTTLE_MS)
+        const shouldRunSetup = job.serviceName !== 'unknown' && job.serviceName !== 'unknown-service' && job.serviceName !== 'unknown-app' && (now - last >= SETUP_THROTTLE_MS)
         if (shouldRunSetup) {
           handleLog._lastSetupTime.set(job.serviceName, now)
           setupGrafanaForApp(job.serviceName).then(() => {

package/store.js

@@ -1,6 +1,15 @@
 const { AsyncLocalStorage } = require('async_hooks')
 
 const als = new AsyncLocalStorage()
+let lastJobContext = null
+
+function setLastJobContext(ctx) {
+  lastJobContext = ctx || null
+}
+
+function getLastJobContext() {
+  return lastJobContext
+}
 
 function fastGenerateId(length = 16) {
   const chars = '0123456789abcdef'
@@ -12,21 +21,22 @@ function fastGenerateId(length = 16) {
   return result
 }
 
-function toTraceId(hex32) {
-  const h = (hex32 || '').padStart(32, '0').slice(0, 32)
-  return `${h.substring(0, 8)}-${h.substring(8, 12)}-${h.substring(12, 16)}-${h.substring(16, 20)}-${h.substring(20, 32)}`
+function toTraceIdHex(hex32) {
+  const raw = hex32 != null && typeof hex32 === 'string' ? String(hex32).replace(/[^0-9a-fA-F]/g, '').slice(0, 32) : ''
+  const hex = raw || fastGenerateId(16)
+  return hex.padStart(32, '0').slice(0, 32)
 }
 
-function startRequestContext(initial = {}) {
+function startRequestContext(initial) {
+  if (!initial || typeof initial !== 'object') initial = {}
   const traceHex = initial.traceHex || fastGenerateId(16)
   const spanHex = initial.spanHex || fastGenerateId(8)
-  const ctx = {
-    traceId: toTraceId(traceHex),
-    spanId: spanHex,
-    parentSpanId: initial.parentSpanId || null,
-    requestId: initial.requestId
+  return {
+    traceId: toTraceIdHex(traceHex),
+    spanId: spanHex != null && spanHex !== '' ? String(spanHex).slice(0, 16) : fastGenerateId(8),
+    parentSpanId: initial.parentSpanId != null && initial.parentSpanId !== '' ? String(initial.parentSpanId) : null,
+    requestId: initial.requestId != null && initial.requestId !== '' ? String(initial.requestId) : null
   }
-  return ctx
 }
 
 function runWithRequestContext(ctx, fn) {
@@ -37,11 +47,27 @@ function getRequestContext() {
   return als.getStore() || null
 }
 
+function mergeTraceIntoJobPayload(data, traceContext) {
+  if (!traceContext || !traceContext.traceId) return data
+  const base = data && typeof data === 'object' && !Array.isArray(data) ? data : {}
+  return {
+    ...base,
+    traceId: traceContext.traceId,
+    spanId: traceContext.spanId ?? null,
+    parentSpanId: traceContext.parentSpanId ?? null,
+    requestId: traceContext.requestId ?? null
+  }
+}
+
 module.exports = {
   als,
   startRequestContext,
   runWithRequestContext,
-  getRequestContext
+  getRequestContext,
+  getLastJobContext,
+  setLastJobContext,
+  mergeTraceIntoJobPayload,
+  toTraceIdHex
 }
 
 

package/streams/httpQueue.js

@@ -84,7 +84,7 @@ function resolveRedisConfig (overrides = {}) {
     (overrides.redis && overrides.redis.url) ||
     process.env.AZIFY_LOGGER_REDIS_URL ||
     DEFAULT_REDIS_URL
-  
+
   if (!redisUrl) {
     return null
   }
@@ -108,11 +108,13 @@ function createHttpLoggerTransport (loggerUrl, overrides) {
   if (!loggerUrl) {
     return noopTransport
   }
+  overrides = overrides || {}
 
   const options = resolveOptions(overrides)
   const redisConfig = resolveRedisConfig(overrides)
+  const hasRedisPassword = redisConfig && redisConfig.password != null && String(redisConfig.password).trim() !== ''
 
-  if (redisConfig) {
+  if (redisConfig && hasRedisPassword) {
     try {
       return createRedisStreamTransport(loggerUrl, options, redisConfig)
     } catch (err) {
@@ -124,9 +126,7 @@ function createHttpLoggerTransport (loggerUrl, overrides) {
   }
 
   const redisUrl = overrides.redisUrl || (overrides.redis && overrides.redis.url) || process.env.AZIFY_LOGGER_REDIS_URL || DEFAULT_REDIS_URL
-  const password = overrides.redisPassword ?? (overrides.redis && overrides.redis.password) ?? process.env.AZIFY_LOGGER_REDIS_PASSWORD
-  const pass = password != null && String(password).trim() !== '' ? String(password).trim() : undefined
-  if (redisUrl && !pass) {
+  if (redisUrl && !hasRedisPassword) {
     if (typeof global.__azifyLoggerRedisPasswordWarned === 'undefined') {
       global.__azifyLoggerRedisPasswordWarned = true
       process.stderr.write('[azify-logger] ⚠️  Redis requires a password. No password set. Using direct HTTP (no Redis). Set AZIFY_LOGGER_REDIS_PASSWORD to use Redis.\n')
@@ -250,7 +250,7 @@ function buildInlineTransport (loggerUrl, options) {
 
     flushTimer = setTimeout(() => {
       flushTimer = null
-      void flushQueue()
+      flushQueue().catch(() => {})
     }, delay)
 
     if (typeof flushTimer.unref === 'function') {
@@ -278,9 +278,15 @@ function buildInlineTransport (loggerUrl, options) {
     try {
       for (let i = 0; i < batch.length; i += 1) {
         const { payload, headers } = batch[i]
+        let body
+        try {
+          body = typeof payload === 'string' ? payload : JSON.stringify(payload)
+        } catch (_) {
+          continue
+        }
         try {
-          await axios.post(loggerUrl, payload, {
-            headers,
+          await axios.post(loggerUrl, body, {
+            headers: { ...headers, 'Content-Type': 'application/json' },
             timeout: options.timeout,
             httpAgent,
             httpsAgent,
@@ -298,11 +304,9 @@ function buildInlineTransport (loggerUrl, options) {
           if (remaining.length) {
             queue.unshift(...remaining)
           }
-
-          throw error
         }
       }
-    } catch (_) {
+    } catch (e) {
     } finally {
       flushing = false
       if (queue.length) {
@@ -311,6 +315,12 @@ function buildInlineTransport (loggerUrl, options) {
     }
   }
 
+  const isRequestOrResponsePayload = (p) => {
+    if (!p || typeof p !== 'object') return false
+    const msg = typeof p.message === 'string' ? p.message : ''
+    return msg.includes('[REQUEST]') || msg.includes('[RESPONSE]')
+  }
+
   const enqueue = (payload, headers = {}) => {
     if (queue.length >= options.maxQueueSize) {
       queue.shift()
@@ -319,7 +329,9 @@ function buildInlineTransport (loggerUrl, options) {
     queue.push({ payload, headers })
 
     if (queue.length >= options.batchSize) {
-      void flushQueue()
+      flushQueue().catch(() => {})
+    } else if (isRequestOrResponsePayload(payload)) {
+      scheduleFlush(0)
     } else {
       scheduleFlush()
     }

package/streams/pino.js

@@ -36,26 +36,49 @@ function createPinoStream(options = {}) {
 
       let traceId, spanId, parentSpanId
       try {
-        const { getRequestContext } = require('../store')
+        const { getRequestContext, getLastJobContext, toTraceIdHex } = require('../store')
         const ctx = getRequestContext()
         if (ctx && ctx.traceId) {
           traceId = ctx.traceId
           spanId = ctx.spanId
           parentSpanId = ctx.parentSpanId
         }
-        
-        if (!traceId && record.traceId) {
-          traceId = record.traceId
-          spanId = record.spanId
-          parentSpanId = record.parentSpanId
+
+        if (!traceId) {
+          const jobCtx = getLastJobContext()
+          if (jobCtx && jobCtx.traceId) {
+            traceId = jobCtx.traceId
+            spanId = jobCtx.spanId
+            parentSpanId = jobCtx.parentSpanId
+          }
+        }
+
+        if (!traceId && (record.traceId || (record.data && record.data.traceId))) {
+          traceId = record.traceId || (record.data && record.data.traceId)
+          spanId = record.spanId != null ? record.spanId : (record.data && record.data.spanId)
+          parentSpanId = record.parentSpanId != null ? record.parentSpanId : (record.data && record.data.parentSpanId)
         }
-        
+
         if (!traceId && record.req && record.req.traceId) {
           traceId = record.req.traceId
           spanId = record.req.spanId
           parentSpanId = record.req.parentSpanId
         }
-        
+
+        if (!traceId) {
+          const msgStr = record.msg || record.message || ''
+          if (typeof msgStr === 'string' && /traceId/i.test(msgStr)) {
+            const m = msgStr.match(/"traceId"\s*:\s*"([^"]+)"/)
+            if (m) {
+              traceId = m[1]
+              const s = msgStr.match(/"spanId"\s*:\s*"([^"]+)"/)
+              spanId = s ? s[1] : null
+              const p = msgStr.match(/"parentSpanId"\s*:\s*"([^"]*)"/)
+              parentSpanId = (p && p[1]) ? p[1] : null
+            }
+          }
+        }
+
         if (!traceId) {
           const span = trace.getSpan(context.active())
           const spanContext = span && span.spanContext()
@@ -65,6 +88,11 @@ function createPinoStream(options = {}) {
             parentSpanId = spanContext.parentSpanId
           }
         }
+
+        if (traceId && typeof traceId === 'string') {
+          traceId = toTraceIdHex(traceId)
+          if (spanId != null) spanId = String(spanId).slice(0, 16)
+        }
       } catch (_) {}
 
       const headers = {}
@@ -90,12 +118,19 @@ function createPinoStream(options = {}) {
         ...(parentSpanId && { parentSpanId })
       }
 
-      if (!shouldSample(level, 'logger')) {
+      const isErrorOrWarn = level === 'error' || level === 'fatal' || level === 'warn'
+      if (!isErrorOrWarn && !shouldSample(level, 'logger')) {
         return
       }
 
       const payload = { level, message: record.msg || record.message || 'log', meta }
-      transport.enqueue(payload, headers)
+      try {
+        transport.enqueue(payload, headers)
+      } catch (err) {
+        if (process.env.AZIFY_LOGGER_DEBUG === '1') {
+          process.stderr.write(`[azify-logger] pino stream enqueue error: ${err && err.message}\n`)
+        }
+      }
     }
   }
 }