Skip to content

Commit

Permalink
Refactor event logging and tracing initialization
Browse files Browse the repository at this point in the history
Moved initialization of logging and tracing queues to improve code organization and readability. Retained all existing functionalities, including event consumption and appender registrations.
  • Loading branch information
smyrgeorge committed Oct 19, 2024
1 parent 26ad7db commit 45fc715
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,6 @@ object RootLogger {
private val traces: Channel<TracingEvent> =
Channel(capacity = Channel.UNLIMITED)

object Logging {
private var idx: Long = 0
fun id(): Long = ++idx
val factory = SimpleLoggerFactory()
val loggers = LoggerRegistry()
val appenders = AppenderRegistry<LoggingEvent>()
fun register(appender: Appender<LoggingEvent>) = appenders.register(appender)
}

object Tracing {
private var idx: Long = 0
var prefix: String = "span"
fun id(): String = runBlocking { "$prefix-${Clock.System.now().epochSeconds}-${idx()}" }
private val mutex = Mutex()
private suspend fun idx(): Long = mutex.withLock { ++idx }
val appenders = AppenderRegistry<TracingEvent>()
fun register(appender: Appender<TracingEvent>) = appenders.register(appender)
}

init {
Logging.register(SimpleConsoleLoggingAppender())

Expand All @@ -69,6 +50,25 @@ object RootLogger {
fun log(event: LoggingEvent) = runBlocking { logs.send(event) }
fun trace(event: TracingEvent) = runBlocking { traces.send(event) }

object Logging {
private var idx: Long = 0
fun id(): Long = ++idx
val factory = SimpleLoggerFactory()
val loggers = LoggerRegistry()
val appenders = AppenderRegistry<LoggingEvent>()
fun register(appender: Appender<LoggingEvent>) = appenders.register(appender)
}

object Tracing {
private var idx: Long = 0
var prefix: String = "span"
fun id(): String = runBlocking { "$prefix-${Clock.System.now().epochSeconds}-${idx()}" }
private val mutex = Mutex()
private suspend fun idx(): Long = mutex.withLock { ++idx }
val appenders = AppenderRegistry<TracingEvent>()
fun register(appender: Appender<TracingEvent>) = appenders.register(appender)
}

private object LoggerScope : CoroutineScope {
override val coroutineContext: CoroutineContext
get() = EmptyCoroutineContext
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ interface TracingEvent {
RootLogger.trace(event)
}

fun event(msg: String, vararg args: Any?): Unit = withLock {
fun event(msg: String, vararg args: Any?) {
// If already ended, return.
if (closed) return@withLock
if (closed) return
val event = Event(
id = "$id-${idx()}",
spanId = id,
Expand Down

0 comments on commit 45fc715

Please sign in to comment.