Improve path handling in pushgateway client #220
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
Sinjo
force-pushed
the
sinjo-improve-path-handling
branch
from
4bc8b43 to
100b55e
Compare
Sinjo
force-pushed
the
sinjo-improve-path-handling
branch
from
2484585 to
d177e66
Compare
Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
Sinjo
force-pushed
the
sinjo-improve-path-handling
branch
from
8137703 to
dfa5f90
Compare
When `URI.escape` was deprecated, we switched to using `CGI.escape` to construct the request path in push.rb. The problem with that is that it mishandles spaces, encoding them as `+` rather than `%20`. This leads to literal `+` characters in metric labels, which is a bug. This commit uses `ERB::Util.url_encode` instead, which gives us the behaviour we want. It's not the part of the standard library I expected to use for this, but it's the only one that seems to have the behaviour we want and that hasn't disappeared in Ruby 3.0. `WEBrick::HTTPUtils.escape` seems similar on the surface, but doesn't encode `&`. Presumably it's intended as a best-effort way to encode an entire URL, and has to assume that any `&` character is a separator between query params. Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
Sinjo
force-pushed
the
sinjo-improve-path-handling
branch
from
7b86c47 to
ec5c5aa
Compare
dmagliola
reviewed
Jun 9, 2021
|
Merging this since you've already reviewed, and it's nice not to have any more commits build up on this branch! Will spin up another branch to finish the work for #186. |
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.
This implements some of the changes from #186. This is an intermediate PR to avoid building up too many unmerged commits.