Skip to content

fix: missing headers for http response logs [WPB-21930] #3795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yamilmedina merged 1 commit into from
Jan 15, 2026
Merged

fix: missing headers for http response logs [WPB-21930] #3795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 13 additions & 36 deletions data/network/src/commonMain/kotlin/com/wire/kalium/network/KaliumHttpLogger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import io.ktor.http.HttpHeaders
import io.ktor.http.HttpStatusCode
import io.ktor.http.Url
import io.ktor.http.content.OutgoingContent
import io.ktor.http.contentLength
import io.ktor.http.contentType
import kotlinx.atomicfu.atomic
import kotlinx.coroutines.Job

Expand All @@ -55,34 +57,13 @@ internal class KaliumHttpLogger(

val content = request.body as OutgoingContent

when {
level.info -> {
val obfuscatedHeaders = obfuscatedHeaders(request.headers.entries().map { it.key to it.value }).toMutableMap()
content.contentLength?.let { obfuscatedHeaders[HttpHeaders.ContentLength] = it.toString() }
content.contentType?.let { obfuscatedHeaders[HttpHeaders.ContentType] = it.toString() }
obfuscatedHeaders.putAll(obfuscatedHeaders(content.headers.entries().map { it.key to it.value }))
if (level.headers) {
val obfuscatedHeaders = obfuscatedHeaders(request.headers.entries().map { it.key to it.value }).toMutableMap()
content.contentLength?.let { obfuscatedHeaders[HttpHeaders.ContentLength] = it.toString() }
content.contentType?.let { obfuscatedHeaders[HttpHeaders.ContentType] = it.toString() }
obfuscatedHeaders.putAll(obfuscatedHeaders(content.headers.entries().map { it.key to it.value }))

requestLog["headers"] = obfuscatedJsonMessage(obfuscatedHeaders.toJsonElement().toString())
}

level.headers -> {

val obfuscatedHeaders = obfuscatedHeaders(request.headers.entries().map { it.key to it.value }).toMutableMap()
content.contentLength?.let { obfuscatedHeaders[HttpHeaders.ContentLength] = it.toString() }
content.contentType?.let { obfuscatedHeaders[HttpHeaders.ContentType] = it.toString() }
obfuscatedHeaders.putAll(obfuscatedHeaders(content.headers.entries().map { it.key to it.value }))

requestLog["headers"] = obfuscatedJsonMessage(obfuscatedHeaders.toJsonElement().toString())
}

level.body -> {
val obfuscatedHeaders = obfuscatedHeaders(request.headers.entries().map { it.key to it.value }).toMutableMap()
content.contentLength?.let { obfuscatedHeaders[HttpHeaders.ContentLength] = it.toString() }
content.contentType?.let { obfuscatedHeaders[HttpHeaders.ContentType] = it.toString() }
obfuscatedHeaders.putAll(obfuscatedHeaders(content.headers.entries().map { it.key to it.value }))

requestLog["headers"] = obfuscatedJsonMessage(obfuscatedHeaders.toJsonElement().toString())
}
requestLog["headers"] = obfuscatedJsonMessage(obfuscatedHeaders.toJsonElement().toString())
}

return null
Expand All @@ -93,15 +74,11 @@ internal class KaliumHttpLogger(
responseLog["endpoint"] = obfuscatePath(response.call.request.url)
responseLog["status"] = response.status.value

when {
level.info -> {
// Intentionally left empty
}

level.headers -> {
val obfuscatedHeaders = obfuscatedHeaders(response.headers.entries().map { it.key to it.value }).toMutableMap()
responseLog["headers"] = obfuscatedHeaders.toMap()
}
if (level.headers) {
val obfuscatedHeaders = obfuscatedHeaders(response.headers.entries().map { it.key to it.value }).toMutableMap()
response.contentLength()?.let { obfuscatedHeaders[HttpHeaders.ContentLength] = it.toString() }
response.contentType()?.let { obfuscatedHeaders[HttpHeaders.ContentType] = it.toString() }
responseLog["headers"] = obfuscatedHeaders.toMap()
}

responseLogLevel = if (response.status.value < HttpStatusCode.BadRequest.value) {
Expand Down
Loading