Merge pull request #624 from swisspost/develop

PR for release
swisspost · Jan 6, 2025 · 9bc4263 · 9bc4263
2 parents 99cc369 + dc6591d
commit 9bc4263
Show file tree

Hide file tree

Showing 43 changed files with 747 additions and 129 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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-core</artifactId>

diff --git a/gateleen-core/src/main/java/org/swisspush/gateleen/core/util/LockUtil.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/util/LockUtil.java
@@ -80,4 +80,14 @@ public void releaseLock(Lock lockImpl, String lock, String token, Logger log){
             }
         });
     }
+
+    /**
+     * Calculate the lock expiry time. This is a simple helper to work with the lock expiry time.
+     *
+     * @param taskInterval the interval of the task
+     * @return the calculated lock expiry time
+     */
+    public static long calcLockExpiry(long taskInterval) {
+        return taskInterval <= 1 ? 1 : taskInterval / 2;
+    }
 }
diff --git a/gateleen-core/src/test/java/org/swisspush/gateleen/core/util/LockUtilTest.java b/gateleen-core/src/test/java/org/swisspush/gateleen/core/util/LockUtilTest.java
@@ -33,6 +33,20 @@ public void setUp(){
         lockUtil = new LockUtil(newGateleenWastefulExceptionFactory());
     }
 
+    @Test
+    public void testCalculateLockExpiry(TestContext context) {
+        context.assertEquals(1L, LockUtil.calcLockExpiry(1));
+        context.assertEquals(1L, LockUtil.calcLockExpiry(0));
+        context.assertEquals(1L, LockUtil.calcLockExpiry(-20));
+        context.assertEquals(1L, LockUtil.calcLockExpiry(2));
+        context.assertEquals(1L, LockUtil.calcLockExpiry(3));
+        context.assertEquals(2L, LockUtil.calcLockExpiry(4));
+        context.assertEquals(4L, LockUtil.calcLockExpiry(8));
+        context.assertEquals(32L, LockUtil.calcLockExpiry(64));
+        context.assertEquals(750L, LockUtil.calcLockExpiry(1500));
+        context.assertEquals(5000L, LockUtil.calcLockExpiry(10001));
+    }
+
     @Test
     public void testAcquireLockWithoutLockImplementationDefined(TestContext context) {
         Async async = context.async();

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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-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.13-SNAPSHOT</version>
+        <version>2.1.14-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-playground</artifactId>
@@ -103,6 +103,21 @@
             <artifactId>gateleen-kafka</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-micrometer-metrics</artifactId>
+            <version>${vertx.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <version>${micrometer.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>${micrometer.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.swisspush</groupId>
             <artifactId>redisques</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.13-SNAPSHOT</version>
+        <version>2.1.14-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-qos</artifactId>

diff --git a/gateleen-queue/README_queue.md b/gateleen-queue/README_queue.md
@@ -303,6 +303,7 @@ The result will be a json object with the circuit information like the example b
   "status": "closed",
   "info": {
     "failRatio": 15,
+    "metric": "server-tests",
     "circuit": "/playground/server/tests/(.*)"
   }
 }
@@ -323,6 +324,7 @@ The result will be a json object with the information of all circuits like the e
   "myCircuitHash": {
     "infos": {
       "failRatio": 15,
+      "metric": "server-tests",
       "circuit": "/playground/server/tests/(.*)"
     },
     "status": "closed"

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.13-SNAPSHOT</version>
+        <version>2.1.14-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-queue</artifactId>

diff --git a/...push/gateleen/queue/queuing/circuitbreaker/api/QueueCircuitBreakerHttpRequestHandler.java b/...push/gateleen/queue/queuing/circuitbreaker/api/QueueCircuitBreakerHttpRequestHandler.java
@@ -291,7 +291,7 @@ private void handleGetCircuitStatus(Message<JsonObject> message) {
 
     private void handleCloseCircuit(Message<JsonObject> message) {
         String circuitHash = message.body().getJsonObject(PAYLOAD).getString(CIRCUIT_HASH);
-        PatternAndCircuitHash patternAndCircuitHash = new PatternAndCircuitHash(null, circuitHash);
+        PatternAndCircuitHash patternAndCircuitHash = new PatternAndCircuitHash(null, circuitHash, null);
         storage.closeCircuit(patternAndCircuitHash).onComplete(event -> {
             if (event.failed()) {
                 message.reply(new JsonObject().put(STATUS, ERROR).put(MESSAGE, event.cause().getMessage()));

diff --git a/...ava/org/swisspush/gateleen/queue/queuing/circuitbreaker/impl/QueueCircuitBreakerImpl.java b/...ava/org/swisspush/gateleen/queue/queuing/circuitbreaker/impl/QueueCircuitBreakerImpl.java
@@ -452,7 +452,7 @@ public Future<Long> unlockSampleQueues() {
                         failedFutures.add(event1.cause().getMessage());
                     }
                     if (futureCounter.get() == 0) {
-                        if (failedFutures.size() > 0) {
+                        if (!failedFutures.isEmpty()) {
                             promise.fail("The following queues could not be unlocked: " + failedFutures);
                         } else {
                             promise.complete((long) queuesToUnlock.size());

diff --git a/...swisspush/gateleen/queue/queuing/circuitbreaker/impl/RedisQueueCircuitBreakerStorage.java b/...swisspush/gateleen/queue/queuing/circuitbreaker/impl/RedisQueueCircuitBreakerStorage.java
@@ -1,6 +1,5 @@
 package org.swisspush.gateleen.queue.queuing.circuitbreaker.impl;
 
-import io.vertx.core.CompositeFuture;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.json.JsonObject;
@@ -38,8 +37,10 @@ public class RedisQueueCircuitBreakerStorage implements QueueCircuitBreakerStora
     public static final String STORAGE_OPEN_CIRCUITS = STORAGE_PREFIX + "open-circuits";
     public static final String STORAGE_QUEUES_TO_UNLOCK = STORAGE_PREFIX + "queues-to-unlock";
     public static final String FIELD_STATE = "state";
+    public static final String FIELD_STATUS = "status";
     public static final String FIELD_FAILRATIO = "failRatio";
     public static final String FIELD_CIRCUIT = "circuit";
+    public static final String FIELD_METRICNAME = "metricName";
 
     private final LuaScriptState openCircuitLuaScriptState;
     private final LuaScriptState closeCircuitLuaScriptState;
@@ -99,7 +100,7 @@ public Future<QueueCircuitState> getQueueCircuitState(String circuitHash) {
     public Future<JsonObject> getQueueCircuitInformation(String circuitHash) {
         Promise<JsonObject> promise = Promise.promise();
         redisProvider.redis().onSuccess(redisAPI -> redisAPI.hmget(Arrays.asList(buildInfosKey(circuitHash), FIELD_STATE,
-                FIELD_FAILRATIO, FIELD_CIRCUIT), event -> {
+                FIELD_FAILRATIO, FIELD_CIRCUIT, FIELD_METRICNAME), event -> {
             if (event.failed()) {
                 promise.fail(event.cause());
             } else {
@@ -108,15 +109,19 @@ public Future<JsonObject> getQueueCircuitInformation(String circuitHash) {
                             QueueCircuitState.CLOSED);
                     String failRatioStr = Objects.toString(event.result().get(1), null);
                     String circuit = Objects.toString(event.result().get(2), null);
+                    String metric = Objects.toString(event.result().get(3), null);
                     JsonObject result = new JsonObject();
-                    result.put("status", state.name().toLowerCase());
+                    result.put(FIELD_STATUS, state.name().toLowerCase());
                     JsonObject info = new JsonObject();
                     if (failRatioStr != null) {
                         info.put(FIELD_FAILRATIO, Integer.valueOf(failRatioStr));
                     }
                     if (circuit != null) {
                         info.put(FIELD_CIRCUIT, circuit);
                     }
+                    if (StringUtils.isNotEmptyTrimmed(metric)) {
+                        info.put(FIELD_METRICNAME, metric);
+                    }
                     result.put("info", info);
                     promise.complete(result);
                 } catch (Exception e) {
@@ -156,6 +161,7 @@ public Future<UpdateStatisticsResult> updateStatistics(PatternAndCircuitHash pat
         List<String> arguments = Arrays.asList(
                 uniqueRequestID,
                 patternAndCircuitHash.getPattern().pattern(),
+                patternAndCircuitHash.getMetricName() != null ? patternAndCircuitHash.getMetricName() : "",
                 patternAndCircuitHash.getCircuitHash(),
                 String.valueOf(timestamp),
                 String.valueOf(errorThresholdPercentage),
@@ -240,7 +246,7 @@ public Future<Void> closeAllCircuits() {
         Future<Void> closeOpenCircuitsFuture = closeCircuitsByKey(STORAGE_OPEN_CIRCUITS);
         Future<Void> closeHalfOpenCircuitsFuture = closeCircuitsByKey(STORAGE_HALFOPEN_CIRCUITS);
 
-        CompositeFuture.all(closeOpenCircuitsFuture, closeHalfOpenCircuitsFuture).onComplete(event -> {
+        Future.all(closeOpenCircuitsFuture, closeHalfOpenCircuitsFuture).onComplete(event -> {
             if (event.succeeded()) {
                 promise.complete();
             } else {
@@ -255,14 +261,14 @@ private Future<Void> closeCircuitsByKey(String key) {
         Promise<Void> promise = Promise.promise();
         redisProvider.redis().onSuccess(redisAPI -> redisAPI.smembers(key, event -> {
             if (event.succeeded()) {
-                List<Future> promises = new ArrayList<>();
+                List<Future<Void>> promises = new ArrayList<>();
                 for (Response circuit : event.result()) {
                     promises.add(closeCircuit(circuit.toString(), false));
                 }
-                if (promises.size() == 0) {
+                if (promises.isEmpty()) {
                     promise.complete();
                 } else {
-                    CompositeFuture.all(promises).onComplete(event1 -> {
+                    Future.all(promises).onComplete(event1 -> {
                         if (event1.succeeded()) {
                             promise.complete();
                         } else {