azify-logger 1.0.43 → 1.0.45

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

@@ -34,21 +34,65 @@ function createPinoStream(options = {}) {
       const levelMap = { 60: 'fatal', 50: 'error', 40: 'warn', 30: 'info', 20: 'debug', 10: 'trace' }
       const level = levelMap[record.level] || 'info'
 
-      let traceId, spanId
+      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
-        } else {
+          parentSpanId = ctx.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()
-          if (spanContext) {
+          if (spanContext && spanContext.traceId) {
             traceId = spanContext.traceId
             spanId = spanContext.spanId
+            parentSpanId = spanContext.parentSpanId
           }
         }
+
+        if (traceId && typeof traceId === 'string') {
+          traceId = toTraceIdHex(traceId)
+          if (spanId != null) spanId = String(spanId).slice(0, 16)
+        }
       } catch (_) {}
 
       const headers = {}
@@ -70,15 +114,23 @@ function createPinoStream(options = {}) {
         hostname: require('os').hostname(),
         requestId: record.requestId || record.req_id || record.reqId,
         ...(traceId && { traceId }),
-        ...(spanId && { spanId })
+        ...(spanId && { spanId }),
+        ...(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`)
+        }
+      }
     }
   }
 }