release: 1.9.6 (#353)

devxb · web-flow · commit 651cead51480 · 2025-04-13T16:22:44.000+09:00
diff --git a/src/main/kotlin/org/gitanimals/core/OrchestratorExtension.kt b/src/main/kotlin/org/gitanimals/core/OrchestratorExtension.kt
@@ -1,6 +1,7 @@
 package org.gitanimals.core
 
 import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
+import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
 import org.rooftop.netx.api.Context
 import org.rooftop.netx.api.ContextOrchestrate
 import org.rooftop.netx.api.ContextRollback
@@ -12,7 +13,11 @@ open class TraceIdContextOrchestrator<T : Any, V : Any>(
 ) : ContextOrchestrate<T, V> {
 
     override fun orchestrate(context: Context, request: T): V {
-        MDC.put(TRACE_ID, context.decodeContext(TRACE_ID, String::class))
+        runCatching { context.decodeContext(TRACE_ID, String::class) }
+            .onSuccess { MDC.put(TRACE_ID, it) }
+        runCatching { context.decodeContext(USER_ID, String::class) }
+            .onSuccess { MDC.put(USER_ID, it) }
+
         return runCatching {
             orchestrate.orchestrate(context, request)
         }.getOrElse {
@@ -33,7 +38,11 @@ open class TraceIdContextRollback<T : Any, V : Any?>(
 ) : ContextRollback<T, V> {
 
     override fun rollback(context: Context, request: T): V {
-        MDC.put(TRACE_ID, context.decodeContext(TRACE_ID, String::class))
+        runCatching { context.decodeContext(TRACE_ID, String::class) }
+            .onSuccess { MDC.put(TRACE_ID, it) }
+        runCatching { context.decodeContext(USER_ID, String::class) }
+            .onSuccess { MDC.put(USER_ID, it) }
+
         return runCatching {
             rollback.rollback(context, request)
         }.getOrElse {
diff --git a/src/main/kotlin/org/gitanimals/core/auth/InternalAuth.kt b/src/main/kotlin/org/gitanimals/core/auth/InternalAuth.kt
@@ -2,7 +2,10 @@ package org.gitanimals.core.auth
 
 import jakarta.servlet.http.HttpServletRequest
 import org.gitanimals.core.AUTHORIZATION_EXCEPTION
+import org.gitanimals.core.AuthorizationException
+import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
 import org.slf4j.LoggerFactory
+import org.slf4j.MDC
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpHeaders
 import org.springframework.stereotype.Component
@@ -37,6 +40,14 @@ class InternalAuth(
     }
 
     fun findUserId(): Long? {
+        val userIdInMdc = runCatching {
+            MDC.get(USER_ID).toLong()
+        }.getOrNull()
+
+        if (userIdInMdc != null) {
+            return userIdInMdc
+        }
+
         val token: String? = httpServletRequest.getHeader(HttpHeaders.AUTHORIZATION)
         val iv: String? = httpServletRequest.getHeader(INTERNAL_AUTH_IV_KEY)
         val internalAuthSecret: String? = httpServletRequest.getHeader(INTERNAL_AUTH_SECRET_KEY)
@@ -58,6 +69,9 @@ class InternalAuth(
             userId = runCatching {
                 internalAuthClient.getUserByToken(token).id.toLong()
             }.getOrElse {
+                if (it is AuthorizationException) {
+                    return@getOrElse null
+                }
                 logger.warn("[InternalAuth] Fail to get userId by token", it)
                 null
             }
diff --git a/src/main/kotlin/org/gitanimals/core/redis/AsyncRedisPubSubEvent.kt b/src/main/kotlin/org/gitanimals/core/redis/AsyncRedisPubSubEvent.kt
@@ -1,8 +1,11 @@
 package org.gitanimals.core.redis
 
 import com.fasterxml.jackson.annotation.JsonIgnore
+import org.gitanimals.core.filter.MDCFilter
+import org.slf4j.MDC
 
 abstract class AsyncRedisPubSubEvent(
+    val apiUserId: String? = runCatching { MDC.get(MDCFilter.USER_ID) }.getOrNull(),
     val traceId: String,
     @JsonIgnore
     val channel: String,
diff --git a/src/main/kotlin/org/gitanimals/core/redis/TraceableMessageListener.kt b/src/main/kotlin/org/gitanimals/core/redis/TraceableMessageListener.kt
@@ -2,6 +2,7 @@ package org.gitanimals.core.redis
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.gitanimals.core.filter.MDCFilter
 import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.slf4j.LoggerFactory
 import org.slf4j.MDC
@@ -12,17 +13,28 @@ import org.springframework.data.redis.core.StringRedisTemplate
 abstract class TraceableMessageListener(
     private val redisTemplate: StringRedisTemplate,
     private val objectMapper: ObjectMapper,
-): MessageListener {
+) : MessageListener {
 
     private val logger = LoggerFactory.getLogger(this::class.simpleName)
 
     override fun onMessage(message: Message, pattern: ByteArray?) {
         runCatching {
-            val traceId: String = objectMapper.readValue(
+            val request = objectMapper.readValue(
                 redisTemplate.stringSerializer.deserialize(message.body),
-                object: TypeReference<Map<String, String>>(){},
-            )["traceId"] ?: throw IllegalArgumentException("Cannot find traceId on message: $message")
-            MDC.put(TRACE_ID, traceId)
+                object : TypeReference<Map<String, String>>() {},
+            )
+
+            runCatching {
+                request["traceId"] as String
+            }.onSuccess {
+                MDC.put(TRACE_ID, it)
+            }
+            runCatching {
+                request["apiUserId"] as String
+            }.onSuccess {
+                MDC.put(MDCFilter.USER_ID, it)
+            }
+
             onMessage(message)
         }.onFailure {
             logger.error("Fail to listen message: $message, error: $it", it)
diff --git a/src/main/kotlin/org/gitanimals/core/redis/TransactionCommitRedisPubSubEvent.kt b/src/main/kotlin/org/gitanimals/core/redis/TransactionCommitRedisPubSubEvent.kt
@@ -1,9 +1,12 @@
 package org.gitanimals.core.redis
 
 import com.fasterxml.jackson.annotation.JsonIgnore
+import org.gitanimals.core.filter.MDCFilter
+import org.slf4j.MDC
 import org.springframework.context.ApplicationEvent
 
 abstract class TransactionCommitRedisPubSubEvent(
+    val apiUserId: String? = runCatching { MDC.get(MDCFilter.USER_ID) }.getOrNull(),
     val traceId: String,
     @JsonIgnore
     val channel: String,
diff --git a/src/main/kotlin/org/gitanimals/guild/app/CreateGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/CreateGuildFacade.kt
@@ -3,6 +3,7 @@ package org.gitanimals.guild.app
 import org.gitanimals.core.TraceIdContextOrchestrator
 import org.gitanimals.core.TraceIdContextRollback
 import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
+import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
 import org.gitanimals.guild.app.request.CreateGuildRequest
 import org.gitanimals.guild.app.response.GuildResponse
 import org.gitanimals.guild.domain.GuildService
@@ -42,6 +43,7 @@ class CreateGuildFacade(
                 "token" to token,
                 IDEMPOTENCY_KEY to UUID.randomUUID().toString(),
                 TRACE_ID to MDC.get(TRACE_ID),
+                USER_ID to MDC.get(USER_ID),
             ),
             timeoutMillis = 1.minutes.inWholeMilliseconds,
         ).decodeResultOrThrow(GuildResponse::class).also {
