metrics: Add new relay metrics to MetricsPort

This commit adds the total number of DROP cell seen, the total number of
DESTROY cell received and the total number of protocol violation that lead to a
circuit close.

Closes #40816

Signed-off-by: David Goulet <dgoulet@torproject.org>

1 files changed, 65 insertions, 0 deletions

diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c
index 8b8c07f580..492a5945b8 100644
--- a/src/feature/relay/relay_metrics.c
+++ b/src/feature/relay/relay_metrics.c
@@ -13,6 +13,7 @@
 #include "core/or/or.h"
 #include "core/mainloop/connection.h"
 #include "core/mainloop/mainloop.h"
+#include "core/or/command.h"
 #include "core/or/congestion_control_common.h"
 #include "core/or/congestion_control_vegas.h"
 #include "core/or/congestion_control_flow.h"
@@ -54,6 +55,9 @@ static void fill_socket_values(void);
 static void fill_onionskins_values(void);
 static void fill_oom_values(void);
 static void fill_streams_values(void);
+static void fill_relay_circ_proto_violation(void);
+static void fill_relay_destroy_cell(void);
+static void fill_relay_drop_cell(void);
 static void fill_relay_flags(void);
 static void fill_tcp_exhaustion_values(void);
 static void fill_traffic_values(void);
@@ -217,6 +221,27 @@ static const relay_metrics_entry_t base_metrics[] =
     .help = "Total number of REND1 cells we received",
     .fill_fn = fill_rend1_cells,
   },
+  {
+    .key = RELAY_METRICS_CIRC_DESTROY_CELL,
+    .type = METRICS_TYPE_COUNTER,
+    .name = METRICS_NAME(relay_destroy_cell_total),
+    .help = "Total number of DESTROY cell we received",
+    .fill_fn = fill_relay_destroy_cell,
+  },
+  {
+    .key = RELAY_METRICS_CIRC_PROTO_VIOLATION,
+    .type = METRICS_TYPE_COUNTER,
+    .name = METRICS_NAME(relay_circ_proto_violation_total),
+    .help = "Total number of circuit protocol violation",
+    .fill_fn = fill_relay_circ_proto_violation,
+  },
+  {
+    .key = RELAY_METRICS_CIRC_DROP_CELL,
+    .type = METRICS_TYPE_COUNTER,
+    .name = METRICS_NAME(relay_drop_cell_total),
+    .help = "Total number of DROP cell we received",
+    .fill_fn = fill_relay_drop_cell,
+  },
 };
 static const size_t num_base_metrics = ARRAY_LENGTH(base_metrics);
 
@@ -1206,6 +1231,46 @@ fill_rend1_cells(void)
   }
 }
 
+/** Fill the metrics store for the RELAY_METRICS_CIRC_DESTROY_CELL counter. */
+static void
+fill_relay_destroy_cell(void)
+{
+  metrics_store_entry_t *sentry;
+  const relay_metrics_entry_t *rentry =
+    &base_metrics[RELAY_METRICS_CIRC_DESTROY_CELL];
+
+  sentry = metrics_store_add(the_store, rentry->type, rentry->name,
+                             rentry->help, 0, NULL);
+  metrics_store_entry_update(sentry,
+                             (int64_t) stats_n_destroy_cells_processed);
+}
+
+/** Fill the metrics store for the RELAY_METRICS_CIRC_DROP_CELL counter. */
+static void
+fill_relay_drop_cell(void)
+{
+  metrics_store_entry_t *sentry;
+  const relay_metrics_entry_t *rentry =
+    &base_metrics[RELAY_METRICS_CIRC_DROP_CELL];
+
+  sentry = metrics_store_add(the_store, rentry->type, rentry->name,
+                             rentry->help, 0, NULL);
+  metrics_store_entry_update(sentry, rep_hist_get_drop_cell_received_count());
+}
+
+/** Fill the metrics store for the RELAY_METRICS_CIRC_PROTO_VIOLATION. */
+static void
+fill_relay_circ_proto_violation(void)
+{
+  metrics_store_entry_t *sentry;
+  const relay_metrics_entry_t *rentry =
+    &base_metrics[RELAY_METRICS_CIRC_PROTO_VIOLATION];
+
+  sentry = metrics_store_add(the_store, rentry->type, rentry->name,
+                             rentry->help, 0, NULL);
+  metrics_store_entry_update(sentry, circ_n_proto_violation);
+}
+
 /** Reset the global store and fill it with all the metrics from base_metrics
  * and their associated values.
  *