fluent-plugin-buffered-metrics 0.0.1 → 0.0.2

data/README.md

@@ -57,7 +57,7 @@ Note that the following is at test configuration, appending to a file on the loc
     prefix fluentd.<hostname>.5m
     #url tcp://localhost:2003
     url file:///var/tmp/graphite_test.out
-    sum_defaults [{"-.-.-.count":0},{"-.-.-.bytes":0}]
+    sum_defaults [{"name":"-.-.-.count","value":0},{"name":"-.-.-.bytes","value":0}]
     sum_maps {"event['record'].empty? ? false : 1":["-.-.-.count","(['tag','facility','level'].map {|t| event['record'][t] || '-'}+['count']).join('.')"],"event['record'].empty? ? false : event.to_s.length":["-.-.-.bytes","(['tag','facility','level'].map {|t| event['record'][t] || '-'}+['bytes']).join('.')"]}
     metric_maps {}
     metric_defaults []
@@ -106,12 +106,14 @@ So, even though there is only one event matching condition, two distinct metrics
 ```JSON
   [
      {
-        "-.-.-.count" : 0
+        "name": "-.-.-.count",
+        "value": 0
      },
      {
-        "-.-.-.bytes" : 0
+        "name": "-.-.-.bytes",
+        "value": 0
      }
   ]
 ```
 
-The "defaults" specifications are needed if there are metrics which need to be sent with every metrics publication, even it none of the matches are met and the metric is never created during the run.  This may be more of an artifact, as this was initially done for Stackdriver, which had real issues with gaps in metrics series.
+The "defaults" specifications are needed if there are metrics which need to be sent with every metrics publication, even it none of the matches are met and the metric is never created during the run.  This may be more of an artifact, as this was initially done for Stackdriver, which had real issues with gaps in metrics series.

data/lib/fluent/plugin/out_buffered_metrics.rb

@@ -46,9 +46,9 @@ module Fluent
       unless @prefix.nil?
 
         begin
-          @prefix = eval(@prefix) || eval('"'+@prefix+'"')
-        rescue
-          raise ArgumentError, "Error setting prefix from '#{@prefix}'"
+          @prefix = eval(@prefix)
+        rescue Exception
+          @prefix = eval('"'+@prefix+'"')
         end
 
         @base_entry['prefix'] = @prefix unless @prefix.empty?
@@ -141,9 +141,7 @@ module Fluent
       end
 
       @sum_defaults.each do |e|
-        if e.key?('name') and not e['name'].nil? and not e['name'].empty?
-          sum_data[e['name']] = e['value'] unless sum_data.key?(e['name'])
-        end
+        sum_data[e['name']] = e['value'] unless sum_data.key?(e['name'])
       end
 
       @metrics_backend.buffer_append_array_of_hashes(
@@ -154,9 +152,7 @@ module Fluent
 
       @metrics_backend.buffer_append_array_of_hashes(
          @metric_defaults.map {|e|
-           if e.key?('name') and not e['name'].nil? and not e['name'].empty?
-             @base_entry.merge(e).merge({'time' => timestamp}) unless metric_data.key?(e['name'])
-          end
+           @base_entry.merge(e).merge({'time' => timestamp}) unless metric_data.key?(e['name'])
          }
       )
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluent-plugin-buffered-metrics
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alex Yamauchi
@@ -41,7 +41,7 @@ cert_chain:
   2Zk648Ep9HVPKmwoVuB75+xEQw==
   -----END CERTIFICATE-----
 
-date: 2018-04-05 00:00:00 Z
+date: 2018-04-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fluentd