fluent-plugin-honeycomb 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7083d11330f158765d8eb1e0079b7e50b1c0f979
-  data.tar.gz: a25a7b1023946e9c3a28dbdfb700bf3046f48717
+SHA256:
+  metadata.gz: 8138cd6ca1e9f12779f36bb584169c22908cfaf959d160d2cc749557ef3d6bda
+  data.tar.gz: 5f1f4af9e18dac5dc798bc072728258f95f0b7220cd3e17b1466c5c20a55db74
 SHA512:
-  metadata.gz: 7be1985ff4cbe433a9fd29b3e97dfb9ffe92eab9be59089f27177081fcea34be4341aa9a8dbe310bf1c11fc5f6caa5494d78358d6a01d3d88216dc6de017ce73
-  data.tar.gz: c8515220ffb762a2b3942795afb55460db2c2a41f64ae7a9c9b9f98d1ba22a52af110b29fcf1847004e7afce3a6fbe4203a1a0c79a271651372e7476652d43ce
+  metadata.gz: 86ad70b5484e9cbfb6c0ca7a51bf50190283a372674547b70a6d05a4a2eaa62ca5968c7257d126fccadf6bfe820a222db89c34aa8052a001e272eda3ded38ed4
+  data.tar.gz: 85de3ad6302b8f91f990e84ff6011da8fb74cb05fee8434d8696e0f29b65177ef43754e017a694e565eadc0bd185ba9376d38aaa33b9e6c3d3add6c21cee9e8a

data/README.md

@@ -29,6 +29,7 @@ Parameter | Type | Required? | Description
 | `tag_key` | string | no | If `include_tag_key` is `true`, the tag key name in the event (default: `fluentd_tag`).
 | `flatten_keys` | array | no | Flatten nested JSON data under these keys into the top-level event.
 | `dataset_from_key` | string | no | Look for this key in each event, and use its value as the destination dataset. If an event doesn't contain the key, it'll be sent to the dataset given by the `dataset` parameter.
+| `presampled_key` | string | no | Look for this key in each event, and use its value as the sample rate for the record. If an event doesn't contain the key, the logic around `sample_rate` will be used (1 out of every N events will be sent instead). If an event's `presampled_key` value is not a positive integer, the value is discarded, and the event is sent to Honeycomb with a `samplerate` of 1 (the default), ignoring the `sample_rate` configuration option. |
 
 ### Buffering options
 

data/fluent-plugin-honeycomb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'fluent-plugin-honeycomb'
-  spec.version     = '0.5.0'
+  spec.version     = '0.6.0'
 
   spec.summary     = "Fluentd output plugin for Honeycomb.io"
   spec.description = "Fluentd output plugin for Honeycomb.io"
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "webmock", "~> 2.1"
   spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "mocha"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "bump"

data/lib/fluent/plugin/out_honeycomb.rb

@@ -19,6 +19,7 @@ module Fluent
     config_param :api_host, :string, :default => "https://api.honeycomb.io"
     config_param :flatten_keys, :array, value_type: :string, :default => []
     config_param :dataset_from_key, :string, :default => ""
+    config_param :presampled_key, :string, :default => nil
 
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
@@ -63,9 +64,23 @@ module Fluent
           log.debug "Skipping record #{record}"
           next
         end
-        if @sample_rate > 1 && rand(1..@sample_rate) == 1
-          next
+
+        if @presampled_key && record.include?(@presampled_key)
+          sample_rate = record.delete(@presampled_key)
+
+          if !sample_rate.is_a?(Integer) || sample_rate < 1
+            log.warn "Record emitted a presampled key (#{@presampled_key} = #{sample_rate}), but was not a valid sample rate #{record}"
+
+            sample_rate = 1
+          end
+        else
+          sample_rate = @sample_rate
+
+          if @sample_rate > 1 && rand(1..@sample_rate) > 1
+            next
+          end
         end
+
         if @include_tag_key
           record[@tag_key] = tag
         end
@@ -84,7 +99,7 @@ module Fluent
         batch = batches[dataset]
         batch.push({
             "data" => record,
-            "samplerate" => @sample_rate,
+            "samplerate" => sample_rate,
             "time" => Time.at(time).utc.to_datetime.rfc3339
         })
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - The Honeycomb.io Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin for Honeycomb.io