Merge branch 'feature/DRAW-241' into sandbox

YAPP-Github · Aug 24, 2024 · 5865fdc · 5865fdc
2 parents f6e926f + 47312bf
commit 5865fdc
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 1 deletion.
diff --git a/app/api/build.gradle.kts b/app/api/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     implementation(project(":app:websocket"))
     implementation(project(":core"))
     implementation(project(":support:logging"))
+    implementation(project(":support:metric"))
     implementation(project(":support:yaml"))
 
     implementation("org.springframework.boot:spring-boot-starter-web:${Versions.SPRING_BOOT}")

diff --git a/app/websocket/build.gradle.kts b/app/websocket/build.gradle.kts
@@ -9,8 +9,9 @@ dependencies {
     implementation(project(":app:support:auth"))
     implementation(project(":app:support:exception"))
     implementation(project(":core"))
-    implementation(project(":support:yaml"))
     implementation(project(":support:logging"))
+    implementation(project(":support:metric"))
+    implementation(project(":support:yaml"))
 
     implementation("org.springframework.boot:spring-boot-starter-web:${Versions.SPRING_BOOT}")
     implementation("org.springframework.boot:spring-boot-starter-websocket:${Versions.SPRING_BOOT}")

diff --git a/app/websocket/src/main/kotlin/com/xorker/draw/websocket/MainWebSocketHandler.kt b/app/websocket/src/main/kotlin/com/xorker/draw/websocket/MainWebSocketHandler.kt
@@ -1,6 +1,7 @@
 package com.xorker.draw.websocket
 
 import com.xorker.draw.exception.XorkerException
+import com.xorker.draw.support.metric.MetricManager
 import com.xorker.draw.websocket.exception.WebSocketExceptionHandler
 import com.xorker.draw.websocket.log.WebSocketLogger
 import com.xorker.draw.websocket.parser.WebSocketRequestParser
@@ -18,9 +19,11 @@ class MainWebSocketHandler(
     private val sessionEventListener: List<SessionEventListener>,
     private val webSocketExceptionHandler: WebSocketExceptionHandler,
     private val webSocketLogger: WebSocketLogger,
+    private val metricManager: MetricManager,
 ) : TextWebSocketHandler() {
     override fun afterConnectionEstablished(session: WebSocketSession) {
         webSocketLogger.afterConnectionEstablished(session)
+        metricManager.increaseWebsocket()
     }
 
     override fun handleTextMessage(session: WebSocketSession, message: TextMessage) {
@@ -36,7 +39,9 @@ class MainWebSocketHandler(
     }
 
     override fun afterConnectionClosed(session: WebSocketSession, status: CloseStatus) {
+        metricManager.decreaseWebsocket()
         webSocketLogger.afterConnectionClosed(session, status)
+
         val sessionDto = sessionUseCase.getSession(SessionId(session.id)) ?: return // TODO error logging
 
         when (status) {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -12,4 +12,5 @@ object Versions {
     const val WEBMVC_UI = "2.5.0"
     const val COROUTINES = "1.6.4"
     const val LOGBACK = "0.1.5"
+    const val MICROMETER = "1.12.9"
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     implementation(project(":adapter:oauth"))
     implementation(project(":adapter:rdb"))
     implementation(project(":support:jwt"))
+    implementation(project(":support:metric"))
     implementation(project(":support:time"))
 
     implementation("org.springframework.boot:spring-boot-starter:${Versions.SPRING_BOOT}")

diff --git a/core/src/main/kotlin/com/xorker/draw/mafia/phase/MafiaPhaseEndGameProcessor.kt b/core/src/main/kotlin/com/xorker/draw/mafia/phase/MafiaPhaseEndGameProcessor.kt
@@ -8,6 +8,7 @@ import com.xorker.draw.mafia.MafiaPhase
 import com.xorker.draw.mafia.MafiaPhaseMessenger
 import com.xorker.draw.mafia.assertIs
 import com.xorker.draw.mafia.event.JobWithStartTime
+import com.xorker.draw.support.metric.MetricManager
 import com.xorker.draw.timer.TimerRepository
 import org.springframework.stereotype.Component
 
@@ -17,6 +18,7 @@ internal class MafiaPhaseEndGameProcessor(
     private val timerRepository: TimerRepository,
     private val mafiaPhaseMessenger: MafiaPhaseMessenger,
     private val mafiaGameMessenger: MafiaGameMessenger,
+    private val metricManager: MetricManager,
 ) {
 
     // TODO 게임 결과 DB 저장
@@ -58,6 +60,8 @@ internal class MafiaPhaseEndGameProcessor(
         val phase = gameInfo.phase
         assertIs<MafiaPhase.End>(phase)
 
+        metricManager.decreaseGameCount()
+
         val room = gameInfo.room
 
         val players = room.players

diff --git a/core/src/main/kotlin/com/xorker/draw/mafia/phase/MafiaPhasePlayGameProcessor.kt b/core/src/main/kotlin/com/xorker/draw/mafia/phase/MafiaPhasePlayGameProcessor.kt
@@ -5,6 +5,7 @@ import com.xorker.draw.mafia.MafiaGameMessenger
 import com.xorker.draw.mafia.MafiaGameRepository
 import com.xorker.draw.mafia.MafiaPhase
 import com.xorker.draw.mafia.assertIs
+import com.xorker.draw.support.metric.MetricManager
 import com.xorker.draw.timer.TimerRepository
 import org.springframework.stereotype.Component
 
@@ -13,12 +14,15 @@ internal class MafiaPhasePlayGameProcessor(
     private val timerRepository: TimerRepository,
     private val mafiaGameMessenger: MafiaGameMessenger,
     private val mafiaGameRepository: MafiaGameRepository,
+    private val metricManager: MetricManager,
 ) {
 
     internal fun playMafiaGame(gameInfo: MafiaGameInfo, nextStep: () -> Unit): MafiaPhase.Playing {
         val phase = gameInfo.phase
         assertIs<MafiaPhase.Ready>(phase)
 
+        metricManager.increaseGameCount()
+
         val gameOption = gameInfo.gameOption
 
         var time = gameOption.turnTime

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,6 +9,7 @@ include(
     "domain",
     "core",
     "support:jwt",
+    "support:metric",
     "support:logging",
     "support:time",
     "support:yaml",

diff --git a/support/metric/build.gradle.kts b/support/metric/build.gradle.kts
@@ -0,0 +1,11 @@
+import org.springframework.boot.gradle.tasks.bundling.BootJar
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter-actuator:${Versions.SPRING_BOOT}")
+    implementation("io.micrometer:micrometer-registry-prometheus:${Versions.MICROMETER}")
+}
+
+tasks {
+    withType<Jar> { enabled = true }
+    withType<BootJar> { enabled = false }
+}
diff --git a/support/metric/src/main/kotlin/com/xorker/draw/support/metric/MetricManager.kt b/support/metric/src/main/kotlin/com/xorker/draw/support/metric/MetricManager.kt
@@ -0,0 +1,41 @@
+package com.xorker.draw.support.metric
+
+import io.micrometer.core.instrument.Gauge
+import io.micrometer.core.instrument.MeterRegistry
+import java.util.concurrent.atomic.AtomicInteger
+import org.springframework.stereotype.Component
+
+@Component
+class MetricManager(
+    private val metric: MeterRegistry,
+) {
+    private val connectedWebSocketCount: AtomicInteger = AtomicInteger()
+    private val playingPlayingRoomCount: AtomicInteger = AtomicInteger()
+
+    init {
+        Gauge
+            .builder("connect_websocket_gauge", connectedWebSocketCount) { it.toDouble() }
+            .register(metric)
+
+        Gauge
+            .builder("playing_game_room_gauge", playingPlayingRoomCount) { it.toDouble() }
+            .register(metric)
+
+    }
+
+    fun increaseWebsocket() {
+        connectedWebSocketCount.incrementAndGet()
+    }
+
+    fun decreaseWebsocket() {
+        connectedWebSocketCount.decrementAndGet()
+    }
+
+    fun increaseGameCount(){
+        playingPlayingRoomCount.incrementAndGet()
+    }
+
+    fun decreaseGameCount(){
+        playingPlayingRoomCount.decrementAndGet()
+    }
+}
diff --git a/support/metric/src/main/resources/application-metric.yml b/support/metric/src/main/resources/application-metric.yml
@@ -0,0 +1,11 @@
+management:
+    endpoints:
+        web:
+            exposure:
+                include: prometheus
+    endpoint:
+        prometheus:
+            enabled: true
+#    metrics:
+#        tags:
+#            application: ${spring.application.name}