logstash-input-dead_letter_queue 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72ab4a3d095208dd728b509cf547ef47c8951d5093027a72254674c52a79baa
-  data.tar.gz: 3c584acddee29a2f11327087a145b12cbee811ba844abc886df1c797cbf1cc21
+  metadata.gz: 9a9f7c1ca29e4d2e0b409b3a7f56d69b800ca1321386e9402530605224fbc64e
+  data.tar.gz: efc30664c8fc92365eda9e20cadffdd67123c9a80d79a04a3160dae5fcf6b33e
 SHA512:
-  metadata.gz: d66fc9550df26ec02d4f8872007131825e243c2429410698d4e94844ae71760831803b3beb7db8810de6698fb5e5b495d67763f96d79dfd076131a7d9aea92fd
-  data.tar.gz: 8a42ff2bc10cd95892a48bb6c38a6f95940cd0b3098bcc1b8084b2da4d12b6650dfa02d645e50d5c68a695f3b8fd2a590ee80f2d5f880bcad247a5815ed2d1e0
+  metadata.gz: 9da83407c607cd6977d988f3da9972ec6aba3e9383aabfef709f79f777b67a81c3d9f15f4a3fb7e7ab6e10e725bb7482b7689671851ba08e96e85b8a0337e8c9
+  data.tar.gz: 9bb864de1fe4c5d9d5c8a137e9977454dfcbf0d862454847ebd18cedc98451d4b3e3989a6e3bf68de65816600b424eb148e600beaea516aaea86d17a7c052f11

data/CHANGELOG.md

@@ -1,5 +1,9 @@
+## 1.1.11
+  - Fix: pre-flight checks before creating DLQ reader [#35](https://github.com/logstash-plugins/logstash-input-dead_letter_queue/pull/35)
+
 ## 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)
 

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

data/lib/logstash/inputs/dead_letter_queue.rb

@@ -2,6 +2,8 @@ require 'logstash/namespace'
 require 'logstash/inputs/base'
 require 'logstash-input-dead_letter_queue_jars'
 
+require 'fileutils'
+
 # Logstash input to read events from Logstash's dead letter queue
 # 
 # [source, sh]
@@ -45,7 +47,7 @@ class LogStash::Inputs::DeadLetterQueue < LogStash::Inputs::Base
       FileUtils::mkdir_p datapath
       @sincedb_path = File.join(datapath, ".sincedb_" + Digest::MD5.hexdigest(@path))
     elsif File.directory?(@sincedb_path)
-        raise ArgumentError.new("The \"sincedb_path\" argument must point to a file, received a directory: \"#{@sincedb_path}\"")
+      raise ArgumentError.new("The \"sincedb_path\" argument must point to a file, received a directory: \"#{@sincedb_path}\"")
     end
 
     dlq_path = java.nio.file.Paths.get(File.join(@path, @pipeline_id))
@@ -53,20 +55,24 @@ class LogStash::Inputs::DeadLetterQueue < LogStash::Inputs::Base
     start_timestamp = @start_timestamp ? org.logstash.Timestamp.new(@start_timestamp) : nil
     @inner_plugin = org.logstash.input.DeadLetterQueueInputPlugin.new(dlq_path, @commit_offsets, sincedb_path, start_timestamp)
     @inner_plugin.register
+
+    if Gem::Requirement.new('< 7.0').satisfied_by?(Gem::Version.new(LOGSTASH_CORE_VERSION))
+      @event_creator = Proc.new do |entry|
+        clone = entry.event.clone
+        # LS 6 LogStash::Event.new accept Map not Event
+        event = LogStash::Event.new(clone.getData())
+        event.set("[@metadata]", clone.getMetadata())
+        event
+      end
+    else
+      @event_creator = -> (entry) { LogStash::Event.new(entry.event.clone) }
+    end
   end # def register
 
   public
   def run(logstash_queue)
     @inner_plugin.run do |entry|
-      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 = @event_creator.(entry)
       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.10')
+require_jar('co.elastic.logstash.input', 'logstash-input-dead_letter_queue', '1.1.11')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-dead_letter_queue
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ files:
 - logstash-input-dead_letter_queue.gemspec
 - spec/unit/inputs/dead_letter_queue_spec.rb
 - 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
+- vendor/jar-dependencies/co/elastic/logstash/input/logstash-input-dead_letter_queue/1.1.11/logstash-input-dead_letter_queue-1.1.11.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)