icerockdev
diff --git a/‎README.md
Lines changed: 1 addition & 1 deletion b/‎README.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎sample/collection.http
Lines changed: 4 additions & 4 deletions b/‎sample/collection.http
Lines changed: 4 additions & 4 deletions
diff --git a/‎sample/src/main/kotlin/com/icerockdev/sample/server.kt
Lines changed: 4 additions & 1 deletion b/‎sample/src/main/kotlin/com/icerockdev/sample/server.kt
Lines changed: 4 additions & 1 deletion
diff --git a/‎web-utils/build.gradle.kts
Lines changed: 1 addition & 1 deletion b/‎web-utils/build.gradle.kts
Lines changed: 1 addition & 1 deletion
diff --git a/‎web-utils/src/main/kotlin/com/icerockdev/webserver/Constants.kt
Lines changed: 1 addition & 0 deletions b/‎web-utils/src/main/kotlin/com/icerockdev/webserver/Constants.kt
Lines changed: 1 addition & 0 deletions
diff --git a/‎web-utils/src/main/kotlin/com/icerockdev/webserver/FeatureConfiguration.kt
Lines changed: 7 additions & 1 deletion b/‎web-utils/src/main/kotlin/com/icerockdev/webserver/FeatureConfiguration.kt
Lines changed: 7 additions & 1 deletion
@@ -12,7 +12,7 @@ repositories {
 }
 
 // Append dependency
-implementation("com.icerockdev:web-utils:0.9.1")
+implementation("com.icerockdev:web-utils:0.9.2")
 ````
 
 ## Library usage
 
@@ -30,22 +30,22 @@ Content-Type: application/json
 
 ###
 
-GET http://127.0.0.1:8080/custom-object
+GET http://127.0.0.1:8080/custom-object?userId=123456
 Accept: application/json
 
 ###
 
-GET http://127.0.0.1:8080/exception
+GET http://127.0.0.1:8080/exception?userId=123456
 Accept: application/json
 
 ###
 
-GET http://127.0.0.1:8080/handled
+GET http://127.0.0.1:8080/handled?userId=123456
 Accept: application/json
 
 ###
 
-GET http://127.0.0.1:8080/handled2
+GET http://127.0.0.1:8080/handled2?userId=123456
 Accept: application/json
 
 ###
 
@@ -27,6 +27,7 @@ import com.icerockdev.webserver.log.LoggingConfiguration
 import com.icerockdev.webserver.log.jsonLogger
 import com.icerockdev.webserver.tools.receiveRequest
 import io.ktor.application.Application
+import io.ktor.application.ApplicationCall
 import io.ktor.application.call
 import io.ktor.application.install
 import io.ktor.features.CORS
@@ -57,7 +58,9 @@ fun Application.main() {
     }
     install(DefaultHeaders)
     install(ApplicationCallLogging) {
-        applyDefaultLogging()
+        applyDefaultLogging { call: ApplicationCall ->
+            call.parameters["userId"]
+        }
         // Log only /api requests
         // filter { call -> call.request.path().startsWith("/api") }
     }
 
@@ -17,7 +17,7 @@ apply(plugin = "java")
 apply(plugin = "kotlin")
 
 group = "com.icerockdev"
-version = "0.9.1"
+version = "0.9.2"
 
 val sourcesJar by tasks.registering(Jar::class) {
     archiveClassifier.set("sources")
 
@@ -15,6 +15,7 @@ object Constants {
     const val LOG_FIELD_TRACE_UUID: String = "traceUUID"
     const val LOG_FIELD_STATUS_CODE: String = "statusCode"
     const val LOG_FIELD_ENV: String = "env"
+    const val LOG_FIELD_USER_ID: String = "userId"
 }
 
 enum class Environment(val value: String) {
 
@@ -72,7 +72,10 @@ fun CORS.Configuration.applyDefaultCORS() {
     allowNonSimpleContentTypes = true
 }
 
-fun ApplicationCallLogging.Configuration.applyDefaultLogging(secretFieldList: List<String> = getDefaultSecretFieldList()) {
+fun ApplicationCallLogging.Configuration.applyDefaultLogging(
+    secretFieldList: List<String> = getDefaultSecretFieldList(),
+    userExtractor: (ApplicationCall) -> String? = { null }
+) {
     level = Level.TRACE
     callIdMdc(Constants.LOG_FIELD_TRACE_UUID)
     mdc(Constants.LOG_FIELD_ENV) {
@@ -109,6 +112,9 @@ fun ApplicationCallLogging.Configuration.applyDefaultLogging(secretFieldList: Li
             call.attributes.getOrNull(key = it.loggerDataKey)?.responseBody
         }
     }
+    mdc(Constants.LOG_FIELD_USER_ID) { call: ApplicationCall ->
+        userExtractor(call)
+    }
 }
 
 internal fun getDefaultSecretFieldList(): List<String> {
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ repositories {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`// Append dependency`
`15`		`-implementation("com.icerockdev:web-utils:0.9.1")`
	`15`	`+implementation("com.icerockdev:web-utils:0.9.2")`
`16`	`16`	````
`17`	`17`
`18`	`18`	`## Library usage`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ object Constants {`
`15`	`15`	`const val LOG_FIELD_TRACE_UUID: String = "traceUUID"`
`16`	`16`	`const val LOG_FIELD_STATUS_CODE: String = "statusCode"`
`17`	`17`	`const val LOG_FIELD_ENV: String = "env"`
	`18`	`+ const val LOG_FIELD_USER_ID: String = "userId"`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`enum class Environment(val value: String) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,10 @@ fun CORS.Configuration.applyDefaultCORS() {`
`72`	`72`	`allowNonSimpleContentTypes = true`
`73`	`73`	`}`
`74`	`74`
`75`		`-fun ApplicationCallLogging.Configuration.applyDefaultLogging(secretFieldList: List<String> = getDefaultSecretFieldList()) {`
	`75`	`+fun ApplicationCallLogging.Configuration.applyDefaultLogging(`
	`76`	`+ secretFieldList: List<String> = getDefaultSecretFieldList(),`
	`77`	`+ userExtractor: (ApplicationCall) -> String? = { null }`
	`78`	`+) {`
`76`	`79`	`level = Level.TRACE`
`77`	`80`	`callIdMdc(Constants.LOG_FIELD_TRACE_UUID)`
`78`	`81`	`mdc(Constants.LOG_FIELD_ENV) {`
`@@ -109,6 +112,9 @@ fun ApplicationCallLogging.Configuration.applyDefaultLogging(secretFieldList: Li`
`109`	`112`	`call.attributes.getOrNull(key = it.loggerDataKey)?.responseBody`
`110`	`113`	`}`
`111`	`114`	`}`
	`115`	`+ mdc(Constants.LOG_FIELD_USER_ID) { call: ApplicationCall ->`
	`116`	`+ userExtractor(call)`
	`117`	`+ }`
`112`	`118`	`}`
`113`	`119`
`114`	`120`	`internal fun getDefaultSecretFieldList(): List<String> {`