fluent-plugin-statsd-output 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e02ca71e2584cc505e7d2cd91786b363f5a5f8ea
-  data.tar.gz: 0fa458b0c88ef4b7c231a75953f62dcf9d5c176f
+  metadata.gz: 3cd9b0f7773c17c051439293fcfe14ce3e60cbd3
+  data.tar.gz: 3929c05cbb5e59c45aaddb932b884bfff9c015bc
 SHA512:
-  metadata.gz: b7751ed95c4d45e9c772419104a3c507a115c30f849c99af691c2fb5e6f278bf9e3a0835073a34c9a99b0f9441015a169db8b3134646c2cea70253e6634e5fe3
-  data.tar.gz: 0fffe9cfdc7a6b5fd0b7601536ba3b8090cf2eb628178efb721d1cd8a0b12c9e5efe9be390529af186b36a569088e80102ecd6b3c43f4a36c9842c12652104f8
+  metadata.gz: 24e3bf9bc969f442d5b0fd5d0a3b8c82c5225858b34abfe357abd015a6f34522d3e08e2f440d07a5577aa56b0b2bcb22ec7906e04553e67b581418d098d6a1b8
+  data.tar.gz: ec042e836c84efd055fa70b859e7355b7d0776bc85bd18f9d23a09f35e9fd3c009d67ad22a0877d3419e08e1fa0055168b56fb71a41f98b204c73e6b09df2087

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-statsd-output (1.2.0)
+    fluent-plugin-statsd-output (1.3.0)
       fluentd (>= 0.10.8)
       statsd-ruby (~> 1.4)
 
@@ -68,4 +68,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/fluent/plugin/out_statsd.rb

@@ -95,7 +95,7 @@ module Fluent
 
       def parse(string)
         return unless string
-        string.gsub(/\$\{.+\}/) {|str| @obj.instance_eval str[2..-2] }
+        string.gsub(/\$\{[^\}]+\}/) {|str| @obj.instance_eval str[2..-2] }
       end
     end
   end

data/spec/plugin/multiple_placeholders_spec.rb

@@ -0,0 +1,55 @@
+require 'fluent/plugin/out_statsd'
+require 'fluent/test'
+
+RSpec.describe Fluent::StatsdOutput do
+  let(:config) do
+    %{
+      type statsd
+
+      <metric>
+        statsd_type increment
+        statsd_key res_code_${record['hostname']}_${record['status'].to_i / 100}xx
+      </metric>
+    }
+  end
+  let(:driver) { create_driver(config) }
+  let(:statsd) { double('statsd', increment: 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 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
+
+    emit_events([
+      {'hostname' => 'localhost', 'response_time' => 102, 'status' => '200'},
+      {'hostname' => 'localhost', 'response_time' => 105, 'status' => '200'},
+      {'hostname' => 'localhost', 'response_time' => 112, 'status' => '400'},
+      {'hostname' => 'localhost', 'response_time' => 125, 'status' => '500'}
+    ])
+
+    driver.run
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-statsd-output
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Song
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -96,6 +96,7 @@ files:
 - VERSION
 - fluent-plugin-statsd.gemspec
 - lib/fluent/plugin/out_statsd.rb
+- spec/plugin/multiple_placeholders_spec.rb
 - spec/plugin/out_statsd_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lingochamp/fluent-plugin-statsd
@@ -122,5 +123,6 @@ 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/spec_helper.rb