Merge pull request #225 from mashhurs/elastic-transport-support-4.x

Merge pull request #223 from mashhurs/support-elastic-transport-client

Author: mashhurs

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.21.2
+  - Add elastic-transport client support used in elasticsearch-ruby 8.x [#225](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/225)
+
 ## 4.21.1
   - Fix: prevent plugin crash when hits contain illegal structure [#183](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/183)
     - When a hit cannot be converted to an event, the input now emits an event tagged with `_elasticsearch_input_failure` with an `[event][original]` containing a JSON-encoded string representation of the entire hit.

lib/logstash/inputs/elasticsearch.rb

@@ -13,9 +13,7 @@
 require "base64"
 
 require "elasticsearch"
-require "elasticsearch/transport/transport/http/manticore"
-require_relative "elasticsearch/patches/_elasticsearch_transport_http_manticore"
-require_relative "elasticsearch/patches/_elasticsearch_transport_connections_selector"
+require "manticore"
 
 # .Compatibility Note
 # [NOTE]
@@ -323,7 +321,7 @@ def register
     @client_options = {
       :hosts => hosts,
       :transport_options => transport_options,
-      :transport_class => ::Elasticsearch::Transport::Transport::HTTP::Manticore,
+      :transport_class => get_transport_client_class,
       :ssl => ssl_options
     }
 
@@ -678,6 +676,20 @@ def setup_query_executor
                       end
   end
 
+  def get_transport_client_class
+    # LS-core includes `elasticsearch` gem. The gem is composed of two separate gems: `elasticsearch-api` and `elasticsearch-transport`
+    # And now `elasticsearch-transport` is old, instead we have `elastic-transport`.
+    # LS-core updated `elasticsearch` > 8: https://github.com/elastic/logstash/pull/17161
+    # Following source bits are for the compatibility to support both `elasticsearch-transport` and `elastic-transport` gems
+    require "elasticsearch/transport/transport/http/manticore"
+    require_relative "elasticsearch/patches/_elasticsearch_transport_http_manticore"
+    require_relative "elasticsearch/patches/_elasticsearch_transport_connections_selector"
+    ::Elasticsearch::Transport::Transport::HTTP::Manticore
+  rescue ::LoadError
+    require "elastic/transport/transport/http/manticore"
+    ::Elastic::Transport::Transport::HTTP::Manticore
+  end
+
   module URIOrEmptyValidator
     ##
     # @override to provide :uri_or_empty validator

logstash-input-elasticsearch.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '4.21.1'
+  s.version         = '4.21.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads query results from an Elasticsearch cluster"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elastic"]
   s.email           = '[email protected]'
-  s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.homepage        = "https://elastic.co/logstash"
   s.require_paths = ["lib"]
 
   # Files
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-mixin-validator_support", '~> 1.0'
   s.add_runtime_dependency "logstash-mixin-scheduler", '~> 1.0'
 
-  s.add_runtime_dependency 'elasticsearch', '>= 7.17.9'
+  s.add_runtime_dependency 'elasticsearch', '>= 7.17.9', '< 9'
   s.add_runtime_dependency 'logstash-mixin-ca_trusted_fingerprint_support', '~> 1.0'
   s.add_runtime_dependency 'logstash-mixin-normalize_config_support', '~>1.0'
 

spec/inputs/elasticsearch_spec.rb

@@ -21,6 +21,13 @@
   let(:es_version) { "7.5.0" }
   let(:cluster_info) { {"version" => {"number" => es_version, "build_flavor" => build_flavor}, "tagline" => "You Know, for Search"} }
 
+  def elastic_ruby_v8_client_available?
+    Elasticsearch::Transport
+    false
+  rescue NameError # NameError: uninitialized constant Elasticsearch::Transport if Elastic Ruby client is not available
+    true
+  end
+
   before(:each) do
     Elasticsearch::Client.send(:define_method, :ping) { } # define no-action ping method
     allow_any_instance_of(Elasticsearch::Client).to receive(:info).and_return(cluster_info)
@@ -79,9 +86,11 @@
 
         before do
           allow(Elasticsearch::Client).to receive(:new).and_return(es_client)
-          allow(es_client).to receive(:info).and_raise(
-            Elasticsearch::Transport::Transport::Errors::BadRequest.new
-          )
+          if elastic_ruby_v8_client_available?
+            allow(es_client).to receive(:info).and_raise(Elastic::Transport::Transport::Errors::BadRequest.new)
+          else
+            allow(es_client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Errors::BadRequest.new)
+          end
         end
 
         it "raises an exception" do
@@ -731,8 +740,13 @@ def synchronize_method!(object, method_name)
       it "should set host(s)" do
         plugin.register
         client = plugin.send(:client)
-
-        expect( client.transport.instance_variable_get(:@seeds) ).to eql [{
+        target_field = :@seeds
+        begin
+          Elasticsearch::Transport::Client
+        rescue
+          target_field = :@hosts
+        end
+        expect( client.transport.instance_variable_get(target_field) ).to eql [{
                                                                               :scheme => "https",
                                                                               :host => "ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io",
                                                                               :port => 9243,