Fix Apache HttpClient host + absolute uri #3694
Merged
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
trask
requested review from
anuraaga,
iNikem,
jkwatson,
laurit,
mateuszrzeszutek,
pavolloffay and
tylerbenson
as code owners
What is this 4.3? 😉 |
I took a slightly different approach using instanceof, but since the tests are the same may easily have the same bug |
anuraaga
reviewed
Jul 28, 2021
...o/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientRequest.java
Outdated
Show resolved
Hide resolved
...ain/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java
Outdated
Show resolved
Hide resolved
...in/groovy/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTest.groovy
Outdated
Show resolved
Hide resolved
|
@open-telemetry/java-instrumentation-approvers apologies, i got mixed up a bit between branches and apache httpclient spaghetti, and a couple of changes from this PR leaked into #3692, which is why a couple diffs in this PR are a bit weird |
trask
commented
Jul 28, 2021
Comment on lines
-126
to
-129
| // TODO(trask) substitute a non-resolving host and port to make sure that the host and port | ||
| // from this uri are not used (currently that causes redirect tests to fail | ||
| // because Apache HttpClient 5 appears to resolve relative redirects against this uri | ||
| // instead of against the host, which is different from Apache HttpClient 4 behavior) |
There was a problem hiding this comment.
this is captured in #3697 now
anuraaga
approved these changes
Jul 29, 2021
mateuszrzeszutek
approved these changes
Jul 29, 2021
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.
Noticed this gap while fixing #3692