From 7e748e751a54a5f28c06415ff36ab81cf72eea32 Mon Sep 17 00:00:00 2001 From: runner Date: Thu, 28 Nov 2024 15:28:12 +0000 Subject: [PATCH 1/5] updating poms for branch'release-4.1.7' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed42716..a324343 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.swisspush redisques - 4.1.7-SNAPSHOT + 4.1.7 redisques A highly scalable redis-persistent queuing system for vertx From 8ad045a37f5b580d803bfcb885609bcb3090cb1c Mon Sep 17 00:00:00 2001 From: runner Date: Thu, 28 Nov 2024 15:28:12 +0000 Subject: [PATCH 2/5] updating poms for 4.1.8-SNAPSHOT development --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed42716..464284d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.swisspush redisques - 4.1.7-SNAPSHOT + 4.1.8-SNAPSHOT redisques A highly scalable redis-persistent queuing system for vertx From e079a31ab26e017c3e4b9fdbd1c86ea202dc6f8f Mon Sep 17 00:00:00 2001 From: runner Date: Thu, 28 Nov 2024 15:30:43 +0000 Subject: [PATCH 3/5] updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 464284d..a324343 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.swisspush redisques - 4.1.8-SNAPSHOT + 4.1.7 redisques A highly scalable redis-persistent queuing system for vertx From 29a27ee3d8aedc2326843a084163f6ac6ca90d35 Mon Sep 17 00:00:00 2001 From: runner Date: Thu, 28 Nov 2024 15:30:44 +0000 Subject: [PATCH 4/5] Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a324343..464284d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.swisspush redisques - 4.1.7 + 4.1.8-SNAPSHOT redisques A highly scalable redis-persistent queuing system for vertx From bc92c6cac84c4f2cbfae7dd6742211850782b9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Weber?= Date: Fri, 29 Nov 2024 13:57:29 +0100 Subject: [PATCH 5/5] #224 Added micrometer identifier option to configuration to distinguish between multiple redisques instances --- .../org/swisspush/redisques/RedisQues.java | 3 +- .../metrics/PeriodicMetricsCollector.java | 17 ++++++-- .../util/RedisquesConfiguration.java | 41 ++++++++++++++----- .../util/RedisquesConfigurationTest.java | 9 ++++ 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/swisspush/redisques/RedisQues.java b/src/main/java/org/swisspush/redisques/RedisQues.java index 2667e0a..c95910b 100644 --- a/src/main/java/org/swisspush/redisques/RedisQues.java +++ b/src/main/java/org/swisspush/redisques/RedisQues.java @@ -393,7 +393,8 @@ private void initMicrometerMetrics(RedisquesConfiguration modConfig) { String address = modConfig.getAddress(); int metricRefreshPeriod = modConfig.getMetricRefreshPeriod(); - new PeriodicMetricsCollector(vertx, periodicSkipScheduler, address, meterRegistry, metricRefreshPeriod); + String identifier = modConfig.getMicrometerMetricsIdentifier(); + new PeriodicMetricsCollector(vertx, periodicSkipScheduler, address, identifier, meterRegistry, metricRefreshPeriod); } private void initialize() { diff --git a/src/main/java/org/swisspush/redisques/metrics/PeriodicMetricsCollector.java b/src/main/java/org/swisspush/redisques/metrics/PeriodicMetricsCollector.java index 224a100..21e0236 100644 --- a/src/main/java/org/swisspush/redisques/metrics/PeriodicMetricsCollector.java +++ b/src/main/java/org/swisspush/redisques/metrics/PeriodicMetricsCollector.java @@ -2,6 +2,7 @@ import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; +import io.netty.util.internal.StringUtil; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; import io.vertx.core.Vertx; @@ -27,15 +28,23 @@ public class PeriodicMetricsCollector { private final Vertx vertx; private final String redisquesAddress; + private static final String DEFAULT_IDENTIFIER = "default"; + private final AtomicLong activeQueuesCount = new AtomicLong(0); - public PeriodicMetricsCollector(Vertx vertx, PeriodicSkipScheduler periodicSkipScheduler, String redisquesAddress, MeterRegistry meterRegistry, long metricCollectIntervalSec) { + public PeriodicMetricsCollector(Vertx vertx, PeriodicSkipScheduler periodicSkipScheduler, String redisquesAddress, + String identifier, MeterRegistry meterRegistry, long metricCollectIntervalSec) { this.vertx = vertx; this.redisquesAddress = redisquesAddress; - Gauge.builder(MetricMeter.ACTIVE_QUEUES.getId(), activeQueuesCount, AtomicLong::get). - description(MetricMeter.ACTIVE_QUEUES.getDescription()). - register(meterRegistry); + String id = identifier; + + if(StringUtil.isNullOrEmpty(id)) { + id = DEFAULT_IDENTIFIER; + } + + Gauge.builder(MetricMeter.ACTIVE_QUEUES.getId(), activeQueuesCount, AtomicLong::get).tag("identifier", id) + .description(MetricMeter.ACTIVE_QUEUES.getDescription()).register(meterRegistry); periodicSkipScheduler.setPeriodic(metricCollectIntervalSec * 1000, "metricCollectRefresh", this::updateActiveQueuesCount); diff --git a/src/main/java/org/swisspush/redisques/util/RedisquesConfiguration.java b/src/main/java/org/swisspush/redisques/util/RedisquesConfiguration.java index 368eee3..2175062 100644 --- a/src/main/java/org/swisspush/redisques/util/RedisquesConfiguration.java +++ b/src/main/java/org/swisspush/redisques/util/RedisquesConfiguration.java @@ -40,6 +40,7 @@ public class RedisquesConfiguration { private final boolean httpRequestHandlerEnabled; private final boolean httpRequestHandlerAuthenticationEnabled; private final boolean micrometerMetricsEnabled; + private final String micrometerMetricsIdentifier; private final String httpRequestHandlerPrefix; private final String httpRequestHandlerUsername; private final String httpRequestHandlerPassword; @@ -114,6 +115,7 @@ public class RedisquesConfiguration { public static final String PROP_HTTP_REQUEST_HANDLER_ENABLED = "httpRequestHandlerEnabled"; public static final String PROP_HTTP_REQUEST_HANDLER_AUTH_ENABLED = "httpRequestHandlerAuthenticationEnabled"; public static final String PROP_MICROMETER_METRICS_ENABLED = "micrometerMetricsEnabled"; + public static final String PROP_MICROMETER_METRICS_IDENTIFIER = "micrometerMetricsIdentifier"; public static final String PROP_HTTP_REQUEST_HANDLER_PREFIX = "httpRequestHandlerPrefix"; public static final String PROP_HTTP_REQUEST_HANDLER_USERNAME = "httpRequestHandlerUsername"; public static final String PROP_HTTP_REQUEST_HANDLER_PASSWORD = "httpRequestHandlerPassword"; @@ -148,7 +150,8 @@ public RedisquesConfiguration(String address, String configurationUpdatedAddress String publishMetricsAddress, String metricStorageName, int metricRefreshPeriod, int refreshPeriod, String redisHost, int redisPort, String redisAuth, int checkInterval, int processorTimeout, long processorDelayMax, boolean httpRequestHandlerEnabled, - boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, String httpRequestHandlerPrefix, + boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, + String micrometerMetricsIdentifier, String httpRequestHandlerPrefix, String httpRequestHandlerUsername, String httpRequestHandlerPassword, Integer httpRequestHandlerPort, String httpRequestHandlerUserHeader, List queueConfigurations, boolean enableQueueNameDecoding) { @@ -156,7 +159,7 @@ public RedisquesConfiguration(String address, String configurationUpdatedAddress metricRefreshPeriod, refreshPeriod, DEFAULT_CONSUMER_LOCK_MULTIPLIER, Collections.singletonList(redisHost), Collections.singletonList(redisPort), RedisClientType.STANDALONE, redisAuth, null, null, false, checkInterval, processorTimeout, processorDelayMax, httpRequestHandlerEnabled, - httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, httpRequestHandlerPrefix, httpRequestHandlerUsername, + httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, micrometerMetricsIdentifier, httpRequestHandlerPrefix, httpRequestHandlerUsername, httpRequestHandlerPassword, httpRequestHandlerPort, httpRequestHandlerUserHeader, queueConfigurations, enableQueueNameDecoding, DEFAULT_REDIS_MAX_POOL_SIZE, DEFAULT_REDIS_MAX_POOL_WAIT_SIZE, DEFAULT_REDIS_MAX_PIPELINE_WAIT_SIZE, DEFAULT_QUEUE_SPEED_INTERVAL_SEC, DEFAULT_MEMORY_USAGE_LIMIT_PCT, @@ -173,7 +176,8 @@ public RedisquesConfiguration(String address, String configurationUpdatedAddress String publishMetricsAddress, String metricStorageName, int metricRefreshPeriod, int refreshPeriod, String redisHost, int redisPort, String redisPassword, String redisUser, boolean redisEnableTls, int checkInterval, int processorTimeout, long processorDelayMax, boolean httpRequestHandlerEnabled, - boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, String httpRequestHandlerPrefix, + boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, + String micrometerMetricsIdentifier, String httpRequestHandlerPrefix, String httpRequestHandlerUsername, String httpRequestHandlerPassword, Integer httpRequestHandlerPort, String httpRequestHandlerUserHeader, List queueConfigurations, boolean enableQueueNameDecoding) { @@ -181,7 +185,7 @@ public RedisquesConfiguration(String address, String configurationUpdatedAddress metricRefreshPeriod, refreshPeriod, DEFAULT_CONSUMER_LOCK_MULTIPLIER, Collections.singletonList(redisHost), Collections.singletonList(redisPort), RedisClientType.STANDALONE, null, redisPassword, redisUser, redisEnableTls, checkInterval, processorTimeout, processorDelayMax, httpRequestHandlerEnabled, - httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, httpRequestHandlerPrefix, httpRequestHandlerUsername, + httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, micrometerMetricsIdentifier, httpRequestHandlerPrefix, httpRequestHandlerUsername, httpRequestHandlerPassword, httpRequestHandlerPort, httpRequestHandlerUserHeader, queueConfigurations, enableQueueNameDecoding, DEFAULT_REDIS_MAX_POOL_SIZE, DEFAULT_REDIS_MAX_POOL_WAIT_SIZE, DEFAULT_REDIS_MAX_PIPELINE_WAIT_SIZE, DEFAULT_QUEUE_SPEED_INTERVAL_SEC, DEFAULT_MEMORY_USAGE_LIMIT_PCT, @@ -198,14 +202,15 @@ public RedisquesConfiguration(String address, String configurationUpdatedAddress String redisHost, int redisPort, RedisClientType redisClientType, String redisPassword, String redisUser, boolean redisEnableTls, int checkInterval, int processorTimeout, long processorDelayMax, boolean httpRequestHandlerEnabled, - boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, String httpRequestHandlerPrefix, + boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, + String micrometerMetricsIdentifier, String httpRequestHandlerPrefix, String httpRequestHandlerUsername, String httpRequestHandlerPassword, Integer httpRequestHandlerPort, String httpRequestHandlerUserHeader, List queueConfigurations, boolean enableQueueNameDecoding) { this(address, configurationUpdatedAddress, redisPrefix, processorAddress, publishMetricsAddress, metricStorageName, metricRefreshPeriod, refreshPeriod, DEFAULT_CONSUMER_LOCK_MULTIPLIER, Collections.singletonList(redisHost), Collections.singletonList(redisPort), redisClientType, null, redisPassword, redisUser, redisEnableTls, checkInterval, processorTimeout, - processorDelayMax, httpRequestHandlerEnabled, httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, httpRequestHandlerPrefix, httpRequestHandlerUsername, + processorDelayMax, httpRequestHandlerEnabled, httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, micrometerMetricsIdentifier, httpRequestHandlerPrefix, httpRequestHandlerUsername, httpRequestHandlerPassword, httpRequestHandlerPort, httpRequestHandlerUserHeader, queueConfigurations, enableQueueNameDecoding, DEFAULT_REDIS_MAX_POOL_SIZE, DEFAULT_REDIS_MAX_POOL_WAIT_SIZE, DEFAULT_REDIS_MAX_PIPELINE_WAIT_SIZE, DEFAULT_QUEUE_SPEED_INTERVAL_SEC, DEFAULT_MEMORY_USAGE_LIMIT_PCT, @@ -222,7 +227,8 @@ public RedisquesConfiguration(String address, String configurationUpdatedAddress int consumerLockMultiplier, String redisHost, int redisPort, RedisClientType redisClientType, String redisPassword, String redisUser, boolean redisEnableTls, int checkInterval, int processorTimeout, long processorDelayMax, boolean httpRequestHandlerEnabled, - boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, String httpRequestHandlerPrefix, + boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, + String micrometerMetricsIdentifier, String httpRequestHandlerPrefix, String httpRequestHandlerUsername, String httpRequestHandlerPassword, Integer httpRequestHandlerPort, String httpRequestHandlerUserHeader, List queueConfigurations, boolean enableQueueNameDecoding) { @@ -230,7 +236,7 @@ public RedisquesConfiguration(String address, String configurationUpdatedAddress metricRefreshPeriod, refreshPeriod, consumerLockMultiplier, Collections.singletonList(redisHost), Collections.singletonList(redisPort), redisClientType, null, redisPassword, redisUser, redisEnableTls, checkInterval, processorTimeout, processorDelayMax, httpRequestHandlerEnabled, - httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, httpRequestHandlerPrefix, httpRequestHandlerUsername, + httpRequestHandlerAuthenticationEnabled, micrometerMetricsEnabled, micrometerMetricsIdentifier, httpRequestHandlerPrefix, httpRequestHandlerUsername, httpRequestHandlerPassword, httpRequestHandlerPort, httpRequestHandlerUserHeader, queueConfigurations, enableQueueNameDecoding, DEFAULT_REDIS_MAX_POOL_SIZE, DEFAULT_REDIS_MAX_POOL_WAIT_SIZE, DEFAULT_REDIS_MAX_PIPELINE_WAIT_SIZE, DEFAULT_QUEUE_SPEED_INTERVAL_SEC, DEFAULT_MEMORY_USAGE_LIMIT_PCT, @@ -244,7 +250,7 @@ private RedisquesConfiguration(String address, String configurationUpdatedAddres int consumerLockMultiplier, List redisHosts, List redisPorts, RedisClientType redisClientType, String redisAuth, String redisPassword, String redisUser, boolean redisEnableTls, int checkInterval, int processorTimeout, long processorDelayMax, boolean httpRequestHandlerEnabled, - boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, + boolean httpRequestHandlerAuthenticationEnabled, boolean micrometerMetricsEnabled, String micrometerMetricsIdentifier, String httpRequestHandlerPrefix, String httpRequestHandlerUsername, String httpRequestHandlerPassword, Integer httpRequestHandlerPort, String httpRequestHandlerUserHeader, List queueConfigurations, boolean enableQueueNameDecoding, @@ -313,6 +319,7 @@ private RedisquesConfiguration(String address, String configurationUpdatedAddres this.httpRequestHandlerEnabled = httpRequestHandlerEnabled; this.httpRequestHandlerAuthenticationEnabled = httpRequestHandlerAuthenticationEnabled; this.micrometerMetricsEnabled = micrometerMetricsEnabled; + this.micrometerMetricsIdentifier = micrometerMetricsIdentifier; this.httpRequestHandlerPrefix = httpRequestHandlerPrefix; this.httpRequestHandlerUsername = httpRequestHandlerUsername; this.httpRequestHandlerPassword = httpRequestHandlerPassword; @@ -361,7 +368,7 @@ private RedisquesConfiguration(RedisquesConfigurationBuilder builder) { builder.redisPassword, builder.redisUser, builder.redisEnableTls, builder.checkInterval, builder.processorTimeout, builder.processorDelayMax, builder.httpRequestHandlerEnabled, builder.httpRequestHandlerAuthenticationEnabled, - builder.micrometerMetricsEnabled, builder.httpRequestHandlerPrefix, + builder.micrometerMetricsEnabled, builder.micrometerMetricsIdentifier, builder.httpRequestHandlerPrefix, builder.httpRequestHandlerUsername, builder.httpRequestHandlerPassword, builder.httpRequestHandlerPort, builder.httpRequestHandlerUserHeader, builder.queueConfigurations, builder.enableQueueNameDecoding, @@ -405,6 +412,7 @@ public JsonObject asJsonObject() { obj.put(PROP_HTTP_REQUEST_HANDLER_ENABLED, getHttpRequestHandlerEnabled()); obj.put(PROP_HTTP_REQUEST_HANDLER_AUTH_ENABLED, getHttpRequestHandlerAuthenticationEnabled()); obj.put(PROP_MICROMETER_METRICS_ENABLED, getMicrometerMetricsEnabled()); + obj.put(PROP_MICROMETER_METRICS_IDENTIFIER, getMicrometerMetricsIdentifier()); obj.put(PROP_HTTP_REQUEST_HANDLER_PREFIX, getHttpRequestHandlerPrefix()); obj.put(PROP_HTTP_REQUEST_HANDLER_USERNAME, getHttpRequestHandlerUsername()); obj.put(PROP_HTTP_REQUEST_HANDLER_PASSWORD, getHttpRequestHandlerPassword()); @@ -506,6 +514,9 @@ public static RedisquesConfiguration fromJsonObject(JsonObject json) { if (json.containsKey(PROP_MICROMETER_METRICS_ENABLED)) { builder.micrometerMetricsEnabled(json.getBoolean(PROP_MICROMETER_METRICS_ENABLED)); } + if (json.containsKey(PROP_MICROMETER_METRICS_IDENTIFIER)) { + builder.micrometerMetricsIdentifier(json.getString(PROP_MICROMETER_METRICS_IDENTIFIER)); + } if (json.containsKey(PROP_HTTP_REQUEST_HANDLER_PREFIX)) { builder.httpRequestHandlerPrefix(json.getString(PROP_HTTP_REQUEST_HANDLER_PREFIX)); } @@ -665,6 +676,10 @@ public boolean getHttpRequestHandlerAuthenticationEnabled() { public boolean getMicrometerMetricsEnabled() { return micrometerMetricsEnabled; } + public String getMicrometerMetricsIdentifier() { + return micrometerMetricsIdentifier; + } + public String getHttpRequestHandlerPrefix() { return httpRequestHandlerPrefix; } @@ -790,6 +805,7 @@ public static class RedisquesConfigurationBuilder { private int processorTimeout; private long processorDelayMax; private boolean micrometerMetricsEnabled; + private String micrometerMetricsIdentifier; private boolean httpRequestHandlerEnabled; private boolean httpRequestHandlerAuthenticationEnabled; private String httpRequestHandlerPrefix; @@ -976,6 +992,11 @@ public RedisquesConfigurationBuilder micrometerMetricsEnabled(boolean micrometer return this; } + public RedisquesConfigurationBuilder micrometerMetricsIdentifier(String micrometerMetricsIdentifier) { + this.micrometerMetricsIdentifier = micrometerMetricsIdentifier; + return this; + } + public RedisquesConfigurationBuilder httpRequestHandlerAuthenticationEnabled(boolean httpRequestHandlerAuthenticationEnabled) { this.httpRequestHandlerAuthenticationEnabled = httpRequestHandlerAuthenticationEnabled; return this; diff --git a/src/test/java/org/swisspush/redisques/util/RedisquesConfigurationTest.java b/src/test/java/org/swisspush/redisques/util/RedisquesConfigurationTest.java index 41590b0..5c0de28 100644 --- a/src/test/java/org/swisspush/redisques/util/RedisquesConfigurationTest.java +++ b/src/test/java/org/swisspush/redisques/util/RedisquesConfigurationTest.java @@ -42,6 +42,7 @@ public void testDefaultConfiguration(TestContext testContext) { testContext.assertFalse(config.getHttpRequestHandlerEnabled()); testContext.assertFalse(config.getHttpRequestHandlerAuthenticationEnabled()); testContext.assertFalse(config.getMicrometerMetricsEnabled()); + testContext.assertNull(config.getMicrometerMetricsIdentifier()); testContext.assertEquals(config.getHttpRequestHandlerPrefix(), "/queuing"); testContext.assertNull(config.getHttpRequestHandlerUsername()); testContext.assertNull(config.getHttpRequestHandlerPassword()); @@ -71,6 +72,7 @@ public void testOverrideConfiguration(TestContext testContext) { .httpRequestHandlerEnabled(true) .httpRequestHandlerAuthenticationEnabled(true) .micrometerMetricsEnabled(true) + .micrometerMetricsIdentifier("foobar") .httpRequestHandlerPrefix("/queuing/test") .httpRequestHandlerUsername("foo") .httpRequestHandlerPassword("bar") @@ -106,6 +108,7 @@ public void testOverrideConfiguration(TestContext testContext) { testContext.assertTrue(config.getHttpRequestHandlerEnabled()); testContext.assertTrue(config.getHttpRequestHandlerAuthenticationEnabled()); testContext.assertTrue(config.getMicrometerMetricsEnabled()); + testContext.assertEquals(config.getMicrometerMetricsIdentifier(), "foobar"); testContext.assertEquals(config.getHttpRequestHandlerPrefix(), "/queuing/test"); testContext.assertEquals(config.getHttpRequestHandlerUsername(), "foo"); testContext.assertEquals(config.getHttpRequestHandlerPassword(), "bar"); @@ -146,6 +149,7 @@ public void testGetDefaultAsJsonObject(TestContext testContext) { testContext.assertFalse(json.getBoolean(PROP_HTTP_REQUEST_HANDLER_ENABLED)); testContext.assertFalse(json.getBoolean(PROP_HTTP_REQUEST_HANDLER_AUTH_ENABLED)); testContext.assertFalse(json.getBoolean(PROP_MICROMETER_METRICS_ENABLED)); + testContext.assertNull(json.getString(PROP_MICROMETER_METRICS_IDENTIFIER)); testContext.assertEquals(json.getString(PROP_HTTP_REQUEST_HANDLER_PREFIX), "/queuing"); testContext.assertNull(json.getString(PROP_HTTP_REQUEST_HANDLER_USERNAME)); testContext.assertNull(json.getString(PROP_HTTP_REQUEST_HANDLER_PASSWORD)); @@ -177,6 +181,7 @@ public void testGetOverriddenAsJsonObject(TestContext testContext) { .httpRequestHandlerPort(7171) .httpRequestHandlerAuthenticationEnabled(true) .micrometerMetricsEnabled(true) + .micrometerMetricsIdentifier("foobar") .httpRequestHandlerUsername("foo") .httpRequestHandlerPassword("bar") .httpRequestHandlerUserHeader("x-custom-user-header") @@ -218,6 +223,7 @@ public void testGetOverriddenAsJsonObject(TestContext testContext) { testContext.assertEquals(json.getString(PROP_HTTP_REQUEST_HANDLER_PASSWORD), "bar"); testContext.assertTrue(json.getBoolean(PROP_HTTP_REQUEST_HANDLER_AUTH_ENABLED)); testContext.assertTrue(json.getBoolean(PROP_MICROMETER_METRICS_ENABLED)); + testContext.assertEquals(json.getString(PROP_MICROMETER_METRICS_IDENTIFIER), "foobar"); testContext.assertEquals(json.getString(PROP_HTTP_REQUEST_HANDLER_USER_HEADER), "x-custom-user-header"); testContext.assertEquals(json.getInteger(PROP_QUEUE_SPEED_INTERVAL_SEC), 1); testContext.assertEquals(json.getInteger(PROP_MEMORY_USAGE_LIMIT_PCT), 55); @@ -258,6 +264,7 @@ public void testGetDefaultFromJsonObject(TestContext testContext) { testContext.assertFalse(config.getHttpRequestHandlerEnabled()); testContext.assertFalse(config.getHttpRequestHandlerAuthenticationEnabled()); testContext.assertFalse(config.getMicrometerMetricsEnabled()); + testContext.assertNull(config.getMicrometerMetricsIdentifier()); testContext.assertEquals(config.getHttpRequestHandlerPrefix(), "/queuing"); testContext.assertNull(config.getHttpRequestHandlerUsername()); testContext.assertNull(config.getHttpRequestHandlerPassword()); @@ -293,6 +300,7 @@ public void testGetOverriddenFromJsonObject(TestContext testContext) { json.put(PROP_HTTP_REQUEST_HANDLER_ENABLED, Boolean.TRUE); json.put(PROP_HTTP_REQUEST_HANDLER_AUTH_ENABLED, Boolean.TRUE); json.put(PROP_MICROMETER_METRICS_ENABLED, Boolean.TRUE); + json.put(PROP_MICROMETER_METRICS_IDENTIFIER, "foobar"); json.put(PROP_HTTP_REQUEST_HANDLER_PREFIX, "/queuing/test123"); json.put(PROP_HTTP_REQUEST_HANDLER_USERNAME, "foo"); json.put(PROP_HTTP_REQUEST_HANDLER_PASSWORD, "bar"); @@ -328,6 +336,7 @@ public void testGetOverriddenFromJsonObject(TestContext testContext) { testContext.assertTrue(config.getHttpRequestHandlerEnabled()); testContext.assertTrue(config.getHttpRequestHandlerAuthenticationEnabled()); testContext.assertTrue(config.getMicrometerMetricsEnabled()); + testContext.assertEquals(config.getMicrometerMetricsIdentifier(), "foobar"); testContext.assertEquals(config.getHttpRequestHandlerPort(), 7171); testContext.assertEquals(config.getHttpRequestHandlerPrefix(), "/queuing/test123"); testContext.assertEquals(config.getHttpRequestHandlerUsername(), "foo");