Skip to content

Commit

Permalink
feat: handle keep-alive timeout
Browse files Browse the repository at this point in the history 
Add the possibility to configure the keep-alive timeout at API level.

https://gravitee.atlassian.net/browse/APIM-3966
(cherry picked from commit 9894ebb)
  • Loading branch information
@phiz71
phiz71 committed Mar 28, 2024
1 parent 7836e50 commit 8bc0563
Show file tree
Hide file tree
Showing 80 changed files with 211 additions and 70 deletions.
1 change: 1 addition & 0 deletions docker/quick-setup/https-gateway/.resources/Echo.json
View file
Expand Up @@ -123,6 +123,7 @@
"http": {
"connectTimeout": 5000,
"idleTimeout": 60000,
"keepAliveTimeout": 30000,
"keepAlive": true,
"readTimeout": 10000,
"pipelining": false,
Expand Down
1 change: 1 addition & 0 deletions docker/quick-setup/keycloak/secured-api.json
View file
Expand Up @@ -94,6 +94,7 @@
"http": {
"connectTimeout": 5000,
"idleTimeout": 60000,
"keepAliveTimeout": 30000,
"keepAlive": true,
"readTimeout": 10000,
"pipelining": false,
Expand Down
2 changes: 2 additions & 0 deletions ...java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientOptionsDeserializer.java
View file
Expand Up @@ -44,6 +44,8 @@ public HttpClientOptions deserialize(JsonParser jp, DeserializationContext ctxt)

httpClientOptions.setIdleTimeout(node.path("idleTimeout").asLong(HttpClientOptions.DEFAULT_IDLE_TIMEOUT));

httpClientOptions.setKeepAliveTimeout(node.path("keepAliveTimeout").asLong(HttpClientOptions.DEFAULT_KEEP_ALIVE_TIMEOUT));

httpClientOptions.setKeepAlive(node.path("keepAlive").asBoolean(HttpClientOptions.DEFAULT_KEEP_ALIVE));

httpClientOptions.setPipelining(node.path("pipelining").asBoolean(HttpClientOptions.DEFAULT_PIPELINING));
Expand Down
1 change: 1 addition & 0 deletions ...ain/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientOptionsSerializer.java
View file
Expand Up @@ -37,6 +37,7 @@ public void serialize(HttpClientOptions httpClientOptions, JsonGenerator jgen, S
jgen.writeStartObject();
jgen.writeNumberField("connectTimeout", httpClientOptions.getConnectTimeout());
jgen.writeNumberField("idleTimeout", httpClientOptions.getIdleTimeout());
jgen.writeNumberField("keepAliveTimeout", httpClientOptions.getKeepAliveTimeout());
jgen.writeBooleanField("keepAlive", httpClientOptions.isKeepAlive());
jgen.writeNumberField("readTimeout", httpClientOptions.getReadTimeout());
jgen.writeBooleanField("pipelining", httpClientOptions.isPipelining());
Expand Down
1 change: 1 addition & 0 deletions ...son/src/test/resources/io/gravitee/definition/jackson/api-bestMatchFlowMode-expected.json
View file
Expand Up @@ -25,6 +25,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...finition-jackson/src/test/resources/io/gravitee/definition/jackson/api-cors-expected.json
View file
Expand Up @@ -28,6 +28,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...kson/src/test/resources/io/gravitee/definition/jackson/api-default-failover-expected.json
View file
Expand Up @@ -31,6 +31,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...son/src/test/resources/io/gravitee/definition/jackson/api-defaulthttpconfig-expected.json
View file
Expand Up @@ -25,6 +25,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
2 changes: 2 additions & 0 deletions ...kson/src/test/resources/io/gravitee/definition/jackson/api-empty-hostHeader-expected.json
View file
Expand Up @@ -21,6 +21,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand All @@ -35,6 +36,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
2 changes: 2 additions & 0 deletions ...jackson/src/test/resources/io/gravitee/definition/jackson/api-endpointgroup-expected.json
View file
Expand Up @@ -28,6 +28,7 @@
"http" : {
"connectTimeout" : 4000,
"idleTimeout" : 50000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 9000,
"pipelining" : false,
Expand All @@ -42,6 +43,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
2 changes: 2 additions & 0 deletions ...finition-jackson/src/test/resources/io/gravitee/definition/jackson/api-endpointgroup.json
View file
Expand Up @@ -10,6 +10,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand All @@ -28,6 +29,7 @@
"http" : {
"connectTimeout" : 4000,
"idleTimeout" : 50000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 9000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...n/src/test/resources/io/gravitee/definition/jackson/api-failover-singlecase-expected.json
View file
Expand Up @@ -31,6 +31,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...jackson/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-expected.json
View file
Expand Up @@ -25,6 +25,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...son/src/test/resources/io/gravitee/definition/jackson/api-grpc-endpoint-ssl-expected.json
View file
Expand Up @@ -25,6 +25,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...est/resources/io/gravitee/definition/jackson/api-grpc-endpoint-without-type-expected.json
View file
Expand Up @@ -25,6 +25,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...ition-jackson/src/test/resources/io/gravitee/definition/jackson/api-headers-expected.json
View file
Expand Up @@ -29,6 +29,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...on-jackson/src/test/resources/io/gravitee/definition/jackson/api-hostHeader-expected.json
View file
Expand Up @@ -28,6 +28,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...ackson/src/test/resources/io/gravitee/definition/jackson/api-http2-endpoint-expected.json
View file
Expand Up @@ -29,6 +29,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
3 changes: 2 additions & 1 deletion ...ackson/src/test/resources/io/gravitee/definition/jackson/api-kafka-endpoint-expected.json
View file
Expand Up @@ -29,7 +29,8 @@
},
"http": {
"connectTimeout": 5000,
"idleTimeout": 60000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive": true,
"readTimeout": 10000,
"pipelining": false,
Expand Down
1 change: 1 addition & 0 deletions ...ackson/src/test/resources/io/gravitee/definition/jackson/api-logging-client-expected.json
View file
Expand Up @@ -34,6 +34,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...-jackson/src/test/resources/io/gravitee/definition/jackson/api-multitenants-expected.json
View file
Expand Up @@ -26,6 +26,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...son/src/test/resources/io/gravitee/definition/jackson/api-override-failover-expected.json
View file
Expand Up @@ -31,6 +31,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...n/src/test/resources/io/gravitee/definition/jackson/api-overridedhttpconfig-expected.json
View file
Expand Up @@ -32,6 +32,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...on/src/test/resources/io/gravitee/definition/jackson/api-response-templates-expected.json
View file
Expand Up @@ -28,6 +28,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
1 change: 1 addition & 0 deletions ...-jackson/src/test/resources/io/gravitee/definition/jackson/api-virtualhosts-expected.json
View file
Expand Up @@ -29,6 +29,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
4 changes: 3 additions & 1 deletion ...son/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-expected.json
View file
Expand Up @@ -19,7 +19,8 @@
"backup" : false,
"type" : "http",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand All @@ -39,6 +40,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
4 changes: 3 additions & 1 deletion ...est/resources/io/gravitee/definition/jackson/api-withclientoptions-keystore-expected.json
View file
Expand Up @@ -19,7 +19,8 @@
"backup" : false,
"type" : "http",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand All @@ -40,6 +41,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
3 changes: 2 additions & 1 deletion ...son/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-keystore.json
View file
Expand Up @@ -9,7 +9,8 @@
"name": "default",
"target": "http://localhost:8083/myapi",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand Down
3 changes: 2 additions & 1 deletion .../src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-no-trustore.json
View file
Expand Up @@ -9,7 +9,8 @@
"name": "default",
"target": "http://localhost:8083/myapi",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand Down
1 change: 1 addition & 0 deletions ...st/resources/io/gravitee/definition/jackson/api-withclientoptions-nooptions-expected.json
View file
Expand Up @@ -25,6 +25,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
4 changes: 3 additions & 1 deletion ...c/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl-expected.json
View file
Expand Up @@ -19,7 +19,8 @@
"backup" : false,
"type" : "http",
"http" : {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true
}
Expand All @@ -30,6 +31,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
3 changes: 2 additions & 1 deletion ...ackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl.json
View file
Expand Up @@ -9,7 +9,8 @@
"name": "default",
"target": "http://localhost:8083/myapi",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true
}
Expand Down
3 changes: 2 additions & 1 deletion ...son/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-null-pem.json
View file
Expand Up @@ -9,7 +9,8 @@
"name": "default",
"target": "http://localhost:8083/myapi",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand Down
3 changes: 2 additions & 1 deletion ...itee/definition/jackson/api-withclientoptions-propagateClientAcceptEncoding-expected.json
View file
Expand Up @@ -33,7 +33,8 @@
},
"http": {
"connectTimeout": 5000,
"idleTimeout": 60000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive": true,
"readTimeout": 10000,
"pipelining": false,
Expand Down
4 changes: 3 additions & 1 deletion ...t/resources/io/gravitee/definition/jackson/api-withclientoptions-truststore-expected.json
View file
Expand Up @@ -19,7 +19,8 @@
"backup" : false,
"type" : "http",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand All @@ -39,6 +40,7 @@
"http" : {
"connectTimeout" : 5000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive" : true,
"readTimeout" : 10000,
"pipelining" : false,
Expand Down
3 changes: 2 additions & 1 deletion ...n/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-truststore.json
View file
Expand Up @@ -9,7 +9,8 @@
"name": "default",
"target": "http://localhost:8083/myapi",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand Down
3 changes: 2 additions & 1 deletion ...tion-jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions.json
View file
Expand Up @@ -9,7 +9,8 @@
"name": "default",
"target": "http://localhost:8083/myapi",
"http": {
"idleTimeout": 5000,
"idleTimeout" : 5000,
"keepAliveTimeout" : 3000,
"connectTimeout": 5000,
"keepAlive": true,
"followRedirects": true
Expand Down
3 changes: 2 additions & 1 deletion ...ources/io/gravitee/definition/jackson/debug/debug-api-with-backend-response-expected.json
View file
Expand Up @@ -29,7 +29,8 @@
},
"http": {
"connectTimeout": 5000,
"idleTimeout": 60000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive": true,
"readTimeout": 10000,
"pipelining": false,
Expand Down
3 changes: 2 additions & 1 deletion ...urces/io/gravitee/definition/jackson/debug/debug-api-with-debug-steps-error-expected.json
View file
Expand Up @@ -29,7 +29,8 @@
},
"http": {
"connectTimeout": 5000,
"idleTimeout": 60000,
"idleTimeout" : 60000,
"keepAliveTimeout" : 30000,
"keepAlive": true,
"readTimeout": 10000,
"pipelining": false,
Expand Down

0 comments on commit 8bc0563

Please sign in to comment.