telemetry: small fixes

- removed remnant debugging code
+ fix compatibility with Metric naming convention
+ fix failures when perf-stat command returns wrong data
+ better handling when perf-stat command fails

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: I23a064ed09c8cf0394abb5306fb04f4e33c20aa4

1 files changed, 2 insertions, 2 deletions

diff --git a/resources/tools/telemetry/metrics.py b/resources/tools/telemetry/metrics.py
index ba6bae5e70..7a22acfd1b 100644
--- a/resources/tools/telemetry/metrics.py
+++ b/resources/tools/telemetry/metrics.py
@@ -104,7 +104,7 @@ class Metric:
             u"Sample", [u"name", u"labels", u"value", u"timestamp"]
         )
 
-        if not re.compile(r"^[a-zA-Z_:\-.][a-zA-Z0-9_:\-.]*$").match(name):
+        if not re.compile(r"^[a-zA-Z_:][a-zA-Z0-9_:]*$").match(name):
             raise ValueError(f"Invalid metric name: {name}!")
         if typ not in self.metric_types:
             raise ValueError(f"Invalid metric type: {typ}!")
@@ -214,7 +214,7 @@ class MetricBase:
         full_name += f"{subsystem}_" if subsystem else u""
         full_name += name
 
-        if not re.compile(r"^[a-zA-Z_:\-.][a-zA-Z0-9_:\-.]*$").match(full_name):
+        if not re.compile(r"^[a-zA-Z_:][a-zA-Z0-9_:]*$").match(full_name):
             raise ValueError(
                 f"Invalid metric name: {full_name}!"
             )