fluent-plugin-sampling-filter 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3bc7e8e8abf7ba9ab745bd507bda6cba1d6b0eb3
+  data.tar.gz: 73e288aaf2416e2c120ee5009ca05497e4f4896d
+SHA512:
+  metadata.gz: f17bcc17d7d9b8593e7c6d85c8ec5fa567484625ae43c9fd9e8cb1de0f3c0234151f46643e3645cff1457ddea98763601a87f3bd98755869a073a0c7e53fbb7b
+  data.tar.gz: 477ed760d0a90510ab1bbc8694fb8da4fd2be91a58668826a79d261b3e312f29b25b77b628f6603e2c8425cad1b462ec854395f7e334bb2e2824af203760c57d

data/.gitignore

@@ -0,0 +1,51 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+
+# For TextMate
+*.tmproj
+tmtags
+
+# For emacs:
+*~
+\#*
+.\#*
+
+# For vim:
+*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+Gemfile.lock
+vendor

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,16 +1,2 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "simplecov", ">= 0"
-  gem "rdoc"
-end
-
-gem "fluentd"
+source "https://rubygems.org"
+gemspec

data/README.md

@@ -0,0 +1,52 @@
+# fluent-plugin-sampling-filter
+
+## Component
+
+### SamplingFilterOutput
+
+This is a [Fluentd](http://fluentd.org) plugin to sample matching messages to analyse and report messages behavior and emit sampled messages with modified tag.
+
+* sampling rate per tags, or for all
+* remove_prefix of tags for input messages, and add_prefix of tags for output(sampled) messages
+
+## Configuration
+
+### SamplingFilterOutput
+
+Pickup 1/10 messages about each tags(default: `sample_unit tag`), and add tag prefix `sampled`.
+
+    <match **>
+      type sampling_filter
+      interval 10
+      add_prefix sampled
+    </match>
+    
+    <match sampled.**>
+      # output configurations where to send sampled messages
+    </match>
+
+Pickup 1/100 messages of all matched messages, and modify tags from `input.**` to `output.**`
+
+    <match input.**>
+      type sampling_filter
+      interval 100
+      sample_unit all
+      remove_prefix input
+      add_prefix output
+    </match>
+    
+    <match sampled.**>
+      # output configurations where to send sampled messages
+    </match>
+
+## TODO
+
+* consider what to do next
+* patches welcome!
+
+## Copyright
+
+* Copyright
+  * Copyright (c) 2012- TAGOMORI Satoshi (tagomoris)
+* License
+  * Apache License, Version 2.0

data/Rakefile

@@ -1,29 +1,5 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "fluent-plugin-sampling-filter"
-  gem.homepage = "http://github.com/tagomoris/fluent-plugin-sampling-filter"
-  # gem.license = "MIT"
-  gem.summary = %Q{fluentd plugin to pickup sample data from matched massages}
-  gem.description = %Q{fluentd plugin to pickup sample data from matched massages}
-  gem.email = "tagomoris@gmail.com"
-  gem.authors = ["TAGOMORI Satoshi"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -32,22 +8,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-# require 'rcov/rcovtask'
-# Rcov::RcovTask.new do |test|
-#   test.libs << 'test'
-#   test.pattern = 'test/**/test_*.rb'
-#   test.verbose = true
-#   test.rcov_opts << '--exclude "gems/*"'
-# end
-
 task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "fluent-plugin-sampling-filter #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/fluent-plugin-sampling-filter.gemspec

@@ -1,64 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "fluent-plugin-sampling-filter"
-  s.version = "0.1.2"
+Gem::Specification.new do |gem|
+  gem.name          = "fluent-plugin-sampling-filter"
+  gem.version       = "0.1.3"
+  gem.authors       = ["TAGOMORI Satoshi"]
+  gem.email         = ["tagomoris@gmail.com"]
+  gem.description   = %q{fluentd plugin to pickup sample data from matched massages}
+  gem.summary       = %q{fluentd plugin to pickup sample data from matched massages}
+  gem.homepage      = "https://github.com/tagomoris/fluent-plugin-sampling-filter"
+  gem.license       = "APLv2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["TAGOMORI Satoshi"]
-  s.date = "2012-08-08"
-  s.description = "fluentd plugin to pickup sample data from matched massages"
-  s.email = "tagomoris@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "AUTHORS",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "fluent-plugin-sampling-filter.gemspec",
-    "lib/fluent/plugin/out_sampling_filter.rb",
-    "test/helper.rb",
-    "test/plugin/test_out_sampling_filter.rb"
-  ]
-  s.homepage = "http://github.com/tagomoris/fluent-plugin-sampling-filter"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
-  s.summary = "fluentd plugin to pickup sample data from matched massages"
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluentd>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-    else
-      s.add_dependency(%q<fluentd>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<fluentd>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-  end
+  gem.add_development_dependency "rake"
+  gem.add_runtime_dependency "fluentd"
 end
-

data/lib/fluent/plugin/out_sampling_filter.rb

@@ -7,14 +7,21 @@ class Fluent::SamplingFilterOutput < Fluent::Output
   config_param :add_prefix, :string, :default => 'sampled'
   config_param :minimum_rate_per_min, :integer, :default => nil
 
+  # Define `log` method for v0.10.42 or earlier
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   def configure(conf)
     super
 
     if @remove_prefix
       @removed_prefix_string = @remove_prefix + '.'
       @removed_length = @removed_prefix_string.length
+    elsif @add_prefix.empty?
+      raise Fluent::ConfigError, "either of 'add_prefix' or 'remove_prefix' must be specified"
     end
-    @added_prefix_string = @add_prefix + '.'
+    @added_prefix_string = @add_prefix + '.' unless @add_prefix.empty?
 
     @sample_unit = case @sample_unit
                    when 'tag'
@@ -33,11 +40,11 @@ class Fluent::SamplingFilterOutput < Fluent::Output
         ( (tag.start_with?(@removed_prefix_string) and tag.length > @removed_length) or tag == @remove_prefix)
       tag = tag[@removed_length..-1]
     end
-    tag = if tag.length > 0
-            @added_prefix_string + tag
-          else
-            @add_prefix
-          end
+    if tag.length > 0
+      tag = @added_prefix_string + tag if @added_prefix_string
+    else
+      tag = @add_prefix
+    end
 
     time_record_pairs.each {|t,r|
       Fluent::Engine.emit(tag, t, r)

data/test/helper.rb

@@ -8,7 +8,6 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'test/unit'
-require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/plugin/test_out_sampling_filter.rb

@@ -144,4 +144,22 @@ minimum_rate_per_min 10
     assert_equal ((1..10).map(&:to_i)+[20,30,40,50,60,70,80,90,100]+(101..110).map(&:to_i)+[120,130]), emits.map{|t,time,r| r['times']}
     assert_equal (['x']*19 + ['y']*12), emits.map{|t,time,r| r['data']}
   end
+
+  def test_without_add_prefix_but_remove_prefix
+    config = %[
+interval 10
+add_prefix  # empty
+remove_prefix input
+]
+    d = create_driver(config, 'input.hoge3')
+    time = Time.parse("2012-01-02 13:14:15").to_i
+    d.run do
+      (1..100).each do |t|
+        d.emit({'times' => t, 'data' => 'x'})
+      end
+    end
+    emits = d.emits
+    assert_equal 10, emits.length
+    assert_equal 'hoge3', emits[0][0]
+  end
 end

metadata

@@ -1,156 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sampling-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
+  name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: fluentd plugin to pickup sample data from matched massages
-email: tagomoris@gmail.com
+email:
+- tagomoris@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
 - fluent-plugin-sampling-filter.gemspec
 - lib/fluent/plugin/out_sampling_filter.rb
 - test/helper.rb
 - test/plugin/test_out_sampling_filter.rb
-homepage: http://github.com/tagomoris/fluent-plugin-sampling-filter
-licenses: []
+homepage: https://github.com/tagomoris/fluent-plugin-sampling-filter
+licenses:
+- APLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2658451737493219281
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fluentd plugin to pickup sample data from matched massages
-test_files: []
+test_files:
+- test/helper.rb
+- test/plugin/test_out_sampling_filter.rb

data/README.rdoc

@@ -1,50 +0,0 @@
-= fluent-plugin-sampling-filter
-
-== Component
-
-=== SamplingFilterOutput
-
-Do sampling from matching messages to analyse and report messages behavior, and emit sampled messages with modified tag.
-
-- sampling rate per tags, or for all
-- remove_prefix of tags for input messages, and add_prefix of tags for output(sampled) messages
-
-== Configuration
-
-=== SamplingFilterOutput
-
-Pickup 1/10 messages about each tags(default: 'sample_unit tag'), and add tag prefix 'sampled'.
-
-    <match **>
-      type sampling_filter
-      interval 10
-      add_prefix sampled
-    </match>
-    
-    <match sampled.**>
-      # output configurations where to send sampled messages
-    </match>
-
-Pickup 1/100 messages of all matched messages, and modify tags from input.** to output.**
-
-    <match input.**>
-      type sampling_filter
-      interval 100
-      sample_unit all
-      remove_prefix input
-      add_prefix output
-    </match>
-    
-    <match sampled.**>
-      # output configurations where to send sampled messages
-    </match>
-
-== TODO
-
-- consider what to do next
-- patches welcome!
-
-== Copyright
-
-Copyright:: Copyright (c) 2012- TAGOMORI Satoshi (tagomoris)
-License::   Apache License, Version 2.0

data/VERSION

@@ -1 +0,0 @@
-0.1.2