#5: share request counter between logger entities

xe11 · Jan 5, 2024 · 7e36ab5 · 7e36ab5
1 parent fa03b86
commit 7e36ab5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/tagged-logger/src/main/java/xe11/ok/logger/tag/CompositeTagProvider.kt b/tagged-logger/src/main/java/xe11/ok/logger/tag/CompositeTagProvider.kt
@@ -7,7 +7,7 @@ internal class CompositeTagProvider(
 ) {
 
     private val urlTagProvider = UrlTagProvider()
-    private val requestNumberTagProvider = RequestNumberTagProvider()
+    private val requestNumberTagProvider = RequestNumberTagProvider.globalCounter
 
     fun getTag(request: Request): String {
         val tagUtils = TagUtilsImpl(request, urlTagProvider, requestNumberTagProvider)

diff --git a/tagged-logger/src/main/java/xe11/ok/logger/tag/RequestNumberTagProvider.kt b/tagged-logger/src/main/java/xe11/ok/logger/tag/RequestNumberTagProvider.kt
@@ -18,4 +18,15 @@ internal class RequestNumberTagProvider : TagProvider {
         repeat(min(9, exponent)) { result *= 10 }
         return result
     }
+
+    companion object {
+
+        private var _globalCounter = RequestNumberTagProvider()
+        val globalCounter: RequestNumberTagProvider
+            get() = _globalCounter
+
+        internal fun resetGlobalCounter() {
+            _globalCounter = RequestNumberTagProvider()
+        }
+    }
 }
diff --git a/tagged-logger/src/test/java/xe11/ok/logger/TaggedHttpLoggingInterceptorIntegrationTest.kt b/tagged-logger/src/test/java/xe11/ok/logger/TaggedHttpLoggingInterceptorIntegrationTest.kt
@@ -15,6 +15,7 @@ import xe11.ok.logger.level.Level
 import xe11.ok.logger.level.OkHttpLogLevel
 import xe11.ok.logger.printer.ChunkingPrinter
 import xe11.ok.logger.printer.Printer
+import xe11.ok.logger.tag.RequestNumberTagProvider
 import java.io.InterruptedIOException
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.toJavaDuration
@@ -27,6 +28,7 @@ internal class TaggedHttpLoggingInterceptorIntegrationTest {
 
     @BeforeEach
     fun setUp() {
+        RequestNumberTagProvider.resetGlobalCounter()
         server.start()
     }