From 23cccdfbfe12e8278f36f3276fd6f01624e7755c Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 7 Sep 2023 09:59:06 -0500 Subject: [PATCH] more metric name fixes for prom expo form --- .../engine/api/metrics/ExceptionCountMetrics.java | 4 ++-- .../ExceptionExpectedResultVerificationMetrics.java | 4 ++-- .../engine/api/metrics/ExceptionMeterMetrics.java | 4 ++-- .../engine/api/metrics/ExceptionTimerMetrics.java | 2 +- .../engine/api/metrics/ActivityMetricsTest.java | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java index 959b4f9bd..f9f71ff9d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java @@ -34,7 +34,7 @@ public class ExceptionCountMetrics { public ExceptionCountMetrics(final NBLabeledElement parentLabels) { this.parentLabels = parentLabels; - this.allerrors =ActivityMetrics.counter(parentLabels, "errorcounts.ALL"); + this.allerrors =ActivityMetrics.counter(parentLabels, "errors_ALL"); } public void count(final String name) { @@ -42,7 +42,7 @@ public class ExceptionCountMetrics { if (null == c) synchronized (this.counters) { c = this.counters.computeIfAbsent( name, - k -> ActivityMetrics.counter(this.parentLabels, "errorcounts." + name) + k -> ActivityMetrics.counter(this.parentLabels, "errors_" + name) ); } c.inc(); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java index e54726dfc..36527851b 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java @@ -31,8 +31,8 @@ public class ExceptionExpectedResultVerificationMetrics { public ExceptionExpectedResultVerificationMetrics(final NBLabeledElement parentLabels) { this.parentLabels = parentLabels; - verificationRetries = ActivityMetrics.counter(parentLabels, "verificationcounts.RETRIES"); - verificationErrors = ActivityMetrics.counter(parentLabels, "verificationcounts.ERRORS"); + verificationRetries = ActivityMetrics.counter(parentLabels, "verificationcounts_RETRIES"); + verificationErrors = ActivityMetrics.counter(parentLabels, "verificationcounts_ERRORS"); } public void countVerificationRetries() { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java index 6c3e3c8fd..a4505945e 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java @@ -34,7 +34,7 @@ public class ExceptionMeterMetrics { public ExceptionMeterMetrics(final NBLabeledElement parentLabels) { this.parentLabels = parentLabels; - this.allerrors = ActivityMetrics.meter(parentLabels, "errormeters.ALL"); + this.allerrors = ActivityMetrics.meter(parentLabels, "errormeters_ALL"); } public void mark(final String name) { @@ -42,7 +42,7 @@ public class ExceptionMeterMetrics { if (null == c) synchronized (this.meters) { c = this.meters.computeIfAbsent( name, - k -> ActivityMetrics.meter(this.parentLabels, "errormeters." + name) + k -> ActivityMetrics.meter(this.parentLabels, "errormeters_" + name) ); } c.mark(); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java index 642ae47b9..b7e7f7f14 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java @@ -51,7 +51,7 @@ public class ExceptionTimerMetrics { if (null == timer) synchronized (this.timers) { timer = this.timers.computeIfAbsent( name, - k -> ActivityMetrics.timer(this.parentLabels, "errortimers." + name, this.activityDef.getParams().getOptionalInteger("hdr_digits").orElse(4)) + k -> ActivityMetrics.timer(this.parentLabels, "errortimers_" + name, this.activityDef.getParams().getOptionalInteger("hdr_digits").orElse(4)) ); } timer.update(nanosDuration, TimeUnit.NANOSECONDS); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java index dc9f372a3..abf5cc22c 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/ActivityMetricsTest.java @@ -34,20 +34,20 @@ public class ActivityMetricsTest { int extant = ActivityMetrics.getMetricRegistry().getMetrics().size(); - ActivityMetrics.mountSubRegistry("aprefixhere.",r1); + ActivityMetrics.mountSubRegistry("aprefixhere_",r1); Map metrics = ActivityMetrics.getMetricRegistry().getMetrics(); - assertThat(metrics).containsKey("aprefixhere.counter1"); + assertThat(metrics).containsKey("aprefixhere_counter1"); assertThat(metrics).hasSize(extant+1); r1.counter("counter2"); metrics = ActivityMetrics.getMetricRegistry().getMetrics(); assertThat(metrics).hasSize(extant+2); - assertThat(metrics).containsKey("aprefixhere.counter2"); + assertThat(metrics).containsKey("aprefixhere_counter2"); r1.remove("counter1"); metrics = ActivityMetrics.getMetricRegistry().getMetrics(); assertThat(metrics).hasSize(extant+1); - assertThat(metrics).containsKey("aprefixhere.counter2"); + assertThat(metrics).containsKey("aprefixhere_counter2"); r1.remove("counter2"); metrics = ActivityMetrics.getMetricRegistry().getMetrics();