Merge branch 'testing'

Author: oDaviML

.github/workflows/deploy.yml

@@ -28,15 +28,26 @@ jobs:
         push: true
         tags: ${{ secrets.DOCKER_USERNAME }}/api-onibusbh:latest
 
+    - name: Copy config to EC2
+      uses: appleboy/scp-action@master
+      with:
+        host: ${{ secrets.EC2_HOST }}
+        username: ${{ secrets.EC2_USERNAME }}
+        key: ${{ secrets.EC2_SSH_KEY }}
+        source: "filebeat.prod.yml"
+        target: "/home/${{ secrets.EC2_USERNAME }}/api-onibusbh/"
+
     - name: Deploy to EC2
       uses: appleboy/ssh-action@master
       with:
         host: ${{ secrets.EC2_HOST }}
         username: ${{ secrets.EC2_USERNAME }}
         key: ${{ secrets.EC2_SSH_KEY }}
         script: |
-          docker stop api-onibusbh || true
-          docker rm api-onibusbh || true
+          WORKDIR="/home/${{ secrets.EC2_USERNAME }}/api-onibusbh"
+          
+          docker stop api-onibusbh filebeat-prod || true
+          docker rm api-onibusbh filebeat-prod || true
           
           docker pull ${{ secrets.DOCKER_USERNAME }}/api-onibusbh:latest
           
@@ -49,4 +60,17 @@ jobs:
             -e MONGO_DATABASE=${{ secrets.MONGO_DATABASE }} \
             -e MONGO_USERNAME=${{ secrets.MONGO_USERNAME }} \
             -e MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }} \
+            -e ELASTIC_HOST=${{ secrets.ELASTIC_HOST }} \
+            --restart unless-stopped \
             ${{ secrets.DOCKER_USERNAME }}/api-onibusbh:latest
+            
+          docker run -d \
+            --name filebeat-prod \
+            --user root \
+            --restart unless-stopped \
+            -e ELASTIC_HOST=${{ secrets.ELASTIC_HOST }} \
+            -v /var/lib/docker/containers:/var/lib/docker/containers:ro \
+            -v /var/run/docker.sock:/var/run/docker.sock:ro \
+            -v $WORKDIR/filebeat.prod.yml:/usr/share/filebeat/filebeat.yml:ro \
+            docker.elastic.co/beats/filebeat:8.15.0 \
+            --strict.perms=false

.gitignore

@@ -31,3 +31,11 @@ build/
 
 ### VS Code ###
 .vscode/
+
+### Environment ###
+.env
+.env.*
+
+### Logs ###
+logs/
+*.log

compose.yaml

@@ -6,4 +6,20 @@ services:
       - MONGO_INITDB_ROOT_PASSWORD=E0K64Y7sAqNYqOAx
       - MONGO_INITDB_ROOT_USERNAME=admin
     ports:
-      - "27017:27017"
+      - "27017:27017"
+
+  filebeat:
+    image: docker.elastic.co/beats/filebeat:8.11.1
+    user: root
+    environment:
+      - ELASTIC_HOST=${ELASTIC_HOST}
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+    volumes:
+      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
+      - ./logs:/host_logs:ro
+    command: ["--strict.perms=false"]
+    restart: unless-stopped

filebeat.prod.yml

@@ -0,0 +1,29 @@
+filebeat.autodiscover:
+  providers:
+    - type: docker
+      hints.enabled: true
+      templates:
+        - condition:
+            contains:
+              docker.container.name: springboot-app_prod
+          config:
+            - type: container
+              paths:
+                - /var/lib/docker/containers/${data.docker.container.id}/*.log
+              processors:
+                - decode_json_fields:
+                    fields: ["message"]
+                    target: ""
+                    overwrite_keys: true
+                    add_error_key: true
+
+processors:
+  - add_docker_metadata: ~
+  - add_cloud_metadata: ~
+  - add_tags:
+      tags: ["production", "api-onibusbh"]
+
+output.elasticsearch:
+  hosts: ['${ELASTIC_HOST}']
+  protocol: "https"
+  # ssl.verification_mode: none

filebeat.yml

@@ -0,0 +1,44 @@
+filebeat.inputs:
+- type: log
+  enabled: true
+  paths:
+    - /host_logs/*.json
+  json.keys_under_root: true
+  json.overwrite_keys: true
+  processors:
+    - add_tags:
+        tags: ["local_dev_ide"]
+
+- type: container
+  paths: 
+    - '/var/lib/docker/containers/*/*.log'
+  processors:
+  - add_docker_metadata:
+      host: "unix:///var/run/docker.sock"
+
+  - drop_event:
+      when:
+        not:
+          contains:
+            container.name: "springboot-app_prod"
+
+  - decode_json_fields:
+      fields: ["message"]
+      target: ""
+      overwrite_keys: true
+      process_array: false
+      max_depth: 1
+
+output.elasticsearch:
+  hosts: ["${ELASTIC_HOST:localhost:9200}"]
+  ssl.verification_mode: none
+
+  index: "api-onibusbh-prod-%{+yyyy.MM.dd}"
+
+setup.template.name: "api-onibusbh"
+setup.template.pattern: "api-onibusbh-*"
+setup.ilm.enabled: false
+
+logging.level: debug
+logging.to_stderr: true
+logging.selectors: ["*"]

pom.xml

@@ -84,6 +84,11 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>9.0</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/dmware/api_onibusbh/config/RequestLoggingFilter.java

@@ -0,0 +1,62 @@
+package com.dmware.api_onibusbh.config;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.util.UUID;
+
+import static net.logstash.logback.argument.StructuredArguments.kv;
+
+@Component
+public class RequestLoggingFilter extends OncePerRequestFilter {
+
+    private static final Logger logger = LoggerFactory.getLogger(RequestLoggingFilter.class);
+    private static final String TRANSACTION_ID_KEY = "transaction_id";
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+
+        long startTime = System.currentTimeMillis();
+
+        String transactionId = request.getHeader("X-Transaction-ID");
+        if (transactionId == null || transactionId.isEmpty()) {
+            transactionId = UUID.randomUUID().toString();
+        }
+        
+        MDC.put(TRANSACTION_ID_KEY, transactionId);
+
+        try {
+            logger.info("Requisição recebida: {} {}", request.getMethod(), request.getRequestURI(),
+                    kv("method", request.getMethod()),
+                    kv("uri", request.getRequestURI()),
+                    kv("client_ip", request.getRemoteAddr()),
+                    kv("user_agent", request.getHeader("User-Agent"))
+            );
+
+            filterChain.doFilter(request, response);
+
+            long duration = System.currentTimeMillis() - startTime;
+            
+            logger.info("Requisição finalizada: {} {} - Status: {} - Tempo: {}ms", 
+                    request.getMethod(), 
+                    request.getRequestURI(), 
+                    response.getStatus(), 
+                    duration,
+                    kv("status_code", response.getStatus()),
+                    kv("duration_ms", duration)
+            );
+
+        } finally {
+            MDC.remove(TRANSACTION_ID_KEY);
+        }
+    }
+}

src/main/java/com/dmware/api_onibusbh/infra/CustomExceptionHandler.java

@@ -1,6 +1,8 @@
 package com.dmware.api_onibusbh.infra;
 
 import com.dmware.api_onibusbh.exceptions.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -11,54 +13,66 @@
 
 import java.io.IOException;
 
+import static net.logstash.logback.argument.StructuredArguments.kv;
+
 @ControllerAdvice
 public class CustomExceptionHandler extends ResponseEntityExceptionHandler {
 
+    private static final Logger logger = LoggerFactory.getLogger(CustomExceptionHandler.class);
+
     @ExceptionHandler(LinhasNotFoundException.class)
     public ResponseEntity<ErrorResponse> linhasNotFoundException(LinhasNotFoundException ex) {
+        logger.warn("Recurso não encontrado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.NOT_FOUND));
         return ErrorResponse.of("Não foi encontrada nenhuma linha, por favor tente novamente", HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(CoordenadasNotFoundException.class)
     public ResponseEntity<ErrorResponse> coordenadasNotFoundException(CoordenadasNotFoundException ex) {
+        logger.warn("Recurso não encontrado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.NOT_FOUND));
         return ErrorResponse.of("Não foi encontrada nenhuma coordenada, por favor tente novamente",
                 HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(DicionarioNotFoundException.class)
     public ResponseEntity<ErrorResponse> dicionarioNotFoundException(DicionarioNotFoundException ex) {
+        logger.warn("Recurso não encontrado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.NOT_FOUND));
         return ErrorResponse.of("Não foi encontrado o dicionário para os dados, por favor tente novamente",
                 HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(LinhaNotFoundException.class)
     public ResponseEntity<ErrorResponse> linhaNotFoundException(LinhaNotFoundException ex) {
+        logger.warn("Recurso não encontrado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.NOT_FOUND));
         return ErrorResponse.of("Não foi encontrada nenhuma linha, por favor tente novamente", HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(ValidJsonException.class)
     public ResponseEntity<ErrorResponse> validJsonException(ValidJsonException ex) {
+        logger.warn("Erro de validação JSON", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.BAD_REQUEST), kv("mensagem_erro", ex.getMessage()));
         return ErrorResponse.of(ex.getMessage(), HttpStatus.BAD_REQUEST);
     }
 
     @ExceptionHandler(RuntimeException.class)
     public ResponseEntity<ErrorResponse> runtimeException(RuntimeException ex) {
-        logger.error(ex.getMessage(), ex);
+        logger.error("Erro interno não tratado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.INTERNAL_SERVER_ERROR), ex);
         return ErrorResponse.of("Ocorreu um erro interno, por favor tente novamente", HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
     @ExceptionHandler(IOException.class)
     public ResponseEntity<ErrorResponse> ioException(IOException ex) {
+        logger.error("Erro interno não tratado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.INTERNAL_SERVER_ERROR), ex);
         return ErrorResponse.of("Ocorreu um erro interno, por favor tente novamente", HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
     @ExceptionHandler(NoResourceFoundException.class)
     public ResponseEntity<ErrorResponse> noResourceFoundException(NoResourceFoundException ex) {
+        logger.warn("Recurso não encontrado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.NOT_FOUND));
         return ErrorResponse.of("Verifique a rota digitada ou os dados enviados", HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(NoHandlerFoundException.class)
     public ResponseEntity<ErrorResponse> noHandlerFoundException(NoHandlerFoundException ex) {
+        logger.warn("Recurso não encontrado", kv("exception", ex.getClass().getSimpleName()), kv("status", HttpStatus.NOT_FOUND));
         return ErrorResponse.of("Verifique a rota digitada ou os dados enviados", HttpStatus.NOT_FOUND);
     }
 }

src/main/java/com/dmware/api_onibusbh/scheduler/CoordenadasScheduler.java

@@ -2,10 +2,12 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import com.dmware.api_onibusbh.dto.CoordenadaDTO;
 import com.dmware.api_onibusbh.services.APIService;
+import org.slf4j.MDC;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -15,6 +17,7 @@
 @Component
 public class CoordenadasScheduler {
 
+    private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CoordenadasScheduler.class);
     private final APIService apiService;
     private final OnibusService onibusService;
 
@@ -25,8 +28,15 @@ public CoordenadasScheduler(APIService apiService, OnibusService onibusService)
 
     @Scheduled(fixedDelay = 20, timeUnit = TimeUnit.SECONDS)
     public void fetchCoordenadasOnibus() {
-        List<CoordenadaDTO> coordenadas = apiService.getOnibusCoordenadaBH();
-        onibusService.salvaCoordenadas(coordenadas);
+        try {
+            MDC.put("transaction_id", UUID.randomUUID().toString());
+            logger.info("Job de Coordenadas iniciado.");
+            List<CoordenadaDTO> coordenadas = apiService.getOnibusCoordenadaBH();
+            onibusService.salvaCoordenadas(coordenadas);
+            logger.info("Job de Coordenadas finalizado.");
+        } finally {
+            MDC.clear();
+        }
     }
 
 }

src/main/java/com/dmware/api_onibusbh/scheduler/DicionarioScheduler.java

@@ -1,7 +1,9 @@
 package com.dmware.api_onibusbh.scheduler;
 
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -12,6 +14,7 @@
 @Component
 public class DicionarioScheduler {
 
+    private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DicionarioScheduler.class);
     private final DicionarioService dicionarioService;
 
     public DicionarioScheduler(DicionarioService dicionarioService) {
@@ -21,6 +24,13 @@ public DicionarioScheduler(DicionarioService dicionarioService) {
     @Async
       @Scheduled(fixedDelay = 12, timeUnit = TimeUnit.HOURS)
       public void salvaDicionarioBanco() {
-            dicionarioService.salvarDicionarioBanco();
+            try {
+                  MDC.put("transaction_id", UUID.randomUUID().toString());
+                  logger.info("Job de Dicionário iniciado.");
+                  dicionarioService.salvarDicionarioBanco();
+                  logger.info("Job de Dicionário finalizado.");
+            } finally {
+                  MDC.clear();
+            }
       }
 }