fix: http trace interceptor not keeping original HttpBody properties and LogMode not behaving as expected #1035
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…and LogMode not behaving as expected
lauzadis
approved these changes
Feb 12, 2024
0marperez
approved these changes
Feb 12, 2024
ianbotsf
approved these changes
Feb 12, 2024
Comment on lines
113
to
117
| request.headers.entries() | ||
| .filterNot { it.key in skip } | ||
| .forEach { | ||
| buffer.writeUtf8(it.value.joinToString(separator = ";", prefix = "${it.key}: ", postfix = "\r\n")) | ||
| .forEach { entry -> | ||
| buffer.writeUtf8(entry.value.joinToString(separator = ";", prefix = "${entry.key}: ", postfix = "\r\n")) | ||
| } |
There was a problem hiding this comment.
Style: Consider using a destructured lambda declaration:
.forEach { (key, value) ->
buffer.writeUtf8(value.joinToString(separator = ";", prefix = "$key: ", postfix = "\r\n"))| val expectedWithContent = "$expectedNoContent$content" | ||
| assertEquals(expectedWithContent, actualWithContent) | ||
|
|
||
| val actualReplacedContent = builder.body.readAll()?.decodeToString() ?: fail("expected content") |
There was a problem hiding this comment.
Nit: Replace fail with assertNotNull:
val actualReplacedContent = assertNotNull(builder.body.readAll(), "expected content").decodeToString()
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #
fixes awslabs/aws-sdk-kotlin#1198
Description of changes
HttpBodyproperties like content length from the originalHttpBodywhen duplicating it. The issue in awslabs/aws-sdk-kotlin#1198 seems to have been caused by the fact that the original body was anAwsChunkedbody with atransfer-encoding: chunkedheader. When we replace the body during the trace call it was replaced with a non-equivalent in-memory byte array body which always has a content length.LogRequestWithBodyandLogResponseWithBodyshould implyLogRequestandLogResponserespectively. I discovered this trying to debug this issue and seeing the incorrect behaviors for dumping the canonical request from S3By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.