phihos-fluent-plugin-prometheus 2.0.3.pre.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efd374590cb67d424b01056a347218c26987535304afc2b5ab0c8dffa27ebd42
-  data.tar.gz: a959a82145c5189df3462676fca0390a7a2ebe56c1a766c5be8cc839c40212c7
+  metadata.gz: 3502c3486612aa7d3f802bb36b74e32546b0d794596ef36fd89212677f9ec7d4
+  data.tar.gz: 452afbd170f2d9236c48cd22932e9be5e5562272d400d76ca379c9e2b5e46265
 SHA512:
-  metadata.gz: e62e512ff1b137a95f26a06586cebdebb08e7ad3bd90ddb31218641ebe3c854e649446a389cd54e7f8803c60dfefa5a9f1a6d51190e646fe3df4b8602d5e0bc1
-  data.tar.gz: '08c148bcaa3707aec3b3272e1836e2cc588826f86c6d33a635b00b58cbab5b28309f255ceee3804371cf2f918cfbd3208f9dabb51f8d79122e06934d62c4a8ae'
+  metadata.gz: 68ed7e87f2d2cedc1b8f1e688cca2825a1b2ca8309a0011a2e984a6a1fe6d1a4db0e41cf89b9ba5fdf839049b298d7636ef12c8a34a8b0d64427751adcedf009
+  data.tar.gz: 413c3d13f10213e5119ce34da437c8824a0d5dfa3ec1188ccf3d885ef224db8058237abd6cd3e6e972cb0f5ecdbe5c3be1c60583777169f90b8abbc81bb54fa5

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "phihos-fluent-plugin-prometheus"
-  spec.version       = "2.0.3-1"
+  spec.version       = "2.0.3"
   spec.authors       = ["Philipp Hossner"]
   spec.email         = ["philipp.hossner@posteo.de"]
   spec.summary       = %q{A fluent plugin that collects metrics and exposes for Prometheus.}

data/lib/fluent/plugin/filter_prometheus.rb

@@ -33,13 +33,6 @@ module Fluent::Plugin
         method(:thread_current_running?),
         @log
       )
-      Fluent::Plugin::Prometheus.start_reset_threads(
-        @metrics,
-        @registry,
-        method(:thread_create),
-        method(:thread_current_running?),
-        @log
-      )
     end
 
     def filter(tag, time, record)

data/lib/fluent/plugin/out_prometheus.rb

@@ -33,13 +33,6 @@ module Fluent::Plugin
         method(:thread_current_running?),
         @log
       )
-      Fluent::Plugin::Prometheus.start_reset_threads(
-        @metrics,
-        @registry,
-        method(:thread_create),
-        method(:thread_current_running?),
-        @log
-      )
     end
 
     def process(tag, es)

data/lib/fluent/plugin/prometheus/data_store.rb

@@ -8,10 +8,6 @@ module Prometheus
         label_set = label_set_for(labels)
         @store.remove(labels: label_set)
       end
-
-      def reset_values
-        @store.reset_values
-      end
     end
   end
 end
@@ -88,12 +84,6 @@ module Fluent
               end
             end
           end
-
-          def reset_values
-            synchronize do
-              @internal_store.transform_values! { |_| 0.0 }
-            end
-          end
         end
 
         private_constant :MetricStore

data/lib/fluent/plugin/prometheus.rb

@@ -93,17 +93,6 @@ module Fluent
         end
       end
 
-      def self.start_reset_threads(metrics, registry, thread_create, thread_running, log)
-        metrics.select { |metric| metric.has_reset? }.each do |metric|
-          thread_create.call("prometheus_reset_#{metric.name}".to_sym) do
-            while thread_running.call()
-              sleep(metric.reset_after)
-              metric.reset_values(registry, log)
-            end
-          end
-        end
-      end
-
       def self.placeholder_expander(log)
         Fluent::Plugin::Prometheus::ExpandBuilder.new(log: log)
       end
@@ -181,7 +170,6 @@ module Fluent
         attr_reader :desc
         attr_reader :retention
         attr_reader :retention_check_interval
-        attr_reader :reset_after
 
         def initialize(element, registry, labels)
           ['name', 'desc'].each do |key|
@@ -199,7 +187,6 @@ module Fluent
             @last_modified_store = LastModifiedStore.new
           end
           @topk = element['topk'].to_i
-          @reset_after = element['reset_after'].to_i
 
           @base_labels = Fluent::Plugin::Prometheus.parse_labels_elements(element)
           @base_labels = labels.merge(@base_labels)
@@ -253,10 +240,6 @@ module Fluent
           @retention > 0
         end
 
-        def has_reset?
-          reset_after > 0
-        end
-
         def remove_expired_metrics(registry, log)
           if has_retention?
             metric = registry.get(@name)
@@ -274,16 +257,6 @@ module Fluent
           end
         end
 
-        def reset_values(registry, log)
-          if has_reset?
-            metric = registry.get(@name)
-            log.debug "Resetting values nof metric #{@name}..."
-            metric.reset_values
-          else
-            log.warn('reset_store should not be called when reset_after is not set for this metric!')
-          end
-        end
-
         class LastModifiedStore
           def initialize
             @internal_store = Hash.new

data/spec/fluent/plugin/filter_prometheus_spec.rb

@@ -85,7 +85,7 @@ describe Fluent::Plugin::PrometheusFilter do
     let(:message2) { { "foo" => 300, "bar" => "b" } }
     let(:message3) { { "foo" => 100, "bar" => "c" } }
 
-    context 'config with topk 2' do
+    context 'config with retention 1' do
       let(:config) {
         BASE_CONFIG + %(
           <metric>
@@ -101,7 +101,7 @@ describe Fluent::Plugin::PrometheusFilter do
         )
       }
 
-      it 'shows only top 2 metrics' do
+      it 'expires metric after max 2s' do
         expect(registry.metrics.map(&:name)).not_to eq([:simple])
         driver.run(default_tag: tag) {
           driver.feed(event_time, message1)
@@ -115,31 +115,4 @@ describe Fluent::Plugin::PrometheusFilter do
       end
     end
   end
-
-  describe '#run with reset_after' do
-    let(:message) { { "foo" => 100 } }
-
-    context 'config with reset_after 1' do
-      let(:config) {
-        BASE_CONFIG + %(
-          <metric>
-            name simple
-            type counter
-            desc Something foo.
-            key foo
-            reset_after 1
-          </metric>
-        )
-      }
-
-      it 'resets metric values after max 2s' do
-        expect(registry.metrics.map(&:name)).not_to eq([:simple])
-        driver.run(default_tag: tag) {
-          driver.feed(event_time, message)
-          sleep(2)
-        }
-        expect(registry.metrics[0].values).to eq({ {} => 0 })
-      end
-    end
-  end
 end

data/spec/fluent/plugin/out_prometheus_spec.rb

@@ -106,7 +106,7 @@ describe Fluent::Plugin::PrometheusOutput do
     let(:message2) { { "foo" => 300, "bar" => "b" } }
     let(:message3) { { "foo" => 100, "bar" => "c" } }
 
-    context 'config with topk 2' do
+    context 'config with retention 1' do
       let(:config) {
         BASE_CONFIG + %(
           <metric>
@@ -122,7 +122,7 @@ describe Fluent::Plugin::PrometheusOutput do
         )
       }
 
-      it 'shows only top 2 metrics' do
+      it 'expires metric after max 2s' do
         expect(registry.metrics.map(&:name)).not_to eq([:simple])
         driver.run(default_tag: tag) {
           driver.feed(event_time, message1)
@@ -136,31 +136,4 @@ describe Fluent::Plugin::PrometheusOutput do
       end
     end
   end
-
-  describe '#run with reset_after' do
-    let(:message) { { "foo" => 100 } }
-
-    context 'config with reset_after 1' do
-      let(:config) {
-        BASE_CONFIG + %(
-          <metric>
-            name simple
-            type counter
-            desc Something foo.
-            key foo
-            reset_after 1
-          </metric>
-        )
-      }
-
-      it 'resets metric values after max 2s' do
-        expect(registry.metrics.map(&:name)).not_to eq([:simple])
-        driver.run(default_tag: tag) {
-          driver.feed(event_time, message)
-          sleep(2)
-        }
-        expect(registry.metrics[0].values).to eq({ {} => 0 })
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phihos-fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 2.0.3.pre.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Philipp Hossner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -156,9 +156,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.5
 signing_key: