logstash-input-dead_letter_queue 1.1.6 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b4eb05b3cff8ec450d2e90ba71a15a70bdd5c4d13f33a28c6a578e205d287f
-  data.tar.gz: 4bea1e815281beaf2dbd7e3ee8b15b8aa6cecca2d901386e426e3aa303d61b2d
+  metadata.gz: f72ab4a3d095208dd728b509cf547ef47c8951d5093027a72254674c52a79baa
+  data.tar.gz: 3c584acddee29a2f11327087a145b12cbee811ba844abc886df1c797cbf1cc21
 SHA512:
-  metadata.gz: 6083fb5f80c1871cdb92cbe590d67a424cb5cf8480290650268f46766bbd6a1439d0b04bc8fa166ebcc6c5aa16e449bfa29fa888de849620d42e692eb3ab66c0
-  data.tar.gz: 2d5bdd800692b8a60f9a6391f4d13a39f961a9c80e2d440b944cd295d0d82edd5bc259a4b2a30fff953261843cdc1388473e00cf6c64be19e4d7e517103b80aa
+  metadata.gz: d66fc9550df26ec02d4f8872007131825e243c2429410698d4e94844ae71760831803b3beb7db8810de6698fb5e5b495d67763f96d79dfd076131a7d9aea92fd
+  data.tar.gz: 8a42ff2bc10cd95892a48bb6c38a6f95940cd0b3098bcc1b8084b2da4d12b6650dfa02d645e50d5c68a695f3b8fd2a590ee80f2d5f880bcad247a5815ed2d1e0

data/CHANGELOG.md

@@ -1,5 +1,17 @@
+## 1.1.10
+  - Fix, avoid Logstash crash on shutdown if DLQ files weren't created [#33](https://github.com/logstash-plugins/logstash-input-dead_letter_queue/pull/33)
+## 1.1.9
+  - Fix `@metadata` get overwritten by reestablishing metadata that stored in DLQ [#34](https://github.com/logstash-plugins/logstash-input-dead_letter_queue/pull/34)
+
+## 1.1.8
+  - Update dependencies for log4j to 2.17.1
+
+## 1.1.7
+  - Further update dependencies for log4j (2.17.0) and jackson
+
 ## 1.1.6
   - Update dependencies for log4j and jackson [#30](https://github.com/logstash-plugins/logstash-input-dead_letter_queue/pull/30)
+
 ## 1.1.5
   - Fix asciidoc formatting in documentation [#21](https://github.com/logstash-plugins/logstash-input-dead_letter_queue/pull/21)
 

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.10

data/lib/logstash/inputs/dead_letter_queue.rb

@@ -58,7 +58,15 @@ class LogStash::Inputs::DeadLetterQueue < LogStash::Inputs::Base
   public
   def run(logstash_queue)
     @inner_plugin.run do |entry|
-      event = LogStash::Event.new(entry.event.toMap())
+      clone = entry.event.clone()
+      event = if Gem::Requirement.new('< 7.0').satisfied_by?(Gem::Version.new(LOGSTASH_CORE_VERSION))
+                # LS 6 LogStash::Event.new accept Map not Event
+                event = LogStash::Event.new(clone.getData())
+                event.set("[@metadata]", clone.getMetadata())
+                event
+              else
+                LogStash::Event.new(clone)
+              end
       event.set("[@metadata][dead_letter_queue][plugin_type]", entry.plugin_type)
       event.set("[@metadata][dead_letter_queue][plugin_id]", entry.plugin_id)
       event.set("[@metadata][dead_letter_queue][reason]", entry.reason)

data/lib/logstash-input-dead_letter_queue_jars.rb

@@ -1,4 +1,4 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('co.elastic.logstash.input', 'logstash-input-dead_letter_queue', '1.1.6')
+require_jar('co.elastic.logstash.input', 'logstash-input-dead_letter_queue', '1.1.10')

data/spec/unit/inputs/dead_letter_queue_spec.rb

@@ -19,8 +19,35 @@ describe LogStash::Inputs::DeadLetterQueue do
     expect {subject.register}.to_not raise_error
   end
 
-
   after(:each) do
     FileUtils.remove_entry_secure directory
   end
+
+  context 'test with real DLQ file' do
+    let(:dlq_dir) { Stud::Temporary.directory }
+    let(:fixture_dir) { File.expand_path(File.join(File.dirname(__FILE__),"fixtures", "main")) }
+    let(:plugin) { LogStash::Inputs::DeadLetterQueue.new({ "path" => dlq_dir, "commit_offsets" => true }) }
+    let(:queue) { Queue.new }
+
+    before do
+      FileUtils.cp_r fixture_dir, dlq_dir
+    end
+
+    it 'reserve original metadata' do
+      plugin.register
+      t = Thread.new {
+        begin
+          plugin.run(queue)
+        rescue java.nio.file.ClosedWatchServiceException => e
+        end
+      }
+
+      event = queue.pop
+      expect(event.get("[@metadata][some_key]")).to eq("some_value")
+      expect(event.get("[@metadata][dead_letter_queue][reason]")).to match(/Could not index event to Elasticsearch. status: 400/)
+
+      plugin.stop
+      t.join(1000)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-dead_letter_queue
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.10
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,8 @@ files:
 - lib/logstash/inputs/dead_letter_queue.rb
 - logstash-input-dead_letter_queue.gemspec
 - spec/unit/inputs/dead_letter_queue_spec.rb
-- vendor/jar-dependencies/co/elastic/logstash/input/logstash-input-dead_letter_queue/1.1.6/logstash-input-dead_letter_queue-1.1.6.jar
+- spec/unit/inputs/fixtures/main/1.log
+- vendor/jar-dependencies/co/elastic/logstash/input/logstash-input-dead_letter_queue/1.1.10/logstash-input-dead_letter_queue-1.1.10.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -108,3 +109,4 @@ specification_version: 4
 summary: read events from Logstash's dead letter queue
 test_files:
 - spec/unit/inputs/dead_letter_queue_spec.rb
+- spec/unit/inputs/fixtures/main/1.log