Removed getter abstraction and moved from rephist to relay_metrics.

2 files changed, 87 insertions, 8 deletions

diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c
index d08f01838b..2bed40c33d 100644
--- a/src/feature/relay/relay_metrics.c
+++ b/src/feature/relay/relay_metrics.c
@@ -1053,6 +1053,14 @@ fill_signing_cert_expiry(void)
   }
 }
 
+static uint64_t est_intro_actions[EST_INTRO_ACTION_COUNT] = {0};
+
+void
+increment_est_intro_action(est_intro_action_t action)
+{
+  est_intro_actions[action]++;
+}
+
 static void
 fill_est_intro_cells(void)
 {
@@ -1076,11 +1084,19 @@ fill_est_intro_cells(void)
         metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
     metrics_store_entry_add_label(
         sentry, metrics_format_label("action", actions[i].name));
-    metrics_store_entry_update(
-        sentry, (long)rep_hist_get_est_intro_action_count(actions[i].key));
+    metrics_store_entry_update(sentry,
+                               (long)est_intro_actions[actions[i].key]);
   }
 }
 
+static uint64_t est_rend_actions[EST_REND_ACTION_COUNT] = {0};
+
+void
+increment_est_rend_action(est_rend_action_t action)
+{
+  est_rend_actions[action]++;
+}
+
 static void
 fill_est_rend_cells(void)
 {
@@ -1106,11 +1122,18 @@ fill_est_rend_cells(void)
         metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
     metrics_store_entry_add_label(
         sentry, metrics_format_label("action", actions[i].name));
-    metrics_store_entry_update(
-        sentry, (long)rep_hist_get_est_rend_action_count(actions[i].key));
+    metrics_store_entry_update(sentry, (long)est_rend_actions[actions[i].key]);
   }
 }
 
+static uint64_t intro1_actions[INTRO1_ACTION_COUNT] = {0};
+
+void
+increment_intro1_action(intro1_action_t action)
+{
+  intro1_actions[action]++;
+}
+
 static void
 fill_intro1_cells(void)
 {
@@ -1137,11 +1160,18 @@ fill_intro1_cells(void)
         metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
     metrics_store_entry_add_label(
         sentry, metrics_format_label("action", actions[i].name));
-    metrics_store_entry_update(
-        sentry, (long)rep_hist_get_intro1_action_count(actions[i].key));
+    metrics_store_entry_update(sentry, (long)intro1_actions[actions[i].key]);
   }
 }
 
+static uint64_t rend1_actions[REND1_ACTION_COUNT] = {0};
+
+void
+increment_rend1_action(rend1_action_t action)
+{
+  rend1_actions[action]++;
+}
+
 static void
 fill_rend1_cells(void)
 {
@@ -1166,8 +1196,7 @@ fill_rend1_cells(void)
         metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
     metrics_store_entry_add_label(
         sentry, metrics_format_label("action", actions[i].name));
-    metrics_store_entry_update(
-        sentry, (long)rep_hist_get_rend1_action_count(actions[i].key));
+    metrics_store_entry_update(sentry, (long)rend1_actions[actions[i].key]);
   }
 }
 
diff --git a/src/feature/relay/relay_metrics.h b/src/feature/relay/relay_metrics.h
index a2a52737ff..523570cadd 100644
--- a/src/feature/relay/relay_metrics.h
+++ b/src/feature/relay/relay_metrics.h
@@ -80,4 +80,54 @@ void relay_metrics_free(void);
 /* Accessors. */
 const smartlist_t *relay_metrics_get_stores(void);
 
+typedef enum {
+  EST_INTRO_SUCCESS,
+  EST_INTRO_MALFORMED,
+  EST_INTRO_UNSUITABLE_CIRCUIT,
+  EST_INTRO_CIRCUIT_DEAD,
+
+  EST_INTRO_ACTION_COUNT
+} est_intro_action_t;
+
+void increment_est_intro_action(est_intro_action_t);
+
+typedef enum {
+  EST_REND_SUCCESS,
+  EST_REND_UNSUITABLE_CIRCUIT,
+  EST_REND_SINGLE_HOP,
+  EST_REND_MALFORMED,
+  EST_REND_DUPLICATE_COOKIE,
+  EST_REND_CIRCUIT_DEAD,
+
+  EST_REND_ACTION_COUNT
+} est_rend_action_t;
+
+void increment_est_rend_action(est_rend_action_t);
+
+typedef enum {
+  INTRO1_SUCCESS,
+  INTRO1_CIRCUIT_DEAD,
+  INTRO1_MALFORMED,
+  INTRO1_UNKNOWN_SERVICE,
+  INTRO1_RATE_LIMITED,
+  INTRO1_CIRCUIT_REUSED,
+  INTRO1_SINGLE_HOP,
+
+  INTRO1_ACTION_COUNT
+} intro1_action_t;
+
+void increment_intro1_action(intro1_action_t);
+
+typedef enum {
+  REND1_SUCCESS,
+  REND1_UNSUITABLE_CIRCUIT,
+  REND1_MALFORMED,
+  REND1_UNKNOWN_COOKIE,
+  REND1_CIRCUIT_DEAD,
+
+  REND1_ACTION_COUNT
+} rend1_action_t;
+
+void increment_rend1_action(rend1_action_t);
+
 #endif /* !defined(TOR_FEATURE_RELAY_RELAY_METRICS_H) */