From dfc3659eedc2082ad8ad1056ca559acae74115ab Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Mon, 8 Sep 2025 10:25:31 +0100 Subject: [PATCH 1/6] Fixed a regression where `add_field` is no longer enriching events https://github.com/logstash-plugins/logstash-input-jms/issues/58 --- CHANGELOG.md | 5 ++++- lib/logstash/inputs/jms.rb | 1 + logstash-input-jms.gemspec | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26cb37b..2e5e7f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ +## 3.3.1 + - Fixed a regression introduced in 3.3.0 where `add_field` is no longer enriching events. + ## 3.3.0 - - Added support for decoding multiple events from text or binary messages when using a codec that produces multiple events + - Added support for decoding multiple events from text or binary messages when using a codec that produces multiple events [#56](https://github.com/logstash-plugins/logstash-input-jms/pull/56) ## 3.2.2 - Fix: Remove usage of `java_kind_of?` to allow this plugin to be supported for versions of Logstash using jruby-9.3.x diff --git a/lib/logstash/inputs/jms.rb b/lib/logstash/inputs/jms.rb index 09f1a41..ecbe826 100644 --- a/lib/logstash/inputs/jms.rb +++ b/lib/logstash/inputs/jms.rb @@ -334,6 +334,7 @@ def queue_events(msg, output_queue) @properties_setter.call(event, properties) end + decorate(event) event end.each do |ready_event| output_queue << ready_event diff --git a/logstash-input-jms.gemspec b/logstash-input-jms.gemspec index e62afac..22d0e37 100644 --- a/logstash-input-jms.gemspec +++ b/logstash-input-jms.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-input-jms' - s.version = '3.3.0' + s.version = '3.3.1' s.licenses = ['Apache License (2.0)'] s.summary = "Reads events from a Jms Broker" 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" From 07407c2184cd2af9580d2a5637391788364c8d14 Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Mon, 8 Sep 2025 10:27:31 +0100 Subject: [PATCH 2/6] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e5e7f0..55fe0c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## 3.3.1 - - Fixed a regression introduced in 3.3.0 where `add_field` is no longer enriching events. + - Fixed a regression introduced in 3.3.0 where `add_field` is no longer enriching events [#59](https://github.com/logstash-plugins/logstash-input-jms/pull/59) ## 3.3.0 - Added support for decoding multiple events from text or binary messages when using a codec that produces multiple events [#56](https://github.com/logstash-plugins/logstash-input-jms/pull/56) From 4b91861c5ec268ee6434f49065397b5cf42f74d9 Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Mon, 8 Sep 2025 13:59:08 +0100 Subject: [PATCH 3/6] switch to official mirror --- setup_broker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_broker.sh b/setup_broker.sh index 7829cfc..f7dfee7 100755 --- a/setup_broker.sh +++ b/setup_broker.sh @@ -9,6 +9,6 @@ fi curl -s -o activemq-all.jar https://repo1.maven.org/maven2/org/apache/activemq/activemq-all/$ACTIVEMQ_VERSION/activemq-all-$ACTIVEMQ_VERSION.jar mv activemq-all.jar ./spec/inputs/fixtures/ -curl -s -o activemq-bin.tar.gz https://archive.apache.org/dist/activemq/$ACTIVEMQ_VERSION/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz +curl -s -o activemq-bin.tar.gz https://dlcdn.apache.org//activemq/$ACTIVEMQ_VERSION/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz tar xvf activemq-bin.tar.gz mv apache-activemq-$ACTIVEMQ_VERSION activemq From 433e069cd6972ee7b8c4444947cb3a1aac3b6b16 Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Mon, 8 Sep 2025 14:51:29 +0100 Subject: [PATCH 4/6] update active mq version --- .ci/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/run.sh b/.ci/run.sh index 30fdfa5..01a5837 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -5,7 +5,7 @@ env set -ex -export ACTIVEMQ_VERSION=5.15.16 +export ACTIVEMQ_VERSION=5.19.0 ./setup_broker.sh bundle install From 61dee78148acf15cf64e9861d7b27111b06ec8f7 Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Mon, 8 Sep 2025 15:35:38 +0100 Subject: [PATCH 5/6] Revert "update active mq version" This reverts commit 433e069cd6972ee7b8c4444947cb3a1aac3b6b16. --- .ci/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/run.sh b/.ci/run.sh index 01a5837..30fdfa5 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -5,7 +5,7 @@ env set -ex -export ACTIVEMQ_VERSION=5.19.0 +export ACTIVEMQ_VERSION=5.15.16 ./setup_broker.sh bundle install From bd5189fa5fc4e79f4143825f460aee85f83755fc Mon Sep 17 00:00:00 2001 From: Kaise Cheng Date: Mon, 8 Sep 2025 15:36:12 +0100 Subject: [PATCH 6/6] switch to maven repo --- setup_broker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_broker.sh b/setup_broker.sh index f7dfee7..be4ec8b 100755 --- a/setup_broker.sh +++ b/setup_broker.sh @@ -9,6 +9,6 @@ fi curl -s -o activemq-all.jar https://repo1.maven.org/maven2/org/apache/activemq/activemq-all/$ACTIVEMQ_VERSION/activemq-all-$ACTIVEMQ_VERSION.jar mv activemq-all.jar ./spec/inputs/fixtures/ -curl -s -o activemq-bin.tar.gz https://dlcdn.apache.org//activemq/$ACTIVEMQ_VERSION/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz +curl -s -o activemq-bin.tar.gz https://repo1.maven.org/maven2/org/apache/activemq/apache-activemq/$ACTIVEMQ_VERSION/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz tar xvf activemq-bin.tar.gz mv apache-activemq-$ACTIVEMQ_VERSION activemq