logstash-input-tcp 6.4.15-java → 6.4.17-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5afd982b540c98d13f9be12e8442738725b3a7553f8d9148e4c9bd08151dd828
-  data.tar.gz: 7eb1ae160d880dd795bf9ddb1eec3fdddabe07556ca2638ac62eeb420e774a0f
+  metadata.gz: e4b4f7a07c617f29bad1e28a5712f1c6c73f528f32fbe60961ba6b5f06db42ad
+  data.tar.gz: 0566e4a3a735468dbae2448e3dc5881769ebe8f55f1ff1988766dfc2da2d637c
 SHA512:
-  metadata.gz: 820a05b395fe2a71599241286bbb9b38dbee970800f7db81e38afb7dfe6076a58aa118912eb41c1a626b4a6bd1f4dd8e42d9b78e9948da68f7298ec73fc371b4
-  data.tar.gz: 890f02c27e730f6ebed5e7d10503de4b5c58293e054b5f3738d678c143813345b4f999fb1d0a88d13239b3fb83ba47a5f5cb037fb994c3ebb9f0eb080e3a1b80
+  metadata.gz: a355e7c499d916fbc6761cabd5821dedae49155d5ba4458ff30454d24c6daae59ce49f3d1276833cc679ee3a86666194a163f98213aa078268f26601fa553841
+  data.tar.gz: 40d9d2ffbd6e70a14f513da9533c69150c68ea462d8e25ff05d2e96c5824e7833719bc410daca98b83737df15ba98c5dee281dc492f859cc9368e028ae0ea079

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.4.17
+  - Update Netty dependency to 4.1.138.Final [#289](https://github.com/logstash-plugins/logstash-input-tcp/pull/289)
+
+## 6.4.16
+  - Fix for processing the HA Proxy protocol, considering the line can be split in multiple buffers. [#287](https://github.com/logstash-plugins/logstash-input-tcp/pull/287)
+
 ## 6.4.15
   - Update Netty dependency to 4.1.137.Final [#283](https://github.com/logstash-plugins/logstash-input-tcp/pull/283)
 

data/lib/logstash/inputs/tcp.rb

@@ -181,7 +181,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     validate_ssl_config!
 
     if server?
-      @loop = InputLoop.new(@id, @host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive, java_ssl_context)
+      @loop = InputLoop.new(@id, @host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive, java_ssl_context, @proxy_protocol)
     end
   end
 

data/lib/logstash-input-tcp_jars.rb

@@ -1,12 +1,12 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('io.netty', 'netty-handler', '4.1.137.Final')
+require_jar('io.netty', 'netty-handler', '4.1.138.Final')
 require_jar('commons-io', 'commons-io', '2.17.0')
-require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.137.Final')
-require_jar('io.netty', 'netty-codec', '4.1.137.Final')
-require_jar('io.netty', 'netty-transport', '4.1.137.Final')
-require_jar('io.netty', 'netty-resolver', '4.1.137.Final')
-require_jar('io.netty', 'netty-buffer', '4.1.137.Final')
-require_jar('io.netty', 'netty-common', '4.1.137.Final')
-require_jar('org.logstash.inputs', 'logstash-input-tcp', '6.4.15')
+require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.138.Final')
+require_jar('io.netty', 'netty-codec', '4.1.138.Final')
+require_jar('io.netty', 'netty-transport', '4.1.138.Final')
+require_jar('io.netty', 'netty-resolver', '4.1.138.Final')
+require_jar('io.netty', 'netty-buffer', '4.1.138.Final')
+require_jar('io.netty', 'netty-common', '4.1.138.Final')
+require_jar('org.logstash.inputs', 'logstash-input-tcp', '6.4.17')

data/spec/inputs/tcp_spec.rb

@@ -35,6 +35,23 @@ describe LogStash::Inputs::Tcp, :ecs_compatibility_support do
 
   let(:port) { get_port }
 
+  def queue_pop_with_timeout(seconds, queue)
+    start = Time.now
+    deadline = start + seconds
+    item = nil
+    until item || Time.now >= deadline
+      begin
+        item = queue.pop(true)   # raises ThreadError if empty
+      rescue ThreadError
+        sleep 0.1
+      end
+    end
+    if item == nil
+      raise "Elapsed #{Time.now - start} seconds before pop a value"
+    end
+    return item
+  end
+
   context "codec (PR #1372)" do
     it "switches from plain to line" do
       require "logstash/codecs/plain"
@@ -108,18 +125,27 @@ describe LogStash::Inputs::Tcp, :ecs_compatibility_support do
         }
       CONFIG
 
-      events = input(conf) do |pipeline, queue|
+      events = input(conf) do |_, queue|
         socket = Stud::try(5.times) { TCPSocket.new("127.0.0.1", port) }
-        socket.puts("PROXY TCP4 1.2.3.4 5.6.7.8 1234 5678\r");
+        socket.write("PROXY TCP4 1.2.3.4 5.6.7.8 1234 5678\r")
         socket.flush
-        event_count.times do |i|
-          # unicode smiley for testing unicode support!
-          socket.puts("#{i} ☹")
-          socket.flush
+        # proceed with the rest of data writing in a separate thread
+        # so that crates some interleaving in the buffers seen on network layer
+        Thread.new do
+          sleep(1)
+          begin
+            socket.write("\n")
+            event_count.times do |i|
+              # unicode smiley for testing unicode support!
+              socket.puts("#{i} ☹")
+              socket.flush
+            end
+            socket.close
+          rescue => e
+            puts "Error while writing to the socket #{e.backtrace}"
+          end
         end
-        socket.close
-
-        event_count.times.collect {queue.pop}
+        event_count.times.collect { queue_pop_with_timeout(5, queue) }
       end
 
       expect(events.length).to eq(event_count)

data/version

@@ -1 +1 @@
-6.4.15
+6.4.17

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 6.4.15
+  version: 6.4.17
 platform: java
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 2026-08-20 00:00:00.000000000 Z
+date: 2026-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -245,14 +245,14 @@ files:
 - spec/inputs/tcp_spec.rb
 - spec/spec_helper.rb
 - vendor/jar-dependencies/commons-io/commons-io/2.17.0/commons-io-2.17.0.jar
-- vendor/jar-dependencies/io/netty/netty-buffer/4.1.137.Final/netty-buffer-4.1.137.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec/4.1.137.Final/netty-codec-4.1.137.Final.jar
-- vendor/jar-dependencies/io/netty/netty-common/4.1.137.Final/netty-common-4.1.137.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler/4.1.137.Final/netty-handler-4.1.137.Final.jar
-- vendor/jar-dependencies/io/netty/netty-resolver/4.1.137.Final/netty-resolver-4.1.137.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.137.Final/netty-transport-native-unix-common-4.1.137.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport/4.1.137.Final/netty-transport-4.1.137.Final.jar
-- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.4.15/logstash-input-tcp-6.4.15.jar
+- vendor/jar-dependencies/io/netty/netty-buffer/4.1.138.Final/netty-buffer-4.1.138.Final.jar
+- vendor/jar-dependencies/io/netty/netty-codec/4.1.138.Final/netty-codec-4.1.138.Final.jar
+- vendor/jar-dependencies/io/netty/netty-common/4.1.138.Final/netty-common-4.1.138.Final.jar
+- vendor/jar-dependencies/io/netty/netty-handler/4.1.138.Final/netty-handler-4.1.138.Final.jar
+- vendor/jar-dependencies/io/netty/netty-resolver/4.1.138.Final/netty-resolver-4.1.138.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.138.Final/netty-transport-native-unix-common-4.1.138.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport/4.1.138.Final/netty-transport-4.1.138.Final.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.4.17/logstash-input-tcp-6.4.17.jar
 - version
 homepage: https://elastic.co/logstash
 licenses: