fluent-plugin-time-sampling 0.1.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e27fd7c88ad8400f4aecf81704ca0135b077fa8
-  data.tar.gz: 1d1abcdce48e0c6502654a2be6518f64377e6946
+  metadata.gz: 9b13c685c3a37cd72a52a6b94c76869644d5aaf0
+  data.tar.gz: 4a750fedf415443a7cc3c69432fed6c3ef1ac9dc
 SHA512:
-  metadata.gz: 8ad3bc857f5bc464d055a4d17d23107f1061ef95802ccbcc00eb7590aaf16bcf77cc11ca1dee13b41ba6611e7315e205322ba7dc370cbadea337ae2793a81ef4
-  data.tar.gz: f26d6a494bfa861b1bb95683b6e36ebd2ce2526edfc4d563f7a37808838ee51f34f4b6d2fd30792d7455c0623d87edf5ad9c52b71efc8fddcb68423812fa8d9e
+  metadata.gz: 051c2327dc905e8e6ec3e147bbb3e3c8f5c81f23537df7fbf5943e742d06d16575a1b20702c7f6b2aec0799939ff70fc4c1d3f6791be54cd4d694d10fd931163
+  data.tar.gz: 96bca62ee538425e816eccc5319376475088a014ca18e02468883700e074697cec579b2504d26ff215ffbf9c6851661be89d912a9628fa7a4f0f96ebdffff965

data/README.md

@@ -25,17 +25,15 @@ Example:
 
 Assume following input in 10 seconds:
 ```
-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" }
+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" }
 ```
 
 then output is below:
 ```
-test.tag { "hostname": "host1", "sample_key2": "aaa" }
-test.tag { "hostname": "host2", "sample_key2": "ccc" }
-test.tag { "hostname": "host2", "sample_key2": "ddd" }
+sample.tag { "hostname": "host1", "sample_key2": "aaa" }
+sample.tag { "hostname": "host2", "sample_key2": "ccc" }
 ```
 
 ## 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       = "0.1.2"
+  gem.version       = "1.0.2"
   gem.authors       = ["Yuki Kuwabara"]
   gem.email         = ["eramuk@gmail.com"]
-  gem.summary       = "Fluentd filter plugin to sampling from tag and keys at time interval"
+  gem.summary       = "filtering record at prescribed intervals"
   gem.description   = gem.summary
   gem.homepage      = "https://github.com/eramuk/fluent-plugin-time-sampling"
   gem.licenses      = ["MIT"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "fluentd", "~> 0.12.0"
+  gem.add_runtime_dependency "fluentd", ">= 0.14.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit"

data/lib/fluent/plugin/filter_time_sampling.rb

@@ -1,12 +1,9 @@
-require "fluent/output"
-require "fluent/time"
-require "fluent/timezone"
-require "fluent/config/error"
+require "fluent/plugin/filter"
 require "date"
 
-module Fluent
+module Fluent::Plugin
   class TimeSamplingFilter < Filter
-    Plugin.register_filter('time_sampling', self)
+    Fluent::Plugin.register_filter('time_sampling', self)
 
     config_param :unit, :array, value_type: :string
     config_param :keep_keys, :array, value_type: :string, default: []
@@ -15,9 +12,10 @@ module Fluent
     def configure(conf)
       super
       @cache = {}
-      @cache_clear_lasttime = Time.now
-      @cache_clear_interval = @interval * 2
+      @cache_period = @interval * 2
       @interval = -1 if @interval.zero?
+      @old_cache_clear_interval = 300
+      @old_cache_clear_time = Time.now
     end
 
     def start
@@ -48,9 +46,9 @@ module Fluent
           record.dup : record.select { |k, v| @keep_keys.include?(k) }
       end
 
-      if Time.now > @cache_clear_lasttime + @cache_clear_interval
-        clear_cache
-        @cache_clear_lasttime = Time.now
+      if Time.now > @old_cache_clear_time + @old_cache_clear_interval
+        clear_old_cache
+        @old_cache_clear_time = Time.now
       end
 
       new_record ||= nil
@@ -69,9 +67,9 @@ module Fluent
       end
     end
 
-    def clear_cache
+    def clear_old_cache
       @cache.each_key do |key|
-        expired = Time.now > @cache[key][:time]
+        expired = Time.now > @cache[key][:time] + @cache_period
         @cache.delete(key) if expired
       end
     end

data/test/helper.rb

@@ -1,5 +1,5 @@
-require 'rubygems'
-require 'bundler'
+require "rubygems"
+require "bundler"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -7,11 +7,11 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require "test/unit"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'fluent/test'
+require "fluent/test"
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|
@@ -22,7 +22,8 @@ unless ENV.has_key?('VERBOSE')
   $log = nulllogger
 end
 
-require 'fluent/plugin/filter_time_sampling'
+require "fluent/test/driver/filter"
+require "fluent/plugin/filter_time_sampling"
 
 class Test::Unit::TestCase
 end

data/test/plugin/test_filter_time_sampling.rb

@@ -10,8 +10,8 @@ class TimeSamplingFilterTest < Test::Unit::TestCase
     keep_keys sample_key2
   }
 
-  def create_driver(conf = CONFIG, tag = "test")
-    Fluent::Test::FilterTestDriver.new(Fluent::TimeSamplingFilter, tag).configure(conf)
+  def create_driver(conf = CONFIG, tag = "tag.test")
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::TimeSamplingFilter).configure(conf)
   end
 
   def test_filter
@@ -21,13 +21,11 @@ class TimeSamplingFilterTest < Test::Unit::TestCase
       {"sample_key1" => "bar", "sample_key2" => "ccc"},
     ]
     d = create_driver
-    d.run {
-      sample_records.each do |records|
-        d.filter(records, Time.now)
+    d.run(default_tag: "test") do
+      sample_records.each do |record|
+        d.feed(record)
       end
-    }
-    filtered = d.filtered_as_array
-    p filtered.map {|m| m[2] }
+    end
+    p d.filtered
   end
-
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-time-sampling
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.2
 platform: ruby
 authors:
 - Yuki Kuwabara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Fluentd filter plugin to sampling from tag and keys at time interval
+description: filtering record at prescribed intervals
 email:
 - eramuk@gmail.com
 executables: []
@@ -87,10 +87,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: Fluentd filter plugin to sampling from tag and keys at time interval
+summary: filtering record at prescribed intervals
 test_files:
 - test/helper.rb
 - test/plugin/test_filter_time_sampling.rb