fluent-plugin-prometheus 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8cc397b9977b5dc5215828a0ef11bfe6700c2c364214a5115636012ea06480
-  data.tar.gz: 24157ee77c8cfbda5e1b5612e97be016e46373c68e78068f0cdd504d87991ae1
+  metadata.gz: 95008f0031db355e5a5bbf4ed21f8f9f0a07839480e40bf44e974046b04f562f
+  data.tar.gz: 994a30da7b1ff0ad77f12e5b47d9218a2deb97effc31a36fa83175077cc6ed69
 SHA512:
-  metadata.gz: 4583efbf9e42ca7154f61330b0c702f0cc7190d726983d4dd6ba2f438abed1864391f45e81523a5abde8733b513de5b0a5359e7e0c97762aee83f782dafefec5
-  data.tar.gz: 6aec93c8c72d70cfbc5f328350f527d7388467d6f9be77e8cb78fce8660bd6b25dc5075943289dfad7e4ba2ebaac86f78f85b395f59ff7c1a09c8af446bf3453
+  metadata.gz: e0dc26e78e242e51e0fa87257b85c68af2ae32c11f7dabd1b4245e3ad7e1b1a7182b1b8432578f98af8a5a22d14c14e664285a238f74ebc40df0c0461026f323
+  data.tar.gz: fb31a79f327ce31e8203fa1fa9a5b9d9166410d71f9b62d4fd5411d246c768dfde5c9c076ff6e72f0d9f5bd4c7657c9180eb91ba4ee383729856da0704930404

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "1.6.1"
+  spec.version       = "1.7.0"
   spec.authors       = ["Masahiro Sano"]
   spec.email         = ["sabottenda@gmail.com"]
   spec.summary       = %q{A fluent plugin that collects metrics and exposes for Prometheus.}

data/lib/fluent/plugin/filter_prometheus.rb

@@ -22,9 +22,9 @@ module Fluent::Plugin
       @metrics = Fluent::Plugin::Prometheus.parse_metrics_elements(conf, @registry, labels)
     end
 
-    def filter_stream(tag, es)
-      instrument(tag, es, @metrics)
-      es
+    def filter(tag, time, record)
+      instrument_single(tag, time, record, @metrics)
+      record
     end
   end
 end

data/lib/fluent/plugin/prometheus.rb

@@ -88,10 +88,30 @@ module Fluent
 
       def configure(conf)
         super
+        @placeholder_values = {}
         @placeholder_expander = Fluent::Plugin::Prometheus.placeholder_expander(log)
         @hostname = Socket.gethostname
       end
 
+      def instrument_single(tag, time, record, metrics)
+        @placeholder_values[tag] ||= {
+          'tag' => tag,
+          'hostname' => @hostname,
+          'worker_id' => fluentd_worker_id,
+        }
+
+        placeholders = record.merge(@placeholder_values[tag])
+        placeholders = @placeholder_expander.prepare_placeholders(placeholders)
+        metrics.each do |metric|
+          begin
+            metric.instrument(record, @placeholder_expander, placeholders)
+          rescue => e
+            log.warn "prometheus: failed to instrument a metric.", error_class: e.class, error: e, tag: tag, name: metric.name
+            router.emit_error_event(tag, time, record, e)
+          end
+        end
+      end
+
       def instrument(tag, es, metrics)
         placeholder_values = {
           'tag' => tag,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd