elastic-transport 8.3.7 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c74ecb8b5f87503b024bd292d35e9f090d5de7cb4974354af36b566f9866b2f
-  data.tar.gz: fab6e1f899769073a83692e677be0904c819c4660f4d21908ed6068f0eb5d774
+  metadata.gz: 88698d9c25a84a6242bfb875623c2bca0bd9a0e5c40244272e88fe291b06a9e0
+  data.tar.gz: 90aff86e0a0f301908c888877d97a72ac926e9b5f7f48b23ad447813a729824d
 SHA512:
-  metadata.gz: 4d79595ce41082119444253c1ea940e81ce4beef9c80c7ec7e7b9b7f780f514ffd1ac264455bea49616fa064d2b69c95a1f5977edd93c63ea19cfd5a4c6117d5
-  data.tar.gz: 3c10b49555b514cac6d7c8fe7638d5047e8636114e089e2354032cf39af088247fb0661fb0fae1199c87a59df772991961188df91006912c7b7920ee5d0394a6
+  metadata.gz: 3a235c8813516864b3b661790c56c9eeb6c8ee8b44a208d70a3309faca0075e9b45f25890be47d56ed29b845a70c5d3f6cd45c617592543993a0c6d788eb7211
+  data.tar.gz: 9cd571ba906d3e841f63f8bf3ea018820d0d9e2eddb9171f01785b6787df5ed19fecbeb0b05e494428af8853d2040c78c32f25a370c612d55a4a69ed77798682

data/.github/check_license_headers.rb

@@ -0,0 +1,33 @@
+# 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.
+
+LICENSE = File.read('./.github/license-header.txt')
+files = `git ls-files | grep -E '\.rb|Rakefile|\.rake|\.erb|Gemfile|gemspec'`.split("\n")
+errors = []
+
+files.each do |file|
+  unless File.read(file).include?(LICENSE)
+    errors << file
+    puts "#{file} doesn't contain the correct license header"
+  end
+end
+
+if errors.empty?
+  puts 'All checked files have the correct license header'
+else
+  exit 1
+end

data/.github/license-header.txt

@@ -0,0 +1,16 @@
+# 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.

data/.github/workflows/license.yml

@@ -0,0 +1,13 @@
+name: License headers
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.4'
+    - name: Check license headers
+      run: |
+        ruby ./.github/check_license_headers.rb

data/.github/workflows/otel.yml

@@ -0,0 +1,48 @@
+name: opentelemetry
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  test-otel:
+    name: 'Test Open Telemetry'
+    env:
+      TEST_ES_SERVER: http://localhost:9250
+      PORT: 9250
+      TEST_WITH_OTEL: true
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.4', 'jruby-9.4']
+        es_version: ['8.17.0-SNAPSHOT']
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - 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
+          bundle install
+      - name: unit tests
+        run: bundle exec rake test:unit
+      - name: specs
+        run: bundle exec rake test:spec
+      - name: integration tests
+        run: bundle exec rake test:integration

data/.github/workflows/tests.yml

@@ -0,0 +1,85 @@
+name: main tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  test:
+    name: 'Main tests'
+    env:
+      TEST_ES_SERVER: http://localhost:9250
+      PORT: 9250
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.1', '3.2', '3.3', '3.4', 'jruby-9.3', 'jruby-9.4']
+        es_version: ['8.16.0-SNAPSHOT', '8.17.0-SNAPSHOT', '8.18.0-SNAPSHOT']
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - 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
+        bundle install
+    - name: unit tests
+      run: bundle exec rake test:unit
+    - name: specs
+      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: ['3.0', '3.1', '3.2', '3.3', 'jruby-9.3']
+        es_version: ['8.16.0-SNAPSHOT']
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - 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
+        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

@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+*.log
+.byebug_history
+.bundle
+.config
+.yardoc
+Gemfile*.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/CHANGELOG.md

@@ -1,15 +1,39 @@
-## 8.3.7
+## 8.4.0
 
-- Minor refactor to `curb` implementation.
-- Updated `yard` development dependency to `> 0.9.42`.
-- Fix `multi_json` deprecation warnings. Some deprecations [were introduced in `multi_json` 1.21.0](https://github.com/sferik/multi_json/blob/main/CHANGELOG.md#1210). Pull Request: [#112](https://github.com/elastic/elastic-transport-ruby/pull/112).
-- Reduced gem size. Pull Request: [#114](https://github.com/elastic/elastic-transport-ruby/pull/114).
-- Addresses duplicate `content-type` header in Manticore. Pull Request: [#115](https://github.com/elastic/elastic-transport-ruby/pull/115).
+- Adds support for **[Excon](https://github.com/excon/excon)** Faraday adapter. You can use the Excon adapter by setting it in when initializing an Elasticsearch client:
 
-## 8.3.6
+```ruby
+require 'faraday/excon'
 
-- Moves `require 'timeout'` to the classes that use it. Closed [#79](https://github.com/elastic/elastic-transport-ruby/issues/79).
-- Sanitize url on OTEL spans, thanks @steve21168. Pull Request: [#98](https://github.com/elastic/elastic-transport-ruby/pull/98)
+Elasticsearch::Client.new(
+  host: host,
+  transport_options: transport_options,
+  adapter: :excon
+)
+```
+
+Excon may need some specific configuration for HTTPS/SSL. You may see certificate verification errors when trying to connect to Elastic. Excon has certificates bundled, but these can be customized:
+
+```ruby
+Excon.defaults[:ssl_ca_path] = path_to_certs
+ENV['SSL_CERT_DIR'] = path_to_certs
+Excon.defaults[:ssl_ca_file] = path_to_file
+ENV['SSL_CERT_FILE'] = path_to_file
+Excon.defaults[:ssl_verify_callback] = callback
+# (see OpenSSL::SSL::SSLContext#verify_callback)
+Excon.defaults[:ssl_verify_peer] = false` # (less secure).
+```
+
+- Adds support for **[Async::HTTP::Faraday](https://github.com/socketry/async-http-faraday)**. You can use the adapter by setting it when initializing an Elasticsearch client:
+```ruby
+require 'async-http-faraday'
+
+Elasticsearch::Client.new(
+  host: host,
+  adapter: :async_http
+)
+```
+- Minor refactors, styling fixes.
 
 ## 8.3.5
 

data/CONTRIBUTING.md

@@ -41,7 +41,13 @@ E.g.:
 $ rake docker:start[8.0.0-alpha1]
 ```
 
-You can find the available version in [Docker @ Elastic](https://www.docker.elastic.co/r/elasticsearch).
+You can find the available version in [Docker @ Elastic](https://www.docker.elastic.co/r/elasticsearch). You can also run Elasticsearch and Kibana locally with Docker with `start-local`:
+
+```bash
+curl -fsSL https://elastic.co/start-local | sh
+```
+
+This will run Elasticsearch in http://localhost:9200 and Kibana in http://localhost:5601. More information is available [here](https://www.elastic.co/guide/en/elasticsearch/reference/current/run-elasticsearch-locally.html).
 
 # Contributing
 

data/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'
+
+# Specify your gem's dependencies in elasticsearch-transport.gemspec
+gemspec
+
+group :development, :test do
+  gem 'faraday-excon'
+  gem 'faraday-httpclient'
+  gem 'faraday-net_http_persistent'
+  gem 'faraday-typhoeus'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  gem 'opentelemetry-sdk', require: false if RUBY_VERSION >= '3.0'
+  if defined?(JRUBY_VERSION)
+    gem 'pry-nav'
+  else
+    gem 'async-http-faraday'
+    gem 'faraday-patron'
+    gem 'oj'
+    gem 'pry-byebug'
+  end
+  gem 'rspec'
+end

data/Gemfile-faraday1.gemfile

@@ -0,0 +1,40 @@
+# 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
+
+group :development, :test do
+  gem 'httpclient'
+  gem 'net-http-persistent'
+  gem 'rspec'
+  gem 'typhoeus'
+  if defined?(JRUBY_VERSION)
+    gem 'pry-nav'
+  else
+    gem 'pry-byebug'
+    gem 'oj'
+    gem 'patron'
+  end
+end

data/Rakefile

@@ -0,0 +1,133 @@
+# 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 'bundler/gem_tasks'
+require 'mkmf'
+
+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)
+
+  Rake::TestTask.new(:unit) do |test|
+    test.libs << 'lib' << 'test'
+    test.test_files = FileList['test/unit/**/*_test.rb']
+    test.verbose = false
+    test.warning = false
+  end
+
+  Rake::TestTask.new(:integration) do |test|
+    test.libs << 'lib' << 'test'
+    test.test_files = FileList['test/integration/**/*_test.rb']
+    test.verbose = false
+    test.warning = false
+  end
+
+  desc 'Run all tests'
+  task :all do
+    Rake::Task['test:unit'].invoke
+    Rake::Task['test:spec'].invoke
+    Rake::Task['test:integration'].invoke
+  end
+
+  Rake::TestTask.new(:profile) do |test|
+    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
+  desc <<~DOC
+    Start Elasticsearch in a Docker container. Credentials are 'elastic:changeme'.
+
+    Default:
+      rake docker:start[version]
+    E.g.:
+      rake docker:start[8.0.0-SNAPSHOT]
+  DOC
+  task :start, [:version] do |_, params|
+    abort 'Docker not installed' unless find_executable 'docker'
+    abort 'You need to set a version, e.g. rake docker:start[7.x-SNAPSHOT]' unless params[:version]
+
+    system("docker run -p 9200:9200 -p 9300:9300 -e 'discovery.type=single-node' -e ELASTIC_PASSWORD=changeme docker.elastic.co/elasticsearch/elasticsearch:#{params[:version]}")
+  end
+end
+
+desc 'Run Ruby console with the Elastic transport client libraries loaded'
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  require 'elastic-transport'
+  ARGV.clear
+  IRB.start
+end
+
+# ----- Documentation tasks ---------------------------------------------------
+require 'yard'
+YARD::Rake::YardocTask.new(:doc) do |t|
+  t.options = %w| --embed-mixins --markup=markdown |
+end
+
+# ----- Code analysis tasks ---------------------------------------------------
+require 'cane/rake_task'
+Cane::RakeTask.new(:quality) do |cane|
+  cane.abc_max = 15
+  cane.no_style = true
+end

data/elastic-transport.gemspec

@@ -0,0 +1,71 @@
+# 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.
+
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'elastic/transport/version'
+
+Gem::Specification.new do |s|
+  s.name          = "elastic-transport"
+  s.version       = Elastic::Transport::VERSION
+  s.authors       = ['Elastic Client Library Maintainers']
+  s.email         = ['client-libs@elastic.co']
+  s.summary       = 'Low level Ruby client for Elastic services.'
+  s.homepage      = 'https://github.com/elastic/elastic-transport-ruby'
+  s.license       = 'Apache-2.0'
+  s.metadata = {
+    'homepage_uri' => 'https://github.com/elastic/elastic-transport-ruby',
+    'changelog_uri' => 'https://github.com/elastic/elastic-transport-ruby/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/elastic/elastic-transport-ruby',
+    'bug_tracker_uri' => 'https://github.com/elastic/elastic-transport-ruby/issues'
+  }
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ['lib']
+
+  s.extra_rdoc_files  = ['README.md', 'LICENSE']
+  s.rdoc_options      = [ '--charset=UTF-8' ]
+
+  s.required_ruby_version = '>= 2.5'
+
+  s.add_dependency 'faraday', '< 3'
+  s.add_dependency 'multi_json'
+
+  # 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 'hashie'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake', '~> 13'
+  s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
+  s.add_development_dependency 'ruby-prof'    unless defined?(JRUBY_VERSION) || defined?(Rubinius)
+  s.add_development_dependency 'shoulda-context'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'test-unit', '~> 2'
+  s.add_development_dependency 'yard'
+
+  s.description = <<-DESC.gsub(/^    /, '')
+    Low level Ruby client for Elastic. See the `elasticsearch` or `elastic-enterprise-search` gems for full integration.
+  DESC
+end

data/lib/elastic/transport/client.rb

@@ -123,8 +123,8 @@ module Elastic
       #
       def initialize(arguments = {}, &block)
         @arguments = arguments.transform_keys(&:to_sym)
-        @arguments[:logger] ||= @arguments[:log]   ? DEFAULT_LOGGER.call() : nil
-        @arguments[:tracer] ||= @arguments[:trace] ? DEFAULT_TRACER.call() : nil
+        @arguments[:logger] ||= @arguments[:log]   ? DEFAULT_LOGGER.call : nil
+        @arguments[:tracer] ||= @arguments[:trace] ? DEFAULT_TRACER.call : nil
         @arguments[:reload_connections] ||= false
         @arguments[:retry_on_failure]   ||= false
         @arguments[:delay_on_retry]     ||= 0
@@ -134,13 +134,7 @@ module Elastic
         @arguments[:http]               ||= {}
         @arguments[:enable_meta_header] = arguments.fetch(:enable_meta_header, true)
 
-        @hosts ||= __extract_hosts(@arguments[:hosts] ||
-                                   @arguments[:host] ||
-                                   @arguments[:url] ||
-                                   @arguments[:urls] ||
-                                   ENV['ELASTICSEARCH_URL'] ||
-                                   DEFAULT_HOST)
-
+        @hosts ||= extract_hosts
         @send_get_body_as = @arguments[:send_get_body_as] || 'GET'
         @ca_fingerprint = @arguments.delete(:ca_fingerprint)
 
@@ -153,7 +147,7 @@ module Elastic
         else
           @transport_class = @arguments[:transport_class] || DEFAULT_TRANSPORT_CLASS
           @transport = if @transport_class == Transport::HTTP::Faraday
-                         @arguments[:adapter] ||= __auto_detect_adapter
+                         @arguments[:adapter] ||= auto_detect_adapter
                          set_meta_header # from include MetaHeader
                          @transport_class.new(hosts: @hosts, options: @arguments) do |faraday|
                            faraday.adapter(@arguments[:adapter])
@@ -246,7 +240,7 @@ module Elastic
       #
       # @api private
       #
-      def __extract_hosts(hosts_config)
+      def extract_hosts
         hosts = case hosts_config
                 when String
                   hosts_config.split(',').map { |h| h.strip! || h }
@@ -257,12 +251,20 @@ module Elastic
                 else
                   Array(hosts_config)
                 end
-
-        host_list = hosts.map { |host| __parse_host(host) }
+        host_list = hosts.map { |host| parse_host(host) }
         @arguments[:randomize_hosts] ? host_list.shuffle! : host_list
       end
 
-      def __parse_host(host)
+      def hosts_config
+        @arguments[:hosts] ||
+          @arguments[:host] ||
+          @arguments[:url] ||
+          @arguments[:urls] ||
+          ENV['ELASTICSEARCH_URL'] ||
+          DEFAULT_HOST
+      end
+
+      def parse_host(host)
         host_parts = case host
                      when String
                        if host =~ /^[a-z]+\:\/\//
@@ -313,12 +315,14 @@ module Elastic
       #
       # @api private
       #
-      def __auto_detect_adapter
+      def auto_detect_adapter
         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)
+          return :excon if defined?(Faraday::Adapter::Excon)
+          return :async_http if defined?(Async::HTTP::Faraday)
         else
           return :patron if defined?(::Patron)
           return :typhoeus if defined?(::Typhoeus)