5 Commits

Author SHA1 Message Date
dalbodeule
b1432c662f [feature] metric related fixed. 2025-07-16 18:52:04 +09:00
dalbodeule
19fcc15fe1 [feature] loki handler fix (3x) 2025-07-16 13:17:04 +09:00
dalbodeule
b497c690af [feature] loki handler fix (2x) 2025-07-16 13:14:43 +09:00
dalbodeule
866fe19cb9 [feature] loki handler fix 2025-07-16 13:10:06 +09:00
dalbodeule
e21641da7b [feature] add loki handler. 2025-07-16 13:01:39 +09:00
7 changed files with 38 additions and 8 deletions

View File

@@ -29,6 +29,7 @@ repositories {
dependencies {
// https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
implementation("ch.qos.logback:logback-classic:1.5.13")
implementation("com.github.loki4j:loki-logback-appender:2.0.0")
// https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")

View File

@@ -204,6 +204,7 @@ class UserHandler(
val logger: Logger,
private var user: User,
var streamStartTime: LocalDateTime?,
val chatLogger: Logger = LoggerFactory.getLogger("${channel.channelName}-chat"),
) {
lateinit var client: ChzzkClient
lateinit var chatChannelId: String
@@ -294,7 +295,7 @@ class UserHandler(
logger.info("ChzzkChat connecting... ${channel.channelName} - ${channel.channelId}")
streamStartTime = LocalDateTime.now()
Metrics.streaming++
Metrics.increaseStreaming()
if(!_isActive) {
_isActive = true
@@ -331,7 +332,7 @@ class UserHandler(
listener?.unsubscribeAsync(ChzzkSessionSubscriptionType.CHAT)?.join()
listener?.disconnectAsync()?.join()
_isActive = false
Metrics.streaming--;
Metrics.decreaseStreaming()
CoroutineScope(Dispatchers.Default).launch {
val events = listOf(
@@ -370,6 +371,7 @@ class UserHandler(
GlobalScope.launch {
delay(100L)
client.sendChatToLoggedInChannel(msg.limitUtf8Length(100))
chatLogger.info("[SEND]${channel.channelName}: ${msg.limitUtf8Length(100)}{${msg.length} / 100}")
}
}
}

View File

@@ -31,6 +31,7 @@ class MessageHandler(
private val channel = handler.channel
private val logger = handler.logger
private val chatLogger = handler.chatLogger
private val listener = handler.listener
private val dispatcher: CoroutinesEventBus by inject(CoroutinesEventBus::class.java)
@@ -372,7 +373,7 @@ class MessageHandler(
internal fun handle(msg: SessionChatMessage, user: User) {
if(msg.senderChannelId == ChzzkHandler.botUid) return
chatLogger.info("[RECV]${channel.channelName}: ${msg.content}{${msg.content.length} / 100}")
val commandKey = msg.content.split(' ')[0]
commands[commandKey.lowercase()]?.let { it(msg, user) }
}

View File

@@ -8,12 +8,12 @@ import space.mori.chzzk_bot.common.services.UserService
object Metrics {
val registry = PrometheusMeterRegistry(PrometheusConfig.DEFAULT)
var streamer = UserService.getAllUsers().size.toDouble()
var streamer = 0.0
val streamerGauge: Gauge = Gauge.builder("streamer_gauge", this) { streamer }
.description("Current All Streamer Count")
.register(registry)
var activeStreamer = UserService.getAllUsers().filter { !it.isDisabled }.size.toDouble()
var activeStreamer = 0.0
val activateGauge: Gauge = Gauge.builder("active_streamer_gauge", this) { streamer }
.description("Current Active Streamer Count")
.register(registry)
@@ -22,4 +22,16 @@ object Metrics {
val streamingGauge: Gauge = Gauge.builder("streaming_gauge", this) { streaming }
.description("Current Streaming Streamer Count")
.register(registry)
fun refreshStreamerMetrics() {
streamer = UserService.getAllUsers().size.toDouble()
activeStreamer = UserService.getAllUsers().filter { !it.isDisabled }.size.toDouble()
}
fun increaseStreaming(inc: Int = 1) {
streaming += inc
}
fun decreaseStreaming(dec: Int = 1) {
streaming -= dec
}
}

View File

@@ -1,5 +1,5 @@
<configuration>
<property name="lokiUrl" value="${LOKI_ENDPOINT}"/>
<!-- 콘솔에 출력하는 기본 로그 설정 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -10,6 +10,15 @@
</encoder>
</appender>
<appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
<http>
<url>${lokiUrl}</url>
</http>
<labels>
app = chibot-chzzk-bot
</labels>
</appender>
<!-- HikariCP 로그 레벨 설정 -->
<logger name="com.zaxxer.hikari" level="INFO" />
<logger name="o.m.jdbc.client.impl.StandardClient" level="INFO" />
@@ -31,5 +40,8 @@
<root level="DEBUG">
<appender-ref ref="STDOUT" />
</root>
<root level="INFO">
<appender-ref ref="LOKI" />
</root>
</configuration>

View File

@@ -16,7 +16,7 @@ import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.withTimeoutOrNull
import space.mori.chzzk_bot.common.events.ChzzkUserFindEvent
import space.mori.chzzk_bot.common.events.ChzzkUserReceiveEvent
import space.mori.chzzk_bot.webserver.routes.GuildSettings
import space.mori.chzzk_bot.common.metrics.Metrics
@Serializable
data class GetUserDTO(
@@ -184,6 +184,8 @@ fun Routing.apiRoutes() {
UserService.setIsDisabled(user, body.isBotDisabled)
UserService.setIsStartupDisabled(user, body.isBotMsgDisabled)
Metrics.refreshStreamerMetrics()
call.respond(HttpStatusCode.OK, body)
}
}

View File

@@ -26,7 +26,7 @@ fun Routing.metricRoutes() {
val registry: PrometheusMeterRegistry by inject(PrometheusMeterRegistry::class.java)
dispatcher.subscribe(UserRegisterEvent::class) {
Metrics.streamer++
Metrics.refreshStreamerMetrics()
}
get("/metrics") {