Handle empty instance label in push.rb

Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
prometheus · Mar 27, 2021 · 8137703 · 8137703
1 parent 8f3e71a
commit 8137703
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/prometheus/client/push.rb b/lib/prometheus/client/push.rb
@@ -69,7 +69,7 @@ def parse(url)
       end
 
       def build_path(job, instance)
-        if instance
+        if instance && !instance.empty?
           format(INSTANCE_PATH, CGI::escape(job), CGI::escape(instance))
         else
           format(PATH, CGI::escape(job))

diff --git a/spec/prometheus/client/push_spec.rb b/spec/prometheus/client/push_spec.rb
@@ -76,6 +76,12 @@
       expect(push.path).to eql('/metrics/job/test-job')
     end
 
+    it 'uses the default metrics path if an empty instance value is given' do
+      push = Prometheus::Client::Push.new(job: 'bar-job', instance: '')
+
+      expect(push.path).to eql('/metrics/job/bar-job')
+    end
+
     it 'uses the full metrics path if an instance value is given' do
       push = Prometheus::Client::Push.new(job: 'bar-job', instance: 'foo')