elasticsearch 8.10.0 → 8.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01703b098a99215d5b9b9591ed0e978843b55314b9dfa2d8fcf4abeebbd7dd1e
-  data.tar.gz: 907bf243f4dbc446d962b4055e80a08688b2a28c0fe3a087c8c4e8b648600380
+  metadata.gz: '0863941afcbf869fc63bbc909947da855ad9d23aeacd8631fbbb31028e494d3e'
+  data.tar.gz: 331064a5091a85cbc79f6ef1182c23383b3467501867ae6130864b6e92c664ca
 SHA512:
-  metadata.gz: 0c1f8db8b41885f95e07b12e28f7d402c2695cb2497d0e1de348918c0f0ca7740731dfad4770bd3319e9df2c216b23e00e73ba4ca51e5be2686ee86f4b3b4889
-  data.tar.gz: 4e770597919914ff503d30c3a81bfa38d0361d626eb04e75a7168728baf402ea479bc7a84febde17abf1e7ca85f0a6efdafde429f2d28755966e2ddb06383334
+  metadata.gz: dd080574649cbdb377e37d51b59f5974fcda6e728051077de83b6c3baa12b85df6c19f7b7454127db163ae35786624de33334f3f742fc7b94b8abda4832c5f17
+  data.tar.gz: fe3c174be073f739d409c08394638cc8ff518be2fbb1b01faa677ccfea26f08be63e3f7a137932c5a7b4624e1cdb947e1a8032aa8b17e1caa0f346c3ba1c048a

data/Gemfile

@@ -25,3 +25,7 @@ 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 ENV['TRANSPORT_VERSION'] == 'main'
+  gem 'elastic-transport', git: 'https://github.com/elastic/elastic-transport-ruby.git', branch: 'main'
+end

data/elasticsearch.gemspec

@@ -22,8 +22,8 @@ require 'elasticsearch/version'
 Gem::Specification.new do |s|
   s.name          = 'elasticsearch'
   s.version       = Elasticsearch::VERSION
-  s.authors       = ['Karel Minarik', 'Emily Stolfo', 'Fernando Briano']
-  s.email         = ['clients-team@elastic.co']
+  s.authors       = ['Elastic Client Library Maintainers']
+  s.email         = ['client-libs@elastic.co']
   s.summary       = 'Ruby integrations for Elasticsearch'
   s.homepage      = 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/index.html'
   s.license       = 'Apache-2.0'
@@ -45,8 +45,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency 'elastic-transport', '~> 8'
-  s.add_dependency 'elasticsearch-api', '8.10.0'
+  s.add_dependency 'elastic-transport', '~> 8.3'
+
+  s.add_dependency 'elasticsearch-api', '8.11.1'
+  s.add_dependency 'base64'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION) || defined?(Rubinius)

data/lib/elasticsearch/version.rb

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

data/lib/elasticsearch.rb

@@ -18,6 +18,7 @@
 require 'elasticsearch/version'
 require 'elastic/transport'
 require 'elasticsearch/api'
+require 'base64'
 
 module Elasticsearch
   NOT_ELASTICSEARCH_WARNING = 'The client noticed that the server is not Elasticsearch and we do not support this unknown product.'.freeze
@@ -59,7 +60,11 @@ module Elasticsearch
         super
       elsif name == :perform_request
         # The signature for perform_request is:
-        # method, path, params, body, headers
+        # method, path, params, body, headers, opts
+        # The last arg is opts, which shouldn't be sent when `perform_request` is called
+        # directly. Check if :endpoint is a key, which means it's the extra identifier
+        # used for OpenTelemetry.
+        args.pop if args[-1].is_a?(Hash) && args[-1][:endpoint]
         if (opaque_id = args[2]&.delete(:opaque_id))
           headers = args[4] || {}
           opaque_id = @opaque_id_prefix ? "#{@opaque_id_prefix}#{opaque_id}" : opaque_id

data/spec/unit/headers_spec.rb

@@ -26,7 +26,7 @@ describe Elasticsearch::Client do
       allow(client).to receive(:perform_request) { OpenStruct.new(body: '') }
       expect { client.search(headers: headers) }.not_to raise_error
       expect(client).to have_received(:perform_request)
-        .with('GET', '_search', {}, nil, headers)
+        .with('GET', '_search', {}, nil, headers, { endpoint: 'search' })
     end
   end
 

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 8.10.0
+  version: 8.11.1
 platform: ruby
 authors:
-- Karel Minarik
-- Emily Stolfo
-- Fernando Briano
+- Elastic Client Library Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastic-transport
@@ -18,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.3'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.10.0
+        version: 8.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.10.0
+        version: 8.11.1
+- !ruby/object:Gem::Dependency
+  name: base64
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +196,7 @@ description: 'Ruby integrations for Elasticsearch (client, API, etc.)
 
   '
 email:
-- clients-team@elastic.co
+- client-libs@elastic.co
 executables:
 - elastic_ruby_console
 extensions: []
@@ -241,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch