release: 1.2.3 (#250)

Author: devxb

.github/workflows/deploy.yml

@@ -81,7 +81,7 @@ jobs:
           platforms: linux/arm64/v8
           push: true
           tags: |
-            ghcr.io/devxb/gitanimals-filebeat:latest
+            ghcr.io/devxb/gitanimals-filebeat:${{ steps.extract_version_name.outputs.version }}
 
   deploy:
     needs: build
@@ -120,5 +120,5 @@ jobs:
       - name: run file beats
         if: env.status == 'stopped'
         run: |
-          sudo docker run -d --name filebeat -v logs:/logs -t ghcr.io/devxb/gitanimals-filebeat:latest
+          sudo docker run -d --name filebeat -v logs:/logs -t ghcr.io/devxb/gitanimals-filebeat:${{ steps.extract_version_name.outputs.version }}
             

src/main/kotlin/org/gitanimals/core/filter/MDCFilter.kt

@@ -4,9 +4,11 @@ import jakarta.servlet.FilterChain
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
 import org.gitanimals.core.IdGenerator
+import org.slf4j.LoggerFactory
 import org.slf4j.MDC
 import org.springframework.stereotype.Component
 import org.springframework.web.filter.OncePerRequestFilter
+import kotlin.system.measureTimeMillis
 
 @Component
 class MDCFilter : OncePerRequestFilter() {
@@ -16,17 +18,30 @@ class MDCFilter : OncePerRequestFilter() {
         response: HttpServletResponse,
         filterChain: FilterChain
     ) {
+        val logger = LoggerFactory.getLogger("Request logger")
+
         runCatching {
             val traceId: String = request.getHeader("traceId") ?: IdGenerator.generate().toString()
 
             MDC.put(TRACE_ID, traceId)
-            filterChain.doFilter(request, response)
+            MDC.put(PATH, request.requestURI)
+
+            val elapsedTime = measureTimeMillis {
+                filterChain.doFilter(request, response)
+            }
+            MDC.put(ELAPSED_TIME, elapsedTime.toString())
+        }.onSuccess {
+            logger.info("Request Success with status ${response.status}")
         }.also {
             MDC.remove(TRACE_ID)
+            MDC.remove(ELAPSED_TIME)
+            MDC.remove(PATH)
         }
     }
 
     companion object {
         const val TRACE_ID = "traceId"
+        const val ELAPSED_TIME = "elapsedTime"
+        const val PATH = "path"
     }
 }

src/main/kotlin/org/gitanimals/guild/infra/HttpClientConfigurer.kt

@@ -1,7 +1,9 @@
 package org.gitanimals.guild.infra
 
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.guild.app.IdentityApi
 import org.gitanimals.guild.app.RenderApi
+import org.slf4j.MDC
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
@@ -17,6 +19,9 @@ class HttpClientConfigurer {
     fun identityApiHttpClient(): IdentityApi {
         val restClient = RestClient
             .builder()
+            .defaultHeaders {
+                it.add(TRACE_ID, MDC.get(TRACE_ID))
+            }
             .defaultStatusHandler(httpClientErrorHandler())
             .baseUrl("https://api.gitanimals.org")
             .build()
@@ -32,6 +37,9 @@ class HttpClientConfigurer {
     fun renderApiHttpClient(): RenderApi {
         val restClient = RestClient
             .builder()
+            .defaultHeaders {
+                it.add(TRACE_ID, MDC.get(TRACE_ID))
+            }
             .defaultStatusHandler(httpClientErrorHandler())
             .baseUrl("https://render.gitanimals.org")
             .build()

src/main/kotlin/org/gitanimals/render/controller/AnimationController.kt

@@ -1,9 +1,8 @@
 package org.gitanimals.render.controller
 
 import jakarta.servlet.http.HttpServletResponse
-import org.gitanimals.render.app.AnimationFacade
 import org.gitanimals.core.Mode
-import org.slf4j.LoggerFactory
+import org.gitanimals.render.app.AnimationFacade
 import org.springframework.http.HttpHeaders
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
@@ -15,13 +14,6 @@ class AnimationController(
     private val animationFacade: AnimationFacade,
 ) {
 
-    private val logger = LoggerFactory.getLogger(this::class.simpleName)
-
-    @GetMapping("/for-logging-test")
-    fun forLoggingTest() {
-        logger.warn("For logging test")
-    }
-
     @GetMapping(value = ["/farms/{username}"], produces = ["image/svg+xml"])
     fun getFarmSvgAnimation(
         @PathVariable("username") username: String,

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

@@ -1,7 +1,9 @@
 package org.gitanimals.render.infra
 
 import org.gitanimals.core.AUTHORIZATION_EXCEPTION
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.render.app.IdentityApi
+import org.slf4j.MDC
 import org.springframework.http.HttpHeaders
 import org.springframework.stereotype.Component
 import org.springframework.web.client.RestClient
@@ -15,6 +17,7 @@ class RestIdentityApi : IdentityApi {
         return restClient.get()
             .uri("/users")
             .header(HttpHeaders.AUTHORIZATION, token)
+            .header(TRACE_ID, MDC.get(TRACE_ID))
             .exchange { _, response ->
                 runCatching {
                     response.bodyTo(IdentityApi.UserResponse::class.java)

src/main/resources/application.properties

@@ -1,3 +1,5 @@
+spring.profiles.active=prod
+
 server.name=gitanimals-render
 server.port=8080
 
@@ -32,4 +34,4 @@ spring.application.name=render.gitanimals
 management.endpoints.web.exposure.include=prometheus
 management.metrics.tags.application=${spring.application.name}
 
-logging.level.root=WARN
+logging.level.root=INFO

src/main/resources/logback.xml

@@ -6,7 +6,8 @@
   <springProperty name="slackToken" source="slack.token"/>
   <property name="LOG_PATH" value="${LOG_PATH:-./logs}"/>
   <property name="LOG_FILE" value="${LOG_FILE:-app}"/>
-  <property name="LOG_PATTERN" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}][%thread] %-5level %logger{36} - %msg%n"/>
+  <property name="LOG_PATTERN"
+    value="[%d{yyyy-MM-dd HH:mm:ss.SSS}][%thread] %-5level %logger{36} - %msg%n"/>
   <property name="MAX_HISTORY" value="${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-1}"/>
 
   <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
@@ -27,20 +28,22 @@
       <maxHistory>${MAX_HISTORY}</maxHistory>
     </rollingPolicy>
   </appender>
-  <appender name = "ASYNC_ENC_JSON_FILE_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
+  <appender name="ASYNC_ENC_JSON_FILE_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
     <appender-ref ref="ECS_JSON_FILE_APPENDER"/>
   </appender>
 
   <appender name="SLACK_APPENDER" class="org.gitanimals.core.appender.SlackAppender">
-    <param name="token" value="${slackToken}" />
+    <param name="token" value="${slackToken}"/>
   </appender>
   <appender name="ASYNC_SLACK_APPENDER" class="ch.qos.logback.classic.AsyncAppender">
-    <appender-ref ref="SLACK_APPENDER" />
+    <appender-ref ref="SLACK_APPENDER"/>
   </appender>
 
   <root level="${LOG_LEVEL}">
     <appender-ref ref="ASYNC_ENC_JSON_FILE_APPENDER"/>
-    <appender-ref ref="ASYNC_SLACK_APPENDER"/>
+    <springProfile name="prod">
+      <appender-ref ref="ASYNC_SLACK_APPENDER"/>
+    </springProfile>
     <springProfile name="test">
       <appender-ref ref="CONSOLE_APPENDER"/>
     </springProfile>