fluent-plugin-time-sampling 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b13c685c3a37cd72a52a6b94c76869644d5aaf0
-  data.tar.gz: 4a750fedf415443a7cc3c69432fed6c3ef1ac9dc
+  metadata.gz: 48c74109450def1620ed77ffd0a3f61eccce9c6e
+  data.tar.gz: 2a7af22aedaccd4f0301c23a05622867fd47ce8e
 SHA512:
-  metadata.gz: 051c2327dc905e8e6ec3e147bbb3e3c8f5c81f23537df7fbf5943e742d06d16575a1b20702c7f6b2aec0799939ff70fc4c1d3f6791be54cd4d694d10fd931163
-  data.tar.gz: 96bca62ee538425e816eccc5319376475088a014ca18e02468883700e074697cec579b2504d26ff215ffbf9c6851661be89d912a9628fa7a4f0f96ebdffff965
+  metadata.gz: 2f9d3d34e5fb1f2e09cfe2dc315da236f0b46fad216eda6794b19ff3c78092d8558fd705ed7b06146c62156215cdbf05ca686c9f6ce30c66e459bfe34e5f8340
+  data.tar.gz: ec895b440c3cdafe843f273eb1214253e978120878d403c10a82ee92e5075c117fdbacf2536c1235bcbab62fd528b475063fa2f5b8381229e7d96f2817fcf8a4

data/README.md

@@ -25,15 +25,17 @@ Example:
 
 Assume following input in 10 seconds:
 ```
-sample.tag { "hostname": "host1", "sample_key1": "foo", "sample_key2": "aaa" }
-sample.tag { "hostname": "host1", "sample_key1": "foo", "sample_key2": "bbb" }
-sample.tag { "hostname": "host2", "sample_key1": "bar", "sample_key2": "ccc" }
+test.tag { "hostname": "host1", "sample_key1": "foo", "sample_key2": "aaa" }
+test.tag { "hostname": "host1", "sample_key1": "foo", "sample_key2": "bbb" }
+test.tag { "hostname": "host2", "sample_key1": "bar", "sample_key2": "ccc" }
+test.tag { "hostname": "host2", "sample_key1": "baz", "sample_key2": "ddd" }
 ```
 
 then output is below:
 ```
-sample.tag { "hostname": "host1", "sample_key2": "aaa" }
-sample.tag { "hostname": "host2", "sample_key2": "ccc" }
+test.tag { "hostname": "host1", "sample_key2": "aaa" }
+test.tag { "hostname": "host2", "sample_key2": "ccc" }
+test.tag { "hostname": "host2", "sample_key2": "ddd" }
 ```
 
 ## Configuration

data/fluent-plugin-time-sampling.gemspec

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-time-sampling"
-  gem.version       = "1.0.2"
+  gem.version       = "1.0.3"
   gem.authors       = ["Yuki Kuwabara"]
   gem.email         = ["eramuk@gmail.com"]
-  gem.summary       = "filtering record at prescribed intervals"
+  gem.summary       = "Fluentd filter plugin to sampling from tag and keys at time interval"
   gem.description   = gem.summary
   gem.homepage      = "https://github.com/eramuk/fluent-plugin-time-sampling"
   gem.licenses      = ["MIT"]

data/lib/fluent/plugin/filter_time_sampling.rb

@@ -12,10 +12,9 @@ module Fluent::Plugin
     def configure(conf)
       super
       @cache = {}
-      @cache_period = @interval * 2
+      @cache_clear_lasttime = Time.now
+      @cache_clear_interval = @interval * 2
       @interval = -1 if @interval.zero?
-      @old_cache_clear_interval = 300
-      @old_cache_clear_time = Time.now
     end
 
     def start
@@ -46,9 +45,9 @@ module Fluent::Plugin
           record.dup : record.select { |k, v| @keep_keys.include?(k) }
       end
 
-      if Time.now > @old_cache_clear_time + @old_cache_clear_interval
-        clear_old_cache
-        @old_cache_clear_time = Time.now
+      if Time.now > @cache_clear_lasttime + @cache_clear_interval
+        clear_cache
+        @cache_clear_lasttime = Time.now
       end
 
       new_record ||= nil
@@ -67,9 +66,9 @@ module Fluent::Plugin
       end
     end
 
-    def clear_old_cache
+    def clear_cache
       @cache.each_key do |key|
-        expired = Time.now > @cache[key][:time] + @cache_period
+        expired = Time.now > @cache[key][:time]
         @cache.delete(key) if expired
       end
     end

data/test/plugin/test_filter_time_sampling.rb

@@ -10,7 +10,7 @@ class TimeSamplingFilterTest < Test::Unit::TestCase
     keep_keys sample_key2
   }
 
-  def create_driver(conf = CONFIG, tag = "tag.test")
+  def create_driver(conf = CONFIG)
     Fluent::Test::Driver::Filter.new(Fluent::Plugin::TimeSamplingFilter).configure(conf)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-time-sampling
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Yuki Kuwabara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: filtering record at prescribed intervals
+description: Fluentd filter plugin to sampling from tag and keys at time interval
 email:
 - eramuk@gmail.com
 executables: []
@@ -90,7 +90,7 @@ rubyforge_project:
 rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: filtering record at prescribed intervals
+summary: Fluentd filter plugin to sampling from tag and keys at time interval
 test_files:
 - test/helper.rb
 - test/plugin/test_filter_time_sampling.rb