logstash-integration-rabbitmq 7.3.2-java → 7.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d87b910943f6be19026320fcad93686f4583361f394f4ce5415415bc99faaac3
-  data.tar.gz: f6dce144b898f2a818f8e9bc0751adc1e467f98ddf002abb6eedbf64f24242bd
+  metadata.gz: f8b1b48521b0094de4590f515bf7a0e5b100c31437dfcfd6441054e663a862c3
+  data.tar.gz: cface3e3fa3835787b3f9ca5d9e5447e65d8c2a0473445a41a7984beab07ac56
 SHA512:
-  metadata.gz: 2de6023c6ae0ab82548a8933ed89771ebc839a24320e13065e177a12d488f29e329e0ef9983854600c03f28c67f49fcf627ecf92556a8839abbdae9255195d62
-  data.tar.gz: f0071bfa48a4b2f2c3727bef2543f06c9e88ef92d7a662606f782fccb508028d25f3bd3a7c6107a43334ae86d75ebf0ff6526d27ff400d5035dababf83189977
+  metadata.gz: f94cf03c38e5a6668898cf90cb76f94a56b97c49a150c54a1ed058bd1e8ebd0c6df1061bf4629bb6c93347698a373285d3c28a5ec6acfa263656e44920ecd7ac
+  data.tar.gz: e63a13e0164a381817198b8adf84b149fc278ce7b57b00ba7ed0dc7388b6dbff1a0b9fc5151e1cc488af19eb4ad3e2eb0593ee051157edc175678148f2027521

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 7.4.0
+  - Removed obsolete `verify_ssl` and `debug` options [#60](https://github.com/logstash-plugins/logstash-integration-rabbitmq/pull/60)
+
+## 7.3.3
+  - Fixed the cancellation flow to avoid multiple invocations of basic.cancel [#55](https://github.com/logstash-plugins/logstash-integration-rabbitmq/pull/55)
+
 ## 7.3.2
   - Change `tls_certificate_password` type to `password` to protect from leaks in the logs [#54](https://github.com/logstash-plugins/logstash-integration-rabbitmq/pull/54)
 

data/lib/logstash/inputs/rabbitmq.rb

@@ -308,7 +308,14 @@ module LogStash
       end
 
       def shutdown_consumer
-        return unless @consumer
+        # There are two possible flows to shutdown consumers. When the plugin is the one shutting down, it should send a channel
+        # cancellation message by invoking channel.basic_cancel(consumer_tag) and waiting for the consumer to terminate
+        # (broker replies with an basic.cancel-ok). This back and forth is handled by MarchHare. On the other hand, when the broker
+        # requests the client to shutdown (eg. due to queue deletion). It sends to the client a basic.cancel message, which is handled
+        # internally by the client, unregistering the consumer and then invoking the :on_cancellation callback. In that case, the plugin
+        # should not do anything as the consumer is already cancelled/unregistered.
+        return if !@consumer || @consumer.cancelled? || @consumer.terminated?
+
         @hare_info.channel.basic_cancel(@consumer.consumer_tag)
         connection = @hare_info.connection
         until @consumer.terminated?

data/lib/logstash/plugin_mixins/rabbitmq_connection.rb

@@ -54,18 +54,12 @@ module LogStash
         # Version of the SSL protocol to use.
         config :ssl_version, :validate => :string, :default => "TLSv1.2"
 
-        config :verify_ssl, :validate => :boolean, :default => false,
-          :obsolete => "This function did not actually function correctly and was removed." +
-                       "If you wish to validate SSL certs use the ssl_certificate_path and ssl_certificate_password options."
-
         # Path to an SSL certificate in PKCS12 (.p12) format used for verifying the remote host
         config :ssl_certificate_path, :validate => :path
 
         # Password for the encrypted PKCS12 (.p12) certificate file specified in ssl_certificate_path
         config :ssl_certificate_password, :validate => :password
 
-        config :debug, :validate => :boolean, :obsolete => "Use the logstash --debug flag for this instead."
-
         # Set this to automatically recover from a broken connection. You almost certainly don't want to override this!!!
         config :automatic_recovery, :validate => :boolean, :default => true
 

data/logstash-integration-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-integration-rabbitmq'
-  s.version         = '7.3.2'
+  s.version         = '7.4.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Integration with RabbitMQ - input and output plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline "+

data/spec/inputs/rabbitmq_spec.rb

@@ -63,6 +63,62 @@ describe LogStash::Inputs::RabbitMQ do
       expect(instance.codec.config_name).to eq "json"
     end
 
+    describe "and #stop is called" do
+      let(:consumer_tag) { "foo-bar-queue" }
+      let(:consumer) { double("consumer") }
+
+      before do
+        instance.register
+        instance.setup!
+        instance.instance_variable_set(:@consumer, consumer)
+
+        allow(instance).to receive(:close_connection)
+        allow(consumer).to receive(:consumer_tag).and_return(consumer_tag)
+      end
+
+      context "with a cancelled consumer" do
+        before do
+          allow(consumer).to receive(:cancelled?).and_return(true)
+          allow(consumer).to receive(:terminated?).and_return(false)
+        end
+
+        it "should not call basic_cancel" do
+          expect(channel).to_not receive(:basic_cancel)
+          instance.stop
+        end
+      end
+
+      context "with a terminated consumer" do
+        before do
+          allow(consumer).to receive(:cancelled?).and_return(false)
+          allow(consumer).to receive(:terminated?).and_return(true)
+        end
+
+        it "should not call basic_cancel" do
+          expect(channel).to_not receive(:basic_cancel)
+          instance.stop
+        end
+      end
+
+      context "with a running consumer" do
+        before do
+          allow(consumer).to receive(:cancelled?).and_return(false)
+          allow(consumer).to receive(:terminated?).and_return(false, false, true)
+        end
+
+        it "should call basic_cancel" do
+          expect(channel).to receive(:basic_cancel).with(consumer_tag)
+          instance.stop
+        end
+
+        it "should log terminating info" do
+          allow(channel).to receive(:basic_cancel).with(consumer_tag)
+          expect(instance.logger).to receive(:info).with(/Waiting for RabbitMQ consumer to terminate before stopping/, anything)
+          instance.stop
+        end
+      end
+    end
+
     describe "#connect!" do
       subject { hare_info }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.4.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.5.0
   name: logstash-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -51,8 +51,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-json
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -65,8 +65,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
   name: march_hare
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,8 +79,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.22
   name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -93,8 +93,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: back_pressure
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -107,8 +107,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -121,8 +121,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-input-generator
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,8 +135,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Integration with RabbitMQ - input and output plugins