Merge pull request #64 from jupp0r/feature/fix-benchmark-counter-naming

Fix benchmark metrics naming

Author: jupp0r

tests/benchmark/benchmark_helpers.cc

@@ -5,10 +5,7 @@
 
 std::string GenerateRandomString(size_t length) {
   auto randchar = []() -> char {
-    const char charset[] =
-        "0123456789"
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-        "abcdefghijklmnopqrstuvwxyz";
+    const char charset[] = "abcdefghijklmnopqrstuvwxyz";
     const size_t max_index = (sizeof(charset) - 1);
     return charset[rand() % max_index];
   };

tests/benchmark/counter_bench.cc

@@ -6,7 +6,8 @@ static void BM_Counter_Increment(benchmark::State& state) {
   using prometheus::Counter;
   using prometheus::BuildCounter;
   Registry registry;
-  auto& counter_family = BuildCounter().Name("benchmark counter").Help("").Register(registry);
+  auto& counter_family =
+      BuildCounter().Name("benchmark_counter").Help("").Register(registry);
   auto& counter = counter_family.Add({});
 
   while (state.KeepRunning()) counter.Increment();
@@ -18,7 +19,8 @@ static void BM_Counter_Collect(benchmark::State& state) {
   using prometheus::Counter;
   using prometheus::BuildCounter;
   Registry registry;
-  auto& counter_family = BuildCounter().Name("benchmark counter").Help("").Register(registry);
+  auto& counter_family =
+      BuildCounter().Name("benchmark_counter").Help("").Register(registry);
   auto& counter = counter_family.Add({});
 
   while (state.KeepRunning()) {

tests/benchmark/gauge_bench.cc

@@ -6,7 +6,8 @@ static void BM_Gauge_Increment(benchmark::State& state) {
   using prometheus::Gauge;
   using prometheus::BuildGauge;
   Registry registry;
-  auto& gauge_family = BuildGauge().Name("benchmark gauge").Help("").Register(registry);
+  auto& gauge_family =
+      BuildGauge().Name("benchmark_gauge").Help("").Register(registry);
   auto& gauge = gauge_family.Add({});
 
   while (state.KeepRunning()) gauge.Increment(2);
@@ -18,7 +19,8 @@ static void BM_Gauge_Decrement(benchmark::State& state) {
   using prometheus::Gauge;
   using prometheus::BuildGauge;
   Registry registry;
-  auto& gauge_family = BuildGauge().Name("benchmark gauge").Help("").Register(registry);
+  auto& gauge_family =
+      BuildGauge().Name("benchmark_gauge").Help("").Register(registry);
   auto& gauge = gauge_family.Add({});
 
   while (state.KeepRunning()) gauge.Decrement(2);
@@ -30,7 +32,8 @@ static void BM_Gauge_SetToCurrentTime(benchmark::State& state) {
   using prometheus::Gauge;
   using prometheus::BuildGauge;
   Registry registry;
-  auto& gauge_family = BuildGauge().Name("benchmark gauge").Help("").Register(registry);
+  auto& gauge_family =
+      BuildGauge().Name("benchmark_gauge").Help("").Register(registry);
   auto& gauge = gauge_family.Add({});
 
   while (state.KeepRunning()) gauge.SetToCurrentTime();
@@ -42,7 +45,8 @@ static void BM_Gauge_Collect(benchmark::State& state) {
   using prometheus::Gauge;
   using prometheus::BuildGauge;
   Registry registry;
-  auto& gauge_family = BuildGauge().Name("benchmark gauge").Help("").Register(registry);
+  auto& gauge_family =
+      BuildGauge().Name("benchmark_gauge").Help("").Register(registry);
   auto& gauge = gauge_family.Add({});
 
   while (state.KeepRunning()) {

tests/benchmark/histogram_bench.cc

@@ -24,7 +24,7 @@ static void BM_Histogram_Observe(benchmark::State& state) {
 
   Registry registry;
   auto& histogram_family =
-      BuildHistogram().Name("benchmark histogram").Help("").Register(registry);
+      BuildHistogram().Name("benchmark_histogram").Help("").Register(registry);
   auto bucket_boundaries = CreateLinearBuckets(0, number_of_buckets - 1, 1);
   auto& histogram = histogram_family.Add({}, bucket_boundaries);
   std::random_device rd;
@@ -53,7 +53,7 @@ static void BM_Histogram_Collect(benchmark::State& state) {
 
   Registry registry;
   auto& histogram_family =
-      BuildHistogram().Name("benchmark histogram").Help("").Register(registry);
+      BuildHistogram().Name("benchmark_histogram").Help("").Register(registry);
   auto bucket_boundaries = CreateLinearBuckets(0, number_of_buckets - 1, 1);
   auto& histogram = histogram_family.Add({}, bucket_boundaries);
 

tests/benchmark/registry_bench.cc

@@ -12,7 +12,7 @@ static void BM_Registry_CreateFamily(benchmark::State& state) {
   Registry registry;
 
   while (state.KeepRunning())
-    BuildCounter().Name("benchmark counter").Help("").Register(registry);
+    BuildCounter().Name("benchmark_counter").Help("").Register(registry);
 }
 BENCHMARK(BM_Registry_CreateFamily);
 
@@ -22,10 +22,10 @@ static void BM_Registry_CreateCounter(benchmark::State& state) {
   using prometheus::BuildCounter;
   Registry registry;
   auto& counter_family = BuildCounter()
-                           .Labels(GenerateRandomLabels(10))
-                           .Name("benchmark counter")
-                           .Help("")
-                           .Register(registry);
+                             .Labels(GenerateRandomLabels(10))
+                             .Name("benchmark_counter")
+                             .Help("")
+                             .Register(registry);
 
   while (state.KeepRunning()) {
     auto labels = GenerateRandomLabels(state.range(0));