fix: USER_ENTRY_POINT MDC전이가 끊기는 버그를 수정한다

Author: devxb

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_ENTRY_POINT
 import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
 import org.rooftop.netx.api.Context
 import org.rooftop.netx.api.ContextOrchestrate
@@ -17,6 +18,8 @@ open class TraceIdContextOrchestrator<T : Any, V : Any>(
             .onSuccess { MDC.put(TRACE_ID, it) }
         runCatching { context.decodeContext(USER_ID, String::class) }
             .onSuccess { MDC.put(USER_ID, it) }
+        runCatching { context.decodeContext(USER_ENTRY_POINT, String::class) }
+            .onSuccess { MDC.put(USER_ENTRY_POINT, it) }
 
         return runCatching {
             orchestrate.orchestrate(context, request)
@@ -25,6 +28,8 @@ open class TraceIdContextOrchestrator<T : Any, V : Any>(
             throw it
         }.also {
             MDC.remove(TRACE_ID)
+            MDC.remove(USER_ID)
+            MDC.remove(USER_ENTRY_POINT)
         }
     }
 
@@ -42,6 +47,8 @@ open class TraceIdContextRollback<T : Any, V : Any?>(
             .onSuccess { MDC.put(TRACE_ID, it) }
         runCatching { context.decodeContext(USER_ID, String::class) }
             .onSuccess { MDC.put(USER_ID, it) }
+        runCatching { context.decodeContext(USER_ENTRY_POINT, String::class) }
+            .onSuccess { MDC.put(USER_ENTRY_POINT, it) }
 
         return runCatching {
             rollback.rollback(context, request)
@@ -50,6 +57,8 @@ open class TraceIdContextRollback<T : Any, V : Any?>(
             throw it
         }.also {
             MDC.remove(TRACE_ID)
+            MDC.remove(USER_ID)
+            MDC.remove(USER_ENTRY_POINT)
         }
     }
 

src/main/kotlin/org/gitanimals/core/auth/InternalAuthRequestInterceptor.kt

@@ -24,10 +24,6 @@ class InternalAuthRequestInterceptor(
             MDC.get(USER_ID).toLong()
         }.getOrNull()
 
-        val userEntryPoint = runCatching {
-            MDC.get(USER_ENTRY_POINT)
-        }.getOrNull()
-
         if (userId != null) {
             val encrypt = internalAuth.encrypt(userId = userId)
 
@@ -39,6 +35,13 @@ class InternalAuthRequestInterceptor(
                 InternalAuth.INTERNAL_AUTH_IV_KEY,
                 Base64.getEncoder().encodeToString(encrypt.iv),
             )
+        }
+
+        val userEntryPoint = runCatching {
+            MDC.get(USER_ENTRY_POINT)
+        }.getOrNull()
+
+        if (userEntryPoint != null) {
             request.headers.add(
                 InternalAuth.INTERNAL_ENTRY_POINT_KEY,
                 userEntryPoint,

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_ENTRY_POINT
 import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
 import org.gitanimals.guild.app.request.CreateGuildRequest
 import org.gitanimals.guild.app.response.GuildResponse
@@ -44,6 +45,7 @@ class CreateGuildFacade(
                 IDEMPOTENCY_KEY to UUID.randomUUID().toString(),
                 TRACE_ID to MDC.get(TRACE_ID),
                 USER_ID to MDC.get(USER_ID),
+                USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
             ),
             timeoutMillis = 1.minutes.inWholeMilliseconds,
         ).decodeResultOrThrow(GuildResponse::class).also {