fluent-plugin-groupcounter 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8cc4bf62fb23f54f31a2538cdf2ec1218e2970e
-  data.tar.gz: 8fe568adf912877846f3c26c0bb1426c2c0dba34
+  metadata.gz: 0eae1a0bcfc8a083aae95ca82cf3870d3ec1055c
+  data.tar.gz: 14201fa360defd334687a6ee18aa3722fdba9791
 SHA512:
-  metadata.gz: 13d484566258d0a0ce4b260baaebdfabb2763dcb5df908c684be4a8577173b6dbd2ddd590bbbf16ac170a080bb4b8a7675eefea15c72eed2152cd8c374b204e8
-  data.tar.gz: 93178c805d0fe9a19a206cfd3098a64cc51685f4daa0fb767a2bec45b25dc77b3f0656f85d075f2157b7b41ec63e83d0f88b05e17d1a0cd5d8e437b854e5461f
+  metadata.gz: 089d7eec6dc0e3206e105610b9e28b8f6813c927d79d006c5ec04abcdb1870adc7a4d18808fc821a3050af86ce352557cfc48da51e50d9572fdc1ee465558e3c
+  data.tar.gz: ccc024bf4414587322556d0a9725ad475786b8ac7e71c9c6cd5d07c24bf73b307a5d0169542a0e4cfd7333a566fc898b5d7653991ece26a53449cedfb0ace0d9

data/fluent-plugin-groupcounter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-groupcounter"
-  s.version     = "0.2.1"
+  s.version     = "0.2.2"
   s.authors     = ["Ryosuke IWANAGA", "Naotoshi SEO"]
   s.email       = ["@riywo", "sonots@gmail.com"]
   s.homepage    = "https://github.com/riywo/fluent-plugin-groupcounter"

data/lib/fluent/plugin/out_groupcounter.rb

@@ -37,10 +37,6 @@ class Fluent::GroupCounterOutput < Fluent::Output
   def configure(conf)
     super
 
-    if @group_by_keys.nil? and @group_by_expression.nil?
-      raise Fluent::ConfigError, "Either of group_by_keys or group_by_expression must be specified"
-    end
-
     if @count_interval
       @count_interval = @count_interval.to_i
     else
@@ -114,12 +110,13 @@ class Fluent::GroupCounterOutput < Fluent::Output
     # total_count = counts_per_tag.delete('__total_count')
 
     counts_per_tag.each do |group_key, count|
+      group_key_with = group_key.empty? ? "" : group_key + @delimiter
       output[key_prefix + group_key + @count_suffix] = count[:count] if count[:count]
-      output[key_prefix + group_key + "#{@delimiter}#{@min_key}#{@min_suffix}"] = count[:min] if count[:min]
-      output[key_prefix + group_key + "#{@delimiter}#{@max_key}#{@max_suffix}"] = count[:max] if count[:max]
-      output[key_prefix + group_key + "#{@delimiter}#{@avg_key}#{@avg_suffix}"] = count[:sum] / (count[:count] * 1.0) if count[:sum] and count[:count] > 0
-      # output[key_prefix + group_key + "#{@delimiter}rate"] = ((count[:count] * 100.0) / (1.00 * step)).floor / 100.0
-      # output[key_prefix + group_key + "#{@delimiter}percentage"] = count[:count] * 100.0 / (1.00 * total_count) if total_count > 0
+      output[key_prefix + group_key_with + "#{@min_key}#{@min_suffix}"] = count[:min] if count[:min]
+      output[key_prefix + group_key_with + "#{@max_key}#{@max_suffix}"] = count[:max] if count[:max]
+      output[key_prefix + group_key_with + "#{@avg_key}#{@avg_suffix}"] = count[:sum] / (count[:count] * 1.0) if count[:sum] and count[:count] > 0
+      # output[key_prefix + group_key_with + "rate"] = ((count[:count] * 100.0) / (1.00 * step)).floor / 100.0
+      # output[key_prefix + group_key_with + "percentage"] = count[:count] * 100.0 / (1.00 * total_count) if total_count > 0
     end
 
     output
@@ -139,7 +136,7 @@ class Fluent::GroupCounterOutput < Fluent::Output
 
       output = {}
       counts.keys.each do |tag|
-        generate_fields(counts[tag], output, stripped_tag(tag) + '_')
+        generate_fields(counts[tag], output, stripped_tag(tag) + @delimiter)
       end
       output
     end
@@ -237,9 +234,11 @@ class Fluent::GroupCounterOutput < Fluent::Output
     if @group_by_expression
       tags = tag.split('.')
       group_key = expand_placeholder(@group_by_expression, record, tag, tags, Time.at(time))
-    else # @group_by_keys
+    elsif @group_by_keys
       values = @group_by_keys.map {|key| record[key] || 'undef'}
       group_key = values.join(@delimiter)
+    else
+      return ""
     end
     group_key = group_key.to_s.force_encoding('ASCII-8BIT')
 

data/spec/out_groupcounter_spec.rb

@@ -22,13 +22,6 @@ describe Fluent::GroupCounterOutput do
   let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::GroupCounterOutput, tag).configure(config) }
 
   describe 'test configure' do
-    describe 'bad configuration' do
-      context 'test empty configuration' do
-        let(:config) { %[] }
-        it { expect { driver }.to raise_error(Fluent::ConfigError) }
-      end
-    end
-
     describe 'good configuration' do
       subject { driver.instance }
 
@@ -84,7 +77,7 @@ describe Fluent::GroupCounterOutput do
       Hash[*(expected.map {|key, val| next ["test_#{key}", val] }.flatten)] 
     end
 
-    context 'default' do
+    context 'typical' do
       let(:config) { CONFIG }
       before do
         Fluent::Engine.stub(:now).and_return(time)
@@ -221,6 +214,33 @@ describe Fluent::GroupCounterOutput do
       it { emit }
     end
 
+    context 'no group_by' do
+      let(:config) do
+        %[
+          tag_prefix count
+          output_per_tag true
+
+          count_suffix count
+          max_key reqtime
+          min_key reqtime
+          avg_key reqtime
+        ]
+      end
+      let(:expected) do
+        {
+          "count"=>4,
+          "reqtime_min"=>0.0,
+          "reqtime_max"=>3.003,
+          "reqtime_avg"=>1.5015,
+        }
+      end
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected)
+      end
+      it { emit }
+    end
+
     context 'tag' do
       context 'not effective if output_per_tag true' do
         let(:config) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-groupcounter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryosuke IWANAGA