logstash-input-tcp 7.0.12-java → 7.0.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65b607d3a1f9393b0e110f24b24bdbad927d31c156b96ee07baf6e935aef2062
-  data.tar.gz: a652d0981d9bc95e9fdd18dd58d250cd45d5aecba48cd0afcf751a6df54109eb
+  metadata.gz: db23e4f0f1cc95ca56014235563e54b526a29d6015a7ceef2d23b96b326f0695
+  data.tar.gz: 68fedb5127810036a5b9bd5cc3b70a0b5d0b9604129ae533cbe953f0957ef915
 SHA512:
-  metadata.gz: 25c38a59628c9fd20758cbf3fd4be0cc731e5c9058c3d729efed995efd9f82c33224bf72167169045b375a5c8b25ef939b71c85a3288dc950080176c4a040ddf
-  data.tar.gz: 95c8514020a06088df7db90a2b0871ed0db43cd2682bf013e0f4d7a1636af7ea200f5101d3f60795ce03801022c0b4e19810748d4ce740dfbfb657aaa3578a4a
+  metadata.gz: 139e55fb089960e8cddfa93b49d794a49eae47c90ae60b38ecbd4ac9c01f080ef9a1720d0ebd923063dcf4100cba142d0c5e732d1e187fe4de5cbbad9bab1d3f
+  data.tar.gz: 5bf352df564a453a3b7e5ff819f2ed729ef381b2f386c5c553ea938088979c6046bd9e7669761865c6b930bb2208757e7fd527f00ef68a026cb5d05170b044ea

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 7.0.14
+  - Fix for processing the HA Proxy protocol, considering the line can be split in multiple buffers. [#286](https://github.com/logstash-plugins/logstash-input-tcp/pull/286)
+
+## 7.0.13
+  - Update Netty dependency to 4.1.137.Final [#284](https://github.com/logstash-plugins/logstash-input-tcp/pull/284)
+
 ## 7.0.12
   - Update Netty dependency to 4.1.136.Final [#281](https://github.com/logstash-plugins/logstash-input-tcp/pull/281)
 

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-input-tcp.svg)](https://travis-ci.com/logstash-plugins/logstash-input-tcp)
+[![Unit Tests](https://github.com/logstash-plugins/logstash-input-tcp/actions/workflows/unit-tests.yml/badge.svg?branch=main)](https://github.com/logstash-plugins/logstash-input-tcp/actions/workflows/unit-tests.yml)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/lib/logstash/inputs/tcp.rb

@@ -179,7 +179,8 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     if server?
       begin
         @logger.info("Binding tcp input listener", :address => "#{@host}:#{@port}", :ssl_enabled => @ssl_enabled)
-        @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)
       rescue java.net.BindException => bind_exception
         fail LogStash::ConfigurationError, "could not bind to #{@host}:#{@port}; #{bind_exception.message}"
       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.136.Final')
+require_jar('io.netty', 'netty-handler', '4.1.137.Final')
 require_jar('commons-io', 'commons-io', '2.17.0')
-require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.136.Final')
-require_jar('io.netty', 'netty-codec', '4.1.136.Final')
-require_jar('io.netty', 'netty-transport', '4.1.136.Final')
-require_jar('io.netty', 'netty-resolver', '4.1.136.Final')
-require_jar('io.netty', 'netty-buffer', '4.1.136.Final')
-require_jar('io.netty', 'netty-common', '4.1.136.Final')
-require_jar('org.logstash.inputs', 'logstash-input-tcp', '7.0.12')
+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', '7.0.14')

data/spec/inputs/tcp_spec.rb

@@ -41,6 +41,23 @@ describe LogStash::Inputs::Tcp, :ecs_compatibility_support do
     server.close
   end
 
+  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
+
   let(:port) { find_available_port("127.0.0.1") }
 
   context "codec (PR #1372)" do
@@ -135,18 +152,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 @@
-7.0.12
+7.0.14

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 7.0.12
+  version: 7.0.14
 platform: java
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -231,14 +231,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.136.Final/netty-buffer-4.1.136.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec/4.1.136.Final/netty-codec-4.1.136.Final.jar
-- vendor/jar-dependencies/io/netty/netty-common/4.1.136.Final/netty-common-4.1.136.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler/4.1.136.Final/netty-handler-4.1.136.Final.jar
-- vendor/jar-dependencies/io/netty/netty-resolver/4.1.136.Final/netty-resolver-4.1.136.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.136.Final/netty-transport-native-unix-common-4.1.136.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport/4.1.136.Final/netty-transport-4.1.136.Final.jar
-- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/7.0.12/logstash-input-tcp-7.0.12.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/7.0.14/logstash-input-tcp-7.0.14.jar
 - version
 homepage: https://elastic.co/logstash
 licenses:
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Reads events from a TCP socket
 test_files: