[feat/#647] 로깅 인프라 구축

.gitignore

@@ -60,3 +60,6 @@ src/main/resources/firebase/*.json
 cockple_dump.sql
 
 k6
+
+### logs ###
+logs/

docker-compose.yml

@@ -56,6 +56,7 @@ services:
     environment:
       JAVA_TOOL_OPTIONS: "-Xms768m -Xmx768m"
       SPRING_PROFILES_ACTIVE: prod
+      LOG_PATH: /logs
       DB_PASSWORD: ${DB_PASSWORD}
       GCS_BUCKET: ${GCS_BUCKET}
       KAKAO_CLIENT_ID: ${KAKAO_CLIENT_ID}
@@ -64,6 +65,8 @@ services:
       KAKAO_ADMIN_KEY: ${KAKAO_ADMIN_KEY}
       JWT_SECRET_KEY: ${JWT_SECRET_KEY}
       FIREBASE_SERVICE_ACCOUNT_KEY: ${FIREBASE_SERVICE_ACCOUNT_KEY}
+    volumes:
+      - ./logs/prod:/logs
     depends_on:
       mysql:
         condition: service_healthy
@@ -79,7 +82,7 @@ services:
     environment:
       JAVA_TOOL_OPTIONS: "-Xms128m -Xmx512m"
       SPRING_PROFILES_ACTIVE: staging
-      # [부하테스트용] FCM 인위적 지연(ms). 미설정 시 0=비활성. staging 전용.
+      LOG_PATH: /logs
       FCM_FAKE_LATENCY_MS: ${FCM_FAKE_LATENCY_MS:-0}
       DB_PASSWORD: ${DB_PASSWORD}
       GCS_BUCKET: ${GCS_BUCKET}
@@ -89,6 +92,8 @@ services:
       KAKAO_ADMIN_KEY: ${KAKAO_ADMIN_KEY}
       JWT_SECRET_KEY: ${JWT_SECRET_KEY}
       FIREBASE_SERVICE_ACCOUNT_KEY: ${FIREBASE_SERVICE_ACCOUNT_KEY}
+    volumes:
+      - ./logs/staging:/logs
     depends_on:
       mysql:
         condition: service_healthy

scripts/deploy.sh

@@ -31,6 +31,8 @@ EOF
 
 echo "${FIREBASE_SERVICE_ACCOUNT_KEY}" > /home/ubuntu/cockple/firebase-service-account.json
 
+mkdir -p /home/ubuntu/cockple/logs/prod /home/ubuntu/cockple/logs/staging
+
 echo "=== 배포 전 상태 ==="
 sudo docker ps
 

src/main/java/umc/cockple/demo/domain/chat/presentation/websocket/ChatWebSocketHandler.java

@@ -23,55 +23,63 @@ public class ChatWebSocketHandler extends TextWebSocketHandler {
 
     @Override
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
-        log.info("웹소켓 연결 성공");
+        try (WebSocketMdcSupport.MdcScope ignored = WebSocketMdcSupport.open(session)) {
+            log.info("웹소켓 연결 성공");
 
-        try {
-            Long memberId = (Long) session.getAttributes().get("memberId");
-            Boolean authenticated = (Boolean) session.getAttributes().get("authenticated");
+            try {
+                Long memberId = (Long) session.getAttributes().get("memberId");
+                Boolean authenticated = (Boolean) session.getAttributes().get("authenticated");
 
-            if (memberId != null && Boolean.TRUE.equals(authenticated)) {
-                MemberConnectionInfo memberInfo = memberQueryService.getMemberConnectionInfo(memberId);
-                session.getAttributes().put("memberName", memberInfo.memberName());
+                if (memberId != null && Boolean.TRUE.equals(authenticated)) {
+                    MemberConnectionInfo memberInfo = memberQueryService.getMemberConnectionInfo(memberId);
+                    session.getAttributes().put("memberName", memberInfo.memberName());
 
-                sessionRegistry.register(memberId, session);
-                log.info("사용자 연결 완료 - memberId: {}, 세션 ID: {}", memberId, session.getId());
+                    sessionRegistry.register(memberId, session);
+                    log.info("사용자 연결 완료 - memberId: {}, 세션 ID: {}", memberId, session.getId());
 
-                webSocketResponseSender.sendConnectionSuccessMessage(session, memberInfo);
-            } else {
-                log.warn("memberId를 찾을 수 없습니다. 세션을 종료합니다.");
+                    webSocketResponseSender.sendConnectionSuccessMessage(session, memberInfo);
+                } else {
+                    log.warn("memberId를 찾을 수 없습니다. 세션을 종료합니다.");
+                    session.close();
+                }
+            } catch (Exception e) {
+                log.error("WebSocket 연결 처리 중 오류 발생", e);
                 session.close();
             }
-        } catch (Exception e) {
-            log.error("WebSocket 연결 처리 중 오류 발생", e);
-            session.close();
         }
     }
 
     @Override
     public void handleTextMessage(WebSocketSession session, TextMessage message) {
-        requestDispatcher.dispatch(session, message.getPayload());
+        try (WebSocketMdcSupport.MdcScope ignored = WebSocketMdcSupport.open(session)) {
+            requestDispatcher.dispatch(session, message.getPayload());
+        }
     }
 
     @Override
     public void afterConnectionClosed(WebSocketSession session, CloseStatus status){
-        Long memberId = (Long) session.getAttributes().get("memberId");
+        try (WebSocketMdcSupport.MdcScope ignored = WebSocketMdcSupport.open(session)) {
+            Long memberId = (Long) session.getAttributes().get("memberId");
 
-        log.info("웹소켓 연결 종료");
-        log.info("세션 ID: {}, 사용자 ID: {}, 종료 상태: {}", session.getId(), memberId, status);
+            log.info("웹소켓 연결 종료");
+            log.info("세션 ID: {}, 사용자 ID: {}, 종료 상태: {}", session.getId(), memberId, status);
 
-        if (memberId != null) {
-            sessionRegistry.remove(memberId, session);
-            log.info("사용자 세션 정리 완료 - memberId: {}", memberId);
+            if (memberId != null) {
+                sessionRegistry.remove(memberId, session);
+                log.info("사용자 세션 정리 완료 - memberId: {}", memberId);
+            }
         }
     }
 
     @Override
     public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
-        Long memberId = (Long) session.getAttributes().get("memberId");
-        if (isShutdownRelatedError(exception)) {
-            log.debug("서버 종료 관련 WebSocket 전송 오류 (정상) - 세션: {}, 사용자: {}", session.getId(), memberId);
-        } else {
-            log.error("WebSocket 전송 오류 발생 - 세션 ID: {}, 사용자 ID: {}", session.getId(), memberId, exception);
+        try (WebSocketMdcSupport.MdcScope ignored = WebSocketMdcSupport.open(session)) {
+            Long memberId = (Long) session.getAttributes().get("memberId");
+            if (isShutdownRelatedError(exception)) {
+                log.debug("서버 종료 관련 WebSocket 전송 오류 (정상) - 세션: {}, 사용자: {}", session.getId(), memberId);
+            } else {
+                log.error("WebSocket 전송 오류 발생 - 세션 ID: {}, 사용자 ID: {}", session.getId(), memberId, exception);
+            }
         }
     }
 

src/main/java/umc/cockple/demo/domain/chat/presentation/websocket/ChatWebSocketRequestDispatcher.java

@@ -17,25 +17,27 @@ public class ChatWebSocketRequestDispatcher {
     private final ChatWebSocketCommandHandler commandHandler;
 
     public void dispatch(WebSocketSession session, String payload) {
-        log.info("메시지 수신 - 세션 ID: {}, payloadSize: {}", session.getId(), payload == null ? 0 : payload.length());
-
-        try {
-            WebSocketMessageDTO.Request request = objectMapper.readValue(
-                    payload, WebSocketMessageDTO.Request.class
-            );
-
-            Long memberId = (Long) session.getAttributes().get("memberId");
-            if (memberId == null) {
-                webSocketResponseSender.sendErrorMessage(session, "UNAUTHORIZED", "인증되지 않은 사용자입니다.");
-                return;
+        try (WebSocketMdcSupport.MdcScope ignored = WebSocketMdcSupport.open(session)) {
+            log.debug("메시지 수신 - 세션 ID: {}, payloadSize: {}", session.getId(), payload == null ? 0 : payload.length());
+
+            try {
+                WebSocketMessageDTO.Request request = objectMapper.readValue(
+                        payload, WebSocketMessageDTO.Request.class
+                );
+
+                Long memberId = (Long) session.getAttributes().get("memberId");
+                if (memberId == null) {
+                    webSocketResponseSender.sendErrorMessage(session, "UNAUTHORIZED", "인증되지 않은 사용자입니다.");
+                    return;
+                }
+
+                log.debug("메시지 타입: {}, 채팅방 ID: {}, 사용자 ID: {}", request.type(), session.getId(), memberId);
+                commandHandler.handle(session, request, memberId);
+
+            } catch (Exception e) {
+                log.error("메시지 처리 중 에러 발생", e);
+                webSocketResponseSender.sendErrorMessage(session, "PROCESSING_ERROR", "메시지 처리 중 오류가 발생했습니다.");
             }
-
-            log.info("메시지 타입: {}, 채팅방 ID: {}, 사용자 ID: {}", request.type(), session.getId(), memberId);
-            commandHandler.handle(session, request, memberId);
-
-        } catch (Exception e) {
-            log.error("메시지 처리 중 에러 발생", e);
-            webSocketResponseSender.sendErrorMessage(session, "PROCESSING_ERROR", "메시지 처리 중 오류가 발생했습니다.");
         }
     }
 }

src/main/java/umc/cockple/demo/domain/chat/presentation/websocket/JWTWebSocketAuthInterceptor.java

@@ -21,31 +21,37 @@ public class JWTWebSocketAuthInterceptor implements HandshakeInterceptor {
     @Override
     public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response,
                                    WebSocketHandler wsHandler, Map<String, Object> attributes) throws Exception {
-        log.debug("JWT 기반 WebSocket 인증 시작");
+        try (WebSocketMdcSupport.MdcScope ignored = WebSocketMdcSupport.open((Long) null)) {
+            log.debug("JWT 기반 WebSocket 인증 시작");
 
-        try {
-            String token = extractTokenFromRequest(request);
+            try {
+                String token = extractTokenFromRequest(request);
 
-            if (isInvalidToken(token)) return false;
+                if (isInvalidToken(token)) return false;
 
-            Long memberId = jwtTokenProvider.getUserId(token);
+                Long memberId = jwtTokenProvider.getUserId(token);
 
-            attributes.put("memberId", memberId);
-            attributes.put("authenticated", true);
+                attributes.put("memberId", memberId);
+                attributes.put("authenticated", true);
 
-            log.info("JWT 인증 성공 - memberId: {}", memberId);
-            return true;
-        } catch (Exception e) {
-            log.error("JWT 인증 처리 중 오류 발생", e);
-            return false;
+                try (WebSocketMdcSupport.MdcScope memberScope = WebSocketMdcSupport.open(memberId)) {
+                    log.info("JWT 인증 성공 - memberId: {}", memberId);
+                }
+                return true;
+            } catch (Exception e) {
+                log.error("JWT 인증 처리 중 오류 발생", e);
+                return false;
+            }
         }
     }
 
     @Override
     public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response,
                                WebSocketHandler wsHandler, Exception exception) {
-        if (exception != null) {
-            log.error("JWT HandshakeInterceptor 실행 중 오류", exception);
+        try (WebSocketMdcSupport.MdcScope ignored = WebSocketMdcSupport.open((Long) null)) {
+            if (exception != null) {
+                log.error("JWT HandshakeInterceptor 실행 중 오류", exception);
+            }
         }
     }
 

src/main/java/umc/cockple/demo/domain/chat/presentation/websocket/WebSocketMdcSupport.java

@@ -0,0 +1,76 @@
+package umc.cockple.demo.domain.chat.presentation.websocket;
+
+import org.slf4j.MDC;
+import org.springframework.web.socket.WebSocketSession;
+import umc.cockple.demo.global.security.filter.JwtAuthenticationFilter;
+
+import java.util.Map;
+
+public final class WebSocketMdcSupport {
+
+    public static final String WS_SESSION_ID = "wsSessionId";
+
+    private WebSocketMdcSupport() {
+    }
+
+    public static MdcScope open(WebSocketSession session) {
+        Map<String, String> previousContext = MDC.getCopyOfContextMap();
+        putSessionMdc(session);
+        return new MdcScope(previousContext);
+    }
+
+    public static MdcScope open(Long memberId) {
+        Map<String, String> previousContext = MDC.getCopyOfContextMap();
+        putMemberId(memberId);
+        return new MdcScope(previousContext);
+    }
+
+    private static void putSessionMdc(WebSocketSession session) {
+        if (session == null) {
+            MDC.remove(WS_SESSION_ID);
+            MDC.remove(JwtAuthenticationFilter.MEMBER_ID);
+            return;
+        }
+
+        String sessionId = session.getId();
+        if (sessionId == null || sessionId.isBlank()) {
+            MDC.remove(WS_SESSION_ID);
+        } else {
+            MDC.put(WS_SESSION_ID, sessionId);
+        }
+
+        Map<String, Object> attributes = session.getAttributes();
+        Object memberId = attributes == null ? null : attributes.get(JwtAuthenticationFilter.MEMBER_ID);
+        if (memberId == null) {
+            MDC.remove(JwtAuthenticationFilter.MEMBER_ID);
+        } else {
+            MDC.put(JwtAuthenticationFilter.MEMBER_ID, String.valueOf(memberId));
+        }
+    }
+
+    private static void putMemberId(Long memberId) {
+        if (memberId == null) {
+            MDC.remove(JwtAuthenticationFilter.MEMBER_ID);
+        } else {
+            MDC.put(JwtAuthenticationFilter.MEMBER_ID, String.valueOf(memberId));
+        }
+        MDC.remove(WS_SESSION_ID);
+    }
+
+    public static final class MdcScope implements AutoCloseable {
+        private final Map<String, String> previousContext;
+
+        private MdcScope(Map<String, String> previousContext) {
+            this.previousContext = previousContext;
+        }
+
+        @Override
+        public void close() {
+            if (previousContext == null || previousContext.isEmpty()) {
+                MDC.clear();
+                return;
+            }
+            MDC.setContextMap(previousContext);
+        }
+    }
+}

src/main/java/umc/cockple/demo/global/config/AsyncConfig.java

@@ -1,9 +1,31 @@
 package umc.cockple.demo.global.config;
 
+import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
+import org.springframework.boot.task.ThreadPoolTaskExecutorBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.TaskDecorator;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.stereotype.Component;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import umc.cockple.demo.global.logging.MdcTaskDecorator;
 
-@Component
+@Configuration
 @EnableAsync
 public class AsyncConfig {
+
+    @Bean
+    public TaskDecorator mdcTaskDecorator() {
+        return new MdcTaskDecorator();
+    }
+
+    @Bean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME)
+    public ThreadPoolTaskExecutor applicationTaskExecutor(
+            ThreadPoolTaskExecutorBuilder builder,
+            TaskDecorator mdcTaskDecorator
+    ) {
+        return builder
+                .threadNamePrefix("cockple-async-")
+                .taskDecorator(mdcTaskDecorator)
+                .build();
+    }
 }