Take access timestamp from arg provider

Signed-off-by: Dmitry Sulman <[email protected]>

Author: dmitrysulman

logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEvent.kt

@@ -37,7 +37,7 @@ class AccessEvent(
     context: AccessContext,
 ) : IAccessEvent,
     Serializable {
-    private val _timeStamp = System.currentTimeMillis()
+    private val _timeStamp by lazy { _serverAdapter.requestTimestamp }
     private val _sequenceNumber = context.sequenceNumberGenerator?.nextSequenceNumber() ?: 0
     private val _elapsedTime = argProvider.duration()
     private val _elapsedTimeSeconds = _elapsedTime / 1000
@@ -152,7 +152,7 @@ class AccessEvent(
         responseHeaderMap
         requestHeaderMap
         threadName
-        serverAdapter.requestTimestamp
+        timeStamp
     }
 
     override fun getRequest(): HttpServletRequest? = null

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/AccessEventTests.kt

@@ -54,6 +54,7 @@ class AccessEventTests {
 
         verify(exactly = 1) { mockContext.sequenceNumberGenerator }
         verify(exactly = 1) { mockArgProvider.duration() }
+        verify(exactly = 0) { mockArgProvider.accessDateTime() }
         verify(exactly = 0) { mockArgProvider.method() }
         verify(exactly = 0) { mockArgProvider.uri() }
         verify(exactly = 0) { mockArgProvider.protocol() }
@@ -68,6 +69,7 @@ class AccessEventTests {
         verify(exactly = 0) { mockConnectionInformation.hostPort() }
 
         repeat(2) {
+            accessEvent.timeStamp
             accessEvent.method
             accessEvent.requestURI
             accessEvent.queryString
@@ -117,6 +119,7 @@ class AccessEventTests {
         mockArgProvider: AccessLogArgProvider,
         mockConnectionInformation: ConnectionInformation,
     ) {
+        verify(exactly = 1) { mockArgProvider.accessDateTime() }
         verify(exactly = 1) { mockArgProvider.method() }
         verify(exactly = 3) { mockArgProvider.uri() }
         verify(exactly = 1) { mockArgProvider.protocol() }
@@ -300,6 +303,7 @@ class AccessEventTests {
         every { mockConnectionInformation.connectionRemoteAddress() } returns null
         val mockArgProvider = mockk<AccessLogArgProvider>()
         every { mockArgProvider.duration() } returns 0
+        every { mockArgProvider.accessDateTime() } returns null
         every { mockArgProvider.method() } returns null
         every { mockArgProvider.uri() } returns null
         every { mockArgProvider.protocol() } returns null
@@ -312,6 +316,7 @@ class AccessEventTests {
 
         val accessEvent = AccessEvent(mockArgProvider, mockContext)
 
+        accessEvent.timeStamp.shouldBeZero()
         accessEvent.method shouldBe NA
         accessEvent.requestURI shouldBe NA
         accessEvent.queryString shouldBe NA
@@ -489,6 +494,7 @@ class AccessEventTests {
         accessEvent.getAttribute(ATTRIBUTE) shouldBe NA
         accessEvent.requestContent.shouldBeEmpty()
         accessEvent.responseContent.shouldBeEmpty()
+        accessEvent.timeStamp shouldBe TIMESTAMP
         accessEvent.serverAdapter.shouldNotBeNull()
         accessEvent.serverAdapter.requestTimestamp shouldBe TIMESTAMP
         accessEvent.serverAdapter.contentLength shouldBe CONTENT_LENGTH