ApacheHttpClientRedirectInstrumentation copy headers from original request to redirect if original redirect headers were empty #1539
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
lpriima
changed the title
lpriima
force-pushed
the
lpriima/copy_headers_if_redirect_headers_were_empty
branch
3 times, most recently
from
8694b17
to
883cfdd
Compare
richardstartin
requested changes
Jun 4, 2020
| // will be empty. So in case if not-instrumented redirect had no headers, | ||
| // we just copy all not set headers from original to redirect (doing same | ||
| // thing as apache httpclient does). | ||
| if (redirect.getAllHeaders().length == 0) { |
There was a problem hiding this comment.
This allocates a new array. Instead you can do
if (!redirect.iterator().hasNext()) {
...
}which will do a lot less work when there are a lot of headers.
…quest to redirect if original redirect headers were empty
lpriima
force-pushed
the
lpriima/copy_headers_if_redirect_headers_were_empty
branch
from
883cfdd
to
17b1c39
Compare
tylerbenson
approved these changes
Jun 4, 2020
|
I agree with @tylerbenson . I think this warrants at least 1 test to prevent regressions |
richardstartin
approved these changes
Jun 4, 2020
lpriima
force-pushed
the
lpriima/copy_headers_if_redirect_headers_were_empty
branch
2 times, most recently
from
4ede207
to
fbd8084
Compare
bantonsson
approved these changes
Jun 5, 2020
| @@ -53,6 +55,19 @@ abstract class HttpClientTest extends AgentTestRunner { | |||
| handleDistributedRequest() | |||
| redirect(server.address.resolve("/circular-redirect").toURL().toString()) | |||
| } | |||
| prefix("secured") { | |||
| handleDistributedRequest() | |||
| println("secured: " + request.headers.headers) | |||
There was a problem hiding this comment.
Could we drop this println?
lpriima
force-pushed
the
lpriima/copy_headers_if_redirect_headers_were_empty
branch
from
fbd8084
to
45eb00c
Compare
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.
ApacheHttpClientRedirectInstrumentation:
copy headers from original request to redirect request only if original redirect headers were empty without additinal headers