azify-logger 1.0.41 → 1.0.43

package/middleware-express.d.ts

@@ -15,6 +15,8 @@ declare function createExpressLoggingMiddleware(options?: {
   serviceName?: string;
   loggerUrl?: string;
   environment?: string;
+  otelEndpoint?: string;
+  otelExporterEndpoint?: string;
 }): ExpressMiddleware;
 
 export = createExpressLoggingMiddleware;

package/middleware-express.js

@@ -1,6 +1,7 @@
 require('./otel-env')
 const { startRequestContext, runWithRequestContext, getRequestContext } = require('./store')
 const { createHttpLoggerTransport } = require('./streams/httpQueue')
+const { sendSpanToOtel, setEndpointOverride } = require('./trace-export')
 const { Worker } = require('worker_threads')
 const path = require('path')
 const os = require('os')
@@ -93,8 +94,17 @@ function pickHeaders(source) {
 }
 
 function createExpressLoggingMiddleware(options = {}) {
+  const svcName = options.serviceName || process.env.APP_NAME
+  if (svcName) {
+    process.env.OTEL_SERVICE_NAME = svcName
+    process.env.SERVICE_NAME = svcName
+  }
+  const otelEndpoint = options.otelEndpoint || options.otelExporterEndpoint || process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+  if (otelEndpoint) {
+    setEndpointOverride(otelEndpoint)
+  }
   const config = {
-    serviceName: options.serviceName || process.env.APP_NAME,
+    serviceName: svcName,
     loggerUrl: options.loggerUrl || process.env.AZIFY_LOGGER_URL || 'http://localhost:3001/log',
     environment: options.environment || process.env.NODE_ENV,
     captureResponseBody: options.captureResponseBody !== false && process.env.AZIFY_LOGGER_CAPTURE_RESPONSE_BODY !== 'false',
@@ -354,6 +364,21 @@ function createExpressLoggingMiddleware(options = {}) {
             
             const chunkToProcess = (responseChunk !== null && responseChunkCaptured) ? responseChunk : null
             emitResponseLog(meta, chunkToProcess)
+            if (meta.traceId && meta.spanId && config.serviceName) {
+              const startNs = BigInt(startTime) * BigInt(1e6)
+              const endNs = BigInt(meta.timestamp || Date.now()) * BigInt(1e6)
+              sendSpanToOtel({
+                traceId: meta.traceId,
+                spanId: meta.spanId,
+                serviceName: config.serviceName,
+                name: `request handler - ${path || url}`,
+                startTimeNs: startNs,
+                endTimeNs: endNs,
+                statusCode: res.statusCode || 200,
+                method,
+                url
+              })
+            }
           } catch (err) {
             try {
               ensureIds()
@@ -380,6 +405,21 @@ function createExpressLoggingMiddleware(options = {}) {
               if (serviceObj) meta.service = serviceObj
               if (config.environment) meta.environment = config.environment
               emitResponseLog(meta, null)
+              if (meta.traceId && meta.spanId && config.serviceName) {
+                const startNs = BigInt(startTime) * BigInt(1e6)
+                const endNs = BigInt(meta.timestamp || Date.now()) * BigInt(1e6)
+                sendSpanToOtel({
+                  traceId: meta.traceId,
+                  spanId: meta.spanId,
+                  serviceName: config.serviceName,
+                  name: `request handler - ${path || url}`,
+                  startTimeNs: startNs,
+                  endTimeNs: endNs,
+                  statusCode: statusCode || 200,
+                  method,
+                  url
+                })
+              }
             } catch (_) {
             }
           }

package/middleware-restify.js

@@ -1,6 +1,7 @@
 require('./otel-env')
 const { startRequestContext, runWithRequestContext, getRequestContext, als } = require('./store')
 const { createHttpLoggerTransport } = require('./streams/httpQueue')
+const { sendSpanToOtel, setEndpointOverride } = require('./trace-export')
 const os = require('os')
 
 let trace, otelContext, otelRootContext
@@ -92,8 +93,17 @@ function pickHeaders (source) {
 }
 
 function createRestifyLoggingMiddleware (options = {}) {
+  const svcName = options.serviceName || process.env.APP_NAME
+  if (svcName) {
+    process.env.OTEL_SERVICE_NAME = svcName
+    process.env.SERVICE_NAME = svcName
+  }
+  const otelEndpoint = options.otelEndpoint || options.otelExporterEndpoint || process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+  if (otelEndpoint) {
+    setEndpointOverride(otelEndpoint)
+  }
   const config = {
-    serviceName: options.serviceName || process.env.APP_NAME,
+    serviceName: svcName,
     loggerUrl: options.loggerUrl || process.env.AZIFY_LOGGER_URL || 'http://localhost:3001/log',
     environment: options.environment || process.env.NODE_ENV,
     logRequest: options.logRequest !== false && process.env.AZIFY_LOGGER_LOG_REQUEST !== 'false'
@@ -266,6 +276,22 @@ function createRestifyLoggingMiddleware (options = {}) {
             }
 
             sendLog(level, message, meta)
+            if (meta.traceId && meta.spanId && config.serviceName) {
+              const startNs = BigInt(startTime) * BigInt(1e6)
+              const endNs = BigInt(Date.now()) * BigInt(1e6)
+              const statusCode = meta.response?.statusCode ?? 200
+              sendSpanToOtel({
+                traceId: meta.traceId,
+                spanId: meta.spanId,
+                serviceName: config.serviceName,
+                name: `request handler - ${requestSnapshot?.baseUrl || requestSnapshot?.url || ''}`,
+                startTimeNs: startNs,
+                endTimeNs: endNs,
+                statusCode,
+                method: requestSnapshot?.method,
+                url: requestSnapshot?.url
+              })
+            }
           } catch (err) {
             const errPayload = {
               traceId: reqCtx.traceId,
@@ -282,6 +308,21 @@ function createRestifyLoggingMiddleware (options = {}) {
             setImmediate(() => {
               try {
                 sendLog('error', (requestSnapshot && (requestSnapshot.method + ' ' + requestSnapshot.url)) || 'request', errPayload)
+                if (errPayload.traceId && errPayload.spanId && config.serviceName) {
+                  const startNs = BigInt(startTime) * BigInt(1e6)
+                  const endNs = BigInt(Date.now()) * BigInt(1e6)
+                  sendSpanToOtel({
+                    traceId: errPayload.traceId,
+                    spanId: errPayload.spanId,
+                    serviceName: config.serviceName,
+                    name: `request handler - ${requestSnapshot?.baseUrl || requestSnapshot?.url || ''}`,
+                    startTimeNs: startNs,
+                    endTimeNs: endNs,
+                    statusCode: 500,
+                    method: requestSnapshot?.method,
+                    url: requestSnapshot?.url
+                  })
+                }
               } catch (_) {}
             })
           }

package/package.json

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

package/queue/redisQueue.js

@@ -30,9 +30,7 @@ function createRedisProducer(config = {}) {
   const maxLen = Number.isFinite(config.maxLen) ? config.maxLen : DEFAULT_MAXLEN
   const password = config.password ?? process.env.AZIFY_LOGGER_REDIS_PASSWORD
   const pass = password != null && String(password).trim() !== '' ? String(password).trim() : null
-  if (!pass) {
-    throw new Error('Redis requires a password. Set AZIFY_LOGGER_REDIS_PASSWORD (or options.redis.password).')
-  }
+  const onUnrecoverableError = typeof config.onUnrecoverableError === 'function' ? config.onUnrecoverableError : null
 
   const redisOptions = { ...defaultRedisOptions, ...(config.redisOptions || {}) }
   if (pass) {
@@ -43,13 +41,9 @@ function createRedisProducer(config = {}) {
   let lastConnectionErrorLog = 0
   let lastEnqueueErrorLog = 0
   let connectionErrorCount = 0
+  let unrecoverableNotified = false
   const ERROR_LOG_INTERVAL = 300000
-  
-  if (typeof global.__azifyLoggerRedisErrorLogged === 'undefined') {
-    global.__azifyLoggerRedisErrorLogged = false
-    global.__azifyLoggerRedisErrorLastLog = 0
-  }
-  
+
   function isRedisAuthError(err) {
     if (!err) return false
     const code = err.code || ''
@@ -65,8 +59,26 @@ function createRedisProducer(config = {}) {
     return isRedisAuthError(err)
   }
 
+  function notifyUnrecoverableOnce() {
+    if (unrecoverableNotified) return
+    unrecoverableNotified = true
+    if (typeof global.__azifyLoggerRedisErrorLogged === 'undefined') {
+      global.__azifyLoggerRedisErrorLogged = false
+      global.__azifyLoggerRedisErrorLastLog = 0
+    }
+    global.__azifyLoggerRedisErrorLogged = true
+    global.__azifyLoggerRedisErrorLastLog = Date.now()
+    process.stderr.write('[azify-logger] Redis unavailable or auth failed. Using direct HTTP (no Redis). Continuing.\n')
+    if (onUnrecoverableError) {
+      try { onUnrecoverableError() } catch (_) {}
+    }
+  }
+
   client.on('error', (err) => {
-    if (isRedisAuthError(err)) return
+    if (isRedisAuthError(err) || isRedisUnavailable(err)) {
+      notifyUnrecoverableOnce()
+      return
+    }
     const now = Date.now()
     if (!global.__azifyLoggerRedisErrorLogged && now - global.__azifyLoggerRedisErrorLastLog > ERROR_LOG_INTERVAL) {
       if (isRedisUnavailable(err)) {

package/queue/workerManager.js

@@ -17,9 +17,16 @@ function buildEnv(redisConfig = {}, extraEnv = {}) {
   if (redisConfig.streamKey) env.AZIFY_LOGGER_REDIS_STREAM = String(redisConfig.streamKey)
   if (redisConfig.streamKey) env.AZIFY_LOGGER_REDIS_QUEUE_KEY = String(redisConfig.streamKey)
   if (redisConfig.maxLen != null) env.AZIFY_LOGGER_REDIS_MAX_STREAM_LENGTH = String(redisConfig.maxLen)
-  if (redisConfig.password != null && String(redisConfig.password).trim() !== '') {
-    env.AZIFY_LOGGER_REDIS_PASSWORD = String(redisConfig.password).trim()
-  }
+  const configPass = redisConfig.password != null && String(redisConfig.password).trim() !== ''
+    ? String(redisConfig.password).trim()
+    : null
+  const envPass = process.env.AZIFY_LOGGER_REDIS_PASSWORD != null && String(process.env.AZIFY_LOGGER_REDIS_PASSWORD).trim() !== ''
+    ? String(process.env.AZIFY_LOGGER_REDIS_PASSWORD).trim()
+    : null
+  const password = configPass || envPass
+  if (password) env.AZIFY_LOGGER_REDIS_PASSWORD = password
+  else if (process.env.AZIFY_LOGGER_REDIS_PASSWORD != null && String(process.env.AZIFY_LOGGER_REDIS_PASSWORD).trim() !== '')
+    env.AZIFY_LOGGER_REDIS_PASSWORD = String(process.env.AZIFY_LOGGER_REDIS_PASSWORD).trim()
 
   return env
 }
@@ -77,7 +84,7 @@ function spawnWorker(redisConfig, options = {}) {
     if (code === EXIT_AUTH_FAILURE) {
       if (typeof global.__azifyLoggerWorkerAuthExitLogged === 'undefined') {
         global.__azifyLoggerWorkerAuthExitLogged = true
-        process.stderr.write('[azify-logger] Redis: invalid password. Worker exiting (no restart). Set AZIFY_LOGGER_REDIS_PASSWORD.\n')
+        process.stderr.write('[azify-logger] Redis unavailable or auth failed. Worker exited once (no restart). Using direct HTTP.\n')
       }
       const fns = authFailureCallbacks.splice(0, authFailureCallbacks.length)
       fns.forEach((fn) => { try { fn() } catch (_) {} })

package/register-otel.js

@@ -1,3 +1,8 @@
+function normalizeServiceNameForTraces(s) {
+  const t = String(s || '').trim().toLowerCase().replace(/[^a-z0-9-]/g, '-')
+  return t && t !== 'unknown' && t !== 'unknown-service' ? t : 'default'
+}
+
 try {
   const { NodeSDK } = require('@opentelemetry/sdk-node')
   const { AlwaysOnSampler } = require('@opentelemetry/core')
@@ -7,7 +12,8 @@ try {
   const { Resource } = require('@opentelemetry/resources')
   const { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } = require('@opentelemetry/semantic-conventions')
 
-  const serviceName = process.env.OTEL_SERVICE_NAME || process.env.SERVICE_NAME || process.env.APP_NAME || 'app'
+  const rawName = process.env.APP_NAME || process.env.OTEL_SERVICE_NAME || process.env.SERVICE_NAME || 'app'
+  const serviceName = normalizeServiceNameForTraces(rawName)
   const serviceVersion = process.env.OTEL_SERVICE_VERSION || '1.0.0'
 
   process.env.OTEL_SERVICE_NAME = serviceName

package/scripts/redis-worker.js

@@ -488,8 +488,10 @@ ensureGroup()
       }
       return consumeLoop()
     }
-    const authFail = isRedisAuthError(err) || /noauth|wrongpass|invalid password|authentication required/i.test(errMsg)
-    if (authFail) process.exit(2)
+    const redisUnavailable = isRedisAuthError(err) || isRedisUnavailable(err) || /noauth|wrongpass|invalid password|authentication required|econnrefused/i.test(errMsg)
+    if (redisUnavailable) {
+      process.exit(2)
+    }
     console.error('[azify-logger][worker] failed to start:', errMsg)
     process.exit(1)
   })

package/server.js

@@ -51,24 +51,24 @@ function isPrivateOrLocalhost(ip) {
   if (IS_LOCAL) {
     return true
   }
-  
+
   ip = ip.replace('::ffff:', '').replace('::1', '127.0.0.1')
-  
+
   if (ip === '127.0.0.1' || ip === 'localhost' || ip === '::1') {
     return true
   }
-  
+
   const parts = ip.split('.').map(Number)
-  
+
   if (parts.length !== 4) {
     return false
   }
-  
+
   if (parts[0] === 10) return true
   if (parts[0] === 127) return true
   if (parts[0] === 192 && parts[1] === 168) return true
   if (parts[0] === 172 && parts[1] >= 16 && parts[1] <= 31) return true
-  
+
   return false
 }
 
@@ -76,13 +76,13 @@ function validateNetworkAccess(req, res, next) {
   if (req.path === '/health' || req.path === '/' || req.path === '/v1/traces') {
     return next()
   }
-  
+
   const clientIP = req.headers['x-forwarded-for']?.split(',')[0]?.trim() ||
-                   req.headers['x-real-ip'] || 
-                   req.ip || 
+                   req.headers['x-real-ip'] ||
+                   req.ip ||
                    req.connection.remoteAddress ||
                    req.socket.remoteAddress
-  
+
   if (
     !IS_LOCAL &&
     !isPrivateOrLocalhost(clientIP) &&
@@ -94,7 +94,7 @@ function validateNetworkAccess(req, res, next) {
       clientIP: clientIP
     })
   }
-  
+
   next()
 }
 
@@ -108,7 +108,7 @@ const traceContextMap = new Map()
 async function ensureIndexTemplate() {
   const templateName = 'logs-template'
   const osUrl = process.env.OPENSEARCH_URL || 'http://localhost:9200'
-  
+
   try {
     await axios.put(`${osUrl}/_index_template/${templateName}`, {
       index_patterns: ['logs-*'],
@@ -120,7 +120,8 @@ async function ensureIndexTemplate() {
           },
           mappings: {
             properties: {
-            '@timestamp': { type: 'date' },
+            '@timestamp': { type: 'date', format: 'epoch_millis' },
+              time: { type: 'date' },
               level: { type: 'text', fields: { keyword: { type: 'keyword' } } },
               message: { type: 'text' },
               service: {
@@ -129,7 +130,7 @@ async function ensureIndexTemplate() {
                   version: { type: 'keyword' }
                 }
               },
-            appName: { 
+            appName: {
               type: 'keyword',
               fields: {
                 keyword: { type: 'keyword' }
@@ -174,6 +175,99 @@ async function ensureIndexTemplate() {
 
 ensureIndexTemplate()
 
+const { generateOtelCollectorConfig } = require('./otel-collector-config-generator')
+const seenServiceNames = new Set()
+
+function addSeenServiceName(name) {
+  const s = String(name || '').trim().toLowerCase().replace(/[^a-z0-9-]/g, '-')
+  if (!s || s === 'unknown' || s === 'unknown-service') return
+  const isNew = !seenServiceNames.has(s)
+  seenServiceNames.add(s)
+  if (isNew) scheduleOtelCollectorConfigWrite()
+}
+
+async function fetchGrafanaOrgNames() {
+  const orgs = await fetchGrafanaOrgs()
+  return orgs.map((o) => (o.name || '').trim()).filter(Boolean)
+}
+
+async function fetchGrafanaOrgs() {
+  const runningInDocker = fs.existsSync('/.dockerenv')
+  const defaultGrafanaUrl = runningInDocker ? 'http://azify-grafana:3000' : 'http://127.0.0.1:3002'
+  const grafanaUrl = process.env.GRAFANA_URL || defaultGrafanaUrl
+  const grafanaAdminUser = process.env.GRAFANA_ADMIN_USER || 'admin'
+  const grafanaAdminPassword = process.env.GRAFANA_ADMIN_PASSWORD || process.env.GF_SECURITY_ADMIN_PASSWORD || 'admin'
+  try {
+    const resp = await axios.get(`${grafanaUrl}/api/orgs`, {
+      auth: { username: grafanaAdminUser, password: grafanaAdminPassword },
+      timeout: 3000
+    })
+    const orgs = (resp.data || []).map((o) => ({ id: o.id, name: (o.name || '').trim() })).filter((o) => o.name)
+    return orgs
+  } catch (err) {
+    return []
+  }
+}
+
+function normalizeServiceNameForOtel(s) {
+  const t = String(s || '').trim().toLowerCase().replace(/[^a-z0-9-]/g, '-')
+  return t && t !== 'unknown' && t !== 'unknown-service' ? t : null
+}
+
+async function getOtelCollectorConfigYaml() {
+  const orgNames = await fetchGrafanaOrgNames()
+  const raw = [...new Set([...orgNames, ...seenServiceNames])]
+  const all = raw.map(normalizeServiceNameForOtel).filter(Boolean)
+  return generateOtelCollectorConfig(all)
+}
+
+function tryRestartOtelCollector() {
+  const container = process.env.OTEL_COLLECTOR_CONTAINER || 'azify-otel-collector'
+  try {
+    const http = require('http')
+    const req = http.request({
+      socketPath: '/var/run/docker.sock',
+      path: `/containers/${container}/restart`,
+      method: 'POST',
+      timeout: 10000
+    }, () => {})
+    req.on('error', () => {})
+    req.end()
+  } catch (_) {}
+  console.log('[otel-config] Restart do collector solicitado')
+}
+
+let otelConfigWriteScheduled = null
+async function writeOtelCollectorConfigIfEnabled() {
+  const outPath = process.env.OTEL_COLLECTOR_CONFIG_OUTPUT_PATH
+  if (!outPath) return
+  try {
+    const yaml = await getOtelCollectorConfigYaml()
+    const all = [...new Set([...(await fetchGrafanaOrgNames()), ...seenServiceNames])]
+    const list = all.map(normalizeServiceNameForOtel).filter(Boolean)
+    const dir = require('path').dirname(outPath)
+    if (!fs.existsSync(dir)) {
+      try { fs.mkdirSync(dir, { recursive: true }) } catch (_) {}
+    }
+    if (fs.existsSync(dir)) {
+      fs.writeFileSync(outPath, yaml, 'utf8')
+      console.log('[otel-config] Config escrita:', list.length, 'serviços:', list.join(', ') || '(nenhum)')
+      tryRestartOtelCollector()
+    }
+  } catch (err) {
+    console.warn('[otel-config] Falha ao escrever config do collector:', err?.message || err)
+  }
+}
+
+function scheduleOtelCollectorConfigWrite() {
+  if (!process.env.OTEL_COLLECTOR_CONFIG_OUTPUT_PATH) return
+  if (otelConfigWriteScheduled) return
+  otelConfigWriteScheduled = setTimeout(async () => {
+    otelConfigWriteScheduled = null
+    await writeOtelCollectorConfigIfEnabled()
+  }, 5000)
+}
+
 function escapeForSQLite(str) {
   if (!str) return "''"
   return str.replace(/'/g, "''").replace(/\\/g, '\\\\').replace(/\n/g, '\\n').replace(/\r/g, '\\r')
@@ -184,7 +278,7 @@ function runSqlite(sql) {
   const grafanaContainer = process.env.GRAFANA_DOCKER_CONTAINER || 'azify-grafana'
   const { execSync } = require('child_process')
   const localDbExists = fs.existsSync(dbPath)
-  
+
   const escapedForLocal = sql.replace(/"/g, '""')
   const escapedForDocker = sql.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\$/g, '\\$')
 
@@ -214,20 +308,20 @@ async function createOrgViaSQLite(appName) {
 
     console.log(`[createOrgViaSQLite] Verificando se Organization '${appName}' já existe...`)
     const existingId = runSqlite(`SELECT id FROM org WHERE name='${appName}';`)
-    
+
     if (existingId && existingId !== '') {
       console.log(`[createOrgViaSQLite] ✅ Organization '${appName}' já existe (ID: ${existingId})`)
       return { id: parseInt(existingId), name: appName }
     }
-    
+
     console.log(`[createOrgViaSQLite] Criando Organization '${appName}'...`)
     const newId = runSqlite(`INSERT INTO org (name, version, created, updated) VALUES ('${appName}', 1, datetime('now'), datetime('now')); SELECT id FROM org WHERE name='${appName}';`)
-    
+
     if (newId && newId !== '') {
       console.log(`[createOrgViaSQLite] ✅ Organization '${appName}' criada com sucesso (ID: ${newId})`)
       return { id: parseInt(newId), name: appName }
     }
-    
+
     console.error(`[createOrgViaSQLite] ❌ Não foi possível obter ID da Organization criada`)
     return null
   } catch (error) {
@@ -249,13 +343,13 @@ async function setupGrafanaForApp(appName) {
   if (!setupGrafanaForApp._cache) {
     setupGrafanaForApp._cache = new Set()
   }
-  
+
   if (setupGrafanaForApp._cache.has(appName)) {
     return
   }
-  
+
   setupGrafanaForApp._cache.add(appName)
-  
+
   console.log(`[setupGrafana] Processando app: ${appName}`)
 
   try {
@@ -263,13 +357,13 @@ async function setupGrafanaForApp(appName) {
       username: grafanaAdminUser,
       password: grafanaAdminPassword
     }
-    
+
     console.log(`[setupGrafana] Usando autenticação: user=${grafanaAdminUser}, password=${grafanaAdminPassword ? '***' : 'VAZIO'}`)
 
     let org
-    
+
     try {
-      const orgResponse = await axios.get(`${grafanaUrl}/api/orgs/name/${encodeURIComponent(appName)}`, { 
+      const orgResponse = await axios.get(`${grafanaUrl}/api/orgs/name/${encodeURIComponent(appName)}`, {
         auth,
         timeout: 3000
       })
@@ -319,7 +413,7 @@ async function setupGrafanaForApp(appName) {
       console.error(`[setupGrafana] ❌ Organization não encontrada/criada para ${appName}`)
       throw new Error(`Organization não encontrada ou criada para ${appName}`)
     }
-    
+
     console.log(`[setupGrafana] ✅ Organization encontrada/criada: ${org.name} (ID: ${org.id})`)
 
     const adminEmails = process.env.ADMIN_EMAILS ? process.env.ADMIN_EMAILS.split(',') : []
@@ -327,16 +421,16 @@ async function setupGrafanaForApp(appName) {
       for (const email of adminEmails) {
         const trimmedEmail = email.trim()
         if (!trimmedEmail) continue
-        
+
         try {
           const userResponse = await axios.get(`${grafanaUrl}/api/users/lookup?loginOrEmail=${encodeURIComponent(trimmedEmail)}`, {
             auth,
             timeout: 3000
           })
-          
+
           if (userResponse.data && userResponse.data.id) {
             const userId = userResponse.data.id
-            
+
             try {
               await axios.post(
                 `${grafanaUrl}/api/orgs/${org.id}/users`,
@@ -378,7 +472,7 @@ async function setupGrafanaForApp(appName) {
               resolve(null)
             }
           })
-          
+
           if (dbUserId) {
             try {
               runSqlite(`INSERT OR IGNORE INTO org_user (org_id, user_id, role, created, updated) VALUES (${org.id}, ${dbUserId}, 'Admin', datetime('now'), datetime('now')); UPDATE org_user SET role='Admin' WHERE org_id=${org.id} AND user_id=${dbUserId};`)
@@ -392,7 +486,7 @@ async function setupGrafanaForApp(appName) {
     }
 
     console.log(`[setupGrafana] 📊 Criando datasource para ${appName}...`)
-    
+
     const datasourceUid = `opensearch-${appName.toLowerCase()}`
     const indexName = `logs-${appName}`
     const datasourceConfig = {
@@ -405,7 +499,7 @@ async function setupGrafanaForApp(appName) {
       jsonData: {
         index: indexName,
         database: indexName,
-        timeField: '@timestamp',
+        timeField: 'time',
         esVersion: '2.11.1',
         version: '2.11.1',
         logMessageField: 'message',
@@ -500,10 +594,12 @@ async function setupGrafanaForApp(appName) {
     try {
       const tempoDatasourceUid = `tempo-${appName.toLowerCase()}`
       const tempoUrl = runningInDocker ? 'http://tempo:3200' : 'http://localhost:3200'
-      const serviceFilter = `{ resource.service.name="${appName}" }`
+      const serviceNameNorm = String(appName).trim().toLowerCase().replace(/[^a-z0-9-]/g, '-')
       const tempoJsonData = {
         httpMethod: 'GET',
-        defaultQuery: serviceFilter,
+        httpHeaderName1: 'X-Scope-OrgID',
+        httpHeaderValue1: serviceNameNorm,
+        defaultQuery: `{ resource.service.name="${serviceNameNorm}" }`,
         tracesToLogs: {
           datasourceUid: datasourceUid,
           tags: ['job', 'service', 'pod'],
@@ -517,7 +613,8 @@ async function setupGrafanaForApp(appName) {
           query: `traceId:"\${__trace.traceId}"`
         },
         nodeGraph: { enabled: false },
-        search: { hide: true }
+        search: { hide: true },
+        lokiSearch: { hide: true }
       }
       const tempoDatasourceConfig = {
         name: `Tempo-${appName}`,
@@ -527,6 +624,7 @@ async function setupGrafanaForApp(appName) {
         uid: tempoDatasourceUid,
         isDefault: false,
         jsonData: tempoJsonData,
+        secureJsonData: { httpHeaderValue1: serviceNameNorm },
         editable: true,
         version: 1
       }
@@ -540,9 +638,23 @@ async function setupGrafanaForApp(appName) {
         })
         console.log(`[setupGrafana] Datasource Tempo existente encontrado: ${existingTempo.data?.id || 'N/A'}`)
         try {
+          const id = existingTempo.data.id
+          const putPayload = {
+            id,
+            orgId: existingTempo.data.orgId ?? org.id,
+            name: tempoDatasourceConfig.name,
+            type: 'tempo',
+            access: 'proxy',
+            url: tempoUrl,
+            uid: tempoDatasourceUid,
+            isDefault: false,
+            version: existingTempo.data.version ?? 1,
+            jsonData: { ...(existingTempo.data.jsonData || {}), ...tempoJsonData },
+            secureJsonData: { httpHeaderValue1: serviceNameNorm }
+          }
           await axios.put(
-            `${grafanaUrl}/api/datasources/${existingTempo.data.id}`,
-            tempoDatasourceConfig,
+            `${grafanaUrl}/api/datasources/${id}`,
+            putPayload,
             {
               auth,
               headers: { 'X-Grafana-Org-Id': org.id },
@@ -579,10 +691,10 @@ async function setupGrafanaForApp(appName) {
     }
 
     console.log(`[setupGrafana] 📈 Criando dashboard para ${appName}...`)
-    
+
     const appNameLower = appName.toLowerCase()
     const indexFilter = `_index:logs-${appNameLower}`
-    
+
     const dashboardConfig = {
         dashboard: {
           title: `Application Health - ${appName}`,
@@ -615,11 +727,11 @@ async function setupGrafanaForApp(appName) {
                 defaults: {
                   unit: 'short',
                   color: { mode: 'thresholds' },
-                  custom: { 
-                    reduceOptions: { 
-                      values: false, 
-                      calcs: ['sum'] 
-                    } 
+                  custom: {
+                    reduceOptions: {
+                      values: false,
+                      calcs: ['sum']
+                    }
                   }
                 }
               },
@@ -792,14 +904,14 @@ async function setupGrafanaForApp(appName) {
         auth,
         headers: { 'X-Grafana-Org-Id': org.id }
       })
-      
+
       if (searchResponse.data && searchResponse.data.length > 0) {
         const existingDashboard = searchResponse.data[0]
         const dashboardDetail = await axios.get(`${grafanaUrl}/api/dashboards/uid/${existingDashboard.uid}`, {
           auth,
           headers: { 'X-Grafana-Org-Id': org.id }
         })
-        
+
         dashboardConfig.dashboard.id = dashboardDetail.data.dashboard.id
         dashboardConfig.dashboard.uid = dashboardDetail.data.dashboard.uid
         dashboardConfig.dashboard.version = dashboardDetail.data.dashboard.version
@@ -857,7 +969,7 @@ async function setupGrafanaForApp(appName) {
     }
 
     console.log(`[setupGrafana] ✅ Setup completo para ${appName} (Organization, Datasource e Dashboard)`)
-    
+
     setTimeout(() => {
       setupGrafanaForApp._cache.delete(appName)
     }, 3600000)
@@ -911,7 +1023,7 @@ async function registerAlertRulesForApp(appName, rules, options = {}) {
   await setupGrafanaForApp(serviceName)
 
   const { grafanaUrl, auth, headers } = await getGrafanaClientConfig(options?.grafanaApiToken)
-  
+
   console.log(`[alerts] 🔗 Conectando ao Grafana: ${grafanaUrl}`)
 
   const makeGrafanaRequestConfig = (extra = {}) => {
@@ -943,7 +1055,7 @@ async function registerAlertRulesForApp(appName, rules, options = {}) {
   if (!orgId) {
     throw new Error(`Org não encontrada para app ${serviceName}`)
   }
-  
+
   console.log(`[alerts] ✅ Organização encontrada: ${serviceName} (orgId=${orgId})`)
 
   const datasourceUid = `opensearch-${serviceName}`
@@ -1113,7 +1225,7 @@ async function registerAlertRulesForApp(appName, rules, options = {}) {
 
       const routeMatches = (route) => {
         if (!Array.isArray(route.matchers)) return false
-        return route.matchers.some(m => 
+        return route.matchers.some(m =>
           (typeof m === 'string' && m.includes(`alertId=~${alertId}`)) ||
           (typeof m === 'object' && m.value === alertId)
         )
@@ -1236,8 +1348,8 @@ async function registerAlertRulesForApp(appName, rules, options = {}) {
       if (unit === 'h') windowSeconds = value * 60 * 60
       if (unit === 'd') windowSeconds = value * 60 * 60 * 24
     }
-    
-    const relativeTimeRangeSeconds = Math.max(windowSeconds, 300) // 5 minutos mínimo
+
+    const relativeTimeRangeSeconds = Math.max(windowSeconds, 300)
 
     const receiverName = await createOrUpdateContactPointForRule(rule)
 
@@ -1521,25 +1633,25 @@ function getOrCreateTraceContext(requestId) {
   if (traceContextMap.has(requestId)) {
     return traceContextMap.get(requestId)
   }
-  
+
   const traceContext = {
     traceId: generateTraceId(),
     spanId: generateSpanId(),
     parentSpanId: null
   }
-  
+
   traceContextMap.set(requestId, traceContext)
-  
+
   setTimeout(() => {
     traceContextMap.delete(requestId)
   }, 30000)
-  
+
   return traceContext
 }
 
 app.get('/health', (req, res) => {
-  res.json({ 
-    status: 'ok', 
+  res.json({
+    status: 'ok',
     service: 'azify-logger',
     authEnabled
   })
@@ -1563,7 +1675,7 @@ function decodeHtmlEntities(str) {
   let prev = ''
   let iterations = 0
   const maxIterations = 10
-  
+
   const namedEntities = {
     '&quot;': '"',
     '&apos;': "'",
@@ -1572,7 +1684,7 @@ function decodeHtmlEntities(str) {
     '&amp;': '&',
     '&nbsp;': ' '
   }
-  
+
   while (decoded !== prev && iterations < maxIterations) {
     prev = decoded
     Object.keys(namedEntities).forEach(entity => {
@@ -1597,13 +1709,15 @@ function decodeHtmlEntities(str) {
     })
     iterations++
   }
-  
+
   return decoded
 }
 
 async function handleLog(req, res) {
-  let { level, message, meta } = req.body
-  
+  const body = req.body && typeof req.body === 'object' ? req.body : {}
+  const payload = body.payload && typeof body.payload === 'object' ? body.payload : body
+  let { level, message, meta } = payload
+
   if (!level || !message) {
     return res.status(400).json({ success: false, message: 'Level and message are required.' })
   }
@@ -1615,7 +1729,7 @@ async function handleLog(req, res) {
   const requestPath = meta?.request?.path || meta?.request?.url || meta?.request?.baseUrl || meta?.url || meta?.path || ''
   const requestPathLower = String(requestPath).toLowerCase()
   const messageLower = String(message).toLowerCase()
-  
+
   const isSwaggerPath = (
     requestPathLower.includes('/api-docs') ||
     requestPathLower.includes('/swagger-ui') ||
@@ -1654,7 +1768,7 @@ async function handleLog(req, res) {
   const requestId = meta && meta.requestId
 
   let traceContext = null
-  
+
   if (meta && meta.traceId && meta.spanId) {
     traceContext = {
       traceId: meta.traceId,
@@ -1698,8 +1812,12 @@ async function handleLog(req, res) {
     }
   }
   const traceIdHex = (meta && meta.traceIdHex) || (traceContext.traceId ? String(traceContext.traceId).replace(/-/g, '').padStart(32, '0').slice(0, 32) : null)
+  const ts = (meta && meta.timestamp) != null ? meta.timestamp : Date.now()
+  const timestampMs = typeof ts === 'number' ? ts : new Date(ts).getTime()
+  const timestampIso = new Date(timestampMs).toISOString()
   const logEntry = {
-    '@timestamp': (meta && meta.timestamp) || new Date().toISOString(),
+    '@timestamp': timestampMs,
+    time: timestampIso,
     level,
     message,
     service: {
@@ -1718,7 +1836,7 @@ async function handleLog(req, res) {
     Object.keys(meta).forEach(key => {
       if (!['timestamp', 'service', 'environment', 'hostname', 'traceId', 'traceIdHex', 'spanId', 'parentSpanId'].includes(key)) {
         let value = meta[key]
-        
+
         if (typeof value === 'string') {
           if (key === 'url' || key === 'path' || key === 'baseUrl' || key === 'message') {
             value = decodeHtmlEntities(value)
@@ -1726,7 +1844,7 @@ async function handleLog(req, res) {
             value = decodeHtmlEntities(value)
           }
         }
-        
+
         const truncateBody = (bodyValue, forResponse = false) => {
           if (forResponse) {
             if (typeof bodyValue === 'string') {
@@ -1742,7 +1860,7 @@ async function handleLog(req, res) {
             }
             return String(bodyValue)
           }
-          
+
           if (typeof bodyValue === 'string') {
             return bodyValue
           } else if (typeof bodyValue === 'object' && bodyValue !== null) {
@@ -1761,7 +1879,7 @@ async function handleLog(req, res) {
           }
           return bodyValue
         }
-        
+
         if (key === 'request' && value && typeof value === 'object' && value.body !== undefined) {
           const processedBody = truncateBody(value.body, false)
           if (typeof processedBody === 'string' && processedBody.length > 5000) {
@@ -1812,13 +1930,14 @@ async function handleLog(req, res) {
     const appName = logEntry.appName || logEntry.service?.name || 'unknown'
     const serviceName = appName.toLowerCase().replace(/[^a-z0-9-]/g, '-')
     const indexName = `logs-${serviceName}`
-    
+    addSeenServiceName(serviceName)
+
     await axios.post(`${osUrl}/${indexName}/_doc`, logEntry, {
       headers: { 'Content-Type': 'application/json' }
     })
-    
+
     console.log(`[setupGrafana] serviceName: ${serviceName}, appName: ${appName}`)
-    
+
     if (serviceName !== 'unknown' && serviceName !== 'unknown-service') {
       console.log(`[setupGrafana] Iniciando setup para app: ${serviceName}`)
       setupGrafanaForApp(serviceName).then(() => {
@@ -1834,7 +1953,7 @@ async function handleLog(req, res) {
     } else {
       console.log(`[setupGrafana] ⚠️  Pulando setup para serviceName inválido: ${serviceName}`)
     }
-    
+
     res.json({ success: true, message: 'Log enviado com sucesso', index: indexName })
   } catch (error) {
     const status = error?.response?.status
@@ -1864,10 +1983,41 @@ async function handleLog(req, res) {
 
 app.post('/log', (req, res) => handleLog(req, res))
 
+function extractServiceNamesFromTraceBody(body) {
+  const names = new Set()
+  try {
+    const spans = body?.resourceSpans
+    if (!Array.isArray(spans)) return names
+    for (const rs of spans) {
+      const attrs = rs?.resource?.attributes
+      if (!Array.isArray(attrs)) continue
+      for (const a of attrs) {
+        if (a?.key === 'service.name') {
+          const v = a?.value?.stringValue ?? a?.value
+          if (typeof v === 'string' && v.trim()) names.add(v.trim())
+          break
+        }
+      }
+    }
+  } catch (_) {}
+  return names
+}
+
 app.post('/v1/traces', async (req, res) => {
   try {
-    const collectorUrl = process.env.OTEL_COLLECTOR_URL || 'http://localhost:4318'
-    const response = await axios.post(`${collectorUrl}/v1/traces`, req.body, {
+    const names = extractServiceNamesFromTraceBody(req.body)
+    for (const name of names) addSeenServiceName(name)
+    if (req.body?.resourceSpans?.length) scheduleOtelCollectorConfigWrite()
+
+    const ep = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+    let traceUrl = 'http://127.0.0.1:4318/v1/traces'
+    if (ep) {
+      try {
+        const u = new URL(ep)
+        traceUrl = ep.includes('/v1/') ? ep : `${u.origin.replace(/\/$/, '')}/v1/traces`
+      } catch (_) {}
+    }
+    const response = await axios.post(traceUrl, req.body, {
       headers: {
         'Content-Type': 'application/json'
       },
@@ -1897,7 +2047,7 @@ app.post('/alerts/register', async (req, res) => {
     }
 
     console.log(`[alerts] 📥 Recebido registro de alertas para app=${appName}, ${rules.length} regra(s)`)
-    
+
     const results = await registerAlertRulesForApp(appName, rules, { grafanaApiToken })
 
     res.json({
@@ -1962,7 +2112,7 @@ app.post('/dashboards/register', async (req, res) => {
     const orgId = org.id
 
     const datasourceUid = `opensearch-${appName.toLowerCase()}`
-    
+
     const dashboardConfig = {
       ...dashboard,
       overwrite: true,
@@ -2064,7 +2214,22 @@ app.post('/dashboards/register', async (req, res) => {
 
 const port = process.env.PORT || 3001
 
-app.listen(port)
+app.listen(port, () => {
+  setTimeout(() => writeOtelCollectorConfigIfEnabled().catch(() => {}), 3000)
+  setTimeout(async () => {
+    try {
+      const orgs = await fetchGrafanaOrgs()
+      const toSetup = orgs.filter((o) => o.id !== 1 && o.name && o.name.toLowerCase() !== 'main org')
+      if (setupGrafanaForApp._cache) setupGrafanaForApp._cache.clear()
+      for (const org of toSetup) {
+        await setupGrafanaForApp(org.name).catch((e) => console.warn('[setupGrafana] Reaplicar Tempo para org', org.name, ':', e?.message || e))
+      }
+      if (toSetup.length) await writeOtelCollectorConfigIfEnabled().catch(() => {})
+    } catch (e) {
+      console.warn('[setupGrafana] Reaplicar Tempo para todas as orgs:', e?.message || e)
+    }
+  }, 12000)
+})
 
 process.on('SIGTERM', () => {
   process.exit(0)

package/streams/httpQueue.js

@@ -95,10 +95,6 @@ function resolveRedisConfig (overrides = {}) {
   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 (!pass) {
-    return null
-  }
-
   return {
     url: redisUrl,
     streamKey,
@@ -141,9 +137,20 @@ function createHttpLoggerTransport (loggerUrl, overrides) {
 }
 
 function createRedisStreamTransport (loggerUrl, options, redisConfig) {
+  let useInlineFallback = false
+  let inlineTransport = null
+  const redisConfigWithCb = {
+    ...redisConfig,
+    onUnrecoverableError () {
+      if (useInlineFallback) return
+      useInlineFallback = true
+      inlineTransport = buildInlineTransport(loggerUrl, options)
+    }
+  }
+
   let producer = null
   try {
-    producer = createRedisProducer(redisConfig)
+    producer = createRedisProducer(redisConfigWithCb)
   } catch (err) {
     throw new Error(`Failed to create Redis producer: ${err.message}`)
   }
@@ -152,9 +159,6 @@ function createRedisStreamTransport (loggerUrl, options, redisConfig) {
     throw new Error('Failed to create Redis producer: producer is null')
   }
 
-  let useInlineFallback = false
-  let inlineTransport = null
-
   let spool = null
   if (createFileSpool) {
     try {

package/trace-export.js

@@ -25,6 +25,11 @@ function normalizeHex(val, len) {
   return hex || null
 }
 
+function normalizeServiceNameForTraces(s) {
+  const t = String(s || '').trim().toLowerCase().replace(/[^a-z0-9-]/g, '-')
+  return t && t !== 'unknown' && t !== 'unknown-service' ? t : 'default'
+}
+
 function sendSpanToOtel(opts) {
   const endpoint = getEndpoint()
   if (!endpoint) return
@@ -32,7 +37,7 @@ function sendSpanToOtel(opts) {
   const traceIdHex = normalizeHex(traceId, 32)
   const spanIdHex = normalizeHex(spanId, 16)
   if (!traceIdHex || !spanIdHex || !serviceName) return
-  const svc = String(serviceName).trim() || 'unknown'
+  const svc = normalizeServiceNameForTraces(String(serviceName).trim() || 'unknown')
   const spanName = name || 'request'
   const start = startTimeNs || BigInt(Date.now()) * BigInt(1e6)
   const end = endTimeNs || BigInt(Date.now()) * BigInt(1e6)