logstash-input-http 4.0.0-java → 4.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c406f5e0d989c833db3c35529b4012053539955f830fde6ca9e44235f4a39d3b
-  data.tar.gz: 22916a6402a2c55edfbee1bf3af0a578b630d2fd756356733bfc0c7de3359fdf
+  metadata.gz: fe102365f0992c7be2664c393bb5678e17980fe6f66d35d8027a3b2a90d572d9
+  data.tar.gz: 52408f65829a38c1737ed7bb06a7b01ec1f1b1038bf36cd1e610d8c490ac723c
 SHA512:
-  metadata.gz: 2c2616bcde330f2d0a2d0f4273f45e7bd2ad7e09e3a1322d0c759c146c38e13c92f202b45c4a1df6a19b0b9e1ae46eaaa0e3ec1fc81f5e8421a591479122ab3e
-  data.tar.gz: 1b4d208dc8e180ee5818270f1ceb36625870d4429b9570102f69beb96c253bc5a64fc3837c90d8960b2bca1391b9b93bff76fd648d67ed27cb8b9b366b238ca2
+  metadata.gz: eed5f4bde55202f473b37a0743dc4995c675980fdc365c0b0df230ae209477d6e108ecfb028387cc1c57f826cfd38f9c7e295d30f8ebb07a3d0d6c6819790fe2
+  data.tar.gz: 7d72588d9a877920e22d37d7870999ea22b81680f0834179bdef3ab0ebac355337285b2db2c58ee97aaa7f3722ecd8f866770cded3660fef5872921e81f0895a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.1.0
+  - add improved proactive rate-limiting, rejecting new requests when queue has been actively blocking for more than 10 seconds [#186](https://github.com/logstash-plugins/logstash-input-http/pull/186)
+    - This is a forward-port of functionality also introduced to the 3.x series in v3.10.0 
+
 ## 4.0.0
   - SSL settings that were marked deprecated in version `3.7.0` are now marked obsolete, and will prevent the plugin from starting.
   - These settings are:
@@ -11,6 +15,9 @@
     - `verify_mode`, which should bre replaced by `ssl_client_authentication`
     - [#182](https://github.com/logstash-plugins/logstash-input-http/pull/182)
 
+## 3.10.0
+ - add improved proactive rate-limiting, rejecting new requests when queue has been actively blocking for more than 10 seconds [#179](https://github.com/logstash-plugins/logstash-input-http/pull/179)
+
 ## 3.9.2
  - Upgrade netty to 4.1.115 [#183](https://github.com/logstash-plugins/logstash-input-http/pull/183)
 

data/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0

data/lib/logstash-input-http_jars.rb

@@ -8,4 +8,4 @@ require_jar('io.netty', 'netty-common', '4.1.115.Final')
 require_jar('io.netty', 'netty-transport', '4.1.115.Final')
 require_jar('io.netty', 'netty-handler', '4.1.115.Final')
 require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.115.Final')
-require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '4.0.0')
+require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '4.1.0')

data/spec/inputs/helpers.rb

@@ -3,4 +3,8 @@ CERTS_DIR = File.expand_path('../fixtures/certs/generated', File.dirname(__FILE_
 
 def certificate_path(filename)
   File.join(CERTS_DIR, filename)
-end
+end
+
+RSpec.configure do |config|
+  config.formatter = :documentation
+end

data/spec/inputs/http_spec.rb

@@ -57,7 +57,7 @@ describe LogStash::Inputs::Http do
       let(:config) { { "port" => port, "threads" => threads, "max_pending_requests" => max_pending_requests } }
 
       context "when sending more requests than queue slots" do
-        it "should block when the queue is full" do
+        it "rejects additional incoming requests with HTTP 429" do
           # these will queue and return 200
           logstash_queue_size.times.each do |i|
             response = client.post("http://127.0.0.1:#{port}", :body => '{}').call
@@ -65,15 +65,77 @@ describe LogStash::Inputs::Http do
           end
 
           # these will block
-          (threads + max_pending_requests).times.each do |i|
-            expect {
-              client.post("http://127.0.0.1:#{port}", :body => '{}').call
-            }.to raise_error(Manticore::SocketTimeout)
+          blocked_calls = (threads + max_pending_requests).times.map do
+            Thread.new do
+              begin
+                {:result => client.post("http://127.0.0.1:#{port}", :body => '{}').call}
+              rescue Manticore::SocketException, Manticore::SocketTimeout => e
+                {:exception => e}
+              end
+            end
+          end
+
+          sleep 1 # let those requests go, but not so long that our block-detector starts emitting 429's
+
+          # by now we should be rejecting with 429 since the backlog is full
+          response = client.post("http://127.0.0.1:#{port}", :body => '{}').call
+          expect(response.code).to eq(429)
+
+          # ensure that our blocked connections did block
+          aggregate_failures do
+            blocked_calls.map(&:value).each do |blocked|
+              expect(blocked[:result]).to be_nil
+              expect(blocked[:exception]).to be_a_kind_of Manticore::SocketTimeout
+            end
+          end
+        end
+      end
+    end
+
+    describe "observing queue back-pressure" do
+      let(:logstash_queue_size) { rand(10) + 1 }
+      let(:max_pending_requests) { rand(5) + 1 }
+      let(:threads) { rand(4) + 1 }
+      let(:logstash_queue) { SizedQueue.new(logstash_queue_size) }
+      let(:client_options) { {
+        "request_timeout" => 0.1,
+        "connect_timeout" => 3,
+        "socket_timeout" => 0.1
+      } }
+
+      let(:config) { { "port" => port, "threads" => threads, "max_pending_requests" => max_pending_requests } }
+
+      context "when sending request to an input that has blocked connections" do
+        it "rejects incoming requests with HTTP 429" do
+          # these will queue and return 200
+          logstash_queue_size.times.each do |i|
+            response = client.post("http://127.0.0.1:#{port}", :body => '{}').call
+            expect(response.code).to eq(200)
           end
 
-          # by now we should be rejecting with 429
+          # these will block
+          blocked_call = Thread.new do
+              begin
+                {:result => client.post("http://127.0.0.1:#{port}", :body => '{}').call}
+              rescue Manticore::SocketException, Manticore::SocketTimeout => e
+                {:exception => e}
+              end
+            end
+
+          sleep 12 # let that requests go, and ensure it is blocking long enough to be problematic
+
+          # by now we should be rejecting with 429 since at least one existing request is blocked
+          # for more than 10s.
           response = client.post("http://127.0.0.1:#{port}", :body => '{}').call
           expect(response.code).to eq(429)
+
+          # ensure that our blocked connections did block
+          aggregate_failures do
+            blocked_call.value.tap do |blocked|
+              expect(blocked[:result]).to be_nil
+              expect(blocked[:exception]).to be_a_kind_of Manticore::SocketTimeout
+            end
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-handler/4.1.115.Final/netty-handler-4.1.115.Final.jar
 - vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.115.Final/netty-transport-native-unix-common-4.1.115.Final.jar
 - vendor/jar-dependencies/io/netty/netty-transport/4.1.115.Final/netty-transport-4.1.115.Final.jar
-- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.0.0/logstash-input-http-4.0.0.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.1.0/logstash-input-http-4.1.0.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)