fluent-plugin-indicative 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d91e885b3638a46fae8fd381a7dcbedcc054d43e11f8c2e99eac1c691c9544
-  data.tar.gz: 90152aadeaedcb61989ce25e0bbdf682098c0e6621e102447352a50f98522083
+  metadata.gz: 5156275d2e768b5d94cfb54dacac2edbd1730480dd13b94f02df6b3fb2345fd6
+  data.tar.gz: 8014b67c109af46ddbb9a9085cb8da4c93bc23f82a1c926418074a2832c36f6d
 SHA512:
-  metadata.gz: 59d9539774cac95d2b87ee221cdbde3f757e9637258723fe1a6d6b85dc3cf43aff52cd31755c9f89e2558eaed9bcac3082273da446849c0c135482c5f974ca73
-  data.tar.gz: d12cd7b41f43304cae2cfea5f7343e7b55bf9256f9e84ebd7d51ce638ef5d5b566f9fa9ad9dd2b2aefe243d91359392de73f550c4def63ecb0fbf515f9b83f4e
+  metadata.gz: cf214eec01b00c32e7928d2c040bc9c0e44b03c4f5fac422e363ca4bed3aaafa2f211e426ba598f63c4d41b8d1edaffa38fa579817d9ecfc27361883220edaa8
+  data.tar.gz: c7c971b0fac7a26fffd47402f1915d8bbdfe79f78da32513f1207ec29e53b6abbde6319027c99873ede53a4c7e15927cbc5964c567eb3024f6472796af9fa74a

data/fluent-plugin-indicative.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-indicative"
-  s.version     = "0.1.7"
+  s.version     = "0.1.8"
   s.authors     = ["Sam Millar"]
   s.email       = ["sam@millar.io"]
-  s.homepage    = "https://github.com/millar/fluent-plugin-indicative"
+  s.homepage    = "https://github.com/mixcloud/fluent-plugin-indicative"
   s.summary     = %q{Fluentd output plugin to send events to Indicative}
 
   s.files         = `git ls-files`.split("\n")

data/lib/fluent/plugin/out_indicative.rb

@@ -17,8 +17,6 @@ def flatten_hash(hash)
       v.each do |item|
         if item.is_a?(Hash) && item.has_key?("key") && item.has_key?("value")
           h["#{k}.#{item["key"]}"] = item["value"]
-        else
-          h["#{k}.#{item}"] = true
         end
       end
     else
@@ -37,6 +35,7 @@ class Fluent::Plugin::IndicativeOutput < Fluent::Plugin::Output
   config_param :event_name_key, :string
   config_param :event_time_key, :string
   config_param :event_unique_id_keys, :array, value_type: :string
+  config_param :event_filter_key, :string, default: nil
 
   def process(tag, es)
     es.each_slice(@batch_size) do |events|
@@ -61,7 +60,7 @@ class Fluent::Plugin::IndicativeOutput < Fluent::Plugin::Output
 
     payload = {
       apiKey: @api_key,
-      events: events.map do |data|
+      events: events.filter {|data| !@event_filter_key or data[@event_filter_key] != false}.map do |data|
         unique_id_key = @event_unique_id_keys.find {|k| data[k]}
         {
           eventName: data[@event_name_key],

data/test/plugin/test_out_indicative.rb

@@ -12,6 +12,14 @@ class IndicativeOutputTest < Test::Unit::TestCase
     event_unique_id_keys  user_id, session_id
   ]
 
+  FILTER_CONFIG = %[
+    api_key               INDICATIVE_API_KEY
+    event_name_key        event_name
+    event_time_key        created_at
+    event_unique_id_keys  user_id, session_id
+    event_filter_key      indicative
+  ]
+
   BUFFER_CONFIG = %[
     api_key               INDICATIVE_API_KEY
     event_name_key        event_name
@@ -65,24 +73,13 @@ class IndicativeOutputTest < Test::Unit::TestCase
       }.to_json, times: 1
   end
 
-  def test_emit_buffer
-    d = create_driver(BUFFER_CONFIG)
-    stub_request(:any, d.instance.api_url)
-    d.run(default_tag: 'test') do
-      5.times do
-        d.feed({'event_name' => 'screen_view', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2', 'user_id' => nil, 'screen' => {'id' => 'index'}})
-      end
-    end
-    events = d.events
-    assert_equal 0, events.length
-    assert_requested :post, d.instance.api_url, times: 1
-  end
-
-  def test_array_transformation
-    d = create_driver(STREAM_CONFIG)
+  def test_emit_stream_with_filter
+    d = create_driver(FILTER_CONFIG)
     stub_request(:any, d.instance.api_url)
     d.run(default_tag: 'test') do
-      d.feed({'event_name' => 'screen_view', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2', 'experiments': ['a', 'c']})
+      d.feed({'event_name' => 'filter_nil', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2'})
+      d.feed({'event_name' => 'filter_false', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2', 'indicative' => false})
+      d.feed({'event_name' => 'filter_true', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2', 'indicative' => true})
     end
     events = d.events
     assert_equal 0, events.length
@@ -90,20 +87,41 @@ class IndicativeOutputTest < Test::Unit::TestCase
       headers: {'Content-Type' => 'application/json'}, body: {
         'apiKey' => 'INDICATIVE_API_KEY',
         'events' => [{
-          'eventName' => 'screen_view',
+          'eventName' => 'filter_nil',
           'eventUniqueId' => 'a3bd2',
           'properties' => {
-            'event_name' => 'screen_view',
+            'event_name' => 'filter_nil',
+            'created_at' => '2015-01-01T10:00:00.000Z',
+            'session_id' => 'a3bd2'
+          },
+          'eventTime' => '2015-01-01T10:00:00+00:00'
+        }, {
+          'eventName' => 'filter_true',
+          'eventUniqueId' => 'a3bd2',
+          'properties' => {
+            'event_name' => 'filter_true',
             'created_at' => '2015-01-01T10:00:00.000Z',
             'session_id' => 'a3bd2',
-            'experiments.a' => true,
-            'experiments.c' => true
+            'indicative' => true
           },
           'eventTime' => '2015-01-01T10:00:00+00:00'
         }]
       }.to_json, times: 1
   end
 
+  def test_emit_buffer
+    d = create_driver(BUFFER_CONFIG)
+    stub_request(:any, d.instance.api_url)
+    d.run(default_tag: 'test') do
+      5.times do
+        d.feed({'event_name' => 'screen_view', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2', 'user_id' => nil, 'screen' => {'id' => 'index'}})
+      end
+    end
+    events = d.events
+    assert_equal 0, events.length
+    assert_requested :post, d.instance.api_url, times: 1
+  end
+
   def test_key_value_object_transformation
     d = create_driver(STREAM_CONFIG)
     stub_request(:any, d.instance.api_url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-indicative
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Sam Millar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,7 +95,7 @@ files:
 - lib/fluent/plugin/out_indicative.rb
 - test/helper.rb
 - test/plugin/test_out_indicative.rb
-homepage: https://github.com/millar/fluent-plugin-indicative
+homepage: https://github.com/mixcloud/fluent-plugin-indicative
 licenses: []
 metadata: {}
 post_install_message: