From a0808dc2cd5db376dd547263f858dd630dc6d699 Mon Sep 17 00:00:00 2001 From: edmocosta <11836452+edmocosta@users.noreply.github.com> Date: Mon, 11 Aug 2025 16:21:10 +0200 Subject: [PATCH 1/2] Fixed concurrency issue with multiline codec and other grok-based plugins --- CHANGELOG.md | 3 +++ lib/logstash/codecs/multiline.rb | 2 +- logstash-codec-multiline.gemspec | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c1bc08..f78887b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.1.3 + - Fix: concurrency issue with multiline codec and other grok-based plugins [#TBD](https://github.com/logstash-plugins/logstash-codec-multiline/pull/TBD) + ## 3.1.2 - Fix: periodic runner fails to stop and prevent pipeline shutdown [#72](https://github.com/logstash-plugins/logstash-codec-multiline/pull/72) diff --git a/lib/logstash/codecs/multiline.rb b/lib/logstash/codecs/multiline.rb index fba87f2..a933c01 100644 --- a/lib/logstash/codecs/multiline.rb +++ b/lib/logstash/codecs/multiline.rb @@ -5,6 +5,7 @@ require "logstash/codecs/auto_flush" require 'logstash/plugin_mixins/ecs_compatibility_support' require 'logstash/plugin_mixins/event_support/event_factory_adapter' +require "grok-pure" # rubygem 'jls-grok' # The multiline codec will collapse multiline messages and merge them into a # single event. @@ -155,7 +156,6 @@ def initialize(*params) end def register - require "grok-pure" # rubygem 'jls-grok' require 'logstash/patterns/core' # Detect if we are running from a jarfile, pick the right path. diff --git a/logstash-codec-multiline.gemspec b/logstash-codec-multiline.gemspec index 05bef8c..315eee7 100644 --- a/logstash-codec-multiline.gemspec +++ b/logstash-codec-multiline.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-codec-multiline' - s.version = '3.1.2' + s.version = '3.1.3' s.licenses = ['Apache License (2.0)'] s.summary = "Merges multiline messages into a single event" 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 5057e3763fcbc075d2a76d9b4973a9fb3f5875fd Mon Sep 17 00:00:00 2001 From: Edmo Vamerlatti Costa <11836452+edmocosta@users.noreply.github.com> Date: Mon, 11 Aug 2025 16:32:30 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f78887b..d035698 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## 3.1.3 - - Fix: concurrency issue with multiline codec and other grok-based plugins [#TBD](https://github.com/logstash-plugins/logstash-codec-multiline/pull/TBD) + - Fix: concurrency issue with multiline codec and other grok-based plugins [#75](https://github.com/logstash-plugins/logstash-codec-multiline/pull/75) ## 3.1.2 - Fix: periodic runner fails to stop and prevent pipeline shutdown [#72](https://github.com/logstash-plugins/logstash-codec-multiline/pull/72)