fluent-plugin-elasticsearch 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef45e29f8c3a6ff15a0abd5cf6161bc17774c48c84a5d768b33b7b9d0482d9ea
-  data.tar.gz: 2a05a508cbf5763de05e58e1a3a8a3549a36e85610684fd7365825fbcec1b056
+  metadata.gz: 6c5093f6c265f2f0ac3cd14caea2f3fbe35e3ec8298d0c5f7189caeab58303e6
+  data.tar.gz: 36feb2e651446883c84b8e41dfceb8f0d16e53920938c623540db83c7ae92a38
 SHA512:
-  metadata.gz: 29565f1f6a3a11de6a96ee9961c3361b51cb688bf4dac65702a9977687402af454b55526df3532c628fdf2369e733a65c4dda4526c4f2b896a094d1885c854f2
-  data.tar.gz: 2970335562ad4bb92e8de45862999ff974b4c76dda3a8257c14d7559ed0a04e91bb37b2aa793d3cfee847637475a27fae59cb8b4d3c49a1962008ce626b0ad1a
+  metadata.gz: 858f0656ee19d31d7dde01a0df664269eb350f79c58fe051f4881479a74c11b4448800a04f36bb6c01dbd03800bbf5fa3c3b8ccca0a5a9bb3e1b5a9cb300875d
+  data.tar.gz: 2a9bf33a6840fcd246117d362e83524a79544b61a3a19ad977b1407d8bf8577bc5634a71952a34e78f553194b23595341324b451ba18f01b79942b46a40a2984

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 3.5.3
+- Handle nil items response (#611)
+
 ### 3.5.2
 - Fix `@meta_config_map` creation timing (#592)
 

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '3.5.2'
+  s.version       = '3.5.3'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/elasticsearch_error_handler.rb

@@ -56,10 +56,13 @@ class Fluent::Plugin::ElasticsearchErrorHandler
         next
       end
       item = items.shift
-      if item.has_key?(@plugin.write_operation)
+      if item.is_a?(Hash) && item.has_key?(@plugin.write_operation)
         write_operation = @plugin.write_operation
-      elsif INDEX_OP == @plugin.write_operation && item.has_key?(CREATE_OP)
+      elsif INDEX_OP == @plugin.write_operation && item.is_a?(Hash) && item.has_key?(CREATE_OP)
         write_operation = CREATE_OP
+      elsif item.nil?
+        stats[:errors_nil_resp] += 1
+        next
       else
         # When we don't have an expected ops field, something changed in the API
         # expected return values (ES 2.x)

data/test/plugin/test_elasticsearch_error_handler.rb

@@ -145,6 +145,20 @@ class TestElasticsearchErrorHandler < Test::Unit::TestCase
     end
   end
 
+  def test_nil_items_responses
+    records = [{time: 123, record: {"foo" => "bar", '_id' => 'abc'}}]
+    response = parse_response(%({
+      "took" : 0,
+      "errors" : true,
+      "items" : [{}]
+     }))
+    chunk = MockChunk.new(records)
+    dummy_extracted_values = []
+    @handler.handle_error(response, 'atag', chunk, records.length, dummy_extracted_values)
+    assert_equal(0, @plugin.error_events.size)
+    assert_nil(@plugin.error_events[0])
+  end
+
   def test_dlq_400_responses
     records = [{time: 123, record: {"foo" => "bar", '_id' => 'abc'}}]
     response = parse_response(%({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd