[CLIENT] Updates manticore headers setup

Author: picandocodigo

elasticsearch-transport/lib/elasticsearch/transport/transport/base.rb

@@ -18,7 +18,6 @@
 module Elasticsearch
   module Transport
     module Transport
-
       # @abstract Module with common functionality for transport implementations.
       #
       module Base
@@ -431,7 +430,7 @@ def apply_headers(client, options)
         end
 
         def find_value(hash, regex)
-          key_value = hash.find { |k,v| k.to_s.downcase =~ regex }
+          key_value = hash.find { |k, _| k.to_s.downcase =~ regex }
           if key_value
             hash.delete(key_value[0])
             key_value[1]

elasticsearch-transport/lib/elasticsearch/transport/transport/http/manticore.rb

@@ -62,8 +62,14 @@ module HTTP
         class Manticore
           include Base
 
-          def initialize(arguments={}, &block)
-            @request_options = { headers: (arguments.dig(:transport_options, :headers) || {}) }
+          def initialize(arguments = {}, &block)
+            @request_options = {
+              headers: (
+                arguments.dig(:transport_options, :headers) ||
+                arguments.dig(:options, :transport_options, :headers) ||
+                {}
+              )
+            }
             @manticore = build_client(arguments[:options] || {})
             super(arguments, &block)
           end
@@ -113,8 +119,7 @@ def perform_request(method, path, params={}, body=nil, headers=nil, opts={})
           # @return [Connections::Collection]
           #
           def __build_connections
-            apply_headers(@request_options, options[:transport_options])
-            apply_headers(@request_options, options)
+            apply_headers(options)
 
             Connections::Collection.new \
               :connections => hosts.map { |host|
@@ -157,12 +162,12 @@ def host_unreachable_exceptions
 
           private
 
-          def apply_headers(request_options, options)
-            headers = options&.[](:headers) || {}
+          def apply_headers(options)
+            headers = options.dig(:headers) || options.dig(:transport_options, :headers) || {}
             headers[CONTENT_TYPE_STR] = find_value(headers, CONTENT_TYPE_REGEX) || DEFAULT_CONTENT_TYPE
-            headers[USER_AGENT_STR] = find_value(headers, USER_AGENT_REGEX) || user_agent_header
+            headers[USER_AGENT_STR] = find_value(headers, USER_AGENT_REGEX) || find_value(@request_options[:headers], USER_AGENT_REGEX) || user_agent_header
             headers[ACCEPT_ENCODING] = GZIP if use_compression?
-            request_options[:headers].merge!(headers)
+            @request_options[:headers].merge!(headers)
           end
 
           def user_agent_header