refactor: Scheduler에 TRACE_ID가 기본으로 남도록 수정한다

Author: devxb

src/main/kotlin/org/gitanimals/rank/app/GivePointToGuildFacade.kt

@@ -1,15 +1,13 @@
 package org.gitanimals.rank.app
 
 import org.gitanimals.core.IdGenerator
-import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.rank.domain.GuildContributionRankService
 import org.gitanimals.rank.domain.RankQueryRepository
 import org.gitanimals.rank.domain.RankQueryRepository.RankType.WEEKLY_GUILD_CONTRIBUTIONS
 import org.gitanimals.rank.domain.history.RankHistoryService
 import org.gitanimals.rank.domain.history.request.InitRankHistoryRequest
 import org.gitanimals.rank.domain.response.RankResponse
 import org.slf4j.LoggerFactory
-import org.slf4j.MDC
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 
@@ -27,7 +25,6 @@ class GivePointToGuildFacade(
     @Scheduled(cron = "0 0 23 * * SUN")
     fun givePointsToGuildUsers() {
         runCatching {
-            MDC.put(TRACE_ID, IdGenerator.generate().toString())
             val guildRankWithIds = rankQueryRepository.findAllRank(
                 rankStartedAt = 0,
                 limit = 2,
@@ -63,8 +60,6 @@ class GivePointToGuildFacade(
             rankQueryRepository.initialRank(WEEKLY_GUILD_CONTRIBUTIONS)
         }.onFailure {
             logger.info("[GivePointToGuildFacade] Fail to awarded point. ${it.message}", it)
-        }.also {
-            MDC.remove(TRACE_ID)
         }
     }
 

src/main/kotlin/org/gitanimals/rank/app/GivePointToUsersFacade.kt

@@ -1,15 +1,13 @@
 package org.gitanimals.rank.app
 
 import org.gitanimals.core.IdGenerator
-import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.rank.domain.RankQueryRepository
 import org.gitanimals.rank.domain.RankQueryRepository.RankType.WEEKLY_USER_CONTRIBUTIONS
 import org.gitanimals.rank.domain.UserContributionRankService
 import org.gitanimals.rank.domain.history.RankHistoryService
 import org.gitanimals.rank.domain.history.request.InitRankHistoryRequest
 import org.gitanimals.rank.domain.response.RankResponse
 import org.slf4j.LoggerFactory
-import org.slf4j.MDC
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 
@@ -26,7 +24,6 @@ class GivePointToUsersFacade(
     @Scheduled(cron = "0 0 23 * * SUN")
     fun givePointToUsers() {
         runCatching {
-            MDC.put(TRACE_ID, IdGenerator.generate().toString())
             val userRankWithIds = rankQueryRepository.findAllRank(
                 rankStartedAt = 0,
                 limit = 2,
@@ -55,7 +52,7 @@ class GivePointToUsersFacade(
                         rank = it.rank,
                         prize = getPoint(it),
                         rankType = RankQueryRepository.RankType.WEEKLY_USER_CONTRIBUTIONS,
-                        winnerId  = it.id.toLong(),
+                        winnerId = it.id.toLong(),
                         winnerName = it.name,
                     )
                 }
@@ -64,8 +61,6 @@ class GivePointToUsersFacade(
             rankQueryRepository.initialRank(WEEKLY_USER_CONTRIBUTIONS)
         }.onFailure {
             logger.info("[GivePointToUsersFacade] Fail to awarded point. ${it.message}", it)
-        }.also {
-            MDC.remove(TRACE_ID)
         }
     }
 

src/main/kotlin/org/gitanimals/render/infra/NewPetDropRateDistributionReport.kt

@@ -1,6 +1,5 @@
 package org.gitanimals.render.infra
 
-import org.gitanimals.core.IdGenerator
 import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.core.instant
 import org.gitanimals.render.domain.PersonaStatisticService
@@ -49,8 +48,6 @@ class NewPetDropRateDistributionReport(
     }
 
     private fun publishDropRateDistribution(days: Long, type: Type) {
-        MDC.put(TRACE_ID, IdGenerator.generate().toString())
-
         logger.info("[NewPetDropRateDistributionReport] Aggregate yesterday days pet distribution drop rate...")
 
         val createdAt = instant().minus(days, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS)

src/main/kotlin/org/gitanimals/supports/schedule/SchedulerTraceIdAspect.kt

@@ -0,0 +1,29 @@
+package org.gitanimals.supports.schedule
+
+import org.aspectj.lang.ProceedingJoinPoint
+import org.aspectj.lang.annotation.Around
+import org.aspectj.lang.annotation.Aspect
+import org.gitanimals.core.IdGenerator
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
+import org.slf4j.MDC
+import org.springframework.core.annotation.Order
+import org.springframework.scheduling.annotation.Scheduled
+import org.springframework.stereotype.Component
+
+@Aspect
+@Component
+@Order(value = Int.MIN_VALUE)
+class SchedulerTraceIdAspect {
+
+    @Around("@annotation(scheduled)")
+    fun putMdcFilter(joinPoint: ProceedingJoinPoint, scheduled: Scheduled): Any? {
+        return runCatching {
+            MDC.put(TRACE_ID, IdGenerator.generate().toString())
+            joinPoint.proceed()
+        }.also {
+            MDC.remove(TRACE_ID)
+        }.onFailure {
+            throw it
+        }
+    }
+}