From e59025f931f365b00adf9cd71bc2422171a49fa1 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 21 Jul 2022 11:28:29 -0500
Subject: [PATCH] set error metric names to "error*" instead of "exception*"
 for consistency.

---
 .../engine/api/metrics/ExceptionCountMetrics.java        | 3 +++
 .../engine/api/metrics/ExceptionHistoMetrics.java        | 3 +++
 .../engine/api/metrics/ExceptionMeterMetrics.java        | 5 ++++-
 .../engine/api/metrics/ExceptionTimerMetrics.java        | 9 ++++++++-
 4 files changed, 18 insertions(+), 2 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 ed42c37e4..846539149 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
@@ -29,10 +29,12 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class ExceptionCountMetrics {
     private final ConcurrentHashMap<String, Counter> counters = new ConcurrentHashMap<>();
+    private final Counter allerrors;
     private final ActivityDef activityDef;
 
     public ExceptionCountMetrics(ActivityDef activityDef) {
         this.activityDef = activityDef;
+        allerrors=ActivityMetrics.counter(activityDef, "errorcounts.ALL");
     }
 
     public void count(String name) {
@@ -46,6 +48,7 @@ public class ExceptionCountMetrics {
             }
         }
         c.inc();
+        allerrors.inc();
     }
 
     public List<Counter> getCounters() {
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
index 4d9387955..dd543d01b 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
@@ -31,10 +31,12 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class ExceptionHistoMetrics {
     private final ConcurrentHashMap<String, Histogram> histos = new ConcurrentHashMap<>();
+    private final Histogram allerrors;
     private final ActivityDef activityDef;
 
     public ExceptionHistoMetrics(ActivityDef activityDef) {
         this.activityDef = activityDef;
+        allerrors = ActivityMetrics.histogram(activityDef, "errorhistos.ALL", activityDef.getParams().getOptionalInteger("hdr_digits").orElse(4));
     }
 
     public void update(String name, long magnitude) {
@@ -48,6 +50,7 @@ public class ExceptionHistoMetrics {
             }
         }
         h.update(magnitude);
+        allerrors.update(magnitude);
     }
 
 
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 a2001e29d..5c538e665 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
@@ -29,10 +29,12 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class ExceptionMeterMetrics {
     private final ConcurrentHashMap<String, Meter> meters = new ConcurrentHashMap<>();
+    private final Meter allerrors;
     private final ActivityDef activityDef;
 
     public ExceptionMeterMetrics(ActivityDef activityDef) {
         this.activityDef = activityDef;
+        allerrors = ActivityMetrics.meter(activityDef, "errormeters.ALL");
     }
 
     public void mark(String name) {
@@ -41,11 +43,12 @@ public class ExceptionMeterMetrics {
             synchronized (meters) {
                 c = meters.computeIfAbsent(
                     name,
-                    k -> ActivityMetrics.meter(activityDef, "exceptions." + name)
+                    k -> ActivityMetrics.meter(activityDef, "errormeters." + name)
                 );
             }
         }
         c.mark();
+        allerrors.mark();
     }
 
     public List<Meter> getMeters() {
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 ca81bc50d..d8825ffaa 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
@@ -30,10 +30,16 @@ import java.util.concurrent.TimeUnit;
  */
 public class ExceptionTimerMetrics {
     private final ConcurrentHashMap<String, Timer> timers = new ConcurrentHashMap<>();
+    private final Timer allerrors;
     private final ActivityDef activityDef;
 
     public ExceptionTimerMetrics(ActivityDef activityDef) {
         this.activityDef = activityDef;
+        allerrors = ActivityMetrics.timer(
+            activityDef,
+            "errortimers.ALL",
+            activityDef.getParams().getOptionalInteger("hdr_digits").orElse(4)
+        );
     }
 
     public void update(String name, long nanosDuration) {
@@ -42,11 +48,12 @@ public class ExceptionTimerMetrics {
             synchronized (timers) {
                 timer = timers.computeIfAbsent(
                     name,
-                    k -> ActivityMetrics.timer(activityDef, "exceptions." + name, activityDef.getParams().getOptionalInteger("hdr_digits").orElse(4))
+                    k -> ActivityMetrics.timer(activityDef, "errortimers." + name, activityDef.getParams().getOptionalInteger("hdr_digits").orElse(4))
                 );
             }
         }
         timer.update(nanosDuration, TimeUnit.NANOSECONDS);
+        allerrors.update(nanosDuration, TimeUnit.NANOSECONDS);
     }
 
     public List<Timer> getTimers() {