fluent-plugin-elasticsearch 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157eb6e8f0c5412c1eec69c86be920e6737c2ed172cfd62618d284ae99bb68fc
-  data.tar.gz: 30d6c01d4626bbc016fe97e95caf529e1be40afa48196e806aebbc02457b7119
+  metadata.gz: ef45e29f8c3a6ff15a0abd5cf6161bc17774c48c84a5d768b33b7b9d0482d9ea
+  data.tar.gz: 2a05a508cbf5763de05e58e1a3a8a3549a36e85610684fd7365825fbcec1b056
 SHA512:
-  metadata.gz: 5b2830f040fda0e697a7b6e54eff371d78858637476eae95e8bbce7edc7334cb38b29977961b0ccf4f52aebb084638e4b4a8f3a8f5023766d28ec1781ab5b400
-  data.tar.gz: 8518ef11cdeca51a115e0be1201df72df0639c33e00f2b200148ede002e32d2a734cbba4e7b3accc16d25eed91120615277ba1ac40e39a901198f0d60425443a
+  metadata.gz: 29565f1f6a3a11de6a96ee9961c3361b51cb688bf4dac65702a9977687402af454b55526df3532c628fdf2369e733a65c4dda4526c4f2b896a094d1885c854f2
+  data.tar.gz: 2970335562ad4bb92e8de45862999ff974b4c76dda3a8257c14d7559ed0a04e91bb37b2aa793d3cfee847637475a27fae59cb8b4d3c49a1962008ce626b0ad1a

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 3.5.2
+- Fix `@meta_config_map` creation timing (#592)
+
 ### 3.5.1
 - Configurable split request size threshold (#586)
 

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.1'
+  s.version       = '3.5.2'
   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/out_elasticsearch.rb

@@ -205,13 +205,6 @@ EOC
         end
       end
 
-      # Consider missing the prefix of "$." in nested key specifiers.
-      @id_key = convert_compat_id_key(@id_key) if @id_key
-      @parent_key = convert_compat_id_key(@parent_key) if @parent_key
-      @routing_key = convert_compat_id_key(@routing_key) if @routing_key
-
-      @meta_config_map = create_meta_config_map
-
       @serializer_class = nil
       begin
         require 'oj'
@@ -285,7 +278,13 @@ EOC
         log.warn "To prevent events traffic jam, you should specify 2 or more 'flush_thread_count'."
       end
 
+      # Consider missing the prefix of "$." in nested key specifiers.
+      @id_key = convert_compat_id_key(@id_key) if @id_key
+      @parent_key = convert_compat_id_key(@parent_key) if @parent_key
+      @routing_key = convert_compat_id_key(@routing_key) if @routing_key
+
       @routing_key_name = configure_routing_key_name
+      @meta_config_map = create_meta_config_map
       @current_config = nil
 
       @ignore_exception_classes = @ignore_exceptions.map do |exception|

data/test/plugin/test_out_elasticsearch.rb

@@ -475,7 +475,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     # creation
     stub_request(:put, "https://john:doe@logs.google.com:777/es//_template/myapp_alias_template").
       to_return(:status => 200, :body => "", :headers => {})
-    
+
     driver(config)
 
     assert_requested(:put, "https://john:doe@logs.google.com:777/es//_template/myapp_alias_template", times: 1)
@@ -520,7 +520,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     # put the alias for the index
     stub_request(:put, "https://john:doe@logs.google.com:777/es//%3Cmylogs-myapp-%7Bnow%2Fw%7Bxxxx.ww%7D%7D-000001%3E/_alias/myapp_deflector").
       to_return(:status => 200, :body => "", :headers => {})
-    
+
     driver(config)
 
     assert_requested(:put, "https://john:doe@logs.google.com:777/es//_template/myapp_alias_template", times: 1)
@@ -584,7 +584,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     # creation
     stub_request(:put, "https://john:doe@logs.google.com:777/es//_template/myapp_alias_template").
       to_return(:status => 200, :body => "", :headers => {})
-    
+
     driver(config)
 
     assert_requested(:put, "https://john:doe@logs.google.com:777/es//_template/myapp_alias_template", times: 1)
@@ -629,7 +629,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     # put the alias for the index
     stub_request(:put, "https://john:doe@logs.google.com:777/es//%3Cmylogs-myapp-%7Bnow%2Fd%7D-000001%3E/_alias/myapp_deflector").
       to_return(:status => 200, :body => "", :headers => {})
-  
+
     driver(config)
 
     assert_requested(:put, "https://john:doe@logs.google.com:777/es//_template/myapp_alias_template", times: 1)
@@ -2049,7 +2049,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
 
   class AddsRoutingKeyWhenConfiguredTest < self
     def test_es6
-      driver('', 6).configure("routing_key routing_id\n")
+      driver("routing_key routing_id\n", 6)
       stub_elastic
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)
@@ -2058,7 +2058,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     end
 
     def test_es7
-      driver('', 7).configure("routing_key routing_id\n")
+      driver("routing_key routing_id\n", 7)
       stub_elastic
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -737,7 +737,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
 
   class AddsRoutingKeyWhenConfiguredTest < self
     def test_es6
-      driver('', 6).configure("routing_key routing_id\n")
+      driver("routing_key routing_id\n", 6)
       stub_elastic
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)
@@ -746,7 +746,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     end
 
     def test_es7
-      driver('', 7).configure("routing_key routing_id\n")
+      driver("routing_key routing_id\n", 7)
       stub_elastic
       driver.run(default_tag: 'test') do
         driver.feed(sample_record)

metadata

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