This is an automated email from the ASF dual-hosted git repository. aahmed pushed a commit to branch prometheusMtest in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit c56f50fbe2dd514ea545882fc19064b5f8fcf2a7 Author: Ali Ahmed <[email protected]> AuthorDate: Wed Mar 17 17:27:10 2021 -0700 Cleanup up PromethuesMetricsTest --- .../broker/authentication/AuthenticationProviderToken.java | 6 ++++-- .../apache/pulsar/broker/stats/PrometheusMetricsTest.java | 12 +++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java index 5071298..245aa23 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java @@ -77,6 +77,7 @@ public class AuthenticationProviderToken implements AuthenticationProvider { .name("pulsar_expired_token_count") .help("Pulsar expired token") .register(); + private static final Histogram expiringTokenMinutesMetrics = Histogram.build() .name("pulsar_expiring_token_minutes") .help("The remaining time of expiring token in minutes") @@ -99,7 +100,8 @@ public class AuthenticationProviderToken implements AuthenticationProvider { @Override public void close() throws IOException { - // noop + expiredTokenMetrics.clear(); + expiringTokenMinutesMetrics.clear(); } @Override @@ -197,7 +199,7 @@ public class AuthenticationProviderToken implements AuthenticationProvider { if (object instanceof List) { List<String> audiences = (List<String>) object; // audience not contains this broker, throw exception. - if (!audiences.stream().anyMatch(audienceInToken -> audienceInToken.equals(audience))) { + if (audiences.stream().noneMatch(audienceInToken -> audienceInToken.equals(audience))) { throw new AuthenticationException("Audiences in token: [" + String.join(", ", audiences) + "] not contains this broker: " + audience); } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java index b7e5eac..0d12edc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java @@ -892,6 +892,9 @@ public class PrometheusMetricsTest extends BrokerTestBase { provider.close(); } + // Investigate issue + // java.lang.AssertionError: line pulsar_broker_publish_latency{cluster="test",quantile="0.0"} +Inf does not match pattern + // ^(\w+)\{([^\}]+)\}\s(-?[\d\w\.-]+)(\s(\d+))?$ expected [true] but found [false] @Test public void testExpiringTokenMetrics() throws Exception { SecretKey secretKey = AuthTokenUtils.createSecretKey(SignatureAlgorithm.HS256); @@ -953,6 +956,9 @@ public class PrometheusMetricsTest extends BrokerTestBase { provider.close(); } + // Investigate issue + // java.lang.AssertionError: line pulsar_broker_publish_latency{cluster="test",quantile="0.0"} +Inf does not match pattern + // ^(\w+)\{([^\}]+)\}\s(-?[\d\w\.-]+)(\s(\d+))?$ expected [true] but found [false] @Test public void testManagedCursorPersistStats() throws Exception { final String subName = "my-sub"; @@ -1011,7 +1017,7 @@ public class PrometheusMetricsTest extends BrokerTestBase { ByteArrayOutputStream statsOut = new ByteArrayOutputStream(); PrometheusMetricsGenerator.generate(pulsar, true, false, false, statsOut); - String metricsStr = new String(statsOut.toByteArray()); + String metricsStr = statsOut.toString(); Multimap<String, Metric> metrics = parseMetrics(metricsStr); List<Metric> cm = (List<Metric>) metrics.get("pulsar_connection_created_total_count"); compareBrokerConnectionStateCount(cm, 1.0); @@ -1028,7 +1034,7 @@ public class PrometheusMetricsTest extends BrokerTestBase { pulsarClient.close(); statsOut = new ByteArrayOutputStream(); PrometheusMetricsGenerator.generate(pulsar, true, false, false, statsOut); - metricsStr = new String(statsOut.toByteArray()); + metricsStr = statsOut.toString(); metrics = parseMetrics(metricsStr); cm = (List<Metric>) metrics.get("pulsar_connection_closed_total_count"); @@ -1050,7 +1056,7 @@ public class PrometheusMetricsTest extends BrokerTestBase { pulsarClient.close(); statsOut = new ByteArrayOutputStream(); PrometheusMetricsGenerator.generate(pulsar, true, false, false, statsOut); - metricsStr = new String(statsOut.toByteArray()); + metricsStr = statsOut.toString(); metrics = parseMetrics(metricsStr); cm = (List<Metric>) metrics.get("pulsar_connection_closed_total_count");
