azify-logger 1.0.14 → 1.0.15

package/index.js

@@ -162,7 +162,6 @@ function createAzifyLoggerFromEnv() {
     environment: process.env.NODE_ENV || 'development'
   })
   
-  // Automatically intercept console methods
   interceptConsole(logger)
   
   return logger
@@ -181,33 +180,128 @@ function interceptConsole(logger) {
 
   console.log = (...args) => {
     originalConsoleLog(...args);
-    void logger.info(args.join(' '));
+    const { getRequestContext } = require('./store');
+    const ctx = getRequestContext();
+    const message = args.join(' ');
+    if (message.includes('failed after')) {
+    }
+    if (ctx && ctx.traceId) {
+      void logger.info(message, { traceId: ctx.traceId, spanId: ctx.spanId, parentSpanId: ctx.parentSpanId, requestId: ctx.requestId });
+    } else {
+      void logger.info(message);
+    }
   };
 
   console.error = (...args) => {
     originalConsoleError(...args);
-    void logger.error(args.join(' '));
+    const { getRequestContext } = require('./store');
+    const ctx = getRequestContext();
+    if (ctx && ctx.traceId) {
+      void logger.error(args.join(' '), { traceId: ctx.traceId, spanId: ctx.spanId, parentSpanId: ctx.parentSpanId, requestId: ctx.requestId });
+    } else {
+      void logger.error(args.join(' '));
+    }
   };
 
   console.warn = (...args) => {
     originalConsoleWarn(...args);
-    void logger.warn(args.join(' '));
+    const { getRequestContext } = require('./store');
+    const ctx = getRequestContext();
+    if (ctx && ctx.traceId) {
+      void logger.warn(args.join(' '), { traceId: ctx.traceId, spanId: ctx.spanId, parentSpanId: ctx.parentSpanId, requestId: ctx.requestId });
+    } else {
+      void logger.warn(args.join(' '));
+    }
   };
 
   console.info = (...args) => {
     originalConsoleInfo(...args);
-    void logger.info(args.join(' '));
+    const { getRequestContext } = require('./store');
+    const ctx = getRequestContext();
+    if (ctx && ctx.traceId) {
+      void logger.info(args.join(' '), { traceId: ctx.traceId, spanId: ctx.spanId, parentSpanId: ctx.parentSpanId, requestId: ctx.requestId });
+    } else {
+      void logger.info(args.join(' '));
+    }
   };
 
   console.debug = (...args) => {
     originalConsoleDebug(...args);
-    void logger.debug(args.join(' '));
+    const { getRequestContext } = require('./store');
+    const ctx = getRequestContext();
+    if (ctx && ctx.traceId) {
+      void logger.debug(args.join(' '), { traceId: ctx.traceId, spanId: ctx.spanId, parentSpanId: ctx.parentSpanId, requestId: ctx.requestId });
+    } else {
+      void logger.debug(args.join(' '));
+    }
   };
 }
 
+/**
+ * Creates a NestJS logger configuration that sends logs to azify-logger
+ * @returns {Object} NestJS logger configuration
+ * @example
+ * const app = await NestFactory.create(AppModule, {
+ *   logger: createNestLogger()
+ * });
+ */
+function createNestLogger() {
+  const { getRequestContext } = require('./store')
+  const pino = require('pino')
+
+  return {
+    log: (message, context) => {
+      const ctx = getRequestContext()
+      if (ctx && ctx.traceId) {
+        pino().info(message, context || '')
+      } else {
+        pino().info(message, context || '')
+      }
+    },
+    error: (message, trace, context) => {
+      const ctx = getRequestContext()
+      if (ctx && ctx.traceId) {
+        pino().error(message, trace || '', context || '')
+      } else {
+        pino().error(message, trace || '', context || '')
+      }
+    },
+    warn: (message, context) => {
+      const ctx = getRequestContext()
+      if (ctx && ctx.traceId) {
+        pino().warn(message, context || '')
+      } else {
+        pino().warn(message, context || '')
+      }
+    },
+    debug: (message, context) => {
+      const ctx = getRequestContext()
+      if (ctx && ctx.traceId) {
+        pino().debug(message, context || '')
+      } else {
+        pino().debug(message, context || '')
+      }
+    },
+    verbose: (message, context) => {
+      const ctx = getRequestContext()
+      if (ctx && ctx.traceId) {
+        pino().info(message, context || '')
+      } else {
+        pino().info(message, context || '')
+      }
+    }
+  }
+}
+
+if (process.env.AZIFY_LOGGER_DISABLE !== '1') {
+  require('./init')
+  require('./register')
+}
+
 module.exports = AzifyLogger
 module.exports.createAzifyLogger = createAzifyLogger
 module.exports.createAzifyLoggerFromEnv = createAzifyLoggerFromEnv
+module.exports.createNestLogger = createNestLogger
 module.exports.interceptConsole = interceptConsole
 module.exports.streams = {
   createBunyanStream: require('./streams/bunyan'),

package/middleware-express.d.ts

@@ -17,5 +17,4 @@ declare function createExpressLoggingMiddleware(options?: {
   environment?: string;
 }): ExpressMiddleware;
 
-export default createExpressLoggingMiddleware;
-
+export = createExpressLoggingMiddleware;

package/middleware-express.js

@@ -63,16 +63,39 @@ function createExpressLoggingMiddleware(options = {}) {
     const requestId = req.requestId || require('uuid').v4()
     const middlewareId = require('uuid').v4().substring(0, 8)
     
-    const reqCtx = startRequestContext({ requestId })
-    req.__azifyTraceId = reqCtx.traceId
-    req.__azifySpanId = reqCtx.spanId
-    req.__azifyParentSpanId = reqCtx.parentSpanId
+    let existingTraceId = null
+    let existingSpanId = null
+    let existingParentSpanId = null
     
-    const requestTraceId = req.__azifyTraceId
-    const requestSpanId = req.__azifySpanId
-    const requestParentSpanId = req.__azifyParentSpanId
+    if (req.headers['x-trace-id']) {
+      existingTraceId = req.headers['x-trace-id']
+      existingSpanId = req.headers['x-span-id']
+      existingParentSpanId = req.headers['x-parent-span-id']
+    }
+    
+    const currentCtx = getRequestContext()
+    if (currentCtx && currentCtx.traceId) {
+      existingTraceId = currentCtx.traceId
+      existingSpanId = currentCtx.spanId
+      existingParentSpanId = currentCtx.parentSpanId
+    }
+    
+    let reqCtx
+    if (existingTraceId) {
+      reqCtx = {
+        traceId: existingTraceId,
+        spanId: existingSpanId || require('uuid').v4().substring(0, 16),
+        parentSpanId: existingParentSpanId,
+        requestId: requestId
+      }
+    } else {
+      reqCtx = startRequestContext({ requestId })
+    }
+    
+    const requestTraceId = reqCtx.traceId
+    const requestSpanId = reqCtx.spanId
+    const requestParentSpanId = reqCtx.parentSpanId
 
-    // Store original console methods
     const originalConsole = {
       log: console.log,
       info: console.info,
@@ -80,7 +103,6 @@ function createExpressLoggingMiddleware(options = {}) {
       error: console.error
     }
 
-    // Override console methods to use the request context
     console.log = (...args) => {
       const message = args.map(String).join(' ')
       sendLog('info', message, {
@@ -128,13 +150,41 @@ function createExpressLoggingMiddleware(options = {}) {
     baseUrl = baseUrl.replace(/\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, '/{id}')
     baseUrl = baseUrl.replace(/\/[0-9]+/g, '/{id}')
 
+    function sanitizeHeaders(headers) {
+      const sanitized = { ...headers }
+      const sensitiveHeaders = ['authorization', 'cookie', 'x-api-key', 'x-auth-token', 'x-access-token']
+      
+      for (const key of Object.keys(sanitized)) {
+        if (sensitiveHeaders.includes(key.toLowerCase())) {
+          sanitized[key] = '***'
+        }
+      }
+      
+      return sanitized
+    }
+
+    function sanitizeBody(body) {
+      if (!body || typeof body !== 'object') return body
+      
+      const sanitized = Array.isArray(body) ? [...body] : { ...body }
+      const sensitiveFields = ['password', 'token', 'secret', 'apiKey', 'api_key', 'accessToken', 'access_token', 'refreshToken', 'refresh_token', 'clientSecret', 'client_secret']
+      
+      for (const key of Object.keys(sanitized)) {
+        if (sensitiveFields.includes(key) || key.toLowerCase().includes('password') || key.toLowerCase().includes('secret')) {
+          sanitized[key] = '***'
+        }
+      }
+      
+      return sanitized
+    }
+
     req._azifyRequestData = {
       requestId,
       method: req.method,
       url: req.url,
       baseUrl: baseUrl,
       path: req.url,
-      headers: req.headers || {},
+      headers: sanitizeHeaders(req.headers || {}),
       query: req.query || {},
       userAgent: req.headers?.['user-agent'] || 'unknown',
       ip: req.connection?.remoteAddress || req.socket?.remoteAddress || req.ip || 'unknown',
@@ -147,7 +197,7 @@ function createExpressLoggingMiddleware(options = {}) {
       sendLog('info', `[REQUEST] ${req.method} ${req.url}`, req._azifyRequestData)
     } else {
       if (req.body !== undefined) {
-        req._azifyRequestData.requestBody = req.body
+        req._azifyRequestData.requestBody = sanitizeBody(req.body)
       }
       sendLog('info', `[REQUEST] ${req.method} ${req.url}`, req._azifyRequestData)
     }
@@ -157,7 +207,6 @@ function createExpressLoggingMiddleware(options = {}) {
         logResponse()
         responseLogged = true
       }
-      // Restore original console methods
       console.log = originalConsole.log
       console.info = originalConsole.info
       console.warn = originalConsole.warn
@@ -169,7 +218,6 @@ function createExpressLoggingMiddleware(options = {}) {
         logResponse()
         responseLogged = true
       }
-      // Restore original console methods
       console.log = originalConsole.log
       console.info = originalConsole.info
       console.warn = originalConsole.warn

package/middleware-restify.js

@@ -15,11 +15,30 @@ const { als, runWithRequestContext, startRequestContext, getRequestContext } = r
 function createRestifyLoggingMiddleware(options = {}) {
   const config = {
     serviceName: options.serviceName || process.env.APP_NAME || 'azipay',
-    loggerUrl: options.loggerUrl || process.env.AZIFY_LOGGER_URL || 'http://localhost:3001',
+    loggerUrl: (options.loggerUrl || process.env.AZIFY_LOGGER_URL || 'http://localhost:3001/log').replace(/\/log$/, '') + '/log',
     environment: options.environment || process.env.NODE_ENV || 'development'
   }
 
-  async function sendLog(level, message, meta = {}) {
+  const pendingLogs = new Set()
+
+  let exitHandlerInstalled = false
+  if (!exitHandlerInstalled) {
+    exitHandlerInstalled = true
+    
+    process.on('uncaughtException', (err) => {
+      console.error('[AZIFY] Uncaught exception:', err.message)
+      
+      if (pendingLogs.size > 0) {
+        setTimeout(() => {
+          process.exit(1)
+        }, 500)
+      } else {
+        process.exit(1)
+      }
+    })
+  }
+
+  function sendLog(level, message, meta = {}) {
     const logData = {
       level,
       message,
@@ -35,26 +54,59 @@ function createRestifyLoggingMiddleware(options = {}) {
       }
     }
 
-    try {
-      await axios.post(`${config.loggerUrl}`, logData, {
-        timeout: 5000
-      })
-    } catch (error) {}
+    const logId = Math.random().toString(36).substring(7)
+    pendingLogs.add(logId)
+    
+    axios.post(`${config.loggerUrl}`, logData, {
+      timeout: 2000
+    }).then(() => {
+      pendingLogs.delete(logId)
+    }).catch(() => {
+      pendingLogs.delete(logId)
+    })
+  }
+
+  function sanitizeHeaders(headers) {
+    const sanitized = { ...headers }
+    const sensitiveHeaders = ['authorization', 'cookie', 'x-api-key', 'x-auth-token', 'x-access-token']
+    
+    for (const key of Object.keys(sanitized)) {
+      if (sensitiveHeaders.includes(key.toLowerCase())) {
+        sanitized[key] = '***'
+      }
+    }
+    
+    return sanitized
+  }
+
+  function sanitizeBody(body) {
+    if (!body || typeof body !== 'object') return body
+    
+    const sanitized = Array.isArray(body) ? [...body] : { ...body }
+    const sensitiveFields = ['password', 'token', 'secret', 'apiKey', 'api_key', 'accessToken', 'access_token', 'refreshToken', 'refresh_token', 'clientSecret', 'client_secret']
+    
+    for (const key of Object.keys(sanitized)) {
+      if (sensitiveFields.includes(key) || key.toLowerCase().includes('password') || key.toLowerCase().includes('secret')) {
+        sanitized[key] = '***'
+      }
+    }
+    
+    return sanitized
   }
 
   return function azifyLoggingMiddleware(req, res, next) {
     const startTime = Date.now()
     const requestId = req.requestId || require('uuid').v4()
-    const middlewareId = require('uuid').v4().substring(0, 8)
     
-    const reqCtx = startRequestContext({ requestId })
-    req.__azifyTraceId = reqCtx.traceId
-    req.__azifySpanId = reqCtx.spanId
-    req.__azifyParentSpanId = reqCtx.parentSpanId
+    if (res._azifySetup) {
+      return next()
+    }
+    res._azifySetup = true
     
-    const requestTraceId = req.__azifyTraceId
-    const requestSpanId = req.__azifySpanId
-    const requestParentSpanId = req.__azifyParentSpanId
+    const reqCtx = startRequestContext({ requestId })
+    const requestTraceId = reqCtx.traceId
+    const requestSpanId = reqCtx.spanId
+    const requestParentSpanId = reqCtx.parentSpanId
     
     let baseUrl = req.url
     if (baseUrl.includes('?')) {
@@ -69,7 +121,7 @@ function createRestifyLoggingMiddleware(options = {}) {
       url: req.url,
       baseUrl: baseUrl,
       path: req.url,
-      headers: req.headers,
+      headers: sanitizeHeaders(req.headers),
       query: req.query,
       userAgent: req.headers['user-agent'],
       ip: req.connection.remoteAddress || req.socket.remoteAddress,
@@ -82,27 +134,13 @@ function createRestifyLoggingMiddleware(options = {}) {
       sendLog('info', `[REQUEST] ${req.method} ${req.url}`, req._azifyRequestData)
     } else {
       if (req.body !== undefined) {
-        req._azifyRequestData.requestBody = req.body
+        req._azifyRequestData.requestBody = sanitizeBody(req.body)
       }
       sendLog('info', `[REQUEST] ${req.method} ${req.url}`, req._azifyRequestData)
     }
 
-    res.on('finish', () => {
-      if (!responseLogged) {
-        logResponse()
-        responseLogged = true
-      }
-    })
-
-    res.on('close', () => {
-      if (!responseLogged) {
-        logResponse()
-        responseLogged = true
-      }
-    })
-
+    res._azifyResponseLogged = false
     let sentBody
-    let responseLogged = false
     
     const originalSend = res.send && res.send.bind(res)
     if (originalSend) {
@@ -115,9 +153,9 @@ function createRestifyLoggingMiddleware(options = {}) {
           }
         } catch (_) {}
         
-        if (!responseLogged) {
+        if (!res._azifyResponseLogged) {
+          res._azifyResponseLogged = true
           logResponse()
-          responseLogged = true
         }
         
         return originalSend.apply(this, arguments)
@@ -176,21 +214,8 @@ function createRestifyLoggingMiddleware(options = {}) {
           res._actualStatusCode = res.statusCode || 200
         }
       }
-      
-      if (!responseLogged) {
-        logResponse()
-        responseLogged = true
-      }
-      
       return originalJsonMethod.apply(this, arguments)
     }
-    
-    res.on('finish', function() {
-      if (!responseLogged) {
-        logResponse()
-        responseLogged = true
-      }
-    })
 
     const originalEnd = res.end
     res.end = function(chunk, encoding) {
@@ -209,9 +234,9 @@ function createRestifyLoggingMiddleware(options = {}) {
         }
       } catch (_) {}
 
-      if (!responseLogged) {
+      if (!res._azifyResponseLogged) {
         logResponse()
-        responseLogged = true
+        res._azifyResponseLogged = true
       }
 
       originalEnd.call(this, chunk, encoding)
@@ -276,14 +301,46 @@ function createRestifyLoggingMiddleware(options = {}) {
 
     req._azifyContext = reqCtx
     
-    try {
-      runWithRequestContext(reqCtx, () => {
-        next()
-      })
-    } catch (error) {
-      console.error('Error in azify middleware:', error)
-      next()
+    const originalNext = next
+    const wrappedNext = (err) => {
+      if (err && !res._azifyResponseLogged) {
+        const errorData = {
+          ...req._azifyRequestData,
+          statusCode: res.statusCode || 500,
+          responseTime: Date.now() - startTime,
+          error: {
+            message: err.message || String(err),
+            stack: err.stack,
+            name: err.name,
+            code: err.code
+          }
+        }
+        sendLog('error', `[ERROR] ${req.method} ${req.url}: ${err.message || String(err)}`, errorData)
+        res._azifyResponseLogged = true
+      }
+      return originalNext(err)
     }
+    
+    res.on('error', (error) => {
+      if (!res._azifyResponseLogged) {
+        const errorData = {
+          ...req._azifyRequestData,
+          statusCode: res.statusCode || 500,
+          responseTime: Date.now() - startTime,
+          error: {
+            message: error.message,
+            stack: error.stack,
+            name: error.name
+          }
+        }
+        sendLog('error', `[ERROR] ${req.method} ${req.url}: ${error.message}`, errorData)
+        res._azifyResponseLogged = true
+      }
+    })
+    
+    runWithRequestContext(reqCtx, () => {
+      wrappedNext()
+    })
   }
 }
 

package/package.json

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

package/register-restify.js

@@ -1,13 +1,5 @@
 console.log('🔧 @azify/logger-client/register-restify carregando...')
 
-function generateTraceId() {
-  return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15) + Date.now().toString(36)
-}
-
-function generateSpanId() {
-  return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 7)
-}
-
 const Module = require('module')
 const originalRequire = Module.prototype.require
 
@@ -16,185 +8,9 @@ let patched = false
 Module.prototype.require = function(id) {
   const module = originalRequire.apply(this, arguments)
   
-  if (id && typeof id === 'string' && id.includes('restify')) {
-  }
-  
   if (!patched && (id === 'restify' || id.endsWith('/restify') || id.includes('restify/lib'))) {
     patched = true
-    console.log('  ✅ Restify detectado! Aplicando patches...')
-    
-    try {
-      let trace, context
-      try {
-        const otel = require('@opentelemetry/api')
-        trace = otel.trace
-        context = otel.context
-      } catch (_) {}
-      
-      const ServerProto = module.Server && module.Server.prototype
-      
-      if (!ServerProto) return module
-  
-  function wrapAsyncMiddleware(handler) {
-    const isAsync = handler && handler.constructor && handler.constructor.name === 'AsyncFunction'
-    const takesThree = typeof handler === 'function' && handler.length === 3
-    
-    if (isAsync && takesThree) {
-      return function wrappedAsyncMiddleware(req, res, next) {
-        try {
-          const promise = handler(req, res, next)
-          if (promise && typeof promise.then === 'function') {
-            promise.catch(next)
-          }
-        } catch (err) {
-          next(err)
-        }
-      }
-    }
-    return handler
-  }
-  
-  if (ServerProto && !ServerProto.__azifyPatchedUse) {
-    const originalUse = ServerProto.use
-    ServerProto.use = function patchedUse(...handlers) {
-      const patched = handlers.map(h => wrapAsyncMiddleware(h))
-      return originalUse.apply(this, patched)
-    }
-    
-    const originalPre = ServerProto.pre
-    ServerProto.pre = function patchedPre(...handlers) {
-      const patched = handlers.map(h => wrapAsyncMiddleware(h))
-      return originalPre.apply(this, patched)
-    }
-    
-    ServerProto.__azifyPatchedUse = true
-    console.log('✅ Restify 11 async middleware patch aplicado')
-  }
-
-  if (ServerProto && !ServerProto.__azifyReqResLogged) {
-    const { createAzifyLoggerFromEnv } = require('./index.js')
-    const azifyLogger = createAzifyLoggerFromEnv()
-    
-    ServerProto.use(function azifyAutoRR (req, res, next) {
-      if (req.__azifyLogged) return next()
-      req.__azifyLogged = true
-      const start = Date.now()
-
-      let traceId, spanId
-      
-      if (trace && context) {
-        const span = trace.getSpan(context.active())
-        const spanContext = span?.spanContext()
-        
-        if (spanContext) {
-          traceId = spanContext.traceId
-          spanId = spanContext.spanId
-        }
-      }
-      
-      if (!traceId) {
-        traceId = generateTraceId()
-        spanId = generateSpanId()
-      }
-      
-      req.__azifyTrace = { traceId, spanId }
-      
-      const requestId = req.requestId || req.id || (req.getId && req.getId())
-      
-      const requestMeta = {
-        requestId,
-        method: req.method,
-        url: req.url,
-        path: req.path(),
-        headers: req.headers,
-        query: req.query,
-        params: req.params,
-        userAgent: req.headers?.['user-agent'],
-        ip: (req.connection && req.connection.remoteAddress) || (req.socket && req.socket.remoteAddress),
-        requestBody: req.body,
-        traceId,
-        spanId
-      }
-
-      azifyLogger.info(`[REQUEST] ${req.method} ${req.url}`, requestMeta)
-
-      const originalSend = res.send
-      const originalJson = res.json
-      
-      function logResponse(methodName, ...args) {
-        const statusCode = res.statusCode || (typeof args[0] === 'number' ? args[0] : 200)
-        const body = (args.length === 1) ? args[0] : (typeof args[0] === 'number' ? args[1] : (args[1] || args[0]))
-        
-        const { traceId, spanId } = req.__azifyTrace || {}
-        
-        const responseMeta = {
-          requestId,
-          method: req.method,
-          url: req.url,
-          statusCode,
-          responseTime: Date.now() - start,
-          responseBody: body,
-          responseHeaders: res.getHeaders?.() || {},
-          traceId,
-          spanId,
-          responseMethod: methodName
-        }
-
-        const message = (typeof body === 'string' && body.length > 0)
-          ? body
-          : `[RESPONSE] ${req.method} ${req.url} ${statusCode} ${Date.now() - start}ms`
-        azifyLogger.info(message, responseMeta)
-      }
-      
-      res.send = function wrappedSend (...args) {
-        logResponse('send', ...args)
-        res.__azifyResponseLogged = true
-        return originalSend.apply(this, args)
-      }
-      
-      if (originalJson) {
-        res.json = function wrappedJson (...args) {
-          logResponse('json', ...args)
-          res.__azifyResponseLogged = true
-          return originalJson.apply(this, args)
-        }
-      }
-
-      const originalEnd = res.end
-      res.end = function wrappedEnd(chunk, encoding) {
-        if (!res.__azifyResponseLogged && chunk) {
-          const { traceId, spanId } = req.__azifyTrace || {}
-          
-          const responseMeta = {
-            requestId,
-            method: req.method,
-            url: req.url,
-            statusCode: res.statusCode,
-            responseTime: Date.now() - start,
-            responseBody: chunk,
-            responseHeaders: res.getHeaders?.() || {},
-            traceId,
-            spanId,
-            responseMethod: 'end'
-          }
-
-          const message = (typeof chunk === 'string' && chunk.length > 0)
-            ? chunk
-            : `[RESPONSE] ${req.method} ${req.url} ${res.statusCode} ${Date.now() - start}ms`
-          azifyLogger.info(message, responseMeta)
-          res.__azifyResponseLogged = true
-        }
-        
-        return originalEnd.call(this, chunk, encoding)
-      }
-
-      next()
-    })
-      ServerProto.__azifyReqResLogged = true
-    }
-    } catch (error) {
-      console.error('❌ Erro ao aplicar patches no Restify:', error.message)
-    }
+    console.log('  ✅ Restify detectado!')
   }
   
   return module

package/server.js

@@ -167,7 +167,6 @@ app.post('/log', async (req, res) => {
     return res.status(400).json({ success: false, message: 'Level and message are required.' })
   }
 
-  // Filtrar logs verbosos do Prisma e outros logs desnecessários
   const shouldFilterLog = (
     message.includes('prisma:query') ||
     message.includes('prisma:info') ||

package/streams/bunyan.js

@@ -39,8 +39,10 @@ function createBunyanStream(options = {}) {
 
       const headers = {}
 
+      const { time, v, level: _, msg, name, hostname: bunyanHostname, pid, ...cleanRecord } = record
+
       const meta = {
-        ...record,
+        ...cleanRecord,
         service: { name: serviceName, version: record.service?.version || '1.0.0' },
         environment,
         timestamp: new Date().toISOString(),

package/streams/pino.js

@@ -16,11 +16,18 @@ function createPinoStream(options = {}) {
 
       let traceId, spanId
       try {
-        const span = trace.getSpan(context.active())
-        const spanContext = span?.spanContext()
-        if (spanContext) {
-          traceId = spanContext.traceId
-          spanId = spanContext.spanId
+        const { getRequestContext } = require('../store')
+        const ctx = getRequestContext()
+        if (ctx && ctx.traceId) {
+          traceId = ctx.traceId
+          spanId = ctx.spanId
+        } else {
+          const span = trace.getSpan(context.active())
+          const spanContext = span?.spanContext()
+          if (spanContext) {
+            traceId = spanContext.traceId
+            spanId = spanContext.spanId
+          }
         }
       } catch (_) {}