logstash-input-udp 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29522e18476cbd28b2df6af5c4628d51a05269e925fdedab6f9e461108f1453c
-  data.tar.gz: 4de2a83077bdc9193c08970ce38a9eb1f42ebb141b45b5d2eb22af42004aeb61
+  metadata.gz: 0105afa2ee725c47660577dbf22c2ad2f67be803379a6fd65dd0dfae7a2cafff
+  data.tar.gz: 6daebc814537c9219e9b993e97f0a55f2c0bbfb9769bc4ee09930614a3ffd96b
 SHA512:
-  metadata.gz: 93217447e2fdb8ea74166fde9759bf66e031d6570dca4dd471f72913d189926e9e0a77c4f6580e6aa13214cbc6d2ddeaaf8d8621d11e34c9393711bb3b681f22
-  data.tar.gz: 6880681a1da9e4b9399162601532348f47f53414f760077805214e7d25529ae3f00943b467db90fea7b569cda9fb9037fa9b75f89162fb22223b3c6ccb9a2293
+  metadata.gz: 982fef22a015e83c177579134eecc8fb042af10fbe78652b465ad5298f04112855fce191a8818b6518c9dc0119e12bd1c468d8944dc7dcc9867f1ebc6f3943d8
+  data.tar.gz: c540241bc6cec7b34e0063f950967e58f9c241aebb83903aa389019497f9db40b133fa10cc2f309a449d180982bb811c073922c7e37f537e87421f53fddd4fa2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.2.0
+  - Clone codec per worker. See https://github.com/logstash-plugins/logstash-input-udp/pull/32
+
 ## 3.1.3
   - Update gemspec summary
 

data/CONTRIBUTORS

@@ -11,6 +11,7 @@ Contributors:
 * Pier-Hugues Pellerin (ph)
 * Richard Pijnenburg (electrical)
 * kcrayon
+* Colin Surprenant (colinsurprenant)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/lib/logstash/inputs/udp.rb

@@ -37,6 +37,8 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
   # before packets will start dropping.
   config :queue_size, :validate => :number, :default => 2000
 
+  HOST_FIELD = "host".freeze
+
   public
   def initialize(params)
     super
@@ -86,7 +88,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
 
     @input_workers = @workers.times do |i|
       @logger.debug("Starting UDP worker thread", :worker => i)
-      Thread.new { inputworker(i) }
+      Thread.new(i, @codec.clone) { |i, codec| inputworker(i, codec) }
     end
 
     while !stop?
@@ -109,17 +111,15 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
     end
   end # def udp_listener
 
-  def inputworker(number)
+  def inputworker(number, codec)
     LogStash::Util::set_thread_name("<udp.#{number}")
     begin
       while true
         payload, client = @input_to_worker.pop
+        host = client[3]
 
-        @codec.decode(payload) do |event|
-          decorate(event)
-          event.set("host", client[3]) if event.get("host").nil?
-          @output_queue.push(event)
-        end
+        codec.decode(payload) { |event| push_decoded_event(host, event) }
+        codec.flush { |event| push_decoded_event(host, event) }
       end
     rescue => e
       @logger.error("Exception in inputworker", "exception" => e, "backtrace" => e.backtrace)
@@ -136,4 +136,12 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
     @udp.close rescue nil
   end
 
+  private
+
+  def push_decoded_event(host, event)
+    decorate(event)
+    event.set(HOST_FIELD, host) if event.get(HOST_FIELD).nil?
+    @output_queue.push(event)
+  end
+
 end # class LogStash::Inputs::Udp

data/logstash-input-udp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-udp'
-  s.version         = '3.1.3'
+  s.version         = '3.2.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads events over UDP"
   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"
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'stud', '~> 0.0.22'
+  s.add_development_dependency 'logstash-codec-line'
   s.add_development_dependency 'logstash-devutils'
 end
 

data/spec/inputs/udp_spec.rb

@@ -9,8 +9,10 @@ describe LogStash::Inputs::Udp do
   end
 
   let!(:helper) { UdpHelpers.new }
-  let(:port)   { rand(1024..65535) }
-  subject      { LogStash::Plugin.lookup("input", "udp").new({ "port" => port }) }
+  let(:client) { LogStash::Inputs::Test::UDPClient.new(port) }
+  let(:port) { rand(1024..65535) }
+  let(:config) { { "port" => port } }
+  subject { LogStash::Plugin.lookup("input","udp").new(config) }
 
   after :each do
     subject.close rescue nil
@@ -23,8 +25,6 @@ describe LogStash::Inputs::Udp do
   end
 
   describe "receive" do
-
-    let(:client) { LogStash::Inputs::Test::UDPClient.new(port) }
     let(:nevents) { 10 }
 
     let(:events) do
@@ -46,10 +46,32 @@ describe LogStash::Inputs::Udp do
         expect(message).to match(/msg \d+/)
       end
     end
+  end
+
+  describe "multiple lines per datagram using line codec" do
+    # 3 workers for 3 datagrams send below
+    let(:config) { { "port" => port, "workers" => 3, "codec" => "line" } }
+
+    let(:events) do
+      helper.input(subject, 8) do
+        client.send("line1\nline2")
+        client.send("line3\nline4")
+        client.send("line5\nline6\nline7\nline8")
+      end
+    end
 
+    before(:each) do
+      subject.register
+    end
+
+    it "should receive events been generated" do
+      expect(events.size).to be(8)
+      messages = events.map { |event| event.get("message") }.sort # important to sort here because order is unpredictable
+      messages.each_index {|i| expect(messages[i]).to match("line#{i + 1}")}
+    end
   end
 
   it_behaves_like "an interruptible input plugin" do
-    let(:config) { { "port" => port } }
+    # see https://github.com/elastic/logstash-devutils/blob/9c4a1fbf2b0c4547e428c5a40ed84f60aad17f97/lib/logstash/devutils/rspec/shared_examples.rb
   end
-end
+end

data/spec/support/client.rb

@@ -4,7 +4,6 @@ require "socket"
 module LogStash::Inputs::Test
 
   class UDPClient
-
     attr_reader :host, :port, :socket
 
     def initialize(port)
@@ -14,24 +13,18 @@ module LogStash::Inputs::Test
       socket.connect(host, port)
     end
 
-    def send(msg="")
+    def send(msg)
       begin
-        send(msg)
-      rescue Exception => e
-        puts "send.exception", e
+        socket.connect(host, port) if socket.closed?
+        socket.send(msg, 0)
+      rescue  => e
+        puts("send exception, retrying", e.inspect)
         retry
       end
     end
 
-    def send(msg)
-      socket.connect(host, port) if socket.closed?
-      socket.send(msg, 0)
-    end
-
     def close
-      socket.close
+      socket.close unless socket.closed?
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-udp
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-codec-line
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -114,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Reads events over UDP