[CLIENT] Meta header: support unknown faraday adapters

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 7.11.1
+
+### Client
+
+* Bug fix in meta header, adds support for unknown Faraday adapters. [Pull Request](https://github.com/elastic/elasticsearch-ruby/pull/1204).
+
 ## 7.11.0
 
 ### Client

docs/release_notes/711.asciidoc

@@ -1,6 +1,19 @@
-[[release_notes_710]]
+[[release_notes_711]]
 === 7.11 Release notes
 
+[discrete]
+[[release_notes_7111]]
+=== 7.11.1 Release notes
+
+[discrete]
+==== Client
+
+* Bug fix in meta header, adds support for unknown Faraday adapters. https://github.com/elastic/elasticsearch-ruby/pull/1204[Pull Request].
+
+[discrete]
+[[release_notes_7110]]
+=== 7.11.0 Release notes
+
 [discrete]
 ==== Client
 

elasticsearch-api/lib/elasticsearch/api/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module API
-    VERSION = '7.11.0'.freeze
+    VERSION = '7.11.1'.freeze
   end
 end

elasticsearch-transport/lib/elasticsearch/transport/client.rb

@@ -267,6 +267,8 @@ def meta_header_adapter
               {hc: HTTPClient::VERSION}
             when :net_http_persistent
               {np: Net::HTTP::Persistent::VERSION}
+            else
+              {}
             end
           )
         elsif defined?(Transport::HTTP::Curb) && @transport_class == Transport::HTTP::Curb

elasticsearch-transport/lib/elasticsearch/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Transport
-    VERSION = '7.11.0'.freeze
+    VERSION = '7.11.1'.freeze
   end
 end

elasticsearch-transport/spec/elasticsearch/transport/meta_header_spec.rb

@@ -150,6 +150,17 @@ def meta_version
           end
         end
       end
+
+      context 'using other' do
+        let(:adapter) { :some_other_adapter }
+
+        it 'sets adapter in the meta header' do
+          require 'net/http/persistent'
+          Faraday::Adapter.register_middleware some_other_adapter: Faraday::Adapter::NetHttpPersistent
+          expect(headers['x-elastic-client-meta']).to match(regexp)
+          expect(headers).to include('x-elastic-client-meta' => meta_header)
+        end
+      end
     end
 
     if defined?(JRUBY_VERSION)

elasticsearch-xpack/lib/elasticsearch/xpack/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module XPack
-    VERSION = '7.11.0'.freeze
+    VERSION = '7.11.1'.freeze
   end
 end

elasticsearch/elasticsearch.gemspec

@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency 'elasticsearch-transport', '7.11.0'
-  s.add_dependency 'elasticsearch-api',       '7.11.0'
+  s.add_dependency 'elasticsearch-transport', '7.11.1'
+  s.add_dependency 'elasticsearch-api',       '7.11.1'
 
   s.add_development_dependency 'bundler'
 

elasticsearch/lib/elasticsearch/version.rb

@@ -16,5 +16,5 @@
 # under the License.
 
 module Elasticsearch
-  VERSION = '7.11.0'.freeze
+  VERSION = '7.11.1'.freeze
 end