feat: dev, prod 환경별 xml 로그 파일 관리 및 dev 환경 http응답/요청 디스코드 웹훅 연동 - #153

.gitignore

@@ -39,4 +39,7 @@ out/
 ### Mac ###
 .DS_Store
 
-src/main/resources/application.yml
+src/main/resources/application.yml
+src/main/resources/application-dev.yml
+src/main/resources/application-local.yml
+src/main/resources/application-prod.yml

build.gradle

@@ -79,8 +79,10 @@ dependencies {
 	implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
 	//s3
-	implementation("software.amazon.awssdk:bom:2.21.0")
-	implementation("software.amazon.awssdk:s3:2.21.0")
+	implementation "software.amazon.awssdk:s3:2.34.0"
+
+	//Loki
+	implementation 'com.github.loki4j:loki-logback-appender:1.5.2'
 }
 
 

src/main/java/com/permitseoul/permitserver/domain/admin/ticket/api/dto/req/TicketRoundWithTypeCreateRequest.java

@@ -15,11 +15,11 @@ public record TicketRoundWithTypeCreateRequest(
         String ticketRoundName,
 
         @NotNull(message = "티켓라운드 판매 시작일은 필수입니다.")
-        @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         LocalDateTime ticketRoundSalesStartDate,
 
         @NotNull(message = "티켓라운드 판매 종료일은 필수입니다.")
-        @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         LocalDateTime ticketRoundSalesEndDate,
 
         @NotNull(message = "티켓타입 리스트는 필수입니다.")
@@ -41,11 +41,11 @@ public record TicketTypeRequest(
             Integer totalCount,
 
             @NotNull(message = "티켓타입 시작일은 필수입니다.")
-            @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
             LocalDateTime startDate,
 
             @NotNull(message = "티켓타입 종료일은 필수입니다.")
-            @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
             LocalDateTime endDate
     ) { }
 }

src/main/java/com/permitseoul/permitserver/domain/admin/ticket/api/dto/req/TicketRoundWithTypeUpdateRequest.java

@@ -17,11 +17,11 @@ public record TicketRoundWithTypeUpdateRequest(
         String ticketRoundName,
 
         @NotNull(message = "티켓라운드 판매 시작일은 필수입니다.")
-        @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         LocalDateTime ticketRoundSalesStartDate,
 
         @NotNull(message = "티켓라운드 판매 종료일은 필수입니다.")
-        @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         LocalDateTime ticketRoundSalesEndDate,
 
         @NotNull(message = "티켓타입 리스트는 필수입니다.")
@@ -44,11 +44,11 @@ public record TicketTypeUpdateRequest(
             Integer totalCount,
 
             @NotNull(message = "티켓타입 시작일은 필수입니다.")
-            @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
             LocalDateTime startDate,
 
             @NotNull(message = "티켓타입 종료일은 필수입니다.")
-            @JsonFormat(pattern = "yyyy.MM.dd HH:mm")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
             LocalDateTime endDate
     ) {}
 }

src/main/java/com/permitseoul/permitserver/global/config/AsyncConfig.java

@@ -0,0 +1,44 @@
+package com.permitseoul.permitserver.global.config;
+
+import org.slf4j.MDC;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.Map;
+import java.util.concurrent.Executor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+
+    @Bean(name = "alertExecutor")
+    public Executor alertExecutor() {
+        final ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(2);
+        executor.setMaxPoolSize(4);
+        executor.setQueueCapacity(20);
+        executor.setKeepAliveSeconds(60);
+        executor.setThreadNamePrefix("DiscordAlert-");
+        executor.setAllowCoreThreadTimeOut(true);
+
+        //AsyncAppender를 사용하는데, MDC를 비동기 스레드 전파하기 위함
+        executor.setTaskDecorator(runnable -> {
+            Map<String, String> contextMap = MDC.getCopyOfContextMap();
+            return () -> {
+                if (contextMap != null) {
+                    MDC.setContextMap(contextMap);
+                }
+                try {
+                    runnable.run();
+                } finally {
+                    MDC.clear();
+                }
+            };
+        });
+        executor.initialize();
+
+        return executor;
+    }
+}

src/main/java/com/permitseoul/permitserver/global/config/FeignConfig.java

@@ -1,13 +1,19 @@
 package com.permitseoul.permitserver.global.config;
 
 
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import feign.Retryer;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.concurrent.TimeUnit;
+
 @Configuration
 @EnableFeignClients("com.permitseoul")
 public class FeignConfig {
-
+    @Bean
+    public Retryer retryer() {
+        // 3회 재시도 (최대 1초 간격)
+        return new Retryer.Default(100, TimeUnit.SECONDS.toMillis(1), 3);
+    }
 }

src/main/java/com/permitseoul/permitserver/global/external/discord/DiscordDevHttpLogSender.java

@@ -0,0 +1,31 @@
+package com.permitseoul.permitserver.global.external.discord;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.permitseoul.permitserver.global.external.discord.dto.DiscordMessage;
+import com.permitseoul.permitserver.global.external.discord.util.DiscordMessageFormatterUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class DiscordDevHttpLogSender implements DiscordSender {
+
+    private final DiscordFeignClient discordFeignClient;
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    @Async("alertExecutor")
+    public void send(final String jsonMessage) {
+        try {
+            final JsonNode root = OBJECT_MAPPER.readTree(jsonMessage);
+            final String content = DiscordMessageFormatterUtil.formatDevHttpLogToMarkdown(root);
+            discordFeignClient.sendMessage(DiscordMessage.of(content));
+
+        } catch (Exception e) {
+            log.error("🚨 [DiscordDevHttpLogSender] Discord 전송 실패", e);
+        }
+    }
+}

src/main/java/com/permitseoul/permitserver/global/external/discord/DiscordFeignClient.java

@@ -0,0 +1,19 @@
+package com.permitseoul.permitserver.global.external.discord;
+
+import com.permitseoul.permitserver.global.config.FeignConfig;
+import com.permitseoul.permitserver.global.external.discord.dto.DiscordMessage;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(
+        name = "discordClient",
+        url = "${discord.webhook-url}",
+        configuration = FeignConfig.class
+)
+public interface DiscordFeignClient {
+
+    @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
+    void sendMessage(@RequestBody DiscordMessage discordMessage);
+}

src/main/java/com/permitseoul/permitserver/global/external/discord/DiscordSender.java

@@ -0,0 +1,5 @@
+package com.permitseoul.permitserver.global.external.discord;
+
+public interface DiscordSender {
+    void send(String message);
+}

src/main/java/com/permitseoul/permitserver/global/external/discord/dto/DiscordMessage.java

@@ -0,0 +1,9 @@
+package com.permitseoul.permitserver.global.external.discord.dto;
+
+
+public record DiscordMessage(String content) {
+
+    public static DiscordMessage of(final String message) {
+        return new DiscordMessage(message);
+    }
+}

src/main/java/com/permitseoul/permitserver/global/external/discord/util/DiscordMessageFormatterUtil.java

@@ -0,0 +1,79 @@
+package com.permitseoul.permitserver.global.external.discord.util;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public final class DiscordMessageFormatterUtil {
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    private static final String FIELD_TIME = "time";
+    private static final String FIELD_LOG_TYPE = "log_type";
+    private static final String FIELD_METHOD = "method";
+    private static final String FIELD_URL = "url";
+    private static final String FIELD_STATUS = "status";
+    private static final String FIELD_TRACE_ID = "trace_id";
+    private static final String FIELD_DURATION = "duration_ms";
+    private static final String FIELD_REQUEST_BODY = "request_body";
+    private static final String FIELD_RESPONSE_BODY = "response_body";
+    private static final String DEFAULT_NO_TIME = "(no time)";
+    private static final String DEFAULT_NO_LOG_TYPE = "N/A";
+    private static final String DEFAULT_NO_METHOD = "UNKNOWN";
+    private static final String DEFAULT_NO_URL = "N/A";
+    private static final String DEFAULT_NO_TRACE_ID = "(no-trace)";
+    private static final long DEFAULT_DURATION = 0L;
+    private static final String EMPTY_BODY = "(Empty Body)";
+    private static final int DEFAULT_NO_STATUS = 0;
+
+    // [dev 환경] HTTP 요청/응답 로그 포맷팅
+    public static String formatDevHttpLogToMarkdown(final JsonNode root) {
+        final String time = root.path(FIELD_TIME).asText(DEFAULT_NO_TIME);
+        final String logType = root.path(FIELD_LOG_TYPE).asText(DEFAULT_NO_LOG_TYPE);
+        final String method = root.path(FIELD_METHOD).asText(DEFAULT_NO_METHOD);
+        final String url = root.path(FIELD_URL).asText(DEFAULT_NO_URL);
+        final int status = root.path(FIELD_STATUS).asInt(DEFAULT_NO_STATUS);
+        final String traceId = root.path(FIELD_TRACE_ID).asText(DEFAULT_NO_TRACE_ID);
+        final long duration = root.path(FIELD_DURATION).asLong(DEFAULT_DURATION);
+
+        final String requestBody = prettyJson(root.path(FIELD_REQUEST_BODY).asText());
+        final String responseBody = prettyJson(root.path(FIELD_RESPONSE_BODY).asText());
+
+        return """
+            **[HTTP 요청/응답 로그]**
+
+            🕓 **time:** %s
+            🧩 **log_type:** %s
+            🧭 **method:** %s
+            🌐 **url:** %s
+            📦 **status:** %d
+            🫆 **trace_id:** `%s`
+            ⏱️ **duration:** %dms
+
+            **Request Body:**
+            ```json
+            %s
+            ```
+            **Response Body:**
+            ```json
+            %s
+            ```
+            """.formatted(
+                time, logType, method, url, status, traceId, duration,
+                requestBody, responseBody
+        );
+    }
+
+    public static String prettyJson(final String body) {
+        if (body == null || body.isBlank() || body.equals(EMPTY_BODY)) {
+            return EMPTY_BODY;
+        }
+        try {
+            final JsonNode node = OBJECT_MAPPER.readTree(body);
+            return OBJECT_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(node);
+        } catch (Exception e) {
+            return body;
+        }
+    }
+}

src/main/java/com/permitseoul/permitserver/global/filter/DevRequestResponseLoggingFilter.java

@@ -1,73 +1,42 @@
 package com.permitseoul.permitserver.global.filter;
 
+import com.permitseoul.permitserver.global.external.discord.DiscordSender;
+import com.permitseoul.permitserver.global.util.HttpReqResLogJsonBuilder;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 import org.springframework.web.util.ContentCachingRequestWrapper;
 import org.springframework.web.util.ContentCachingResponseWrapper;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
 
 @Slf4j
-@Component // 필터 가장 처음
-@Profile("dev") // dev에서만 적용(테스트 및 qa용)
+@Component
+@Profile("dev")
+@RequiredArgsConstructor
 public class DevRequestResponseLoggingFilter implements Filter {
 
+    private final DiscordSender discordSender;
+
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 
-        // 요청 응답을 여러 번 읽을 수 있도록 래핑
-        final ContentCachingRequestWrapper reqWrapper = new ContentCachingRequestWrapper((HttpServletRequest) request);
-        final ContentCachingResponseWrapper resWrapper = new ContentCachingResponseWrapper((HttpServletResponse) response);
+        // 요청,응답을 여러 번 읽을 수 있도록 래핑
+        final ContentCachingRequestWrapper req = new ContentCachingRequestWrapper((HttpServletRequest) request);
+        final ContentCachingResponseWrapper res = new ContentCachingResponseWrapper((HttpServletResponse) response);
 
         final long start = System.currentTimeMillis();
-        chain.doFilter(reqWrapper, resWrapper);
-        final long duration = System.currentTimeMillis() - start;
-
-        logRequestResponse(reqWrapper, resWrapper, duration);
-        resWrapper.copyBodyToResponse();
-    }
-
-    private void logRequestResponse(final ContentCachingRequestWrapper request,
-                                    final ContentCachingResponseWrapper response,
-                                    final long duration) {
         try {
-            final String method = request.getMethod();
-            final String uri = request.getRequestURI();
-            final String query = request.getQueryString();
-            final String fullUrl = uri + (query != null ? "?" + query : "");
-
-            final String reqBody = new String(request.getContentAsByteArray(), StandardCharsets.UTF_8);
-            final String resBody = new String(response.getContentAsByteArray(), StandardCharsets.UTF_8);
-
-            log.info("""
-                    🧩 [HTTP LOG]
-                    ▶️ Time: {}
-                    ▶️ Method: {}
-                    ▶️ URL: {}
-                    ▶️ Status: {}
-                    ▶️ Duration: {} ms
-                    ▶️ Request Body: {}
-                    ▶️ Response Body: {}
-                    """,
-                    LocalDateTime.now(), method, fullUrl,
-                    response.getStatus(), duration, sanitize(reqBody), sanitize(resBody)
-            );
-
-        } catch (Exception e) {
-            log.error("Error logging request/response", e);
+            chain.doFilter(req, res);
+        } finally {
+            final long duration = System.currentTimeMillis() - start;
+            final String jsonLog = HttpReqResLogJsonBuilder.buildJsonLog(req, res, duration);
+            discordSender.send(jsonLog);
+            res.copyBodyToResponse();
         }
     }
-
-    private String sanitize(String input) {
-        if (input == null || input.isBlank()) return "(empty Body)";
-        // 필요 시 개인정보 마스킹 처리
-        return input.length() > 2000 ? input.substring(0, 2000) + "...(truncated)" : input; //2000자까지만 보임
-    }
-}
+}