fluent-plugin-mixpanel 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f52ca8a3eeb5cf55c6edafa375a7ef3baa85129
-  data.tar.gz: f1ec985b547288ee38f281513e5c6b8945a7da60
+  metadata.gz: 96a9b1fba6cc39288c0391efc0816839dcc081e7
+  data.tar.gz: ffeddf702547a2d981517dcc364af2c31cf89f70
 SHA512:
-  metadata.gz: f5bc26f5e50925291e9b46163d2b5c8e838221982441c65eea3f366820a3e199817679e2569c7dfb8f51e961d7543c0859269181f0d924ccd05dbc27511f48a4
-  data.tar.gz: 52e60e00116aa0668fc56c6a3dfe3971cd964e358800c5881acf1cc817cfe972158f60bf668350324f3375a299377410422c2b75674fc50f4ff8391db1b5f060
+  metadata.gz: 77255b4cb64f0dda7774fa891f2a52a5bffb465a4f95cb3c79b18c0449d19e49026871fde9ba41d2a8ca4434e39be362bb48628932483782ed501828237cd5df
+  data.tar.gz: e618c0d33e8de6e44dae7503c339f344bc516883941045fe89e0af92e9a975493876578235b30ea4a29b3f02ff367af2aa0662f7dcd6b1f48d7765dfcfc15fe7

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1

data/README.md

@@ -62,6 +62,18 @@ tracker.track("123", "event1", { key1: "value1", key2: "value2" })
 
 You can use tag name as event name like this. (see additional tag manipulations options below)
 
+#### Discarding mixpanel errors
+
+When delivering events to Mixpanel, Fluent creates a chunk of messages to send. By default, if one event fails to send to Mixpanel, all messages in that chunk are requeued for delivery. Enabling `discard_event_on_send_error` allows you to ignore single delivery failures. The event is logged via `info`, including the record being dropped.
+
+```
+<match output.mixpanel.*>
+  ...
+  discard_event_on_send_error true
+  ...
+</match>
+```
+
 ##PLEASE NOTE (breaking api change in a future release)
 
 The api for remove_tag_prefix will be changing in a future release. There is currently a boolean option,

data/fluent-plugin-mixpanel.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mixpanel"
-  spec.version       = "0.0.8"
+  spec.version       = "0.0.9"
   spec.authors       = ["Kazuyuki Honda"]
   spec.email         = ["hakobera@gmail.com"]
   spec.summary       = %q{Fluentd plugin to input/output event track data to mixpanel}
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "fluentd", ">= 0.10.55"
-  spec.add_runtime_dependency "mixpanel-ruby", "~> 2.1.0"
+  spec.add_runtime_dependency "mixpanel-ruby", "~> 2.2.0"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "webmock"

data/lib/fluent/plugin/mixpanel_ruby_error_handler.rb

@@ -0,0 +1,15 @@
+require 'mixpanel-ruby'
+
+class Fluent::MixpanelOutputErrorHandler < Mixpanel::ErrorHandler
+   def initialize(logger)
+     @logger = logger
+   end
+
+   def handle(error)
+     # Default behavior is to not return an error. Mixpanel-ruby gem returns
+     # true/false. If there is an error, an optional error handler is called.
+     # In this case, here, we only want to log the error for future development
+     # of error handling.
+     @logger.error "MixpanelOutputErrorHandler:\n\tClass: #{error.class.to_s}\n\tMessage: #{error.message}\n\tBacktrace: #{error.backtrace}"
+   end
+end

data/lib/fluent/plugin/out_mixpanel.rb

@@ -1,11 +1,12 @@
+require_relative "mixpanel_ruby_error_handler.rb"
 
 class Fluent::MixpanelOutput < Fluent::BufferedOutput
   Fluent::Plugin.register_output('mixpanel', self)
 
   include Fluent::HandleTagNameMixin
 
-  config_param :project_token, :string
-  config_param :api_key, :string, :default => ''
+  config_param :project_token, :string, :secret => true
+  config_param :api_key, :string, :default => '', :secret => true
   config_param :use_import, :bool, :default => nil
   config_param :distinct_id_key, :string
   config_param :event_key, :string, :default => nil
@@ -13,6 +14,7 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
   config_param :event_map_tag, :bool, :default => false
   #NOTE: This will be removed in a future release. Please specify the '.' on any prefix
   config_param :use_legacy_prefix_behavior, :default => true
+  config_param :discard_event_on_send_error, :default => false
 
   class MixpanelError < StandardError
   end
@@ -32,6 +34,7 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
     @api_key = conf['api_key']
     @use_import = conf['use_import']
     @use_legacy_prefix_behavior = conf['use_legacy_prefix_behavior']
+    @discard_event_on_send_error = conf['discard_event_on_send_error']
 
     if @event_key.nil? and !@event_map_tag
       raise Fluent::ConfigError, "'event_key' must be specifed when event_map_tag == false."
@@ -40,7 +43,8 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
 
   def start
     super
-    @tracker = Mixpanel::Tracker.new(@project_token)
+    error_handler = Fluent::MixpanelOutputErrorHandler.new(log)
+    @tracker = Mixpanel::Tracker.new(@project_token, error_handler)
   end
 
   def shutdown
@@ -68,19 +72,19 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
         data['event'] = record[@event_key]
         prop.delete(@event_key)
       else
-        log.warn('no event')
-        return
+        log.warn("no event, tag: #{tag}, time: #{time.to_s}, record: #{record.to_json}")
+        next
       end
 
       # Ignore browswer only special event
-      return if data['event'].start_with?('mp_')
+      next if data['event'].start_with?('mp_')
 
       if record[@distinct_id_key]
         data['distinct_id'] = record[@distinct_id_key]
         prop.delete(@distinct_id_key)
       else
-        log.warn('no distinct_id')
-        return
+        log.warn("no distinct_id, tag: #{tag}, time: #{time.to_s}, record: #{record.to_json}")
+        next
       end
 
       if !@ip_key.nil? and record[@ip_key]
@@ -98,13 +102,26 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
   end
 
   def send_to_mixpanel(records)
+    log.debug("sending #{records.length} to mixpanel")
+
     records.each do |record|
-     success = 	if @use_import
-        					@tracker.import(@api_key, record['distinct_id'], record['event'], record['properties'])
-      					else
-        					@tracker.track(record['distinct_id'], record['event'], record['properties'])
-      					end
-      raise MixpanelError.new("Failed to track event to mixpanel") unless success
+      success = true
+
+      if @use_import
+        success = @tracker.import(@api_key, record['distinct_id'], record['event'], record['properties'])
+      else
+        success = @tracker.track(record['distinct_id'], record['event'], record['properties'])
+      end
+
+      unless success
+        if @discard_event_on_send_error
+          msg = "Failed to track event to mixpanel:\n"
+          msg += "\tRecord: #{record.to_json}"
+          log.info(msg)
+        else
+          raise MixpanelError.new("Failed to track event to mixpanel")
+        end
+      end
     end
   end
 end

data/test/helper.rb

@@ -31,6 +31,7 @@ def unused_port
   port
 end
 
+require 'fluent/plugin/mixpanel_ruby_error_handler'
 require 'fluent/plugin/out_mixpanel'
 require 'fluent/plugin/in_http_mixpanel'
 

data/test/plugin/test_in_http_mixpanel.rb

@@ -1,9 +1,23 @@
 require 'helper'
 require 'net/http'
 require 'base64'
+require 'fluent/test'
+require 'net/http'
 
 class HttpMixpanelInputTest < Test::Unit::TestCase
-  
+
+  class << self
+    def startup
+      socket_manager_path = ServerEngine::SocketManager::Server.generate_path
+      @server = ServerEngine::SocketManager::Server.open(socket_manager_path)
+      ENV['SERVERENGINE_SOCKETMANAGER_PATH'] = socket_manager_path.to_s
+    end
+
+    def shutdown
+      @server.close
+    end
+  end
+
   def setup
     Fluent::Test.setup
   end
@@ -11,13 +25,14 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
   PORT = unused_port
   CONFIG = %[
     port #{PORT}
-    bind 127.0.0.1
+    bind "127.0.0.1"
     body_size_limit 10m
     keepalive_timeout 5
+    respond_with_empty_img true
   ]
 
   def create_driver(conf=CONFIG)
-    Fluent::Test::InputTestDriver.new(Fluent::HttpMixpanelInput).configure(conf)
+    Fluent::Test::InputTestDriver.new(Fluent::HttpMixpanelInput).configure(conf, true)
   end
 
   def test_configure
@@ -26,7 +41,7 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
     assert_equal '127.0.0.1', d.instance.bind
     assert_equal 10*1024*1024, d.instance.body_size_limit
     assert_equal 5, d.instance.keepalive_timeout
-    assert_equal false, d.instance.add_http_headers    
+    assert_equal false, d.instance.add_http_headers
   end
 
   def test_time
@@ -39,16 +54,16 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
     d.expect_emit "mixpanel.tag2", time, {"a"=>2}
 
     d.run do
-      d.expected_emits.each {|tag,time,record|
+      d.expected_emits.each {|tag, record_time, record|
         res = track("#{tag}", {"json"=>record})
         assert_equal "200", res.code
         assert_equal '1', res.body
-        assert_equal 'true', res.header['access-control-allow-credentials']
-        assert_equal 'X-Requested-With', res.header['access-control-allow-headers']
-        assert_equal 'GET, POST, OPTIONS', res.header['access-control-allow-methods']
-        assert_equal 'http://foo.example', res.header['access-control-allow-origin']
-        assert_equal '1728000', res.header['access-control-max-age']
-        assert_equal 'no-cache, no-store', res.header['cache-control']
+        assert_equal 'true', res['access-control-allow-credentials']
+        assert_equal 'X-Requested-With', res['access-control-allow-headers']
+        assert_equal 'GET, POST, OPTIONS', res['access-control-allow-methods']
+        assert_equal 'http://foo.example', res['access-control-allow-origin']
+        assert_equal '1728000', res['access-control-max-age']
+        assert_equal 'no-cache, no-store', res['cache-control']
       }
     end
   end
@@ -62,8 +77,8 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
     d.expect_emit "mixpanel.tag2", time, {"a"=>2}
 
     d.run do
-      d.expected_emits.each {|tag,time,record|
-        res = track("#{tag}", {"json"=>record, "time"=>time.to_s})
+      d.expected_emits.each {|tag, record_time, record|
+        res = track("#{tag}", {"json"=>record, "time"=>record_time.to_s})
         assert_equal "200", res.code
       }
     end
@@ -81,8 +96,8 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
     records = [["mixpanel.tag1", time, {"a"=>1}], ["mixpanel.tag2", time, {"a"=>2}]]
 
     d.run do
-      records.each {|tag,time,record|
-        res = track("#{tag}", {"json"=>record, "time"=>time.to_s})
+      records.each {|tag, record_time, record|
+        res = track("#{tag}", {"json"=>record, "time"=>record_time.to_s})
         assert_equal "200", res.code
       }
     end
@@ -99,7 +114,7 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
       event: event,
       properties: params['json']
     }
-    data = URI.escape(Base64.encode64(data.to_json))
+    data = CGI.escape(Base64.encode64(data.to_json))
     query = "data=#{data}"
     path = "/track/?#{query}"
 

data/test/plugin/test_mixpanel_ruby_error_handler.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+class MixpanelRubyErrorHandlerTest < Test::Unit::TestCase
+
+  def test_handle
+    mixpanel_error = Fluent::MixpanelOutput::MixpanelError.new("Foobar failed")
+    @io = StringIO.new
+    logger = Logger.new(@io)
+    error = Fluent::MixpanelOutputErrorHandler.new(logger)
+    error.handle(mixpanel_error)
+
+    output = @io.string
+    expected_output = "MixpanelOutputErrorHandler:\n\tClass: Fluent::MixpanelOutput::MixpanelError\n\tMessage: Foobar failed\n\tBacktrace: \n"
+    assert_match expected_output, output
+  end
+end

data/test/plugin/test_out_mixpanel.rb

@@ -1,5 +1,6 @@
 require 'helper'
 require 'uri'
+require 'msgpack'
 
 class MixpanelOutputTest < Test::Unit::TestCase
 
@@ -70,14 +71,14 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write
     stub_mixpanel
     d = create_driver(CONFIG + "event_key event")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "test_token", @out[0]['properties']['token']
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "event1",  @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
   end
@@ -85,7 +86,7 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_setting_time_via_export
     stub_mixpanel_import
     d = create_driver(CONFIG + "use_import true\nevent_key event")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record.merge!('time' => 1435707767), time)
     d.run
 
@@ -100,8 +101,8 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_multi_request
     stub_mixpanel_import
     d = create_driver(IMPORT_CONFIG + "event_key event")
-    time1 = Time.new('2014-01-01T01:23:45+00:00')
-    time2 = Time.new('2014-01-02T01:23:45+00:00')
+    time1 = Time.new('2014-01-01T01:23:45+00:00').to_i
+    time2 = Time.new('2014-01-02T01:23:45+00:00').to_i
 
     d.emit(sample_record, time1)
     d.emit(sample_record.merge(key3: "value3"), time2)
@@ -109,13 +110,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
 
     assert_equal "123",      @out[0]['properties']['distinct_id']
     assert_equal "event1",   @out[0]['event']
-    assert_equal time1.to_i, @out[0]['properties']['time']
+    assert_equal time1, @out[0]['properties']['time']
     assert_equal "value1",   @out[0]['properties']['key1']
     assert_equal "value2",   @out[0]['properties']['key2']
 
     assert_equal "123",      @out[1]['properties']['distinct_id']
     assert_equal "event1",   @out[1]['event']
-    assert_equal time2.to_i, @out[1]['properties']['time']
+    assert_equal time2, @out[1]['properties']['time']
     assert_equal "value1",   @out[1]['properties']['key1']
     assert_equal "value2",   @out[1]['properties']['key2']
     assert_equal "value2",   @out[1]['properties']['key2']
@@ -124,13 +125,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_ip_key
     stub_mixpanel
     d = create_driver(CONFIG + "event_key event\n ip_key ip_address")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record.merge('ip_address' => '192.168.0.2'), time)
     d.run
 
     assert_equal "123",         @out[0]['properties']['distinct_id']
     assert_equal "event1",      @out[0]['event']
-    assert_equal time.to_i,     @out[0]['properties']['time']
+    assert_equal time,     @out[0]['properties']['time']
     assert_equal "192.168.0.2", @out[0]['properties']['ip']
     assert_equal "value1",      @out[0]['properties']['key1']
     assert_equal "value2",      @out[0]['properties']['key2']
@@ -139,13 +140,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_no_tag_manipulation
     stub_mixpanel
     d = create_driver(CONFIG + "event_map_tag true")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "123",           @out[0]['properties']['distinct_id']
     assert_equal "mixpanel.test", @out[0]['event']
-    assert_equal time.to_i,       @out[0]['properties']['time']
+    assert_equal time,       @out[0]['properties']['time']
     assert_equal "value1",        @out[0]['properties']['key1']
     assert_equal "value2",        @out[0]['properties']['key2']
   end
@@ -153,13 +154,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_event_map_tag_removing_prefix
     stub_mixpanel
     d = create_driver(CONFIG + "remove_tag_prefix mixpanel.\n event_map_tag true")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "test",    @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
   end
@@ -167,13 +168,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_event_map_tag_removing_prefix_LEGACY
     stub_mixpanel
     d = create_driver(CONFIG + "remove_tag_prefix mixpanel\n event_map_tag true\n use_legacy_prefix_behavior true")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "test",    @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
   end
@@ -181,13 +182,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_event_map_tag_removing_prefix_LEGACY_with_dot
     stub_mixpanel
     d = create_driver(CONFIG + "remove_tag_prefix mixpanel.\n event_map_tag true\n use_legacy_prefix_behavior true")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "test",    @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
   end
@@ -195,13 +196,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_event_map_tag_removing_suffix
     stub_mixpanel
     d = create_driver(CONFIG + "remove_tag_suffix .test\n event_map_tag true")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "mixpanel",    @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
   end
@@ -209,13 +210,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_event_map_tag_adding_prefix
     stub_mixpanel
     d = create_driver(CONFIG + "add_tag_prefix foo.\n event_map_tag true")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "foo.mixpanel.test",    @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
   end
@@ -223,13 +224,13 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_with_event_map_tag_adding_suffix
     stub_mixpanel
     d = create_driver(CONFIG + "add_tag_suffix .foo\n event_map_tag true")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record, time)
     d.run
 
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "mixpanel.test.foo",    @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
   end
@@ -237,7 +238,7 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_ignore_special_event
     stub_mixpanel
     d = create_driver(CONFIG + "event_key event")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit({ user_id: '123', event: 'mp_page_view' }, time)
     d.run
 
@@ -247,14 +248,14 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_ignore_special_property
     stub_mixpanel
     d = create_driver(CONFIG + "event_key event")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record.merge('mp_event' => '3'), time)
     d.run
 
     assert_equal "test_token", @out[0]['properties']['token']
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "event1",  @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
     assert_equal false, @out[0]['properties'].key?('mp_event')
@@ -263,14 +264,14 @@ class MixpanelOutputTest < Test::Unit::TestCase
   def test_write_delete_supried_token
     stub_mixpanel
     d = create_driver(CONFIG + "event_key event")
-    time = Time.new('2014-01-01T01:23:45+00:00')
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
     d.emit(sample_record.merge('token' => '123'), time)
     d.run
 
     assert_equal "test_token", @out[0]['properties']['token']
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "event1",  @out[0]['event']
-    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal time, @out[0]['properties']['time']
     assert_equal "value1",  @out[0]['properties']['key1']
     assert_equal "value2",  @out[0]['properties']['key2']
     assert_equal false, @out[0]['properties'].key?('mp_event')
@@ -284,4 +285,87 @@ class MixpanelOutputTest < Test::Unit::TestCase
       d.run
     }
   end
+
+  def test_multiple_records_1_missing_event
+    stub_mixpanel
+    d = create_driver(CONFIG + "event_key event")
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
+    d.emit(sample_record, time)
+
+    broken_record = sample_record.dup.delete(:event)
+    d.emit(broken_record, time)
+
+    d.run
+
+    assert_equal 1, @out.length
+
+    assert_equal "test_token", @out[0]['properties']['token']
+    assert_equal "123",     @out[0]['properties']['distinct_id']
+    assert_equal "event1",  @out[0]['event']
+    assert_equal time, @out[0]['properties']['time']
+    assert_equal "value1",  @out[0]['properties']['key1']
+    assert_equal "value2",  @out[0]['properties']['key2']
+
+  end
+
+  def test_multiple_records_1_missing_distinct_id
+    stub_mixpanel
+    d = create_driver(CONFIG + "event_key event")
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
+    d.emit(sample_record, time)
+
+    broken_record = sample_record.dup.delete(:user_id)
+    d.emit(broken_record, time)
+
+    d.run
+
+    assert_equal 1, @out.length
+
+    assert_equal "test_token", @out[0]['properties']['token']
+    assert_equal "123",     @out[0]['properties']['distinct_id']
+    assert_equal "event1",  @out[0]['event']
+    assert_equal time, @out[0]['properties']['time']
+    assert_equal "value1",  @out[0]['properties']['key1']
+    assert_equal "value2",  @out[0]['properties']['key2']
+
+  end
+
+  def test_multiple_records_1_having_mp
+    stub_mixpanel
+    d = create_driver(CONFIG + "event_key event")
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
+    d.emit(sample_record, time)
+
+    broken_record = sample_record.dup.merge({ event: 'mp_foo'})
+    d.emit(broken_record, time)
+
+    d.run
+
+    assert_equal 1, @out.length
+
+    assert_equal "test_token", @out[0]['properties']['token']
+    assert_equal "123",     @out[0]['properties']['distinct_id']
+    assert_equal "event1",  @out[0]['event']
+    assert_equal time, @out[0]['properties']['time']
+    assert_equal "value1",  @out[0]['properties']['key1']
+    assert_equal "value2",  @out[0]['properties']['key2']
+
+  end
+
+  def test_request_error_discard
+    stub_mixpanel_unavailable
+    d = create_driver(CONFIG + "event_key event\ndiscard_event_on_send_error true")
+    time = Time.new('2014-01-01T01:23:45+00:00').to_i
+    d.emit(sample_record, time)
+    d.run
+
+    logs = d.instance.log.logs
+
+    assert_match "MixpanelOutputErrorHandler:", logs[0]
+    assert_match "Class: Mixpanel::ServerError", logs[0]
+    assert_match "Message: Could not write to Mixpanel, server responded with 503 returning: 'Service Unavailable", logs[0]
+    assert_match "Backtrace", logs[0]
+    assert_match "Failed to track event to mixpanel", logs[1]
+    assert_match 'Record: {"properties":{"key1":"value1","key2":"value2","time":' + time.to_s + '},"event":"event1","distinct_id":"123"}', logs[1]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mixpanel
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Kazuyuki Honda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,9 +98,11 @@ files:
 - example/index.html
 - fluent-plugin-mixpanel.gemspec
 - lib/fluent/plugin/in_http_mixpanel.rb
+- lib/fluent/plugin/mixpanel_ruby_error_handler.rb
 - lib/fluent/plugin/out_mixpanel.rb
 - test/helper.rb
 - test/plugin/test_in_http_mixpanel.rb
+- test/plugin/test_mixpanel_ruby_error_handler.rb
 - test/plugin/test_out_mixpanel.rb
 homepage: https://github.com/hakobera/fluent-plugin-mixpanel
 licenses:
@@ -122,11 +124,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to input/output event track data to mixpanel
 test_files:
 - test/helper.rb
 - test/plugin/test_in_http_mixpanel.rb
+- test/plugin/test_mixpanel_ruby_error_handler.rb
 - test/plugin/test_out_mixpanel.rb