Fix HTTP communication logging in native images

Resolves #28

src/main/kotlin/com/kuvaszuptime/kuvasz/config/HttpCommunicationLogConfig.kt

@@ -0,0 +1,13 @@
+package com.kuvaszuptime.kuvasz.config
+
+import io.micronaut.context.annotation.ConfigurationProperties
+import io.micronaut.context.annotation.Context
+import io.micronaut.core.annotation.Introspected
+import io.micronaut.logging.LogLevel
+
+@ConfigurationProperties("http-communication-log")
+@Context
+@Introspected
+class HttpCommunicationLogConfig {
+    var level: LogLevel = LogLevel.INFO
+}

src/main/kotlin/com/kuvaszuptime/kuvasz/filters/LoggingHttpClientFilter.kt

@@ -13,7 +13,7 @@ import org.reactivestreams.Publisher
 import javax.inject.Inject
 
 @Filter("/**")
-@Requires(property = "app-config.http-communication-logging.enabled", value = "true")
+@Requires(property = "http-communication-log.enabled", value = "true")
 class LoggingHttpClientFilter
 @Inject constructor(private val service: HttpCommunicationLogger) : HttpClientFilter {
 

src/main/kotlin/com/kuvaszuptime/kuvasz/filters/LoggingHttpServerFilter.kt

@@ -13,7 +13,7 @@ import org.reactivestreams.Publisher
 import javax.inject.Inject
 
 @Filter("/**")
-@Requires(property = "app-config.http-communication-logging.enabled", value = "true")
+@Requires(property = "http-communication-log.enabled", value = "true")
 class LoggingHttpServerFilter
 @Inject constructor(private val service: HttpCommunicationLogger) : HttpServerFilter, FilterOrderProvider {
 

src/main/kotlin/com/kuvaszuptime/kuvasz/services/HttpCommunicationLogger.kt

@@ -1,19 +1,18 @@
 package com.kuvaszuptime.kuvasz.services
 
 import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
-import com.kuvaszuptime.kuvasz.util.toNullable
-import com.kuvaszuptime.kuvasz.util.unnest
+import com.kuvaszuptime.kuvasz.config.HttpCommunicationLogConfig
 import io.micronaut.context.annotation.Requires
 import io.micronaut.core.annotation.Introspected
-import io.micronaut.core.io.buffer.ByteBuffer
 import io.micronaut.http.HttpHeaders
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
+import io.micronaut.logging.LogLevel
 import org.slf4j.LoggerFactory
 import java.net.URI
+import javax.inject.Inject
 import javax.inject.Singleton
 
 @Introspected
@@ -22,12 +21,15 @@ data class HttpMessageLog(
     val method: String,
     val uri: URI,
     val headers: List<String>?,
-    val body: Any?
+    val body: String?
 )
 
 @Singleton
-@Requires(property = "app-config.http-communication-logging.enabled", value = "true")
-class HttpCommunicationLogger {
+@Requires(property = "http-communication-log.enabled", value = "true")
+class HttpCommunicationLogger @Inject constructor(httpLogConfig: HttpCommunicationLogConfig) {
+
+    private val withHeaders = httpLogConfig.level.ordinal <= LogLevel.DEBUG.ordinal
+    private val withBody = httpLogConfig.level.ordinal <= LogLevel.TRACE.ordinal
 
     companion object {
         private val objectMapper = ObjectMapper().apply {
@@ -39,59 +41,28 @@ class HttpCommunicationLogger {
     }
 
     fun log(request: HttpRequest<*>) {
-        logger.info(
-            objectMapper.writeValueAsString(
-                request.toLog(
-                    withHeaders = logger.isDebugEnabled,
-                    withBody = logger.isTraceEnabled
-                )
-            )
-        )
+        logger.info(objectMapper.writeValueAsString(request.toLog()))
     }
 
     fun log(request: HttpRequest<*>, response: HttpResponse<*>) {
-        logger.info(
-            objectMapper.writeValueAsString(
-                response.toLog(
-                    request,
-                    withHeaders = logger.isDebugEnabled,
-                    withBody = logger.isTraceEnabled
-                )
-            )
-        )
+        logger.info(objectMapper.writeValueAsString(response.toLog(request)))
     }
 
-    private fun HttpRequest<*>.toLog(
-        withHeaders: Boolean,
-        withBody: Boolean
-    ): HttpMessageLog =
+    private fun HttpRequest<*>.toLog(): HttpMessageLog =
         HttpMessageLog(
             method = method.name,
             uri = uri,
             headers = if (withHeaders) headers.toList() else null,
-            body = if (withBody) body.unnest().toNullable() else null
+            body = if (withBody) getBody(String::class.java).orElse("") else null
         )
 
-    private fun HttpResponse<*>.toLog(
-        request: HttpRequest<*>,
-        withHeaders: Boolean,
-        withBody: Boolean
-    ): HttpMessageLog =
+    private fun HttpResponse<*>.toLog(request: HttpRequest<*>): HttpMessageLog =
         HttpMessageLog(
             status = status.code,
             method = request.method.name,
             uri = request.uri,
             headers = if (withHeaders) headers.toList() else null,
-            body = if (withBody) {
-                body.unnest().toNullable()?.let { nonNullBody ->
-                    when (nonNullBody) {
-                        is ByteBuffer<*> -> getBody(JsonNode::class.java).toNullable()
-                        else -> nonNullBody
-                    }
-                }
-            } else {
-                null
-            }
+            body = if (withBody) getBody(String::class.java).orElse("") else null
         )
 
     private fun HttpHeaders.toList() = flatMap { (key, value) -> value.map { "$key: $it" } }

src/main/resources/application-dev.yml

@@ -13,9 +13,8 @@ datasources:
     username: 'postgres'
     password: 'pass'
 ---
-app-config:
-  http-communication-logging:
-    enabled: true
+http-communication-log:
+  enabled: true
 ---
 handler-config:
   smtp-event-handler:

src/main/resources/application.yml

@@ -74,10 +74,12 @@ jooq:
       sql-dialect: POSTGRES
 ---
 app-config:
-  http-communication-logging:
-    enabled: ${ENABLE_HTTP_COMMUNICATION_LOG:`false`}
   data-retention-days: ${DATA_RETENTION_DAYS:`30`}
 ---
+http-communication-log:
+  enabled: ${ENABLE_HTTP_COMMUNICATION_LOG:`false`}
+  level: ${HTTP_COMMUNICATION_LOG_LEVEL:`INFO`}
+---
 handler-config:
   log-event-handler:
     enabled: ${ENABLE_LOG_EVENT_HANDLER:`true`}

src/main/resources/logback-dev.xml

@@ -1,5 +1,4 @@
 <configuration>
-    <contextListener class="com.kuvaszuptime.kuvasz.config.LoggerStartupListener"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <withJansi>true</withJansi>
         <!-- encoders are assigned the type
@@ -11,7 +10,6 @@
         </encoder>
     </appender>
 
-    <logger name="com.kuvaszuptime.kuvasz.services.HttpCommunicationLogger" level="${HTTP_COMMUNICATION_LOG_LEVEL}"/>
     <logger name="org.jooq.Constants" level="WARN"/>
     <logger name="org.jooq" level="INFO"/>
 

src/main/resources/logback.xml

@@ -1,5 +1,4 @@
 <configuration>
-    <contextListener class="com.kuvaszuptime.kuvasz.config.LoggerStartupListener"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <withJansi>true</withJansi>
         <!-- encoders are assigned the type
@@ -12,7 +11,6 @@
     </appender>
 
     <logger name="org.jooq" level="ERROR"/>
-    <logger name="com.kuvaszuptime.kuvasz.services.HttpCommunicationLogger" level="${HTTP_COMMUNICATION_LOG_LEVEL}"/>
 
     <root level="info">
         <appender-ref ref="STDOUT"/>

src/test/resources/application-test.yml

@@ -13,9 +13,9 @@ datasources:
   default:
     maximumPoolSize: 3
 ---
-app-config:
-  http-communication-logging:
-    enabled: true
+http-communication-log:
+  enabled: true
+  level: TRACE
 ---
 admin-auth:
   username: test-user

src/test/resources/logback-test.xml

@@ -1,5 +1,4 @@
 <configuration>
-    <contextListener class="com.kuvaszuptime.kuvasz.config.LoggerStartupListener"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <withJansi>true</withJansi>
         <!-- encoders are assigned the type
@@ -11,7 +10,6 @@
         </encoder>
     </appender>
 
-    <logger name="com.kuvaszuptime.kuvasz.services.HttpCommunicationLogger" level="TRACE"/>
     <logger name="org.jooq.Constants" level="WARN"/>
     <logger name="org.jooq" level="DEBUG"/>