Moved unwanted char removal out of metrics framework in favor of the …

…caller being responsible for ensuring the name meets requirements.
hpcc-systems · Oct 18, 2023 · 185eb1d · 185eb1d
1 parent efd8e2b
commit 185eb1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/esp/espcommon/espcommon.cpp b/esp/espcommon/espcommon.cpp
@@ -59,8 +59,13 @@ ESPCOMMON_API std::shared_ptr<hpccMetrics::ScaledHistogramMetric> registerServic
 {
     std::string metricName(processName);
     metricName.append(".").append(serviceName).append(".").append(methodName);
-    auto no_ = std::remove(metricName.begin(), metricName.end(), '_');
-    metricName.erase(no_, metricName.end());
+
+    // Remove unwanted characters from new metric name
+    constexpr char removeChars[] = "_-* ";
+    for (unsigned i=0; i<strlen(removeChars); ++i)
+    {
+        metricName.erase(std::remove(metricName.begin(), metricName.end(), removeChars[i]), metricName.end());
+    }
     return registerProfilingMetric(metricName.c_str(), desc, profilingOptions);
 }
 

diff --git a/system/jlib/jmetrics.cpp b/system/jlib/jmetrics.cpp
@@ -153,13 +153,6 @@ bool MetricsManager::addMetric(const std::shared_ptr<IMetric> &pMetric)
     bool rc = false;
     std::string name = pMetric->queryName();
 
-    // Remove unwanted characters from input name
-    char removeChars[] = "_-* ";
-    for (unsigned i=0; i<strlen(removeChars); ++i)
-    {
-        name.erase(std::remove(name.begin(), name.end(), removeChars[i]), name.end());
-    }
-
     // Ensure metric name follows naming convention
     try
     {