Skip to content
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.

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

contrib/{aws/*,net/http}: fix encoding of http.url #1662

Merged
merged 4 commits into from
Jan 17, 2023
Merged

Conversation

knusbaum
Copy link
Contributor

@knusbaum knusbaum commented Jan 13, 2023

What does this PR do?

This PR ensures auth strings are not present in URLs before attaching them to spans in the http.url tag

Describe how to test/QA your changes

Create a traced http client and send a request in the form of http://abc:[email protected]/whatever and ensure that the userinfo part (abc:def) does not appear in the http.url tag in the UI.

This is likely not possible to test with the AWS integration, however the case has been covered by unit/regression tests.

Reviewer's Checklist

  • If known, an appropriate milestone has been selected; otherwise the Triage milestone is set.
  • Changed code has unit tests for its functionality.
  • If this interacts with the agent in a new way, a system test has been added.

@knusbaum knusbaum added this to the v1.47.0 milestone Jan 13, 2023
@knusbaum knusbaum requested a review from a team January 13, 2023 20:38
@pr-commenter
Copy link

pr-commenter bot commented Jan 13, 2023

Benchmarks

Comparing candidate commit 5fe9fd8 in PR branch knusbaum/url-fix with baseline commit a77f976 in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 6 cases.

@knusbaum knusbaum changed the title contrib/{aws/*,net/http}: fix encoding of user credentials in http.url Do a thing Jan 13, 2023
This PR ensures auth strings are not present in URLs before attaching
them to spans in the `http.url` tag
@knusbaum knusbaum changed the title Do a thing contrib/{aws/*,net/http}: fix encoding of http.url Jan 13, 2023
ajgajg1134
ajgajg1134 previously approved these changes Jan 17, 2023
Copy link
Contributor

@ajgajg1134 ajgajg1134 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

katiehockman
katiehockman previously approved these changes Jan 17, 2023
Copy link
Contributor

@katiehockman katiehockman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after the test suggestions we discussed offline

Copy link
Contributor

@ajgajg1134 ajgajg1134 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

APPROVED 😎

@knusbaum knusbaum merged commit 122edbe into main Jan 17, 2023
@knusbaum knusbaum deleted the knusbaum/url-fix branch January 17, 2023 20:38
knusbaum added a commit that referenced this pull request Jan 17, 2023
This PR ensures auth strings are not present in URLs before attaching
them to spans in the `http.url` tag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants