Merge pull request #605 from swisspost/develop

PR for release
swisspost · Aug 8, 2024 · 21dfa68 · 21dfa68
2 parents 9ccff43 + fc56891
commit 21dfa68
Show file tree

Hide file tree

Showing 27 changed files with 45 additions and 30 deletions.
diff --git a/gateleen-cache/pom.xml b/gateleen-cache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-cache</artifactId>

diff --git a/gateleen-core/pom.xml b/gateleen-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-core</artifactId>

diff --git a/gateleen-delegate/pom.xml b/gateleen-delegate/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-delegate</artifactId>

diff --git a/gateleen-delta/pom.xml b/gateleen-delta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-delta</artifactId>

diff --git a/gateleen-expansion/pom.xml b/gateleen-expansion/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-expansion</artifactId>

diff --git a/gateleen-hook-js/pom.xml b/gateleen-hook-js/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
     <artifactId>gateleen-hook-js</artifactId>
     <packaging>jar</packaging>

diff --git a/gateleen-hook/pom.xml b/gateleen-hook/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-hook</artifactId>

diff --git a/gateleen-kafka/pom.xml b/gateleen-kafka/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-kafka</artifactId>

diff --git a/gateleen-logging/pom.xml b/gateleen-logging/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-logging</artifactId>

diff --git a/gateleen-merge/pom.xml b/gateleen-merge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-merge</artifactId>

diff --git a/gateleen-monitoring/pom.xml b/gateleen-monitoring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-monitoring</artifactId>

diff --git a/gateleen-packing/pom.xml b/gateleen-packing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-packing</artifactId>

diff --git a/gateleen-player/pom.xml b/gateleen-player/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-player</artifactId>

diff --git a/gateleen-playground/pom.xml b/gateleen-playground/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-playground</artifactId>

diff --git a/gateleen-qos/pom.xml b/gateleen-qos/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-qos</artifactId>

diff --git a/gateleen-queue/pom.xml b/gateleen-queue/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-queue</artifactId>

diff --git a/gateleen-queue/src/main/java/org/swisspush/gateleen/queue/queuing/QueueProcessor.java b/gateleen-queue/src/main/java/org/swisspush/gateleen/queue/queuing/QueueProcessor.java
@@ -24,6 +24,10 @@
 import org.swisspush.gateleen.queue.queuing.circuitbreaker.util.QueueCircuitState;
 import org.swisspush.gateleen.queue.queuing.circuitbreaker.util.QueueResponseType;
 
+import static io.vertx.core.Future.failedFuture;
+import static io.vertx.core.Future.succeededFuture;
+import static io.vertx.core.buffer.Buffer.buffer;
+import static java.lang.System.currentTimeMillis;
 import static org.swisspush.gateleen.core.exception.GateleenExceptionFactory.newGateleenThriftyExceptionFactory;
 import static org.swisspush.gateleen.queue.queuing.circuitbreaker.util.QueueResponseType.FAILURE;
 import static org.swisspush.gateleen.queue.queuing.circuitbreaker.util.QueueResponseType.SUCCESS;
@@ -290,7 +294,18 @@ private void executeQueuedRequest(Message<JsonObject> message, Logger logger, Ht
             };
             request1.idleTimeout(120000); // avoids blocking other requests
             if (queuedRequest.getPayload() != null) {
-                request1.send(Buffer.buffer(queuedRequest.getPayload()), httpAsyncHandler);
+                vertx.<Buffer>executeBlocking(() -> {
+                    long beginEpchMs = currentTimeMillis();
+                    Buffer payload = buffer(queuedRequest.getPayload());
+                    long durationMs = currentTimeMillis() - beginEpchMs;
+                    if (durationMs > 16) logger.debug("Creating buffer of size {} took {}ms", payload.length(), durationMs);
+                    return payload;
+                }, false).compose((Buffer payload) -> {
+                    request1.send(payload, httpAsyncHandler);
+                    return succeededFuture();
+                }).onFailure((Throwable ex) -> {
+                    httpAsyncHandler.handle(failedFuture(ex));
+                });
             } else {
                 request1.send(httpAsyncHandler);
             }

diff --git a/gateleen-routing/pom.xml b/gateleen-routing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-routing</artifactId>

diff --git a/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/StorageForwarder.java b/gateleen-routing/src/main/java/org/swisspush/gateleen/routing/StorageForwarder.java
@@ -68,8 +68,8 @@ public void handle(final RoutingContext ctx) {
         monitoringHandler.updateRequestsMeter("localhost", ctx.request().uri());
         monitoringHandler.updateRequestPerRuleMonitoring(ctx.request(), rule.getMetricName());
         final long startTime = monitoringHandler.startRequestMetricTracking(rule.getMetricName(), ctx.request().uri());
-        log.debug("Forwarding request: {} to storage {} {} with rule {}", ctx.request().uri(), rule.getStorage(),
-                targetUri, rule.getRuleIdentifier());
+        log.debug("Forwarding {} request: {} to storage {} {} with rule {}", ctx.request().method(), ctx.request().uri(),
+                rule.getStorage(), targetUri, rule.getRuleIdentifier());
         final HeadersMultiMap requestHeaders = new HeadersMultiMap();
         requestHeaders.addAll(ctx.request().headers());
 
@@ -102,14 +102,14 @@ public void handle(final RoutingContext ctx) {
                     response.setStatusCode(StatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
                     response.setStatusMessage(statusMessage);
                     response.end();
-                    log.error(statusMessage, gateleenExceptionFactory.newException(result.cause()));
+                    log.error("{}", statusMessage, gateleenExceptionFactory.newException(result.cause()));
                 } else {
                     Buffer buffer = result.result().body();
                     int headerLength = buffer.getInt(0);
                     JsonObject responseJson = new JsonObject(buffer.getString(4, headerLength + 4));
                     JsonArray headers = responseJson.getJsonArray("headers");
                     MultiMap responseHeaders = null;
-                    if (headers != null && headers.size() > 0) {
+                    if (headers != null && !headers.isEmpty()) {
                         responseHeaders = JsonMultiMap.fromJson(headers);
 
                         setUniqueIdHeader(responseHeaders);

diff --git a/gateleen-runconfig/pom.xml b/gateleen-runconfig/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-runconfig</artifactId>

diff --git a/gateleen-scheduler/pom.xml b/gateleen-scheduler/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-scheduler</artifactId>

diff --git a/gateleen-security/pom.xml b/gateleen-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-security</artifactId>

diff --git a/gateleen-test/pom.xml b/gateleen-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
     <artifactId>gateleen-test</artifactId>
     <packaging>jar</packaging>

diff --git a/gateleen-testhelper/pom.xml b/gateleen-testhelper/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-testhelper</artifactId>

diff --git a/gateleen-user/pom.xml b/gateleen-user/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-user</artifactId>

diff --git a/gateleen-validation/pom.xml b/gateleen-validation/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.9-SNAPSHOT</version>
+        <version>2.1.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-validation</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.swisspush.gateleen</groupId>
     <artifactId>gateleen</artifactId>
-    <version>2.1.9-SNAPSHOT</version>
+    <version>2.1.10-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>gateleen</name>
     <description>Middleware library based on Vert.x to build advanced JSON/REST communication servers</description>