elastic-transport 8.0.0 → 8.4.0

data/test/unit/adapters_test.rb

@@ -0,0 +1,104 @@
+# 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 Excon Faraday adapter' do
+      fork do
+        require 'faraday/excon'
+        client = Elastic::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Excon)
+      end
+    end if is_faraday_v2?
+
+    should 'use Async HTTP Faraday adapter' do
+      fork do
+        require 'async/http/faraday'
+        client = Elastic::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Async::HTTP::Faraday::Adapter)
+      end
+    end if is_faraday_v2?
+
+    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(client.transport.connections.first.connection.adapter, Faraday::Adapter::HTTPClient)
+      end
+    end
+  end unless jruby?
+end

data/test/unit/connection_test.rb

@@ -20,66 +20,66 @@ require 'test_helper'
 class Elastic::Transport::Transport::Connections::ConnectionTest < Minitest::Test
   include Elastic::Transport::Transport::Connections
 
-  context "Connection" do
-    should "be initialized with :host, :connection, and :options" do
+  context 'Connection' do
+    should 'be initialized with :host, :connection, and :options' do
       c = Connection.new :host => 'x', :connection => 'y', :options => {}
       assert_equal 'x', c.host
       assert_equal 'y', c.connection
       assert_instance_of Hash, c.options
     end
 
-    should "return full path" do
+    should 'return full path' do
       c = Connection.new
       assert_equal '_search', c.full_path('_search')
       assert_equal '_search', c.full_path('_search', {})
-      assert_equal '_search?foo=bar', c.full_path('_search', {:foo => 'bar'})
-      assert_equal '_search?foo=bar+bam', c.full_path('_search', {:foo => 'bar bam'})
+      assert_equal '_search?foo=bar', c.full_path('_search', {foo: 'bar'})
+      assert_equal '_search?foo=bar+bam', c.full_path('_search', {foo: 'bar bam'})
     end
 
-    should "return full url" do
-      c = Connection.new :host => { :protocol => 'http', :host => 'localhost', :port => '9200' }
-      assert_equal 'http://localhost:9200/_search?foo=bar', c.full_url('_search', {:foo => 'bar'})
+    should 'return full url' do
+      c = Connection.new host: { protocol: 'http', host: 'localhost', port: '9200' }
+      assert_equal 'http://localhost:9200/_search?foo=bar', c.full_url('_search', { foo: 'bar' })
     end
 
-    should "return full url with credentials" do
-      c = Connection.new :host => { :protocol => 'http', :user => 'U', :password => 'P', :host => 'localhost', :port => '9200' }
-      assert_equal 'http://U:P@localhost:9200/_search?foo=bar', c.full_url('_search', {:foo => 'bar'})
+    should 'return full url with credentials' do
+      c = Connection.new host: { protocol: 'http', user: 'U', password: 'P', host: 'localhost', port: '9200' }
+      assert_equal 'http://U:P@localhost:9200/_search?foo=bar', c.full_url('_search', { foo: 'bar' })
     end
 
-    should "return full url with escaped credentials" do
-      c = Connection.new :host => { :protocol => 'http', :user => 'U$$$', :password => 'P^^^', :host => 'localhost', :port => '9200' }
-      assert_equal 'http://U%24%24%24:P%5E%5E%5E@localhost:9200/_search?foo=bar', c.full_url('_search', {:foo => 'bar'})
+    should 'return full url with escaped credentials' do
+      c = Connection.new host: { protocol: 'http', user: 'U$$$', password: 'P^^^', host: 'localhost', port: '9200' }
+      assert_equal 'http://U%24%24%24:P%5E%5E%5E@localhost:9200/_search?foo=bar', c.full_url('_search', { foo: 'bar' })
     end
 
-    should "return full url with path" do
-      c = Connection.new :host => { :protocol => 'http', :host => 'localhost', :port => '9200', :path => '/foo' }
-      assert_equal 'http://localhost:9200/foo/_search?foo=bar', c.full_url('_search', {:foo => 'bar'})
+    should 'return full url with path' do
+      c = Connection.new host: { protocol: 'http', host: 'localhost', port: '9200', path: '/foo' }
+      assert_equal 'http://localhost:9200/foo/_search?foo=bar', c.full_url('_search', { foo: 'bar' })
     end
 
-    should "return right full url with path when path starts with /" do
-      c = Connection.new :host => { :protocol => 'http', :host => 'localhost', :port => '9200', :path => '/foo' }
-      assert_equal 'http://localhost:9200/foo/_search?foo=bar', c.full_url('/_search', {:foo => 'bar'})
+    should 'return right full url with path when path starts with /' do
+      c = Connection.new host: { protocol: 'http', host: 'localhost', port: '9200', path: '/foo' }
+      assert_equal 'http://localhost:9200/foo/_search?foo=bar', c.full_url('/_search', { foo: 'bar' })
     end
 
-    should "have a string representation" do
-      c = Connection.new :host => 'x'
+    should 'have a string representation' do
+      c = Connection.new(host: 'x')
       assert_match(/host: x/, c.to_s)
       assert_match(/alive/,   c.to_s)
     end
 
-    should "not be dead by default" do
+    should 'not be dead by default' do
       c = Connection.new
       assert ! c.dead?
     end
 
-    should "be dead when marked" do
+    should 'be dead when marked' do
       c = Connection.new.dead!
       assert c.dead?
       assert_equal 1, c.failures
       assert_in_delta c.dead_since, Time.now, 1
     end
 
-    should "be alive when marked" do
+    should 'be alive when marked' do
       c = Connection.new.dead!
       assert c.dead?
       assert_equal 1, c.failures
@@ -90,7 +90,7 @@ class Elastic::Transport::Transport::Connections::ConnectionTest < Minitest::Tes
       assert_equal 1, c.failures
     end
 
-    should "be healthy when marked" do
+    should 'be healthy when marked' do
       c = Connection.new.dead!
       assert c.dead?
       assert_equal 1, c.failures
@@ -101,35 +101,33 @@ class Elastic::Transport::Transport::Connections::ConnectionTest < Minitest::Tes
       assert_equal 0, c.failures
     end
 
-    should "be resurrected if timeout passed" do
+    should 'be resurrected if timeout passed' do
       c = Connection.new.dead!
 
       now = Time.now + 60
       Time.stubs(:now).returns(now)
 
-      assert   c.resurrect!, c.inspect
-      assert ! c.dead?,      c.inspect
+      assert(c.resurrect!, c.inspect)
+      assert(!c.dead?, c.inspect)
     end
 
-    should "be resurrected if timeout passed for multiple failures" do
+    should 'be resurrected if timeout passed for multiple failures' do
       c = Connection.new.dead!.dead!
 
-      now = Time.now + 60*2
+      now = Time.now + 60 * 2
       Time.stubs(:now).returns(now)
 
       assert   c.resurrect!, c.inspect
       assert ! c.dead?,      c.inspect
     end
 
-    should "implement the equality operator" do
-      c1 = Connection.new(:host => { :protocol => 'http', :host => 'foo', :port => 123 })
-      c2 = Connection.new(:host => { :protocol => 'http', :host => 'foo', :port => 123 })
-      c3 = Connection.new(:host => { :protocol => 'http', :host => 'foo', :port => 456 })
+    should 'implement the equality operator' do
+      c1 = Connection.new(host: { protocol: 'http', host: 'foo', port: 123 })
+      c2 = Connection.new(host: { protocol: 'http', host: 'foo', port: 123 })
+      c3 = Connection.new(host: { protocol: 'http', host: 'foo', port: 456 })
 
       assert c1 == c2, "Connection #{c1} should be equal to #{c2}"
       assert c2 != c3, "Connection #{c2} should NOT be equal to #{c3}"
     end
-
   end
-
 end

data/test/unit/transport_base_test.rb

@@ -255,10 +255,9 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
     should "raise an error on connection failure" do
       @transport.expects(:get_connection).returns(stub_everything :failures => 1)
 
-      # `block.expects(:call).raises(::Errno::ECONNREFUSED)` fails on Ruby 1.8
-      block = lambda { |a,b| raise ::Errno::ECONNREFUSED }
+      block = lambda { |a,b| raise Elastic::Transport::Transport::Error }
 
-      assert_raise ::Errno::ECONNREFUSED do
+      assert_raise Elastic::Transport::Transport::Error do
         @transport.perform_request 'GET', '/', &block
       end
     end
@@ -291,11 +290,11 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
       c = stub_everything :failures => 1
       @transport.expects(:get_connection).returns(c)
 
-      block = lambda { |a,b| raise ::Errno::ECONNREFUSED }
+      block = lambda { |a, b| raise Errno::ECONNREFUSED }
 
       c.expects(:dead!)
 
-      assert_raise( ::Errno::ECONNREFUSED ) { @transport.perform_request 'GET', '/', &block }
+      assert_raise( Elastic::Transport::Transport::Error ) { @transport.perform_request 'GET', '/', &block }
     end
   end
 
@@ -311,7 +310,7 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
 
     should "reload connections when host is unreachable" do
       @block.expects(:call).times(2).
-            raises(Errno::ECONNREFUSED).
+        raises(Errno::ECONNREFUSED).
             then.returns(stub_everything :failures => 1)
 
       @transport.expects(:reload_connections!).returns([])
@@ -343,13 +342,13 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
 
     should "raise an error after max tries" do
       @block.expects(:call).times(4).
-            raises(Errno::ECONNREFUSED).
+        raises(Errno::ECONNREFUSED).
             then.raises(Errno::ECONNREFUSED).
             then.raises(Errno::ECONNREFUSED).
             then.raises(Errno::ECONNREFUSED).
             then.returns(stub_everything :failures => 1)
 
-      assert_raise Errno::ECONNREFUSED do
+      assert_raise Elastic::Transport::Transport::Error do
         @transport.perform_request('GET', '/', &@block)
       end
     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

data/test/unit/transport_manticore_test.rb

@@ -111,7 +111,7 @@ if JRUBY
                     {
                       body: '{"foo":"bar"}',
                       headers: {
-                        'Content-Type' => 'application/json',
+                        'Content-Type' => 'application/x-ndjson',
                         'User-Agent' => @transport.send(:user_agent_header)
                       }
                     }

metadata

@@ -1,53 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: elastic-transport
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.4.0
 platform: ruby
 authors:
-- Karel Minarik
-- Emily Stolfo
-- Fernando Briano
-autorequire: 
+- Elastic Client Library Maintainers
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
 - !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 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,34 +135,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 +233,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
@@ -311,7 +252,7 @@ description: 'Low level Ruby client for Elastic. See the `elasticsearch` or `ela
 
   '
 email:
-- support@elastic.co
+- client-libs@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -321,10 +262,13 @@ files:
 - ".github/check_license_headers.rb"
 - ".github/license-header.txt"
 - ".github/workflows/license.yml"
+- ".github/workflows/otel.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- Gemfile-faraday1.gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -333,6 +277,7 @@ files:
 - lib/elastic/transport.rb
 - lib/elastic/transport/client.rb
 - lib/elastic/transport/meta_header.rb
+- lib/elastic/transport/opentelemetry.rb
 - lib/elastic/transport/redacted.rb
 - lib/elastic/transport/transport/base.rb
 - lib/elastic/transport/transport/connections/collection.rb
@@ -355,12 +300,14 @@ files:
 - spec/elastic/transport/http/faraday_spec.rb
 - spec/elastic/transport/http/manticore_spec.rb
 - spec/elastic/transport/meta_header_spec.rb
+- spec/elastic/transport/opentelemetry_spec.rb
 - spec/elastic/transport/sniffer_spec.rb
 - spec/spec_helper.rb
 - test/integration/jruby_test.rb
 - 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
@@ -376,7 +323,6 @@ metadata:
   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
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -392,8 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Low level Ruby client for Elastic services.
 test_files:
@@ -405,12 +350,14 @@ test_files:
 - spec/elastic/transport/http/faraday_spec.rb
 - spec/elastic/transport/http/manticore_spec.rb
 - spec/elastic/transport/meta_header_spec.rb
+- spec/elastic/transport/opentelemetry_spec.rb
 - spec/elastic/transport/sniffer_spec.rb
 - spec/spec_helper.rb
 - test/integration/jruby_test.rb
 - 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