logstash-input-udp 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1a51adcca72f210af80205adc7013e645125c20d9cdcf3594722dc6a1edd30
-  data.tar.gz: ef56390c1eb089a147aec7ed835f0ed2ffd0e1f5d1dd081eebb7b9cedc7c0af6
+  metadata.gz: 5e1175824b16831674875cc4ede62188e3e6d38bff5aed42b169453be00c3cdf
+  data.tar.gz: fc54de7e53214b4f68db927f8e6bf5e81e6cb530a7fa104cb439ceb8920b03bf
 SHA512:
-  metadata.gz: ec255113cc79a3f82da8ca84a35f15d49a05e55fc1cb49f4fe42be2ea226a1997ce862ccaa849fd5b5acc5ff065b3134903be05c96434ad7ad678f85189bc729
-  data.tar.gz: 90143728291117d521b2479b1665e09ddbeb1920135ed66a99dbd7f92898da7585d0fc250d8f3d7e2a6c28ce715e0f1f250621ca86ba99ae3ad53e46d1297279
+  metadata.gz: bee71becfe577ce656daecce595d2b97dafc208a3b93d3dda7718f8f647adbb806e08caadd4ea81e0819158d1914c7efbe3f4745296c80c2dd6d71861faf4b21
+  data.tar.gz: e6cd007d1d904bff2a511101112d40b27f896294f820fc0bdba5213895f5ee5f7219d20cc2dbcaae07c9374ba6ae617237dcddabae3e4ad9833353d4990d5a38

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.3
+  - Work around jruby/jruby#5148 by cloning messages on jruby 9k, therefore resizing the underlying byte buffer
+
 ## 3.3.2
   - Fix missing require for the ipaddr library.
 

data/lib/logstash/inputs/udp.rb

@@ -118,7 +118,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
         begin
           payload, client = @udp.recvfrom_nonblock(@buffer_size)
           break if payload.empty?
-          @input_to_worker.push([payload, client])
+          push_data(payload, client)
         rescue IO::EAGAINWaitReadable
           break
         end
@@ -148,6 +148,21 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
     end
   end
 
+  # work around jruby/jruby#5148
+  # For jruby 9k (ruby >= 2.x) we need to truncate the buffer
+  # after reading from the socket otherwise each
+  # message will use 64kb
+  if RUBY_VERSION.match(/^2/)
+    def push_data(payload, client)
+      payload = payload.b.force_encoding(Encoding::UTF_8)
+      @input_to_worker.push([payload, client])
+    end
+  else
+    def push_data(payload, client)
+      @input_to_worker.push([payload, client])
+    end
+  end
+
   def push_decoded_event(host, event)
     decorate(event)
     event.set(HOST_FIELD, host) if event.get(HOST_FIELD).nil?

data/logstash-input-udp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-udp'
-  s.version         = '3.3.2'
+  s.version         = '3.3.3'
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-udp
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement