fluent-plugin-statsd-output 1.3.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cd9b0f7773c17c051439293fcfe14ce3e60cbd3
-  data.tar.gz: 3929c05cbb5e59c45aaddb932b884bfff9c015bc
+  metadata.gz: 4e5e37a292a8dd34c2aab6f4b929b43fb323bdf8
+  data.tar.gz: 2ac05a175f7ae0a435e26a24ef43b8734b33bc71
 SHA512:
-  metadata.gz: 24e3bf9bc969f442d5b0fd5d0a3b8c82c5225858b34abfe357abd015a6f34522d3e08e2f440d07a5577aa56b0b2bcb22ec7906e04553e67b581418d098d6a1b8
-  data.tar.gz: ec042e836c84efd055fa70b859e7355b7d0776bc85bd18f9d23a09f35e9fd3c009d67ad22a0877d3419e08e1fa0055168b56fb71a41f98b204c73e6b09df2087
+  metadata.gz: 5acbc217ced43063f185d023dfacbe6b6f4e0e50b4eb2117085ee24fa3610d765cc526629816c9c45fad68a7e7ab7b623ad601f4c4c28670442c5bd4c27e9f15
+  data.tar.gz: f72243486ec03cc90ef4d6cb2fdabd5be6292db137e07bf9c176cd7f5fefe91e7c92e936cf6b382751243178942eb7dedca344bf5d77d7da273bbda4f26b7954

data/.gitignore

@@ -2,3 +2,7 @@
 *.gem
 
 spec/examples.txt
+
+# Ignore bundler things
+.bundle
+vendor/

data/.travis.yml

@@ -1,17 +1,29 @@
 sudo: enable
 dist: trusty
 language: ruby
-
 cache: bundler
-
 rvm:
-  - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-
-before_install:
-  - gem install bundler --no-doc
-
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 script: bundle exec rspec
-
+stages:
+  - test
+  - deploy
+jobs:
+  include:
+    - stage: deploy
+      cache: false
+      if: tag =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/
+      deploy:
+        script: skip
+        provider: rubygems
+        api_key:
+          secure: hIk7N6BjLuQDNJWXEc4fZPPqcygxmvQ8IDMitY3rVaXK8+1OJEutHT/ehOhBWMjEvS70OTnCYwo6cpoQkvCmW/V6cchnt5PIBdEQ4vILEh8OP2nB72AhwxnbUOgJ2Uk+EPt1XGJPqUQ0/ZqaP6uIIYClh9s9yAxQWrkJfQrecRJF2WzwWoNVXXCl0+UuH/pcKVo5jaL56zxQTOePdEcBrm/EB3YqAmdW7wHsXnm0CaWWO5VJ/6PJHlyUW4jd5EJBYesPoAEzZwjPhUqNCcg9KqHJSce41WD6eaVHdnqyUwdZCO6OOpXTSArw1XykXX/Z4EXd2QOP/g84XG6vk10hoy9+UomHxFMtGk1AP6vMOLxn9q7zF43S/as6AQdHAnegnWYZxQpW41DSXrqgOWxIFYznR/ZmD8zJR20hgXdMgYjGZq10Wy/i8Y2SUDfojuw5OGej9OehXYQ8ZBNkdSN4U5AiGYrCBOy2WGbiDehIR/EVN5yiUS6WapcRWZ2Ia9vUDgUXHOW2OdUw5N1FR1uJ+dLr5oihD6g7nweFa6qsJb+88ecz+nby9dgL+WTVlzOzBshE8q5UcdS5959wnShHUtEZP5yQDmWn4u/haL+osEO0PRu8KLick6lYzSNO0HEEELEV76mSHI+UKVZxG8T7E+WUEoskxtRn3aomQOKvQkA=
+        gem: fluent-plugin-statsd-output
+        on:
+          tags: true
+          repo: imnotjames/fluent-plugin-statsd

data/Gemfile.lock

@@ -1,61 +1,61 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-statsd-output (1.3.0)
+    fluent-plugin-statsd-output (1.4.2)
       fluentd (>= 0.10.8)
       statsd-ruby (~> 1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    coderay (1.1.1)
-    cool.io (1.5.0)
-    diff-lcs (1.2.5)
-    fluentd (0.14.17)
+    coderay (1.1.2)
+    cool.io (1.5.3)
+    diff-lcs (1.3)
+    dig_rb (1.0.1)
+    fluentd (1.3.3)
       cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 0.7.0, < 2.0.0)
       serverengine (>= 2.0.4, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (~> 0.1.7)
+      strptime (>= 0.2.2, < 1.0.0)
       tzinfo (~> 1.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
     http_parser.rb (0.6.0)
-    method_source (0.8.2)
-    msgpack (1.1.0)
-    power_assert (0.3.0)
-    pry (0.10.4)
+    method_source (0.9.2)
+    msgpack (1.2.6)
+    power_assert (1.1.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      method_source (~> 0.9.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    serverengine (2.0.5)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    serverengine (2.1.0)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    slop (3.6.0)
     statsd-ruby (1.4.0)
-    strptime (0.1.9)
-    test-unit (3.1.8)
+    strptime (0.2.3)
+    test-unit (3.2.9)
       power_assert
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2017.2)
+    tzinfo-data (1.2018.9)
       tzinfo (>= 1.0.0)
-    yajl-ruby (1.3.0)
+    yajl-ruby (1.4.1)
 
 PLATFORMS
   ruby
@@ -68,4 +68,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.15.1
+   1.17.0

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 James Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,6 +1,7 @@
 # Fluent event to statsd plugin.
 
-[![Build Status](https://travis-ci.org/lingochamp/fluent-plugin-statsd.svg?branch=master)](https://travis-ci.org/lingochamp/fluent-plugin-statsd)
+[![Build Status](https://travis-ci.com/imnotjames/fluent-plugin-statsd.svg?branch=master)](https://travis-ci.com/imnotjames/fluent-plugin-statsd)
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-statsd-output.svg)](https://badge.fury.io/rb/fluent-plugin-statsd-output)
 
 # Installation
 
@@ -8,8 +9,6 @@
 $ fluent-gem install fluent-plugin-statsd-output
 ```
 
-[![Gem Version](https://badge.fury.io/rb/fluent-plugin-statsd.png)](http://badge.fury.io/rb/fluent-plugin-statsd)
-
 # Usage
 
 ```
@@ -19,11 +18,13 @@ $ fluent-gem install fluent-plugin-statsd-output
   port 8125 # optional
   namespace a.b.c # optional
   batch_byte_size 512 # optional
+  sample_rate 0.9 # optional
 
   <metric>
     statsd_type timing
     statsd_key my_app.nginx.response_time
-    statsd_key ${record['response_time']}
+    statsd_val ${record['response_time']}
+    statsd_rate 0.6 # optional
   </metric>
 
   <metric>

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.2

data/{fluent-plugin-statsd.gemspec → fluent-plugin-statsd-output.gemspec}

@@ -4,16 +4,17 @@ $:.push File.expand_path('../lib', __FILE__)
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-statsd-output"
   gem.description = "fluentd output filter plugin to send metrics to Esty StatsD"
-  gem.homepage    = "https://github.com/lingochamp/fluent-plugin-statsd"
+  gem.homepage    = "https://github.com/imnotjames/fluent-plugin-statsd"
   gem.summary     = gem.description
   gem.version     = File.read("VERSION").strip
-  gem.authors     = ["Chris Song"]
-  gem.email       = "fakechris@gmail.com"
-  gem.has_rdoc    = false
+  gem.license     = "MIT"
+  gem.authors     = ["James Ward", "Chris Song"]
+  gem.email       = "james@notjam.es"
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
+  gem.required_ruby_version = ">= 2.1.0"
 
   gem.add_dependency "fluentd", ">= 0.10.8"
   gem.add_dependency "statsd-ruby", "~> 1.4"

data/lib/fluent/plugin/out_statsd.rb

@@ -11,11 +11,13 @@ module Fluent
     config_param :port, :string, :default => '8125'
     config_param :namespace, :string, :default => nil
     config_param :batch_byte_size, :integer, :default => nil
+    config_param :sample_rate, :float, :default => 1.0
 
     config_section :metric do
       config_param :statsd_type, :string
       config_param :statsd_key, :string
       config_param :statsd_val, :string, default: nil
+      config_param :statsd_rate, :float, default: 1.0
     end
 
     attr_reader :statsd
@@ -57,7 +59,7 @@ module Fluent
         parser = RubyStringParser.new(record: record, tag: tag)
 
         @metrics.each do |metric|
-          arg_names = %w{statsd_type statsd_key statsd_val}
+          arg_names = %w{statsd_type statsd_key statsd_val statsd_rate}
           send_to_statsd(*metric.values_at(*arg_names).map {|str| parser.parse(str) })
         end
       end
@@ -67,22 +69,24 @@ module Fluent
 
     private
 
-    def send_to_statsd(type, key, val)
-      log.debug([type, key, val])
+    def send_to_statsd(type, key, val, rate)
+      log.debug([type, key, val, rate])
+
+      rate = sample_rate if rate.nil?
 
       case type
       when 'timing'
-        @statsd.timing key, val.to_f
+        @statsd.timing key, val.to_f, rate.to_f
       when 'gauge'
-        @statsd.gauge key, val.to_f
+        @statsd.gauge key, val.to_f, rate.to_f
       when 'count'
-        @statsd.count key, val.to_f
+        @statsd.count key, val.to_f, rate.to_f
       when 'set'
-        @statsd.set key, val
+        @statsd.set key, val, rate.to_f
       when 'increment'
-        @statsd.increment key
+        @statsd.increment key, rate.to_f
       when 'decrement'
-        @statsd.decrement key
+        @statsd.decrement key, rate.to_f
       else
         raise "Invalid statsd type '#{type}'"
       end

data/spec/plugin/multiple_placeholders_spec.rb

@@ -39,9 +39,9 @@ RSpec.describe Fluent::StatsdOutput do
   it 'should call statsd with events data and correctly handle multiple placeholders' do
     allow(Statsd).to receive(:new).and_return(statsd)
 
-    expect(statsd).to receive(:increment).with('res_code_localhost_2xx').twice.times
-    expect(statsd).to receive(:increment).with('res_code_localhost_4xx').once.times
-    expect(statsd).to receive(:increment).with('res_code_localhost_5xx').once.times
+    expect(statsd).to receive(:increment).with('res_code_localhost_2xx', 1.0).twice.times
+    expect(statsd).to receive(:increment).with('res_code_localhost_4xx', 1.0).once.times
+    expect(statsd).to receive(:increment).with('res_code_localhost_5xx', 1.0).once.times
 
     emit_events([
       {'hostname' => 'localhost', 'response_time' => 102, 'status' => '200'},

data/spec/plugin/out_statsd_spec.rb

@@ -52,13 +52,13 @@ RSpec.describe Fluent::StatsdOutput do
     expect(statsd).to receive(:batch_size=).with(nil)
     expect(statsd).to receive(:batch_byte_size=).with(512)
 
-    expect(statsd).to receive(:increment).with('res_code_2xx').twice.times
-    expect(statsd).to receive(:increment).with('res_code_4xx').once.times
-    expect(statsd).to receive(:increment).with('res_code_5xx').once.times
-    expect(statsd).to receive(:timing).with('res_time', 102).ordered
-    expect(statsd).to receive(:timing).with('res_time', 105).ordered
-    expect(statsd).to receive(:timing).with('res_time', 112).ordered
-    expect(statsd).to receive(:timing).with('res_time', 125).ordered
+    expect(statsd).to receive(:increment).with('res_code_2xx', 1.0).twice.times
+    expect(statsd).to receive(:increment).with('res_code_4xx', 1.0).once.times
+    expect(statsd).to receive(:increment).with('res_code_5xx', 1.0).once.times
+    expect(statsd).to receive(:timing).with('res_time', 102, 1.0).ordered
+    expect(statsd).to receive(:timing).with('res_time', 105, 1.0).ordered
+    expect(statsd).to receive(:timing).with('res_time', 112, 1.0).ordered
+    expect(statsd).to receive(:timing).with('res_time', 125, 1.0).ordered
 
     emit_events([
       {'response_time' => 102, 'status' => '200'},

data/spec/plugin/statsd_rate_override.rb

@@ -0,0 +1,65 @@
+require 'fluent/plugin/out_statsd'
+require 'fluent/test'
+
+RSpec.describe Fluent::StatsdOutput do
+  let(:config) do
+    %{
+      type statsd
+      namespace a.b.c
+      batch_byte_size 512
+
+      <metric>
+        statsd_type timing
+        statsd_key res_time
+        statsd_val ${record['response_time']}
+        statsd_rate 0.4
+      </metric>
+    }
+  end
+  let(:driver) { create_driver(config) }
+  let(:statsd) { double('statsd', increment: true,
+                                  timing: true,
+                                  flush: true,
+                                  'namespace=' => true,
+                                  'batch_size=' => true,
+                                  'batch_byte_size' => true)
+
+               }
+  let(:time) { Time.now.utc }
+
+  before :all do
+    Fluent::Test.setup
+  end
+
+  def create_driver(conf)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::StatsdOutput) {
+    }.configure(conf)
+  end
+
+  def emit_events(events)
+    events.each {|e| driver.emit(e, time) }
+  end
+
+
+  it 'should call statsd with events data' do
+    allow(Statsd).to receive(:new).and_return(statsd)
+
+    expect(statsd).to receive(:namespace=).with('a.b.c')
+    expect(statsd).to receive(:batch_size=).with(nil)
+    expect(statsd).to receive(:batch_byte_size=).with(512)
+
+    expect(statsd).to receive(:timing).with('res_time', 102, 0.4).ordered
+    expect(statsd).to receive(:timing).with('res_time', 105, 0.4).ordered
+    expect(statsd).to receive(:timing).with('res_time', 112, 0.4).ordered
+    expect(statsd).to receive(:timing).with('res_time', 125, 0.4).ordered
+
+    emit_events([
+      {'response_time' => 102, 'status' => '200'},
+      {'response_time' => 105, 'status' => '200'},
+      {'response_time' => 112, 'status' => '400'},
+      {'response_time' => 125, 'status' => '500'}
+    ])
+
+    driver.run
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-statsd-output
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.2
 platform: ruby
 authors:
+- James Ward
 - Chris Song
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -81,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: fluentd output filter plugin to send metrics to Esty StatsD
-email: fakechris@gmail.com
+email: james@notjam.es
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,15 +93,18 @@ files:
 - AUTHORS
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - VERSION
-- fluent-plugin-statsd.gemspec
+- fluent-plugin-statsd-output.gemspec
 - lib/fluent/plugin/out_statsd.rb
 - spec/plugin/multiple_placeholders_spec.rb
 - spec/plugin/out_statsd_spec.rb
+- spec/plugin/statsd_rate_override.rb
 - spec/spec_helper.rb
-homepage: https://github.com/lingochamp/fluent-plugin-statsd
-licenses: []
+homepage: https://github.com/imnotjames/fluent-plugin-statsd
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -110,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -118,11 +122,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: fluentd output filter plugin to send metrics to Esty StatsD
 test_files:
 - spec/plugin/multiple_placeholders_spec.rb
 - spec/plugin/out_statsd_spec.rb
+- spec/plugin/statsd_rate_override.rb
 - spec/spec_helper.rb