Merge f31bdcb into c80c550

prometheus · May 21, 2020 · 37c03c4 · 37c03c4
2 parents c80c550 + f31bdcb
commit 37c03c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/prometheus/client/push.rb b/lib/prometheus/client/push.rb
@@ -66,9 +66,9 @@ def parse(url)
 
       def build_path(job, instance)
         if instance
-          format(INSTANCE_PATH, URI.escape(job), URI.escape(instance))
+          format(INSTANCE_PATH, CGI::escape(job), CGI::escape(instance))
         else
-          format(PATH, URI.escape(job))
+          format(PATH, CGI::escape(job))
         end
       end
 

diff --git a/spec/prometheus/client/push_spec.rb b/spec/prometheus/client/push_spec.rb
@@ -73,7 +73,7 @@
     it 'escapes non-URL characters' do
       push = Prometheus::Client::Push.new('bar job', 'foo <my instance>')
 
-      expected = '/metrics/job/bar%20job/instance/foo%20%3Cmy%20instance%3E'
+      expected = '/metrics/job/bar+job/instance/foo+%3Cmy+instance%3E'
       expect(push.path).to eql(expected)
     end
   end