From c5dad11e5e0304c603372c4c69472387eca02a01 Mon Sep 17 00:00:00 2001 From: Menci Date: Fri, 13 Dec 2024 05:47:31 +0800 Subject: [PATCH] [+] Metrics (#95) * Add actuator and micrometer * update * [-] Remove unused import * [O] Make code less verbose * format * refactor --------- Co-authored-by: Azalea <22280294+hykilpikonna@users.noreply.github.com> --- build.gradle.kts | 4 ++ src/main/java/ext/Ext.kt | 1 + .../samnyan/aqua/net/games/mai2/Mai2Import.kt | 2 +- .../samnyan/aqua/net/utils/ErrorResponse.kt | 2 + .../icu/samnyan/aqua/sega/aimedb/AimeDB.kt | 11 +++- .../icu/samnyan/aqua/sega/allnet/AllNet.kt | 26 ++++++--- .../samnyan/aqua/sega/allnet/AllNetSecure.kt | 10 ++++ .../aqua/sega/allnet/KeychipSession.kt | 11 ++-- .../sega/chusan/ChusanServletController.kt | 26 +++++++-- .../sega/maimai2/Maimai2ServletController.kt | 53 ++++++++++++------- .../handler/UploadUserPlaylogHandler.kt | 25 ++++++++- .../samnyan/aqua/sega/wacca/WaccaServer.kt | 53 +++++++++++++------ .../java/icu/samnyan/aqua/spring/Metrics.kt | 45 ++++++++++++++++ src/main/resources/application.properties | 8 +++ .../V1000_20__keychip_session_game_id.sql | 2 + 15 files changed, 225 insertions(+), 54 deletions(-) create mode 100644 src/main/java/icu/samnyan/aqua/spring/Metrics.kt create mode 100644 src/main/resources/db/migration/mariadb/V1000_20__keychip_session_game_id.sql diff --git a/build.gradle.kts b/build.gradle.kts index 172db05d..89da707f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,6 +46,10 @@ dependencies { testImplementation("org.springframework.security:spring-security-test") implementation("net.logstash.logback:logstash-logback-encoder:7.4") + // Metrics + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("io.micrometer:micrometer-registry-prometheus") + // Database runtimeOnly("org.mariadb.jdbc:mariadb-java-client:3.3.3") runtimeOnly("org.xerial:sqlite-jdbc:3.45.2.0") diff --git a/src/main/java/ext/Ext.kt b/src/main/java/ext/Ext.kt index 0d713f18..b7e77c65 100644 --- a/src/main/java/ext/Ext.kt +++ b/src/main/java/ext/Ext.kt @@ -163,6 +163,7 @@ val Any?.truthy get() = when (this) { // Collections fun ls(vararg args: T) = args.toList() +inline fun arr(vararg args: T) = arrayOf(*args) operator fun Map.plus(map: Map) = (if (this is MutableMap) this else toMutableMap()).apply { putAll(map) } operator fun MutableMap.plusAssign(map: Map) { putAll(map) } diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt index 19fb3fde..284fb273 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt @@ -48,4 +48,4 @@ class Mai2Import( ) { override fun createEmpty() = Maimai2DataExport() override val userDataRepo = repos.userData -} \ No newline at end of file +} diff --git a/src/main/java/icu/samnyan/aqua/net/utils/ErrorResponse.kt b/src/main/java/icu/samnyan/aqua/net/utils/ErrorResponse.kt index f60f28c2..7c87b979 100644 --- a/src/main/java/icu/samnyan/aqua/net/utils/ErrorResponse.kt +++ b/src/main/java/icu/samnyan/aqua/net/utils/ErrorResponse.kt @@ -17,6 +17,8 @@ class ApiException(val code: Int, message: Str) : RuntimeException(message) { fun resp() = ResponseEntity.status(code).body(message.toString()) } +fun Exception.simpleDescribe(): String = if (this is ApiException) "E${code}" else javaClass.simpleName + @ControllerAdvice(basePackages = ["icu.samnyan"]) class GlobalExceptionHandler { @ExceptionHandler(ApiException::class) diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt index 89ce6285..40b691c9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt @@ -4,6 +4,7 @@ import ext.toHex import icu.samnyan.aqua.net.db.AquaUserServices import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.general.service.CardService +import icu.samnyan.aqua.sega.allnet.AllNetProps import io.netty.buffer.ByteBuf import io.netty.buffer.ByteBufUtil import io.netty.buffer.Unpooled @@ -25,6 +26,7 @@ import kotlin.jvm.optionals.getOrNull class AimeDB( val cardService: CardService, val us: AquaUserServices, + val allNetProps: AllNetProps, ): ChannelInboundHandlerAdapter() { val logger: Logger = LoggerFactory.getLogger(AimeDB::class.java) @@ -65,7 +67,14 @@ class AimeDB( logger.info("AimeDB /${handler.name} : (game ${base.gameId}, keychip ${base.keychipId})") // Check keychip - if (!us.validKeychip(base.keychipId)) return logger.warn("> Rejected: Keychip not found") + if (!us.validKeychip(base.keychipId)) { + if (allNetProps.keychipPermissiveForTesting) { + logger.warn("> Accepted invalid keychip ${base.keychipId} in permissive mode") + } else { + logger.warn("> Rejected: Keychip not found") + return + } + } handler.fn(data)?.let { ctx.write(it) } } finally { diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt index 1a8c3155..936e9b7c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt +++ b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt @@ -25,6 +25,7 @@ class AllNetProps { var port: Int? = null val keychipSesExpire: Long = 172800000 // milliseconds var checkKeychip: Boolean = false + var keychipPermissiveForTesting: Boolean = false var redirect: String = "web" var placeName: String = "" @@ -102,9 +103,11 @@ class AllNet( // game_id SDEZ, ver 1.35, serial A0000001234, ip, firm_ver 50000, boot_ver 0000, // encode UTF-8, format_ver 3, hops 1， token 2010451813 val reqMap = decodeAllNet(dataStream.readAllBytes()) - var serial = reqMap["serial"] ?: "" + val serial = reqMap["serial"] ?: "" logger.info("AllNet /PowerOn : $reqMap") + var session: String? = null + // Proper keychip authentication if (props.checkKeychip) { // If it's a user keychip, it should be in user database @@ -112,11 +115,20 @@ class AllNet( if (u != null) { // Create a new session for the user logger.info("> Keychip authenticated: ${u.auId} ${u.computedName}") - serial = keychipSessionService.new(u).token + session = keychipSessionService.new(u, reqMap["game_id"] ?: "").token } // Check if it's a whitelisted keychip - else if (serial.isEmpty() || !keychipRepo.existsByKeychipId(serial)) { + else if (!serial.isEmpty() && keychipRepo.existsByKeychipId(serial)) { + session = keychipSessionService.new(null, reqMap["game_id"] ?: "").token + } + + else if (props.keychipPermissiveForTesting) { + logger.warn("> Accepted invalid keychip $serial in permissive mode") + session = keychipSessionService.new(null, reqMap["game_id"] ?: "").token + } + + else { // This will cause an allnet auth bad on client side return "".also { logger.warn("> Rejected: Keychip not found") } } @@ -127,7 +139,7 @@ class AllNet( val formatVer = reqMap["format_ver"] ?: "" val resp = props.map.toMutableMap() + mapOf( - "uri" to switchUri(localAddr, localPort, gameId, ver, serial), + "uri" to switchUri(localAddr, localPort, gameId, ver, session), "host" to props.host.ifBlank { localAddr }, ) @@ -160,15 +172,15 @@ class AllNet( return resp.toUrl() + "\n" } - private fun switchUri(localAddr: Str, localPort: Str, gameId: Str, ver: Str, serial: Str): Str { + private fun switchUri(localAddr: Str, localPort: Str, gameId: Str, ver: Str, session: Str?): Str { val addr = props.host.ifBlank { localAddr } val port = props.port?.toString() ?: localPort // If keychip authentication is enabled, the game URLs will be set to /gs/{token}/{game}/... - val base = if (props.checkKeychip) "gs/$serial" else "g" + val base = if (session != null) "gs/$session" else "g" return "http://$addr:$port/$base/" + when (gameId) { - "SDBT" -> "chu2/$ver/$serial/" + "SDBT" -> "chu2/$ver/$session/" "SDHD" -> "chu3/$ver/" "SDGS" -> "chu3/$ver/" // International (c3exp) "SBZV" -> "diva/" diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetSecure.kt b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetSecure.kt index 23b63957..88a87005 100644 --- a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetSecure.kt +++ b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetSecure.kt @@ -6,6 +6,7 @@ import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletRequestWrapper import jakarta.servlet.http.HttpServletResponse import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Value import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.context.annotation.Configuration @@ -30,6 +31,13 @@ class TokenChecker( ) : HandlerInterceptor { val log = LoggerFactory.getLogger(TokenChecker::class.java) + companion object { + private val log = LoggerFactory.getLogger(TokenChecker::class.java) + + private val currentSession = ThreadLocal() + fun getCurrentSession() = currentSession.get() + } + /** * Handle request before it's processed. */ @@ -48,6 +56,8 @@ class TokenChecker( if (token.isNotBlank() && (keyChipRepo.existsByKeychipId(token) || session != null || (frontierProps.enabled && frontierProps.ftk == token))) { + currentSession.set(session) + // Forward the request val w = RewriteWrapper(req, token).apply { setAttribute("token", token) } req.getRequestDispatcher(w.requestURI).forward(w, resp) diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/KeychipSession.kt b/src/main/java/icu/samnyan/aqua/sega/allnet/KeychipSession.kt index 4681f26f..615f8f6c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/allnet/KeychipSession.kt +++ b/src/main/java/icu/samnyan/aqua/sega/allnet/KeychipSession.kt @@ -21,7 +21,10 @@ import java.security.SecureRandom class KeychipSession( @ManyToOne @JoinColumn(name = "au_id") - var user: AquaNetUser = AquaNetUser(), + var user: AquaNetUser? = null, + + @Column(length = 4) + val gameId: String, @Id @Column(length = 32) @@ -69,8 +72,8 @@ class KeychipSessionService( /** * Create a new session. */ - fun new(user: AquaNetUser): KeychipSession { - val session = KeychipSession(user = user) + fun new(user: AquaNetUser?, gameId: String): KeychipSession { + val session = KeychipSession(user = user, gameId = gameId) return keychipSessionRepo.save(session) } @@ -81,4 +84,4 @@ class KeychipSessionService( lastUse = System.currentTimeMillis() keychipSessionRepo.save(this) } -} \ No newline at end of file +} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt index fca58e6f..bbb92d3d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt @@ -1,14 +1,15 @@ package icu.samnyan.aqua.sega.chusan import ext.* +import icu.samnyan.aqua.net.utils.simpleDescribe import icu.samnyan.aqua.sega.chunithm.handler.impl.GetGameIdlistHandler import icu.samnyan.aqua.sega.chusan.handler.* import icu.samnyan.aqua.sega.general.BaseHandler +import icu.samnyan.aqua.spring.Metrics import org.slf4j.LoggerFactory import org.springframework.web.bind.annotation.* import kotlin.reflect.full.declaredMemberProperties - /** * @author samnyan (privateamusement@protonmail.com) */ @@ -119,14 +120,31 @@ class ChusanServletController( } logger.info("Chu3 $api : $request") + if (api !in noopEndpoint && !handlers.containsKey(api)) { + logger.warn("Chu3 $api not found") + return """{"returnCode":"1","apiName":"$api"}""" + } + + // Only record the counter metrics if the API is known. + Metrics.counter("aquadx_chusan_api_call", "api" to api).increment() if (api in noopEndpoint) { return """{"returnCode":"1"}""" } - return handlers[api]?.handle(request) ?: { - logger.warn("Chu3 $api not found") - """{"returnCode":"1","apiName":"$api"}""" + return try { + Metrics.timer("aquadx_chusan_api_latency", "api" to api).recordCallable { + handlers[api]?.handle(request) ?: { + logger.warn("Chu3 $api not found") + """{"returnCode":"1","apiName":"$api"}""" + } + } + } catch (e: Exception) { + Metrics.counter( + "aquadx_chusan_api_error", + "api" to api, "error" to e.simpleDescribe() + ).increment() + throw e } } } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt index 3afc7bc3..030d1c69 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt @@ -2,9 +2,11 @@ package icu.samnyan.aqua.sega.maimai2 import ext.* import icu.samnyan.aqua.net.utils.ApiException +import icu.samnyan.aqua.net.utils.simpleDescribe import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.handler.* import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos +import icu.samnyan.aqua.spring.Metrics import io.ktor.client.request.* import org.slf4j.LoggerFactory import org.springframework.http.ResponseEntity @@ -339,29 +341,42 @@ class Maimai2ServletController( @API("/{api}") fun handle(@PathVariable api: String, @RequestBody request: Map): Any { - try { - logger.info("Mai2 < $api : ${request.toJson()}") // TODO: Optimize logging + logger.info("Mai2 < $api : ${request.toJson()}") // TODO: Optimize logging + if (api !in noopEndpoint && api !in staticEndpoint && !handlers.containsKey(api)) { + logger.warn("Mai2 > $api not found") + return """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}""" + } - if (api in noopEndpoint) { - logger.info("Mai2 > $api no-op") - return """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}""" - } + // Only record the counter metrics if the API is known. + Metrics.counter("aquadx_maimai2_api_call", "api" to api).increment() - if (api in staticEndpoint) { - logger.info("Mai2 > $api static") - return staticEndpoint[api]!! - } + if (api in noopEndpoint) { + logger.info("Mai2 > $api no-op") + return """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}""" + } - return handlers[api]?.handle(request)?.let { if (it is String) it else it.toJson() }?.also { - if (api !in setOf("GetUserItemApi", "GetGameEventApi")) - logger.info("Mai2 > $api : $it") - } ?: { - logger.warn("Mai2 > $api not found") - """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.$api"}""" + if (api in staticEndpoint) { + logger.info("Mai2 > $api static") + return staticEndpoint[api]!! + } + + return try { + Metrics.timer("aquadx_maimai2_api_latency", "api" to api).recordCallable { + handlers[api]!!.handle(request).let { if (it is String) it else it.toJson() }.also { + if (api !in setOf("GetUserItemApi", "GetGameEventApi")) + logger.info("Mai2 > $api : $it") + } } - } catch (e: ApiException) { - // It's a bad practice to return 200 ok on error, but this is what maimai does so we have to follow - return ResponseEntity.ok().body("""{"returnCode":0,"apiName":"com.sega.maimai2servlet.api.$api","message":"${e.message?.replace("\"", "\\\"")} - ${e.code}"}""") + } catch (e: Exception) { + Metrics.counter( + "aquadx_maimai2_api_error", + "api" to api, "error" to e.simpleDescribe() + ).increment() + + if (e is ApiException) { + // It's a bad practice to return 200 ok on error, but this is what maimai does so we have to follow + return ResponseEntity.ok().body("""{"returnCode":0,"apiName":"com.sega.maimai2servlet.api.$api","message":"${e.message?.replace("\"", "\\\"")} - ${e.code}"}""") + } else throw e } } } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt index 498c8fdf..6f9c7a36 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt @@ -1,12 +1,14 @@ package icu.samnyan.aqua.sega.maimai2.handler import ext.millis +import icu.samnyan.aqua.sega.allnet.TokenChecker +import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo -import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPlaylog import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserPlaylog import icu.samnyan.aqua.sega.util.jackson.BasicMapper +import icu.samnyan.aqua.spring.Metrics import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component import kotlin.jvm.optionals.getOrNull @@ -24,11 +26,23 @@ class UploadUserPlaylogHandler( companion object { @JvmStatic val playBacklog = mutableMapOf>() + + val VALID_GAME_IDS = setOf("SDEZ", "SDGA", "SDGB") } override fun handle(request: Map): String { val req = mapper.convert(request, UploadUserPlaylog::class.java) + val version = tryParseGameVersion(req.userPlaylog.version) + if (version != null) { + val session = TokenChecker.getCurrentSession() + val gameId = if (session?.gameId in VALID_GAME_IDS) session!!.gameId else "" + Metrics.counter( + "aquadx_maimai2_playlog_game_version", + "game_id" to gameId, "version" to version + ).increment() + } + // Save if the user is registered val u = userDataRepository.findByCardExtId(req.userId).getOrNull() if (u != null) playlogRepo.save(req.userPlaylog.apply { user = u }) @@ -52,4 +66,13 @@ class UploadUserPlaylogHandler( playBacklog.filter { (_, v) -> v.isEmpty() || v[0].time - now > 300_000 }.toList() .forEach { (k, _) -> playBacklog.remove(k) } } + + private fun tryParseGameVersion(version: Int): String? { + val major = version / 1000000 + val minor = version / 1000 % 1000 + if (major != 1) return null + if (minor !in 0..99) return null + // e.g. "1.30", minor should have two digits + return "$major.${minor.toString().padStart(2, '0')}" + } } diff --git a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt index 7f324ad8..68d6b39c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt +++ b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt @@ -4,6 +4,7 @@ import ext.* import icu.samnyan.aqua.net.db.AquaGameOptions import icu.samnyan.aqua.net.games.wacca.Wacca import icu.samnyan.aqua.net.utils.ApiException +import icu.samnyan.aqua.net.utils.simpleDescribe import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.wacca.WaccaItemType.* import icu.samnyan.aqua.sega.wacca.WaccaItemType.NOTE_COLOR @@ -12,6 +13,7 @@ import icu.samnyan.aqua.sega.wacca.WaccaItemType.TOUCH_EFFECT import icu.samnyan.aqua.sega.wacca.WaccaOptionType.* import icu.samnyan.aqua.sega.wacca.model.BaseRequest import icu.samnyan.aqua.sega.wacca.model.db.* +import icu.samnyan.aqua.spring.Metrics import io.ktor.client.utils.* import jakarta.servlet.http.HttpServletRequest import org.springframework.beans.factory.annotation.Autowired @@ -79,25 +81,42 @@ class WaccaServer { /** Handle all requests */ @API("/api/**") fun handle(req: HttpServletRequest, @RB body: String): Any { - return try { - val path = req.requestURI.removePrefix("/g/wacca").removePrefix("/WaccaServlet") - .removePrefix("/api").removePrefix("/").lowercase() - if (path in cacheMap) return resp(cacheMap[path]!!) - if (path !in handlerMap) return resp("[]", 1, "Not Found") + // Normalize path + val path = req.requestURI.removePrefix("/g/wacca").removePrefix("/WaccaServlet") + .removePrefix("/api").removePrefix("/").lowercase() - log.info("Wacca < $path : $body") - - val br = JACKSON.parse(body) - handlerMap[path]!!(br, br.params).let { when (it) { - is String -> resp(it) - is List<*> -> resp(it.toJson()) - else -> error("Invalid response type ${it.javaClass}") - } }.also { log.info("Wacca > $path : ${it.body}") } + if (path !in cacheMap && path !in handlerMap) { + return resp("[]", 1, "Not Found") } - catch (e: ApiException) { resp("[]", e.code, e.message ?: "") } - catch (e: Exception) { - log.error("Wacca > Error", e) - resp("[]", 500, e.message ?: "") + + // Only record the counter metrics if the API is known. + Metrics.counter("aquadx_wacca_api_call", "api" to path).increment() + + if (path in cacheMap) return resp(cacheMap[path]!!) + + log.info("Wacca < $path : $body") + + return try { + Metrics.timer("aquadx_wacca_api_latency", "api" to path).recordCallable { + val br = JACKSON.parse(body) + handlerMap[path]!!(br, br.params).let { when (it) { + is String -> resp(it) + is List<*> -> resp(it.toJson()) + else -> error("Invalid response type ${it.javaClass}") + } }.also { log.info("Wacca > $path : ${it.body}") } + } + } catch (e: Exception) { + Metrics.counter( + "aquadx_wacca_api_error", + "api" to path, "error" to e.simpleDescribe() + ).increment() + + if (e is ApiException) { + resp("[]", e.code, e.message ?: "") + } else { + log.error("Wacca > Error", e) + resp("[]", 500, e.message ?: "") + } } } } diff --git a/src/main/java/icu/samnyan/aqua/spring/Metrics.kt b/src/main/java/icu/samnyan/aqua/spring/Metrics.kt new file mode 100644 index 00000000..d37d62b4 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/spring/Metrics.kt @@ -0,0 +1,45 @@ +package icu.samnyan.aqua.spring + +import io.micrometer.core.instrument.Counter +import io.micrometer.core.instrument.Timer +import java.util.concurrent.ConcurrentHashMap +import io.micrometer.core.instrument.Metrics as MMetrics + +object Metrics { + fun counter(metricName: String, vararg pairs: Pair): Counter { + val expandedLabels = expandLabels(*pairs) + return cache.computeIfAbsent(MetricCacheKey(Counter::class.java, metricName, expandedLabels)) { + Counter + .builder(metricName) + .tags(*expandedLabels) + .register(MMetrics.globalRegistry) + } as Counter + } + + fun timer(metricName: String, vararg pairs: Pair): Timer { + val expandedLabels = expandLabels(*pairs) + return cache.computeIfAbsent(MetricCacheKey(Timer::class.java, metricName, expandedLabels)) { + Timer + .builder(metricName) + .publishPercentiles(0.5, 0.75, 0.90, 0.95, 0.99) + .tags(*expandedLabels) + .register(MMetrics.globalRegistry) + } as Timer + } + + private data class MetricCacheKey( + val type: Class<*>, + val metricName: String, + val expandedLabels: Array, + ) + + private val cache = ConcurrentHashMap() + + private fun expandLabels(vararg pairs: Pair): Array { + return pairs + .flatMap { + listOf(it.first, it.second.toString()) + } + .toTypedArray() + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index df763c56..769d910a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -33,3 +33,11 @@ spring.jpa.hibernate.ddl-auto=none # https://github.com/termstandard/colors#truecolor-support-in-output-devices # If you want to read the logs using a script, read the json logs in `logs` folder instead. spring.output.ansi.enabled=always + +# Metrics +management.server.port=8081 +management.endpoint.prometheus.enabled=true +management.endpoints.web.exposure.include=prometheus +management.metrics.distribution.percentiles.http.server.requests=0.5, 0.75, 0.9, 0.95, 0.99 +management.metrics.distribution.percentiles.tasks.scheduled.execution=0.5, 0.75, 0.9, 0.95, 0.99 +management.metrics.distribution.percentiles.spring.data.repository.invocations=0.5, 0.75, 0.9, 0.95, 0.99 diff --git a/src/main/resources/db/migration/mariadb/V1000_20__keychip_session_game_id.sql b/src/main/resources/db/migration/mariadb/V1000_20__keychip_session_game_id.sql new file mode 100644 index 00000000..162c2a2a --- /dev/null +++ b/src/main/resources/db/migration/mariadb/V1000_20__keychip_session_game_id.sql @@ -0,0 +1,2 @@ +ALTER TABLE allnet_keychip_sessions + ADD game_id VARCHAR(4) NULL;