azify-logger 1.0.29 → 1.0.31

package/README.md

@@ -10,15 +10,15 @@ Sistema de logging centralizado com OpenTelemetry e OpenSearch para múltiplas a
 |----------|-----|
 | **Development** | `http://localhost:3001/log` |
 | **Staging** | `https://logsdashboard.azify.dev/send` |
-| **Production** | `https://logsdashboard.azify.prd/send` | (a configurar)
+| **Production** | `https://cadence.aztech.host/send` | 
 
 ### URLs para acessar os logs:
 
-| Ambiente | URL |
-|----------|-----|
-| **Development** | Grafana: `http://localhost:3002` |
+| Ambiente | URL                               |
+|----------|-----------------------------------|
+| **Development** | `http://localhost:3002`  |
 | **Staging** | `https://logsdashboard.azify.dev` |
-| **Production** | `https://logsdashboard.azify.com` |
+| **Production** | `https://cadence.aztech.host`     |
 
 ## 📦 Instalação
 
@@ -68,11 +68,12 @@ await fastify.listen({ port: 3000 })
 
 ## ⚙️ Variáveis de Ambiente
 
-| Variável | Padrão | Descrição |
-|----------|-------|-----------|
-| `APP_NAME` | - | Nome da aplicação |
-| `AZIFY_LOGGER_URL` | `http://localhost:3001/log` | URL do logger |
-| `NODE_ENV` | `development` | Ambiente |
+| Variável | Padrão                             | Descrição |
+|----------|------------------------------------|-----------|
+| `APP_NAME` | -                                  | Nome da aplicação |
+| `AZIFY_LOGGER_URL` | `http://localhost:3001/log`        | URL do logger |
+| `OTEL_EXPORTER_OTLP_ENDPOINT` | `http://localhost:4318/v1/traces`  | Endpoint OTLP para traces (opcional) |
+| `NODE_ENV` | `development`                      | Ambiente |
 
 ## 🎯 O Que Você Ganha
 
@@ -81,6 +82,27 @@ await fastify.listen({ port: 3000 })
 - ✅ **Trace Consistente**: REQUEST e RESPONSE com mesmo traceId/spanId
 - ✅ **Genérico**: Funciona com Bunyan, Pino, console.log ou qualquer logger
 - ✅ **Centralizado**: Todos os logs no OpenSearch
+- ✅ **Tracing Completo**: Traces exportados via OTLP para Grafana Tempo (opcional)
+
+## 📡 OpenTelemetry Collector
+
+O `azify-logger` inclui um OpenTelemetry Collector configurado para receber traces via OTLP e exportá-los para Grafana Tempo.
+
+### Configuração
+
+Para habilitar o envio de traces, configure a variável de ambiente na sua aplicação:
+
+```bash
+OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318/v1/traces
+```
+
+### URLs
+
+| Ambiente | URL |
+|----------|-----|
+| **Development** | `http://localhost:4318/v1/traces` |
+| **Staging** | `https://logsdashboard.azify.dev/v1/traces` |
+| **Production** | `https://cadence.aztech.host/v1/traces` | 
 
 ## 🔍 Como Funciona
 
@@ -183,6 +205,22 @@ curl -X POST http://localhost:3001/log \
 
 Acesse `http://localhost:3002` e faça login com Azure AD.
 
+### Apps fora da mesma máquina / rede (Azure)
+
+Por padrão, o `azify-logger` **só aceita chamadas dos próprios serviços locais** (mesma VM / rede privada).
+
+Se sua aplicação **não estiver rodando na mesma máquina/VM** do `azify-logger`:
+
+- Descubra o **IP público** da aplicação cliente
+- Envie esse IP para que ele seja incluído na configuração interna (`ALLOWED_SOURCE_IPS`)
+
+Isso vale tanto para:
+
+- Envio de logs (`/log` e `/send`)
+- Envio de traces (`/v1/traces`)
+
+Enquanto o IP não for incluído nessa lista, chamadas vindas de fora da mesma máquina/rede serão bloqueadas com `403 Forbidden`.
+
 ## 🚀 Deploy
 
 ### Staging - Deploy Automático
@@ -200,6 +238,102 @@ O deploy é feito automaticamente via GitHub Actions.
 3. Configure: **Environment:** `production`
 4. Clique em **Run workflow**
 
+## 📦 Retenção e Arquivamento de Logs
+
+> **⚠️ Importante**: A retenção é configurada **apenas no servidor `azify-logger`**. As aplicações que usam a lib **não precisam se preocupar** com retenção - elas apenas enviam logs normalmente.
+
+O `azify-logger` inclui um sistema automático de retenção que:
+
+- ✅ **Mantém sempre os últimos 30 dias** de logs disponíveis no OpenSearch para consulta imediata
+- ✅ **Compacta e arquiva** logs mais antigos automaticamente
+- ✅ **Envia para Azure Blob Storage** para armazenamento de longo prazo
+- ✅ **Remove logs antigos** do OpenSearch após arquivamento bem-sucedido
+
+### Como Funciona
+
+1. **Agendamento**: O serviço de retenção executa automaticamente 1x por dia às 3h da manhã (configurável via `RETENTION_RUN_AT_HOUR`)
+2. **Identificação**: Busca todos os logs com mais de 30 dias no OpenSearch
+3. **Arquivamento**:
+   - Exporta logs mais antigos que 30 dias
+   - Compacta em formato ZIP
+   - Envia para Azure Blob Storage na estrutura `logs/{app}/{YYYYMM}/{DD}/`
+   - Remove do OpenSearch após confirmação de upload bem-sucedido
+
+### Configuração (Apenas no Servidor azify-logger)
+
+A configuração de retenção é feita **apenas no servidor `azify-logger`**, no arquivo `env/app.env`:
+
+```bash
+RETENTION_DAYS=30                    # Dias de logs mantidos no OpenSearch (padrão: 30)
+RETENTION_RUN_AT_HOUR=3              # Horário de execução diária (0-23, padrão: 3h da manhã)
+
+**⚠️ As aplicações que usam a lib `azify-logger` não precisam configurar nada relacionado à retenção.**
+
+### Execução Manual
+
+Para executar a retenção manualmente (útil para testes):
+
+```bash
+# Executar uma vez
+npm run retention -- --once
+
+# Ou via Docker
+docker exec azify-retention-manager node scripts/retention-manager.js --once
+```
+
+### Estrutura no Blob Storage
+
+Os arquivos são organizados da seguinte forma:
+
+```
+{container}/
+  └── logs/
+      └── {YYYYMM}/  (ex: 202512/)
+          └── log-YYYY-MM-DD-HH-MM-SS-UUID.zip
+```
+
+Cada arquivo ZIP contém:
+- `metadata.json`: Metadados do índice (nome, data de exportação, contagem de documentos, dias de retenção)
+- `{indexName}-{timestamp}.json`: Todos os documentos exportados em JSON
+
+O sistema sempre mantém **os últimos 30 dias** de logs disponíveis no OpenSearch/Grafana.
+
+### Scripts Úteis
+
+#### Consulta e Validação de Blob Storage
+
+```bash
+# Listar todos os arquivos no blob storage
+npm run list:blob
+
+# Listar arquivos ZIP recentes (última hora)
+npm run list:blob:recent
+
+# Baixar um arquivo ZIP específico
+npm run download:blob "logs/harmony/202512/05/log-2025-12-05-14-29-01.zip" ~/Downloads
+
+# Baixar todos os arquivos de uma pasta
+npm run download:blob "logs/harmony/202512/05/*" ~/Downloads
+```
+
+#### Reimportação de Logs
+
+Para reimportar logs arquivados de volta para o OpenSearch (útil para análise de logs antigos):
+
+```bash
+# Reimportar um arquivo ZIP específico
+npm run reimport:logs ~/Downloads/log-2025-12-05-18-31-32.zip
+
+# Reimportar todos os ZIPs de uma pasta
+npm run reimport:logs ~/Downloads/arquivos-exportados/
+```
+
+**Importante:**
+- Os logs serão reimportados no índice original
+- Os timestamps originais são preservados
+- A aplicação já deve estar configurada no Grafana (organização e datasource)
+- Após a reimportação, os logs estarão disponíveis no Grafana imediatamente
+
 ## ⚠️ Preservação de Dados
 
 **IMPORTANTE:** Logs do OpenSearch são armazenados em volume Docker persistente.

package/middleware-express.js

@@ -1,9 +1,19 @@
-const { startRequestContext } = require('./store')
+const { startRequestContext, runWithRequestContext, getRequestContext } = require('./store')
 const { createHttpLoggerTransport } = require('./streams/httpQueue')
 const { Worker } = require('worker_threads')
 const path = require('path')
 const os = require('os')
 
+let trace, otelContext
+try {
+  const otelApi = require('@opentelemetry/api')
+  trace = otelApi.trace
+  otelContext = otelApi.context
+} catch (_) {
+  trace = { getSpan: () => null }
+  otelContext = { active: () => ({}) }
+}
+
 function fastUUID() {
   const timestamp = Date.now().toString(36)
   const randomPart = Math.random().toString(36).substring(2, 15)
@@ -159,20 +169,58 @@ function createExpressLoggingMiddleware(options = {}) {
     let headersCached = false
     let reqCtx = null
     
-    next()
+    function getOtelTraceContext() {
+      try {
+        const activeContext = otelContext.active()
+        const span = trace.getSpan(activeContext)
+        if (span) {
+          const spanContext = span.spanContext()
+          if (spanContext && spanContext.traceId && spanContext.spanId) {
+            const traceHex = spanContext.traceId.replace(/-/g, '')
+            return {
+              traceId: traceHex.length === 32 ? `${traceHex.substring(0, 8)}-${traceHex.substring(8, 12)}-${traceHex.substring(12, 16)}-${traceHex.substring(16, 20)}-${traceHex.substring(20, 32)}` : spanContext.traceId,
+              spanId: spanContext.spanId,
+              parentSpanId: null
+            }
+          }
+        }
+      } catch (_) {}
+      return null
+    }
     
-    const logWithContext = (level, message, meta) => {
-      if (!reqCtx) {
-        const traceHex = sanitizeTraceHex(req.headers['x-trace-id'])
-        reqCtx = startRequestContext({
-          requestId: requestId || req.requestId || fastUUID(),
-          traceHex,
-          parentSpanId: req.headers['x-parent-span-id'] || null
-        })
+    function ensureRequestContext() {
+      if (reqCtx) return reqCtx
+      
+      const otelCtx = getOtelTraceContext()
+      const traceHex = otelCtx ? otelCtx.traceId.replace(/-/g, '').substring(0, 32) : sanitizeTraceHex(req.headers['x-trace-id'])
+      
+      reqCtx = startRequestContext({
+        requestId: req.requestId || fastUUID(),
+        traceHex: traceHex || undefined,
+        parentSpanId: otelCtx?.parentSpanId || req.headers['x-parent-span-id'] || null
+      })
+      
+      if (otelCtx) {
+        reqCtx.traceId = otelCtx.traceId
+        reqCtx.spanId = otelCtx.spanId
       }
-      meta.traceId = meta.traceId || reqCtx.traceId
-      meta.spanId = meta.spanId || reqCtx.spanId
-      meta.parentSpanId = meta.parentSpanId || reqCtx.parentSpanId
+      
+      return reqCtx
+    }
+    
+    const ctx = ensureRequestContext()
+    
+    runWithRequestContext(ctx, () => {
+      next()
+    })
+    
+    const logWithContext = (level, message, meta) => {
+      const otelCtx = getOtelTraceContext()
+      const ctx = getRequestContext() || ensureRequestContext()
+      
+      meta.traceId = otelCtx?.traceId || meta.traceId || ctx.traceId
+      meta.spanId = otelCtx?.spanId || meta.spanId || ctx.spanId
+      meta.parentSpanId = otelCtx?.parentSpanId || meta.parentSpanId || ctx.parentSpanId
       sendLog(level, message, meta)
     }
     
@@ -182,19 +230,20 @@ function createExpressLoggingMiddleware(options = {}) {
       
       query = req.query || null
       
-      if (!reqCtx) {
-        const traceHex = sanitizeTraceHex(req.headers['x-trace-id'])
-        reqCtx = startRequestContext({
-          requestId: req.requestId || fastUUID(),
-          traceHex,
-          parentSpanId: req.headers['x-parent-span-id'] || null
-        })
+      const ctx = ensureRequestContext()
+      
+      const otelCtx = getOtelTraceContext()
+      if (otelCtx) {
+        traceId = otelCtx.traceId
+        spanId = otelCtx.spanId
+        parentSpanId = otelCtx.parentSpanId
+      } else {
+        traceId = ctx.traceId
+        spanId = ctx.spanId
+        parentSpanId = ctx.parentSpanId || req.headers['x-parent-span-id'] || null
       }
       
-      requestId = reqCtx.requestId || req.requestId || fastUUID()
-      traceId = reqCtx.traceId
-      spanId = reqCtx.spanId
-      parentSpanId = reqCtx.parentSpanId || req.headers['x-parent-span-id'] || null
+      requestId = ctx.requestId || req.requestId || fastUUID()
       
       clientIp = req.ip || req.connection?.remoteAddress || req.socket?.remoteAddress || 'unknown'
       req.requestId = requestId

package/middleware-fastify.js

@@ -1,7 +1,17 @@
-const { startRequestContext } = require('./store')
+const { startRequestContext, runWithRequestContext, getRequestContext } = require('./store')
 const { createHttpLoggerTransport } = require('./streams/httpQueue')
 const os = require('os')
 
+let trace, otelContext
+try {
+  const otelApi = require('@opentelemetry/api')
+  trace = otelApi.trace
+  otelContext = otelApi.context
+} catch (_) {
+  trace = { getSpan: () => null }
+  otelContext = { active: () => ({}) }
+}
+
 function fastUUID() {
   const timestamp = Date.now().toString(36)
   const randomPart = Math.random().toString(36).substring(2, 15)
@@ -92,6 +102,50 @@ function createFastifyLoggingPlugin(options = {}) {
 
   return async function azifyFastifyPlugin(fastify, opts) {
     fastify.addHook('onRequest', async (request, reply) => {
+      let reqCtx = null
+      
+      function getOtelTraceContext() {
+        try {
+          const activeContext = otelContext.active()
+          const span = trace.getSpan(activeContext)
+          if (span) {
+            const spanContext = span.spanContext()
+            if (spanContext && spanContext.traceId && spanContext.spanId) {
+              const traceHex = spanContext.traceId.replace(/-/g, '')
+              return {
+                traceId: traceHex.length === 32 ? `${traceHex.substring(0, 8)}-${traceHex.substring(8, 12)}-${traceHex.substring(12, 16)}-${traceHex.substring(16, 20)}-${traceHex.substring(20, 32)}` : spanContext.traceId,
+                spanId: spanContext.spanId,
+                parentSpanId: null
+              }
+            }
+          }
+        } catch (_) {}
+        return null
+      }
+      
+      function ensureRequestContext() {
+        if (reqCtx) return reqCtx
+        
+        const otelCtx = getOtelTraceContext()
+        const traceHex = otelCtx ? otelCtx.traceId.replace(/-/g, '').substring(0, 32) : sanitizeTraceHex(request.headers['x-trace-id'])
+        
+        reqCtx = startRequestContext({
+          requestId: request.requestId || fastUUID(),
+          traceHex: traceHex || undefined,
+          parentSpanId: otelCtx?.parentSpanId || request.headers['x-parent-span-id'] || null
+        })
+        
+        if (otelCtx) {
+          reqCtx.traceId = otelCtx.traceId
+          reqCtx.spanId = otelCtx.spanId
+        }
+        
+        return reqCtx
+      }
+      
+      const ctx = ensureRequestContext()
+      
+      runWithRequestContext(ctx, () => {})
       const startTime = Date.now()
       const method = request.method
       const url = request.url
@@ -104,20 +158,14 @@ function createFastifyLoggingPlugin(options = {}) {
       let requestId, traceId, spanId, parentSpanId, clientIp, query, cachedHeaders
       let idsCreated = false
       let headersCached = false
-      let reqCtx = null
       
       const logWithContext = (level, message, meta) => {
-        if (!reqCtx) {
-          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
-          reqCtx = startRequestContext({
-            requestId: requestId || request.requestId || fastUUID(),
-            traceHex,
-            parentSpanId: request.headers['x-parent-span-id'] || null
-          })
-        }
-        meta.traceId = meta.traceId || reqCtx.traceId
-        meta.spanId = meta.spanId || reqCtx.spanId
-        meta.parentSpanId = meta.parentSpanId || reqCtx.parentSpanId
+        const otelCtx = getOtelTraceContext()
+        const ctx = getRequestContext() || ensureRequestContext()
+        
+        meta.traceId = otelCtx?.traceId || meta.traceId || ctx.traceId
+        meta.spanId = otelCtx?.spanId || meta.spanId || ctx.spanId
+        meta.parentSpanId = otelCtx?.parentSpanId || meta.parentSpanId || ctx.parentSpanId
         sendLog(level, message, meta)
       }
       
@@ -127,20 +175,20 @@ function createFastifyLoggingPlugin(options = {}) {
         
         query = request.query || null
         
-        if (!reqCtx) {
-          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
-          reqCtx = startRequestContext({
-            requestId: request.requestId || fastUUID(),
-            traceHex,
-            parentSpanId: request.headers['x-parent-span-id'] || null
-          })
-        }
+        const ctx = ensureRequestContext()
         
-        requestId = reqCtx.requestId || request.requestId || fastUUID()
-        traceId = reqCtx.traceId
-        spanId = reqCtx.spanId
-        parentSpanId = reqCtx.parentSpanId || request.headers['x-parent-span-id'] || null
+        const otelCtx = getOtelTraceContext()
+        if (otelCtx) {
+          traceId = otelCtx.traceId
+          spanId = otelCtx.spanId
+          parentSpanId = otelCtx.parentSpanId
+        } else {
+          traceId = ctx.traceId
+          spanId = ctx.spanId
+          parentSpanId = ctx.parentSpanId || request.headers['x-parent-span-id'] || null
+        }
         
+        requestId = ctx.requestId || request.requestId || fastUUID()
         clientIp = request.ip || request.socket?.remoteAddress || 'unknown'
         request.requestId = requestId
       }
@@ -204,10 +252,13 @@ function createFastifyLoggingPlugin(options = {}) {
             requestObj.body = safeSerializeBody(request.body)
           }
           
+          const otelCtx = getOtelTraceContext()
+          const ctx = getRequestContext() || ensureRequestContext()
+          
           const meta = {
-            traceId: reqCtx.traceId,
-            spanId: reqCtx.spanId,
-            parentSpanId: reqCtx.parentSpanId || null,
+            traceId: otelCtx?.traceId || ctx.traceId,
+            spanId: otelCtx?.spanId || ctx.spanId,
+            parentSpanId: otelCtx?.parentSpanId || ctx.parentSpanId || null,
             requestId,
             request: requestObj,
             timestamp: Date.now(),
@@ -240,20 +291,53 @@ function createFastifyLoggingPlugin(options = {}) {
       let requestId, traceId, spanId, parentSpanId, clientIp, query, cachedHeaders
       let idsCreated = false
       let headersCached = false
-      let reqCtx = null
       
-      const logWithContext = (level, message, meta) => {
-        if (!reqCtx) {
-          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
-          reqCtx = startRequestContext({
-            requestId: requestId || request.requestId || fastUUID(),
-            traceHex,
-            parentSpanId: request.headers['x-parent-span-id'] || null
-          })
+      function getOtelTraceContext() {
+        try {
+          const activeContext = otelContext.active()
+          const span = trace.getSpan(activeContext)
+          if (span) {
+            const spanContext = span.spanContext()
+            if (spanContext && spanContext.traceId && spanContext.spanId) {
+              const traceHex = spanContext.traceId.replace(/-/g, '')
+              return {
+                traceId: traceHex.length === 32 ? `${traceHex.substring(0, 8)}-${traceHex.substring(8, 12)}-${traceHex.substring(12, 16)}-${traceHex.substring(16, 20)}-${traceHex.substring(20, 32)}` : spanContext.traceId,
+                spanId: spanContext.spanId,
+                parentSpanId: null
+              }
+            }
+          }
+        } catch (_) {}
+        return null
+      }
+      
+      function ensureRequestContext() {
+        if (reqCtx) return reqCtx
+        
+        const otelCtx = getOtelTraceContext()
+        const traceHex = otelCtx ? otelCtx.traceId.replace(/-/g, '').substring(0, 32) : sanitizeTraceHex(request.headers['x-trace-id'])
+        
+        reqCtx = startRequestContext({
+          requestId: request.requestId || fastUUID(),
+          traceHex: traceHex || undefined,
+          parentSpanId: otelCtx?.parentSpanId || request.headers['x-parent-span-id'] || null
+        })
+        
+        if (otelCtx) {
+          reqCtx.traceId = otelCtx.traceId
+          reqCtx.spanId = otelCtx.spanId
         }
-        meta.traceId = meta.traceId || reqCtx.traceId
-        meta.spanId = meta.spanId || reqCtx.spanId
-        meta.parentSpanId = meta.parentSpanId || reqCtx.parentSpanId
+        
+        return reqCtx
+      }
+      
+      const logWithContext = (level, message, meta) => {
+        const otelCtx = getOtelTraceContext()
+        const ctx = getRequestContext() || ensureRequestContext()
+        
+        meta.traceId = otelCtx?.traceId || meta.traceId || ctx.traceId
+        meta.spanId = otelCtx?.spanId || meta.spanId || ctx.spanId
+        meta.parentSpanId = otelCtx?.parentSpanId || meta.parentSpanId || ctx.parentSpanId
         sendLog(level, message, meta)
       }
       
@@ -263,20 +347,20 @@ function createFastifyLoggingPlugin(options = {}) {
         
         query = request.query || null
         
-        if (!reqCtx) {
-          const traceHex = sanitizeTraceHex(request.headers['x-trace-id'])
-          reqCtx = startRequestContext({
-            requestId: request.requestId || fastUUID(),
-            traceHex,
-            parentSpanId: request.headers['x-parent-span-id'] || null
-          })
-        }
+        const ctx = ensureRequestContext()
         
-        requestId = reqCtx.requestId || request.requestId || fastUUID()
-        traceId = reqCtx.traceId
-        spanId = reqCtx.spanId
-        parentSpanId = reqCtx.parentSpanId || request.headers['x-parent-span-id'] || null
+        const otelCtx = getOtelTraceContext()
+        if (otelCtx) {
+          traceId = otelCtx.traceId
+          spanId = otelCtx.spanId
+          parentSpanId = otelCtx.parentSpanId
+        } else {
+          traceId = ctx.traceId
+          spanId = ctx.spanId
+          parentSpanId = ctx.parentSpanId || request.headers['x-parent-span-id'] || null
+        }
         
+        requestId = ctx.requestId || request.requestId || fastUUID()
         clientIp = request.ip || request.socket?.remoteAddress || 'unknown'
       }
       
@@ -322,10 +406,13 @@ function createFastifyLoggingPlugin(options = {}) {
         if (query) requestObj.query = query
         if (config.captureHeaders && cachedHeaders) requestObj.headers = cachedHeaders
         
+        const otelCtx = getOtelTraceContext()
+        const ctx = getRequestContext() || ensureRequestContext()
+        
         const meta = {
-          traceId: reqCtx.traceId,
-          spanId: reqCtx.spanId,
-          parentSpanId: reqCtx.parentSpanId || null,
+          traceId: otelCtx?.traceId || ctx.traceId,
+          spanId: otelCtx?.spanId || ctx.spanId,
+          parentSpanId: otelCtx?.parentSpanId || ctx.parentSpanId || null,
           requestId,
           request: requestObj,
           response,

package/middleware-restify.js

@@ -1,7 +1,17 @@
-const { startRequestContext } = require('./store')
+const { startRequestContext, runWithRequestContext, getRequestContext } = require('./store')
 const { createHttpLoggerTransport } = require('./streams/httpQueue')
 const os = require('os')
 
+let trace, otelContext
+try {
+  const otelApi = require('@opentelemetry/api')
+  trace = otelApi.trace
+  otelContext = otelApi.context
+} catch (_) {
+  trace = { getSpan: () => null }
+  otelContext = { active: () => ({}) }
+}
+
 function fastUUID() {
   const timestamp = Date.now().toString(36)
   const randomPart = Math.random().toString(36).substring(2, 15)
@@ -78,18 +88,54 @@ function createRestifyLoggingMiddleware (options = {}) {
 
   return function azifyLoggingMiddleware (req, res, next) {
     const startTime = Date.now()
-    const requestId = req.requestId || fastUUID()
 
     if (res._azifySetup) {
       return next()
     }
     res._azifySetup = true
 
-    const traceHex = sanitizeTraceHex(req.headers['x-trace-id'])
-    const reqCtx = startRequestContext({
-      requestId,
-      traceHex,
-      parentSpanId: req.headers['x-parent-span-id'] || null
+    function getOtelTraceContext() {
+      try {
+        const activeContext = otelContext.active()
+        const span = trace.getSpan(activeContext)
+        if (span) {
+          const spanContext = span.spanContext()
+          if (spanContext && spanContext.traceId && spanContext.spanId) {
+            const traceHex = spanContext.traceId.replace(/-/g, '')
+            return {
+              traceId: traceHex.length === 32 ? `${traceHex.substring(0, 8)}-${traceHex.substring(8, 12)}-${traceHex.substring(12, 16)}-${traceHex.substring(16, 20)}-${traceHex.substring(20, 32)}` : spanContext.traceId,
+              spanId: spanContext.spanId,
+              parentSpanId: null
+            }
+          }
+        }
+      } catch (_) {}
+      return null
+    }
+    
+    function ensureRequestContext() {
+      const otelCtx = getOtelTraceContext()
+      const traceHex = otelCtx ? otelCtx.traceId.replace(/-/g, '').substring(0, 32) : sanitizeTraceHex(req.headers['x-trace-id'])
+      
+      const reqCtx = startRequestContext({
+        requestId: req.requestId || fastUUID(),
+        traceHex: traceHex || undefined,
+        parentSpanId: otelCtx?.parentSpanId || req.headers['x-parent-span-id'] || null
+      })
+      
+      if (otelCtx) {
+        reqCtx.traceId = otelCtx.traceId
+        reqCtx.spanId = otelCtx.spanId
+      }
+      
+      return reqCtx
+    }
+    
+    const reqCtx = ensureRequestContext()
+    const requestId = reqCtx.requestId
+    
+    runWithRequestContext(reqCtx, () => {
+      next()
     })
 
     let normalizedPath = req.url
@@ -143,11 +189,14 @@ function createRestifyLoggingMiddleware (options = {}) {
         const duration = Date.now() - startTime
         const statusCode = responseStatus || res.statusCode || 200
         const responseHeaders = typeof res.getHeaders === 'function' ? res.getHeaders() : {}
+        
+        const otelCtx = getOtelTraceContext()
+        const ctx = getRequestContext() || reqCtx
 
         const meta = {
-          traceId: reqCtx.traceId,
-          spanId: reqCtx.spanId,
-          parentSpanId: reqCtx.parentSpanId || null,
+          traceId: otelCtx?.traceId || ctx.traceId,
+          spanId: otelCtx?.spanId || ctx.spanId,
+          parentSpanId: otelCtx?.parentSpanId || ctx.parentSpanId || null,
           requestId,
           request: requestSnapshot,
           response: {