WD-321 Fix default logging configuration

Author: YokiToki

sample/src/main/kotlin/com/icerockdev/sample/server.kt

@@ -12,7 +12,7 @@ import com.icerockdev.exception.ValidationException
 import com.icerockdev.util.QueryParser
 import com.icerockdev.util.receiveQuery
 import com.icerockdev.webserver.*
-import com.icerockdev.webserver.log.CustomLoggingConfiguration
+import com.icerockdev.webserver.log.LoggingConfiguration
 import com.icerockdev.webserver.log.JsonDataLogger
 import com.icerockdev.webserver.log.JsonSecret
 import com.icerockdev.webserver.log.jsonLogger
@@ -42,7 +42,8 @@ fun Application.main() {
     }
     install(JsonDataLogger) {
         mapperConfiguration = getObjectMapper()
-        customLoggingConfiguration = CustomLoggingConfiguration(responseTypes = listOf(CustomResponse::class))
+        loggingConfiguration =
+            LoggingConfiguration(responseTypes = listOf(AbstractResponse::class, CustomResponse::class))
     }
     install(CallId, getCallConfiguration())
     install(ContentNegotiation) {

web-utils/src/main/kotlin/com/icerockdev/webserver/log/CustomLoggingConfiguration.kt

@@ -16,8 +16,6 @@ import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.icerockdev.api.AbstractResponse
-import com.icerockdev.api.Request
 import com.icerockdev.webserver.Constants
 import com.icerockdev.webserver.Environment
 import io.ktor.application.*
@@ -47,7 +45,7 @@ class JsonDataLogger(configure: Configuration.() -> Unit) {
         var responseStatusCodeName: String = Constants.LOG_FIELD_STATUS_CODE
         var appEnvName: String = Constants.LOG_FIELD_ENV
         var systemEnvKey: String = "env"
-        var customLoggingConfiguration: CustomLoggingConfiguration = CustomLoggingConfiguration()
+        var loggingConfiguration: LoggingConfiguration = LoggingConfiguration()
     }
 
     init {
@@ -80,10 +78,7 @@ class JsonDataLogger(configure: Configuration.() -> Unit) {
         // response data intercept
         pipeline.sendPipeline.insertPhaseBefore(ApplicationSendPipeline.Render, LoggingPhase)
         pipeline.sendPipeline.intercept(LoggingPhase) { subject ->
-            if (subject is AbstractResponse) {
-                MDC.put(configuration.responseBodyName, mapper.writeValueAsString(subject))
-            }
-            configuration.customLoggingConfiguration.responseTypes.forEach { type ->
+            configuration.loggingConfiguration.responseTypes.forEach { type ->
                 if (type.isInstance(subject)) {
                     MDC.put(configuration.responseBodyName, mapper.writeValueAsString(subject))
                 }
@@ -94,10 +89,7 @@ class JsonDataLogger(configure: Configuration.() -> Unit) {
         pipeline.receivePipeline.insertPhaseBefore(ApplicationReceivePipeline.After, LoggingPhase)
         pipeline.receivePipeline.intercept(LoggingPhase) { request ->
             val requestValue = request.value
-            if (requestValue is Request) {
-                MDC.put(configuration.requestBodyName, mapper.writeValueAsString(requestValue))
-            }
-            configuration.customLoggingConfiguration.requestTypes.forEach { type ->
+            configuration.loggingConfiguration.requestTypes.forEach { type ->
                 if (type.isInstance(requestValue)) {
                     MDC.put(configuration.requestBodyName, mapper.writeValueAsString(requestValue))
                 }

web-utils/src/main/kotlin/com/icerockdev/webserver/log/JsonDataLogger.kt

@@ -0,0 +1,10 @@
+package com.icerockdev.webserver.log
+
+import com.icerockdev.api.AbstractResponse
+import com.icerockdev.api.Request
+import kotlin.reflect.KClass
+
+class LoggingConfiguration(
+    val requestTypes: List<KClass<*>> = listOf(Request::class),
+    val responseTypes: List<KClass<*>> = listOf(AbstractResponse::class)
+)