elastic-transport 8.0.0 → 8.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbf4a3586e25fe9a9bacee53636589bd2635970266f6938c3588547569b5c406
-  data.tar.gz: 8d2d465485ecc3efd421089feb5f5fd8a81d036c2b77d8d3811e0c0ac8a13c0c
+  metadata.gz: '019bec0fce3232610f573b32a72456674018954609728aba574165f3e4b16393'
+  data.tar.gz: 9f5ef21b2823bccf5c6e22c47420bf543931b1b76cd3b7050272cababffe2929
 SHA512:
-  metadata.gz: 392a3e7e09c0e59b424e0181eea6115fd4781928e51b1efde6450e56ac9099634071cbc8db95959b0adb6c48e961d2c76af3c8a434628012f22984922e05f025
-  data.tar.gz: 8dafbedfbf736513077414861a494bd43bd21410b9c236c8f3b5e2cc8771dfcd9005ffdbf79ec574d819429ddc65fc1f11461194fc2c100d534185c6f4cebd30
+  metadata.gz: 623ad8af7121423ae67655c684293a14f41faffbf76368fc8b2b4b23ce0a48793d238b209d3f8867808a8567b496d6186c8e700be9371d59839154f460f52eb3
+  data.tar.gz: 7cdbcbcb8ab41e11a1a3acd5de8b25520b10823e2706cc8d432fb7057d06181cb0730272289614b34302182d925b82d31a422a0a664c461051db34ce81c3939d

data/.github/workflows/tests.yml

@@ -7,14 +7,16 @@ on:
     branches:
       - main
 jobs:
-  test-ruby:
+  test:
+    name: 'Main tests'
     env:
       TEST_ES_SERVER: http://localhost:9250
       PORT: 9250
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0', '3.1', 'jruby-9.3' ]
+        ruby: [ '2.7', '3.0', '3.1', 'jruby-9.3' ]
+        es_version: ['8.2-SNAPSHOT', '8.3-SNAPSHOT', '8.4-SNAPSHOT']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -26,7 +28,8 @@ jobs:
         sudo sysctl -w vm.max_map_count=262144
     - uses: elastic/elastic-github-actions/elasticsearch@master
       with:
-        stack-version: 8.0.0-SNAPSHOT
+        stack-version: ${{ matrix.es_version }}
+        security-enabled: false
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -42,4 +45,42 @@ jobs:
       run: bundle exec rake test:spec
     - name: integration tests
       run: bundle exec rake test:integration
-
+  test-faraday1:
+    name: 'Test Faraday 1'
+    env:
+      TEST_ES_SERVER: http://localhost:9250
+      PORT: 9250
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '3.0', '3.1', 'jruby-9.3' ]
+        es_version: ['8.3.0-SNAPSHOT']
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Increase system limits
+      run: |
+        sudo swapoff -a
+        sudo sysctl -w vm.swappiness=1
+        sudo sysctl -w fs.file-max=262144
+        sudo sysctl -w vm.max_map_count=262144
+    - uses: elastic/elastic-github-actions/elasticsearch@master
+      with:
+        stack-version: ${{ matrix.es_version }}
+        security-enabled: false
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Build and test with Rake
+      run: |
+        sudo apt-get update
+        sudo apt-get install libcurl4-openssl-dev
+        ruby -v
+        gem install bundler
+        BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle install
+    - name: faraday1 unit tests
+      run: BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:unit
+    - name: specs
+      run: BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:spec
+    - name: integration tests
+      run: BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:integration

data/.gitignore

@@ -5,7 +5,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+Gemfile*.lock
 InstalledFiles
 _yardoc
 coverage

data/CHANGELOG.md

@@ -1,18 +1,48 @@
-## 8.0.0.pre3
+## 8.1.0.pre2
 
-- Tested in Ruby 3.1, JRuby 9.3, drops Ruby 2.5 in test Matrix. Version 8.0.0.pre3 is being tested for Ruby (MRI) 2.6, 2.7, 3.0 and 3.1 and JRuby 9.3.
-- Updates Manticore implementation headers setup. When using the Manticore HTTP implementation, adding a custom `User-Agent` value in the headers on initialization would get overwritten. [Pull Request](https://github.com/elastic/elastic-transport-ruby/pull/22) - [Issue reported in elastic/elasticsearch-ruby#1684](https://github.com/elastic/elasticsearch-ruby/issues/1684).
+Updates Faraday's adapter detection code.
+
+## 8.1.0.pre1
+
+Adds support for Faraday version 2. From [Faraday's Upgrading guide](https://github.com/lostisland/faraday/blob/main/UPGRADING.md#faraday-20), the main change is the adapters have moved:
+
+> With this release, we've officially moved all adapters, except for the net_http one, out of Faraday. What that means, is that they won't be available out-of-the-box anymore, and you'll instead need to add them to your Gemfile.
+> If you just use the default net_http adapter, then you don't need to do anything!
+> Otherwise, add the corresponding adapter gem to your Gemfile (e.g. faraday-net_http_persistent). Then, simply require them after you require faraday. 
+
+We're now supporting Faraday v2 and Faraday v1. The adapters were removed as development dependency in the gemspec and added to the Gemfile. A new file `Gemfile-faraday1.gemfile` was added to run tests with version `1.x` of Faraday too.
+
+These are the gems required for the different adapters with Faraday 2, instead of the libraries on which they were based:
+```
+# HTTPCLient
+'faraday-httpclient'
+
+# NetHTTPPersistent
+'faraday-net_http_persistent'
+
+# Patron
+'faraday-patron'
+
+# Typhoeus
+'faraday-typhoeus'
+```
 
-## 8.0.0.pre2
+If you're using Faraday 1, you shouldn't have to change anything, but please [submit an issue](https://github.com/elastic/elastic-transport-ruby/issues) if you encounter any issues.
 
+## 8.0.1
+
+- Minor code cleanup
+- Adds Elastic Transport service token, updates specs for meta header.
+
+## 8.0.0
+
+- Library renamed from [`elasticsearch-transport`](https://github.com/elastic/elasticsearch-ruby/tree/7.x/elasticsearch-transport) to `elastic-transport` and promoted to its own repository.
 - Fixes tracing for Manticore [commit](https://github.com/elastic/elastic-transport-ruby/commit/98c81d19de4fee394f9c1a5079a1892ec951e0f9).
 - Implements CA Fingerprinting [pull request](https://github.com/elastic/elastic-transport-ruby/pull/13)
 - Adds `delay_on_retry` to wait between each failed connection, thanks @DinoPullerUqido! [commit](https://github.com/elastic/elastic-transport-ruby/commit/c2f8311409ca63a293588cb7eea5a0c672dbd436)
 - Fixes compression, thanks @johnnyshields! [commit](https://github.com/elastic/elastic-transport-ruby/commit/8b326d643f76f037075500e19bbe096b2c298099)
-
-## 8.0.0.pre1
-
-- Library renamed from [`elasticsearch-transport`](https://github.com/elastic/elasticsearch-ruby/tree/7.x/elasticsearch-transport) to `elastic-transport` and promoted to its own repository.
+- Tested in Ruby 3.1, JRuby 9.3, drops Ruby 2.5 in test Matrix. Version 8.0.0 tested for Ruby (MRI) 2.6, 2.7, 3.0 and 3.1 and JRuby 9.3.
+- Updates Manticore implementation headers setup. When using the Manticore HTTP implementation, adding a custom `User-Agent` value in the headers on initialization would get overwritten. [Pull Request](https://github.com/elastic/elastic-transport-ruby/pull/22) - [Issue reported in elastic/elasticsearch-ruby#1684](https://github.com/elastic/elasticsearch-ruby/issues/1684).
 
 # Changes from elasticsearch-transport:
 

data/Gemfile

@@ -20,15 +20,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-transport.gemspec
 gemspec
 
-if File.exist? File.expand_path('../elasticsearch-api/elasticsearch-api.gemspec', __dir__)
-  gem 'elasticsearch-api', path: File.expand_path('../elasticsearch-api', __dir__), require: false
-end
-
-if File.exist? File.expand_path('../elasticsearch/elasticsearch.gemspec', __dir__)
-  gem 'elasticsearch', path: File.expand_path('../elasticsearch', __dir__), require: false
-end
-
 group :development, :test do
+  gem 'faraday-httpclient'
+  gem 'faraday-net_http_persistent'
+  gem 'faraday-patron' unless defined? JRUBY_VERSION
+  gem 'faraday-typhoeus'
   gem 'rspec'
   if defined?(JRUBY_VERSION)
     gem 'pry-nav'

data/Gemfile-faraday1.gemfile

@@ -0,0 +1,39 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+source 'https://rubygems.org'
+
+# Usage:
+#
+# $ BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle install
+# $ BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:unit
+
+gem 'faraday', '~> 1'
+gemspec path: './'
+
+group :development, :test do
+  gem 'httpclient'
+  gem 'net-http-persistent'
+  gem 'patron' unless defined? JRUBY_VERSION
+  gem 'rspec'
+  gem 'typhoeus'
+  if defined?(JRUBY_VERSION)
+    gem 'pry-nav'
+  else
+    gem 'pry-byebug'
+  end
+end

data/Rakefile

@@ -18,13 +18,22 @@
 require 'bundler/gem_tasks'
 require 'mkmf'
 
-desc "Run unit tests"
+desc 'Run unit tests'
 task default: 'test:unit'
 task test: 'test:unit'
 
 # ----- Test tasks ------------------------------------------------------------
 require 'rake/testtask'
 require 'rspec/core/rake_task'
+FARADAY1_GEMFILE = 'Gemfile-faraday1.gemfile'.freeze
+GEMFILES = ['Gemfile', FARADAY1_GEMFILE].freeze
+
+task :install do
+  GEMFILES.each do |gemfile|
+    gemfile = File.expand_path("../#{gemfile}", __FILE__)
+    sh "bundle install --gemfile #{gemfile}"
+  end
+end
 
 namespace :test do
   RSpec::Core::RakeTask.new(:spec)
@@ -46,6 +55,7 @@ namespace :test do
   desc 'Run all tests'
   task :all do
     Rake::Task['test:unit'].invoke
+    Rake::Task['test:spec'].invoke
     Rake::Task['test:integration'].invoke
   end
 
@@ -53,6 +63,34 @@ namespace :test do
     test.libs << 'lib' << 'test'
     test.test_files = FileList['test/profile/**/*_test.rb']
   end
+
+  namespace :faraday1 do
+    desc 'Faraday 1: Run RSpec with dependency on Faraday 1'
+    task :spec do
+      sh "BUNDLE_GEMFILE=#{FARADAY1_GEMFILE} bundle exec rspec"
+    end
+
+    desc 'Faraday 1: Run unit tests with dependency on Faraday 1'
+    task :unit do
+      Dir.glob('./test/unit/**/**.rb').each do |test|
+        sh "BUNDLE_GEMFILE=#{FARADAY1_GEMFILE} ruby -Ilib:test #{test}"
+      end
+    end
+
+    desc 'Faraday 1: Run integration tests with dependency on Faraday 1'
+    task :integration do
+      Dir.glob('./test/integration/**/**.rb').each do |test|
+        sh "BUNDLE_GEMFILE=#{FARADAY1_GEMFILE} ruby -Ilib:test #{test}"
+      end
+    end
+
+    desc 'Faraday 1: Run all tests'
+    task :all do
+      Rake::Task['test:faraday1:unit'].invoke
+      Rake::Task['test:faraday1:spec'].invoke
+      Rake::Task['test:faraday1:integration'].invoke
+    end
+  end
 end
 
 namespace :docker do

data/elastic-transport.gemspec

@@ -44,20 +44,18 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
+  s.add_dependency 'faraday'
   s.add_dependency 'multi_json'
-  s.add_dependency 'faraday', '~> 1'
 
+  # Faraday Adapters
+  s.add_development_dependency 'manticore' if defined? JRUBY_VERSION
+  s.add_development_dependency 'curb' unless defined? JRUBY_VERSION
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'cane'
-  s.add_development_dependency 'curb'   unless defined? JRUBY_VERSION
   s.add_development_dependency 'hashie'
-  s.add_development_dependency 'httpclient'
-  s.add_development_dependency 'manticore' if defined? JRUBY_VERSION
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'net-http-persistent'
-  s.add_development_dependency 'patron' unless defined? JRUBY_VERSION
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
@@ -65,7 +63,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'shoulda-context'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'test-unit', '~> 2'
-  s.add_development_dependency 'typhoeus', '~> 1.4'
   s.add_development_dependency 'yard'
 
   s.description = <<-DESC.gsub(/^    /, '')

data/lib/elastic/transport/client.rb

@@ -211,14 +211,6 @@ module Elastic
         )
       end
 
-      def add_header(header)
-        headers = @arguments[:transport_options]&.[](:headers) || {}
-        headers.merge!(header)
-        @arguments[:transport_options].merge!(
-          headers: headers
-        )
-      end
-
       # Normalizes and returns hosts configuration.
       #
       # Arrayifies the `hosts_config` argument and extracts `host` and `port` info from strings.
@@ -291,24 +283,26 @@ module Elastic
       # Auto-detect the best adapter (HTTP "driver") available, based on libraries
       # loaded by the user, preferring those with persistent connections
       # ("keep-alive") by default
+      # Check adapters based on the usage of Faraday 1 or 2. Faraday should be defined here
+      # since this is only called when transport class is Transport::HTTP::Faraday
       #
       # @return [Symbol]
       #
       # @api private
       #
       def __auto_detect_adapter
-        case
-        when defined?(::Patron)
-          :patron
-        when defined?(::Typhoeus)
-          :typhoeus
-        when defined?(::HTTPClient)
-          :httpclient
-        when defined?(::Net::HTTP::Persistent)
-          :net_http_persistent
+        if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
+          return :patron if defined?(Faraday::Adapter::Patron)
+          return :typhoeus if defined?(Faraday::Adapter::Typhoeus)
+          return :httpclient if defined?(Faraday::Adapter::HTTPClient)
+          return :net_http_persistent if defined?(Faraday::Adapter::NetHttpPersistent)
         else
-          ::Faraday.default_adapter
+          return :patron if defined?(::Patron)
+          return :typhoeus if defined?(::Typhoeus)
+          return :httpclient if defined?(::HTTPClient)
+          return :net_http_persistent if defined?(::Net::HTTP::Persistent)
         end
+        ::Faraday.default_adapter
       end
     end
   end

data/lib/elastic/transport/meta_header.rb

@@ -48,7 +48,7 @@ module Elastic
         elsif defined?(Elasticsearch::VERSION)
           [:es, client_meta_version(Elasticsearch::VERSION)]
         else
-          [:es, client_meta_version(Elastic::Transport::VERSION)]
+          [:et, client_meta_version(Elastic::Transport::VERSION)]
         end
       end
 
@@ -103,31 +103,31 @@ module Elastic
           adapter_version = case @arguments[:adapter]
                    when :patron
                      version = Patron::VERSION if defined?(::Patron::VERSION)
-                     {pt: version}
+                     { pt: version }
                    when :net_http
                      version = if defined?(Net::HTTP::VERSION)
                                  Net::HTTP::VERSION
                                elsif defined?(Net::HTTP::HTTPVersion)
                                  Net::HTTP::HTTPVersion
                                end
-                     {nh: version}
+                     { nh: version }
                    when :typhoeus
                      version = Typhoeus::VERSION if defined?(::Typhoeus::VERSION)
-                     {ty: version}
+                     { ty: version }
                    when :httpclient
                      version = HTTPClient::VERSION if defined?(HTTPClient::VERSION)
-                     {hc: version}
+                     { hc: version }
                    when :net_http_persistent
                      version = Net::HTTP::Persistent::VERSION if defined?(Net::HTTP::Persistent::VERSION)
-                     {np: version}
+                     { np: version }
                    else
                      {}
                    end
-          {fd: Faraday::VERSION}.merge(adapter_version)
+          { fd: Faraday::VERSION }.merge(adapter_version)
         elsif defined?(Transport::HTTP::Curb) && @transport_class == Transport::HTTP::Curb
-          {cl: Curl::CURB_VERSION}
+          { cl: Curl::CURB_VERSION }
         elsif defined?(Transport::HTTP::Manticore) && @transport_class == Transport::HTTP::Manticore
-          {mc: Manticore::VERSION}
+          { mc: Manticore::VERSION }
         end
       end
     end

data/lib/elastic/transport/transport/http/curb.rb

@@ -37,31 +37,34 @@ module Elastic
               body, headers = compress_request(body, headers)
 
               case method
-                when 'HEAD'
-                  connection.connection.set :nobody, true
-                when 'GET', 'POST', 'PUT', 'DELETE'
-                  connection.connection.set :nobody, false
-                  connection.connection.put_data = body if body
+              when 'HEAD'
+                connection.connection.set :nobody, true
+              when 'GET', 'POST', 'PUT', 'DELETE'
+                connection.connection.set :nobody, false
+                connection.connection.put_data = body if body
 
-                  if headers
-                    if connection.connection.headers
-                      connection.connection.headers.merge!(headers)
-                    else
-                      connection.connection.headers = headers
-                    end
+                if headers
+                  if connection.connection.headers
+                    connection.connection.headers.merge!(headers)
+                  else
+                    connection.connection.headers = headers
                   end
+                end
 
-                else raise ArgumentError, "Unsupported HTTP method: #{method}"
+              else raise ArgumentError, "Unsupported HTTP method: #{method}"
               end
 
               connection.connection.http(method.to_sym)
+              header_string = connection.connection.header_str.to_s
 
-              response_headers = {}
-              response_headers['content-type'] = 'application/json' if connection.connection.header_str =~ /\/json/
+              _response_status, *response_headers = header_string.split(/[\r\n]+/).map(&:strip)
+              response_headers = Hash[response_headers.flat_map { |s| s.scan(/^(\S+): (.+)/) }].transform_keys(&:downcase)
 
-              Response.new connection.connection.response_code,
-                           decompress_response(connection.connection.body_str),
-                           response_headers
+              Response.new(
+                connection.connection.response_code,
+                decompress_response(connection.connection.body_str),
+                response_headers
+              )
             end
           end
 
@@ -73,7 +76,7 @@ module Elastic
             client = ::Curl::Easy.new
 
             apply_headers(client, options)
-            client.url     = __full_url(host)
+            client.url = __full_url(host)
 
             if host[:user]
               client.http_auth_types = host[:auth_type] || :basic
@@ -105,13 +108,13 @@ module Elastic
 
           def user_agent_header(client)
             @user_agent ||= begin
-              meta = ["RUBY_VERSION: #{RUBY_VERSION}"]
-              if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
-                meta << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} #{RbConfig::CONFIG['target_cpu']}"
-              end
-              meta << "Curb #{Curl::CURB_VERSION}"
-              "elastic-transport-ruby/#{VERSION} (#{meta.join('; ')})"
-            end
+                              meta = ["RUBY_VERSION: #{RUBY_VERSION}"]
+                              if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
+                                meta << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} #{RbConfig::CONFIG['target_cpu']}"
+                              end
+                              meta << "Curb #{Curl::CURB_VERSION}"
+                              "elastic-transport-ruby/#{VERSION} (#{meta.join('; ')})"
+                            end
           end
         end
       end

data/lib/elastic/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elastic
   module Transport
-    VERSION = '8.0.0'.freeze
+    VERSION = '8.1.0.pre2'.freeze
   end
 end

data/spec/elastic/transport/base_spec.rb

@@ -105,7 +105,8 @@ describe Elastic::Transport::Transport::Base do
     let(:arguments) do
       {
         hosts: ['http://unavailable:9200', 'http://unavailable:9201'],
-        retry_on_failure: 2
+        retry_on_failure: 2,
+        adapter: :net_http
       }
     end
 
@@ -129,7 +130,8 @@ describe Elastic::Transport::Transport::Base do
       let(:arguments) do
         {
           hosts: ELASTICSEARCH_HOSTS,
-          retry_on_status: ['404']
+          retry_on_status: ['404'],
+          adapter: :net_http
         }
       end
 

data/spec/elastic/transport/client_spec.rb

@@ -191,8 +191,8 @@ describe Elastic::Transport::Client do
         it 'uses Faraday NetHttp' do
           expect(adapter).to eq Faraday::Adapter::NetHttp
         end
-      end unless jruby?
-    end
+      end
+    end unless jruby?
 
     context 'when the adapter is patron' do
       let(:adapter) do
@@ -204,9 +204,10 @@ describe Elastic::Transport::Client do
       end
 
       it 'uses Faraday with the adapter' do
+        require 'faraday/patron'
         expect(adapter).to eq Faraday::Adapter::Patron
       end
-    end
+    end unless jruby?
 
     context 'when the adapter is typhoeus' do
       let(:adapter) do
@@ -214,6 +215,8 @@ describe Elastic::Transport::Client do
       end
 
       let(:client) do
+        require 'faraday/typhoeus' if is_faraday_v2?
+
         described_class.new(adapter: :typhoeus, enable_meta_header: false)
       end
 
@@ -234,7 +237,7 @@ describe Elastic::Transport::Client do
       it 'uses Faraday with the adapter' do
         expect(adapter).to eq Faraday::Adapter::Patron
       end
-    end
+    end unless jruby?
 
     context 'when the adapter can be detected', unless: jruby? do
       around do |example|
@@ -274,7 +277,7 @@ describe Elastic::Transport::Client do
       it 'sets the logger' do
         expect(handlers).to include(Faraday::Response::Logger)
       end
-    end
+    end unless jruby?
   end
 
   shared_examples_for 'a client that extracts hosts' do
@@ -1263,6 +1266,8 @@ describe Elastic::Transport::Client do
         end
 
         context 'when the Faraday adapter is set in the block' do
+          require 'faraday/net_http_persistent' if is_faraday_v2?
+
           let(:client) do
             Elastic::Transport::Client.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
               client.adapter(:net_http_persistent)
@@ -1414,6 +1419,8 @@ describe Elastic::Transport::Client do
           end
 
           context 'when using the HTTPClient adapter' do
+            require 'faraday/httpclient'
+
             let(:client) do
               described_class.new(hosts: ELASTICSEARCH_HOSTS, compression: true, adapter: :httpclient, enable_meta_header: false)
             end

data/spec/elastic/transport/meta_header_spec.rb

@@ -26,14 +26,14 @@ describe Elastic::Transport::Client do
     let(:adapter_code) { "nh=#{defined?(Net::HTTP::VERSION) ? Net::HTTP::VERSION : Net::HTTP::HTTPVersion}" }
     let(:meta_header) do
       if jruby?
-        "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
+        "et=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
       else
-        "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
+        "et=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
       end
     end
 
     context 'client_meta_version' do
-      let(:version) { ['7.1.0-alpha', '7.11.0.pre.1', '8.0.0-beta', '8.0.0.beta.2']}
+      let(:version) { ['7.1.0-alpha', '7.11.0.pre.1', '8.0.0-beta', '8.0.0.beta.2'] }
 
       it 'converts the version to X.X.Xp' do
         expect(client.send(:client_meta_version, '7.0.0-alpha')).to eq('7.0.0p')
@@ -81,9 +81,9 @@ describe Elastic::Transport::Client do
     context 'adapters' do
       let(:meta_header) do
         if jruby?
-          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION},fd=#{Faraday::VERSION}"
+          "et=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION},fd=#{Faraday::VERSION}"
         else
-          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},fd=#{Faraday::VERSION}"
+          "et=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},fd=#{Faraday::VERSION}"
         end
       end
       let(:client) { described_class.new(adapter: adapter) }
@@ -155,7 +155,7 @@ describe Elastic::Transport::Client do
           expect(headers).to include('x-elastic-client-meta' => meta)
 
           Typhoeus = @klass if was_required
-        end unless jruby?
+        end
 
         it 'sets adapter in the meta header' do
           require 'typhoeus'
@@ -163,7 +163,7 @@ describe Elastic::Transport::Client do
           meta = "#{meta_header},ty=#{Typhoeus::VERSION}"
           expect(headers).to include('x-elastic-client-meta' => meta)
         end
-      end
+      end unless jruby?
 
       unless jruby?
         let(:adapter) { :patron }
@@ -246,9 +246,9 @@ describe Elastic::Transport::Client do
       let(:subject) { client.instance_variable_get('@arguments')[:transport_options][:headers] }
       let(:meta_header) do
         if jruby?
-          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION}"
+          "et=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION}"
         else
-          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION}"
+          "et=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION}"
         end
       end
 
@@ -258,14 +258,29 @@ describe Elastic::Transport::Client do
       end
     end
 
-    context 'when using a different service version' do
+    context 'when Elasticsearch is being used' do
+      before do
+        stub_const('Elastic::ELASTICSEARCH_SERVICE_VERSION', [:es, '8.0.0'])
+      end
+
+      let(:client) { Elastic::Transport::Client.new }
+
+      it 'sets the service version in the metaheader' do
+        allow_any_instance_of(Kernel).to receive(:caller).and_return(['elasticsearch'])
+        expect(subject['x-elastic-client-meta']).to match(regexp)
+        expect(subject['x-elastic-client-meta']).to start_with('es=8.0.0')
+      end
+    end
+
+    context 'when Enterprise Search is being used' do
       before do
-        stub_const('Elastic::ELASTICSEARCH_SERVICE_VERSION', [:ent, '8.0.0'])
+        stub_const('Elastic::ENTERPRISE_SERVICE_VERSION', [:ent, '8.0.0'])
       end
 
       let(:client) { Elastic::Transport::Client.new }
 
       it 'sets the service version in the metaheader' do
+        allow_any_instance_of(Kernel).to receive(:caller).and_return(['enterprise-search-ruby'])
         expect(subject['x-elastic-client-meta']).to match(regexp)
         expect(subject['x-elastic-client-meta']).to start_with('ent=8.0.0')
       end

data/spec/spec_helper.rb

@@ -74,6 +74,10 @@ def default_client
   $client ||= Elastic::Transport::Client.new(hosts: ELASTICSEARCH_HOSTS)
 end
 
+def is_faraday_v2?
+  Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
+end
+
 module Config
   def self.included(context)
     # Get the hosts to use to connect an elasticsearch client.

data/test/integration/jruby_test.rb

@@ -21,7 +21,7 @@ if JRUBY
   require 'elastic/transport/transport/http/manticore'
 
   class Elastic::Transport::ClientManticoreIntegrationTest < Minitest::Test
-    context "Transport" do
+    context 'Transport' do
       setup do
         uri = URI(HOST)
         @host = {

data/test/integration/transport_test.rb

@@ -18,9 +18,8 @@
 require 'test_helper'
 
 class Elastic::Transport::ClientIntegrationTest < Minitest::Test
-  context "Transport" do
+  context 'Transport' do
     setup do
-      begin; Object.send(:remove_const, :Patron);   rescue NameError; end
       uri = URI(HOST)
       @host = {
         host: uri.host,
@@ -30,69 +29,116 @@ class Elastic::Transport::ClientIntegrationTest < Minitest::Test
       }
     end
 
-    should "allow to customize the Faraday adapter to Typhoeus" do
-      require 'typhoeus'
-      require 'typhoeus/adapters/faraday'
-
+    should 'use the default Faraday adapter' do
       transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
         f.response :logger
-        f.adapter  :typhoeus
       end
 
       client = Elastic::Transport::Client.new(transport: transport)
+      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttp)
       client.perform_request 'GET', ''
-    end unless jruby?
+    end
 
-    should "allow to customize the Faraday adapter to NetHttpPersistent" do
-      require 'net/http/persistent'
+    unless jruby?
+      should 'allow to customize the Faraday adapter to Typhoeus' do
+        if is_faraday_v2?
+          require 'faraday/typhoeus'
+        else
+          require 'typhoeus'
+        end
+
+        transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
+          f.response :logger
+          f.adapter  :typhoeus
+        end
+
+        client = Elastic::Transport::Client.new(transport: transport)
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Typhoeus)
+        client.perform_request 'GET', ''
+      end
 
-      transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
-        f.response :logger
-        f.adapter  :net_http_persistent
+      should 'use the Curb client' do
+        require 'curb'
+        require 'elastic/transport/transport/http/curb'
+
+        transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
+          curl.verbose = true
+        end
+
+        client = Elastic::Transport::Client.new(transport: transport)
+        assert_equal(client.transport.class, Elastic::Transport::Transport::HTTP::Curb)
+        client.perform_request 'GET', ''
       end
 
-      client = Elastic::Transport::Client.new(transport: transport)
-      client.perform_request 'GET', ''
-    end
+      should 'deserialize JSON responses in the Curb client' do
+        require 'curb'
+        require 'elastic/transport/transport/http/curb'
 
-    should "allow to define connection parameters and pass them" do
-      transport = Elastic::Transport::Transport::HTTP::Faraday.new(
-        hosts: [@host],
-        options: { transport_options: { params: { format: 'yaml' } } }
-      )
+        transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
+          curl.verbose = true
+        end
 
-      client = Elastic::Transport::Client.new transport: transport
-      response = client.perform_request 'GET', ''
+        client = Elastic::Transport::Client.new(transport: transport)
+        response = client.perform_request 'GET', ''
 
-      assert response.body.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
+        assert_respond_to(response.body, :to_hash)
+        assert_not_nil response.body['name']
+        assert_equal 'application/json', response.headers['content-type']
+        assert_equal 'Elasticsearch', response.headers['x-elastic-product']
+      end
+
+      should 'allow to customize the Faraday adapter to Patron' do
+        if is_faraday_v2?
+          require 'faraday/patron'
+        else
+          require 'patron'
+        end
+        transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
+          f.response :logger
+          f.adapter  :patron
+        end
+
+        client = Elastic::Transport::Client.new(transport: transport)
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Patron)
+        client.perform_request 'GET', ''
+      end
     end
 
-    should "use the Curb client" do
-      require 'curb'
-      require 'elastic/transport/transport/http/curb'
+    should 'allow to customize the Faraday adapter to NetHttpPersistent' do
+      require 'faraday/net_http_persistent'
 
-      transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
-        curl.verbose = true
+      transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
+        f.response :logger
+        f.adapter  :net_http_persistent
       end
 
       client = Elastic::Transport::Client.new(transport: transport)
+      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttpPersistent)
       client.perform_request 'GET', ''
-    end unless JRUBY
+    end
 
-    should "deserialize JSON responses in the Curb client" do
-      require 'curb'
-      require 'elastic/transport/transport/http/curb'
+    should 'allow to customize the Faraday adapter to HTTPClient' do
+      require 'faraday/httpclient'
 
-      transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
-        curl.verbose = true
+      transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
+        f.response :logger
+        f.adapter  :httpclient
       end
 
       client = Elastic::Transport::Client.new(transport: transport)
-      response = client.perform_request 'GET', ''
+      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::HTTPClient)
+      client.perform_request 'GET', ''
+    end
 
-      assert_respond_to(response.body, :to_hash)
-      assert_not_nil response.body['name']
-      assert_equal 'application/json', response.headers['content-type']
-    end unless jruby?
+    should 'allow to define connection parameters and pass them' do
+      transport = Elastic::Transport::Transport::HTTP::Faraday.new(
+        hosts: [@host],
+        options: { transport_options: { params: { format: 'yaml' } } }
+      )
+
+      client = Elastic::Transport::Client.new transport: transport
+      response = client.perform_request 'GET', ''
+      assert response.body.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
+    end
   end
 end

data/test/test_helper.rb

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+require 'uri'
 
 password = ENV['ELASTIC_PASSWORD'] || 'changeme'
 host = ENV['TEST_ES_SERVER'] || 'http://localhost:9200'
@@ -29,17 +30,16 @@ if ENV['COVERAGE']
   SimpleCov.start { add_filter %r{^/test/} }
 end
 
+require 'ansi/code'
 require 'minitest/autorun'
 require 'minitest/reporters'
-require 'shoulda/context'
 require 'mocha/minitest'
-require 'ansi/code'
+require 'shoulda/context'
 
-require 'require-prof' if ENV["REQUIRE_PROF"]
 require 'elastic-transport'
-require 'logger'
-
 require 'hashie'
+require 'logger'
+require 'require-prof' if ENV["REQUIRE_PROF"]
 
 RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 
@@ -80,4 +80,8 @@ module Minitest
   end
 end
 
+def is_faraday_v2?
+  Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
+end
+
 Minitest::Reporters.use! FixedMinitestSpecReporter.new

data/test/unit/adapters_test.rb

@@ -0,0 +1,88 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test_helper'
+
+class Elastic::Transport::ClientAdaptersUnitTest < Minitest::Test
+  context 'Adapters' do
+    setup do
+      begin
+        Object.send(:remove_const, :Patron)
+      rescue NameError
+      end
+    end
+
+    should 'use the default Faraday adapter' do
+      fork do
+        client = Elastic::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttp)
+      end
+    end
+
+    should 'use Patron Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/patron'
+        else
+          require 'patron'
+        end
+
+        client = Elastic::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Patron)
+      end
+    end
+
+    should 'use Typhoeus Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/typhoeus'
+        else
+          require 'typhoeus'
+        end
+
+        client = Elastic::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Typhoeus)
+      end
+    end
+
+    should 'use NetHttpPersistent Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/net_http_persistent'
+        else
+          require 'net/http/persistent'
+        end
+
+        client = Elastic::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttpPersistent)
+      end
+    end
+
+    should 'use HTTPClient Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/httpclient'
+        else
+          require 'httpclient'
+        end
+
+        client = Elastic::Transport::Client.new
+        assert_equal(Faraday::Adapter::HTTPClient, client.transport.connections.first.connection.adapter)
+      end
+    end
+  end unless jruby?
+end

data/test/unit/transport_curb_test.rb

@@ -83,11 +83,10 @@ else
       should "set application/json response header" do
         @transport.connections.first.connection.expects(:http).with(:GET).returns(stub_everything)
         @transport.connections.first.connection.expects(:body_str).returns('{"foo":"bar"}')
-        @transport.connections.first.connection.expects(:header_str).returns('HTTP/1.1 200 OK\r\nContent-Type: application/json; charset=UTF-8\r\nContent-Length: 311\r\n\r\n')
+        @transport.connections.first.connection.expects(:header_str).returns("HTTP/1.1 200 OK\r\nContent-Type: application/json; charset=UTF-8\r\nContent-Length: 311\r\n\r\n")
 
         response = @transport.perform_request 'GET', '/'
-
-        assert_equal 'application/json', response.headers['content-type']
+        assert_equal 'application/json; charset=UTF-8', response.headers['content-type']
       end
 
       should "handle HTTP methods" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-transport
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0.pre2
 platform: ruby
 authors:
 - Karel Minarik
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -27,27 +27,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -55,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,34 +138,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-http-persistent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: patron
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -278,20 +236,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -325,6 +269,7 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
+- Gemfile-faraday1.gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -361,6 +306,7 @@ files:
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
+- test/unit/adapters_test.rb
 - test/unit/connection_test.rb
 - test/unit/response_test.rb
 - test/unit/serializer_test.rb
@@ -388,11 +334,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Low level Ruby client for Elastic services.
@@ -411,6 +357,7 @@ test_files:
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
+- test/unit/adapters_test.rb
 - test/unit/connection_test.rb
 - test/unit/response_test.rb
 - test/unit/serializer_test.rb