prometheus_exporter 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 194941c0e02ab01e7e35d9931b66d2403100eab66b7b8708b5e512a400293bb8
-  data.tar.gz: 4059f738ec94d58d91c676ac24da5f2d6abd006d4b38ac42ca18ba92af43ab6b
+  metadata.gz: 88f0f450fbf76e51d739c1f9abc7cea62e2651dd366c5e9bd38df9464ebf797e
+  data.tar.gz: a89f2e00749002ba9323a6741cc682fb9bd2df051dd96cd68c9c9fd6e51d73d6
 SHA512:
-  metadata.gz: e1b835e597e67fbe25e3d8c61869f68e7c5d7d5dd51e6c0972508a3816dc81f3454ad7680b74245496a73e14e86ff43dc0569d50fe8488ece2637631f1f4c4cf
-  data.tar.gz: dcb886ecc1e568e93509fd73046cf2f498015791a41521ae567b14467ad4b2e33b93899a9145b997604bbc35916d45303e6845d31a2b284bd268bd685e4dea1e
+  metadata.gz: 32922666245bacfd8d608a4a08c255ef8103f70c7ba31974ed3c2685cc261b05df25d17e2c0bc38c50d67a576388d98ae9150b204a0385d3d516f298b77aa6e4
+  data.tar.gz: 360d70c6f3c03e31158a43f26fccee61ec25717a2b4f021ff46902b447f864533e543083d5dc675bdab0f47df93288f3f7f60157145fbea5a1e1062d6981e4fa

data/.travis

@@ -2,8 +2,8 @@ sudo: false
 dist: trusty
 language: ruby
 rvm:
- - 2.2
  - 2.3
  - 2.4
  - 2.5
+ - 2.6
  - jruby

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.7 - 08-04-2019
+
+- Fix: collector was not escaping " \ and \n correctly. This could lead
+  to a corrupt payload in some cases.
+
 0.4.6 - 02-04-2019
 
 - Feature: Allow resetting a counter
@@ -11,7 +16,7 @@
 
 0.4.4 - 13-02-2019
 
-- Feature: add support for local metric collection without using HTTP 
+- Feature: add support for local metric collection without using HTTP
 
 0.4.3 - 11-02-2019
 

data/lib/prometheus_exporter/metric/base.rb

@@ -57,6 +57,8 @@ module PrometheusExporter::Metric
       labels = (labels || {}).merge(Base.default_labels)
       if labels && labels.length > 0
         s = labels.map do |key, value|
+          value = value.to_s
+          value = escape_value(value) if needs_escape?(value)
           "#{key}=\"#{value}\""
         end.join(",")
         "{#{s}}"
@@ -70,5 +72,29 @@ module PrometheusExporter::Metric
         #{metric_text}
       TEXT
     end
+
+    private
+
+    def escape_value(str)
+      str.gsub(/[\n"\\]/m) do |m|
+        if m == "\n"
+          "\\n"
+        else
+          "\\#{m}"
+        end
+      end
+    end
+
+    # when we drop Ruby 2.3 we can drop this
+    if "".respond_to? :match?
+      def needs_escape?(str)
+        str.match?(/[\n"\\]/m)
+      end
+    else
+      def needs_escape?(str)
+        !!str.match(/[\n"\\]/m)
+      end
+    end
+
   end
 end

data/lib/prometheus_exporter/version.rb

@@ -1,3 +1,3 @@
 module PrometheusExporter
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler