fluent-plugin-latency 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b502cce2c35cb814da44e7b2b61d01b98569aa3
-  data.tar.gz: 0a1352d4b15e9d6aa3dab617b2083f776ad78007
+  metadata.gz: 2698d36098fb68c504f5ca49f6bf2937e26dd618
+  data.tar.gz: 5cba743fd33eeec4fa9657443babfb64b6606d0b
 SHA512:
-  metadata.gz: b29b35635c570151643f6a06c5fb046544878d75d6ce1d59f52da98580a7420d889c7d852955546a892e8ace28a851b282b854033abc0d7bbc1c563c076c0e58
-  data.tar.gz: 915c01177c7db1e2001ebb8043cef76524070fa9ee060360f35cfe23a9446bc52e29828fc043bf4f4b2b24f72a95b191a7bea616f8e5818977a1d72ed433a1e1
+  metadata.gz: 02d84f8dfbe1ff6ddf2df786efd8364e6128c11a94f4486529780e2bd066d4201cda310339668e5516b7ed4390e924b7aa99e2300902c21b8c330c78ceb04ee3
+  data.tar.gz: b6f987c88c32deca9333fe8ffd8501fd886a7420411a5f07581a352bc625d6c55cd301cc5a71b45b3f2c8f567b745a23ccdea9156fe99178c32f2f075ddc5b4e

data/.travis.yml

@@ -1,6 +1,10 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
+  - 2.1.*
+  - 2.2.*
+  - 2.3.0
 gemfile:
   - Gemfile
+  - Gemfile.v0.10
+  - Gemfile.v0.12
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -1,6 +1,16 @@
+## 0.0.3 (2017/09/15)
+
+Enhancements:
+
+* Support Fluentd v0.14
+
+Changes:
+
+* Revert to MultiOutput
+
 ## 0.0.2 (2014/11/26)
 
-Change:
+Changes:
 
 * Do not inherit MultiOutput, but Output
 

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-gem 'fluent-plugin-flowcounter' # for examples

data/Gemfile.v0.10

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec
+gem 'fluent-plugin-flowcounter' # for examples
+gem 'fluentd', '~> 0.10.0'

data/Gemfile.v0.12

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gemspec
+gem 'fluentd', '~> 0.12.0'

data/Rakefile

@@ -1,12 +1,13 @@
 # encoding: utf-8
 require "bundler/gem_tasks"
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
-task :default => :spec
+task :default => :test
 
 desc 'Open an irb session preloaded with the gem library'
 task :console do

data/example.conf

@@ -0,0 +1,22 @@
+<source>
+  type dummy
+  tag raw
+</source>
+
+# Latency plugin output comes here
+<match latency>
+  type stdout
+</match>
+
+# All messages come here once. 
+<match **>
+  type copy
+  <store>
+    type latency
+    tag latency
+    interval 1
+  </store>
+  <store>
+    type stdout
+  </store>
+</match>

data/fluent-plugin-latency.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-latency"
-  gem.version     = "0.0.2"
+  gem.version     = "0.0.3"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-latency"
@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "fluentd"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
   gem.add_development_dependency "timecop"
+  gem.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/out_latency.rb

@@ -1,5 +1,5 @@
 module Fluent
-  class LatencyOutput < Output
+  class LatencyOutput < MultiOutput
     Plugin.register_output('latency', self)
 
     # To support log_level option implemented by Fluentd v0.10.43
@@ -7,6 +7,11 @@ module Fluent
       define_method("log") { $log }
     end
 
+    # Define `router` method of v0.12 to support v0.10 or earlier
+    unless method_defined?(:router)
+      define_method("router") { Fluent::Engine }
+    end
+
     config_param :tag, :string, :default => 'latency'
     config_param :interval, :time, :default => 60
 
@@ -57,7 +62,7 @@ module Fluent
       max = num == 0 ? 0 : latency.max
       avg = num == 0 ? 0 : latency.map(&:to_f).inject(:+) / num.to_f
       message = {"max" => max, "avg" => avg, "num" => num}
-      Engine.emit(@tag, Engine.now, message)
+      router.emit(@tag, Engine.now, message)
     end
   end
 end

data/test/helper.rb

@@ -0,0 +1,15 @@
+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 'test/unit'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'fluent/test'
+require 'fluent/plugin/in_gc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-latency
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,13 +105,15 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.v0.10
+- Gemfile.v0.12
 - LICENSE
 - README.md
 - Rakefile
+- example.conf
 - fluent-plugin-latency.gemspec
 - lib/fluent/plugin/out_latency.rb
-- spec/out_latency_spec.rb
-- spec/spec_helper.rb
+- test/helper.rb
 homepage: https://github.com/sonots/fluent-plugin-latency
 licenses:
 - MIT
@@ -132,10 +134,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to measure latency until receiving the messages
 test_files:
-- spec/out_latency_spec.rb
-- spec/spec_helper.rb
+- test/helper.rb

data/spec/out_latency_spec.rb

@@ -1,41 +0,0 @@
-# encoding: UTF-8
-require_relative 'spec_helper'
-
-describe Fluent::LatencyOutput do
-  before { Fluent::Test.setup }
-  let(:config) { %[] }
-  let(:tag) { 'tag' }
-  let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::LatencyOutput, tag).configure(config) }
-
-  describe 'test configure' do
-    subject { driver.instance }
-
-    context "check default" do
-      let(:config) { %[] }
-      its(:tag) { should == 'latency' }
-      its(:interval) { should == 60 }
-    end
-
-    context "check config" do
-      let(:config) { %[tag tag\ninterval 120]}
-      its(:tag) { should == 'tag' }
-      its(:interval) { should == 120 }
-    end
-  end
-
-  describe 'test emit' do
-    let(:emit_time) { Time.utc(1,1,1,1,1,2010,nil,nil,nil,nil).to_i }
-    let(:current_time) { Time.utc(2,1,1,1,1,2010,nil,nil,nil,nil).to_i }
-    let(:message) { "INFO GET /ping" }
-    let(:expected) { {"max" => 1.0, "avg" => 1.0, "num" => 1} }
-    before {
-      Timecop.freeze(Time.at(current_time))
-      Fluent::Engine.should_receive(:emit).with("latency", current_time, expected)
-    }
-    after  { Timecop.return }
-    it {
-      driver.run { driver.emit({'message' => message}, emit_time) }
-      driver.instance.flush_emit
-    }
-  end
-end

data/spec/spec_helper.rb

@@ -1,14 +0,0 @@
-# encoding: UTF-8
-require 'rubygems'
-require 'bundler'
-Bundler.setup(:default, :test)
-Bundler.require(:default, :test)
-
-require 'fluent/test'
-require 'rspec'
-require 'pry'
-require 'timecop'
-
-$TESTING=true
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'fluent/plugin/out_latency'