From a64aa58fc66a428f3f30f84521405a45a29cba6b Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Sat, 9 Sep 2023 00:12:04 -0500
Subject: [PATCH] remove more invalid metric labels

---
 .../io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java | 2 +-
 .../nosqlbench/api/engine/metrics/ClassicHistoListener.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java
index 6ffdca805..38c5de889 100644
--- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java
+++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java
@@ -43,7 +43,7 @@ public class OpDef extends OpTemplate {
 
     @Override
     public String getName() {
-        return block.getName() + "--" + rawOpDef.getName();
+        return block.getName() + "__" + rawOpDef.getName();
     }
 
     @Override
diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ClassicHistoListener.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ClassicHistoListener.java
index 5ab874800..0066896c5 100644
--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ClassicHistoListener.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ClassicHistoListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class ClassicHistoListener extends CapabilityHook<HistogramAttachment> {
     @Override
     public void onCapableAdded(String name, HistogramAttachment capable) {
         if (pattern.matcher(name).matches()) {
-            String prefixed = prefix + "-" + name;
+            String prefixed = prefix + "_" + name;
             Histogram classicHisto = new Histogram(new ExponentiallyDecayingReservoir());
             capable.attachHistogram(classicHisto);