metrics: Add support for histograms.

This will enable us to add e.g. circuit build metrics (#40717).

Signed-off-by: Gabriela Moldovan <gabi@torproject.org>

1 files changed, 85 insertions, 85 deletions

diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c
index cdf34a3404..99204931fc 100644
--- a/src/feature/relay/relay_metrics.c
+++ b/src/feature/relay/relay_metrics.c
@@ -222,8 +222,8 @@ fill_circuits_values(void)
 {
   const relay_metrics_entry_t *rentry =
     &base_metrics[RELAY_METRICS_NUM_CIRCUITS];
-  metrics_store_entry_t *sentry =
-    metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+  metrics_store_entry_t *sentry = metrics_store_add(
+      the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
 
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "opened"));
@@ -255,57 +255,57 @@ fill_relay_flags(void)
 
   const relay_metrics_entry_t *rentry =
     &base_metrics[RELAY_METRICS_RELAY_FLAGS];
-  metrics_store_entry_t *sentry =
-    metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+  metrics_store_entry_t *sentry = metrics_store_add(
+      the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
 
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "Fast"));
   metrics_store_entry_update(sentry, is_fast);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "Exit"));
   metrics_store_entry_update(sentry, is_exit);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "Authority"));
   metrics_store_entry_update(sentry, is_authority);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "Stable"));
   metrics_store_entry_update(sentry, is_stable);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "HSDir"));
   metrics_store_entry_update(sentry, is_hs_dir);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "Running"));
   metrics_store_entry_update(sentry, is_running);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "V2Dir"));
   metrics_store_entry_update(sentry, is_v2_dir);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "Sybil"));
   metrics_store_entry_update(sentry, is_sybil);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "Guard"));
   metrics_store_entry_update(sentry, is_guard);
@@ -317,15 +317,15 @@ fill_traffic_values(void)
 {
   const relay_metrics_entry_t *rentry =
     &base_metrics[RELAY_METRICS_NUM_TRAFFIC];
-  metrics_store_entry_t *sentry =
-    metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+  metrics_store_entry_t *sentry = metrics_store_add(
+      the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
 
   metrics_store_entry_add_label(sentry,
           metrics_format_label("direction", "read"));
   metrics_store_entry_update(sentry, get_bytes_read());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("direction", "written"));
   metrics_store_entry_update(sentry, get_bytes_written());
@@ -336,57 +336,57 @@ static void
 fill_dos_values(void)
 {
   const relay_metrics_entry_t *rentry = &base_metrics[RELAY_METRICS_NUM_DOS];
-  metrics_store_entry_t *sentry =
-    metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+  metrics_store_entry_t *sentry = metrics_store_add(
+      the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
 
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "circuit_rejected"));
   metrics_store_entry_update(sentry, dos_get_num_cc_rejected());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "circuit_killed_max_cell"));
   metrics_store_entry_update(sentry, stats_n_circ_max_cell_reached);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "circuit_killed_max_cell_outq"));
   metrics_store_entry_update(sentry, stats_n_circ_max_cell_outq_reached);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "marked_address"));
   metrics_store_entry_update(sentry, dos_get_num_cc_marked_addr());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "marked_address_maxq"));
   metrics_store_entry_update(sentry, dos_get_num_cc_marked_addr_maxq());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "conn_rejected"));
   metrics_store_entry_update(sentry, dos_get_num_conn_addr_connect_rejected());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "concurrent_conn_rejected"));
   metrics_store_entry_update(sentry, dos_get_num_conn_addr_rejected());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "single_hop_refused"));
   metrics_store_entry_update(sentry, dos_get_num_single_hop_refused());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("type", "introduce2_rejected"));
   metrics_store_entry_update(sentry, hs_dos_get_intro2_rejected_count());
@@ -399,8 +399,8 @@ fill_cc_counters_values(void)
   const relay_metrics_entry_t *rentry =
     &base_metrics[RELAY_METRICS_CC_COUNTERS];
 
-  metrics_store_entry_t *sentry =
-    metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+  metrics_store_entry_t *sentry = metrics_store_add(
+      the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "starvation"));
   metrics_store_entry_add_label(sentry,
@@ -408,7 +408,7 @@ fill_cc_counters_values(void)
   metrics_store_entry_update(sentry, congestion_control_get_num_rtt_reset());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "clock_stalls"));
   metrics_store_entry_add_label(sentry,
@@ -417,7 +417,7 @@ fill_cc_counters_values(void)
                              congestion_control_get_num_clock_stalls());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "flow_control"));
   metrics_store_entry_add_label(sentry,
@@ -426,7 +426,7 @@ fill_cc_counters_values(void)
                              cc_stats_flow_num_xoff_sent);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "flow_control"));
   metrics_store_entry_add_label(sentry,
@@ -435,7 +435,7 @@ fill_cc_counters_values(void)
                              cc_stats_flow_num_xon_sent);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_limits"));
   metrics_store_entry_add_label(sentry,
@@ -443,7 +443,7 @@ fill_cc_counters_values(void)
   metrics_store_entry_update(sentry, cc_stats_vegas_above_delta);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_limits"));
   metrics_store_entry_add_label(sentry,
@@ -451,7 +451,7 @@ fill_cc_counters_values(void)
   metrics_store_entry_update(sentry, cc_stats_vegas_above_ss_cwnd_max);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_limits"));
   metrics_store_entry_add_label(sentry,
@@ -459,7 +459,7 @@ fill_cc_counters_values(void)
   metrics_store_entry_update(sentry, cc_stats_vegas_below_ss_inc_floor);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_circuits"));
   metrics_store_entry_add_label(sentry,
@@ -467,7 +467,7 @@ fill_cc_counters_values(void)
   metrics_store_entry_update(sentry, cc_stats_circs_created);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_circuits"));
   metrics_store_entry_add_label(sentry,
@@ -475,7 +475,7 @@ fill_cc_counters_values(void)
   metrics_store_entry_update(sentry, cc_stats_circs_closed);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_circuits"));
   metrics_store_entry_add_label(sentry,
@@ -490,8 +490,8 @@ fill_cc_gauges_values(void)
   const relay_metrics_entry_t *rentry =
     &base_metrics[RELAY_METRICS_CC_GAUGES];
 
-  metrics_store_entry_t *sentry =
-    metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+  metrics_store_entry_t *sentry = metrics_store_add(
+      the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "slow_start_exit"));
   metrics_store_entry_add_label(sentry,
@@ -500,7 +500,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_exit_ss_cwnd_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "slow_start_exit"));
   metrics_store_entry_add_label(sentry,
@@ -509,7 +509,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_exit_ss_bdp_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "slow_start_exit"));
   metrics_store_entry_add_label(sentry,
@@ -518,7 +518,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_exit_ss_inc_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "on_circ_close"));
   metrics_store_entry_add_label(sentry,
@@ -527,7 +527,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_circ_close_cwnd_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "on_circ_close"));
   metrics_store_entry_add_label(sentry,
@@ -536,7 +536,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_circ_close_ss_cwnd_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "buffers"));
   metrics_store_entry_add_label(sentry,
@@ -545,7 +545,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_flow_xon_outbuf_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "buffers"));
   metrics_store_entry_add_label(sentry,
@@ -554,7 +554,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_flow_xoff_outbuf_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_backoff"));
   metrics_store_entry_add_label(sentry,
@@ -563,7 +563,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_csig_blocked_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_backoff"));
   metrics_store_entry_add_label(sentry,
@@ -572,7 +572,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_gamma_drop_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_backoff"));
   metrics_store_entry_add_label(sentry,
@@ -581,7 +581,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_delta_drop_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_backoff"));
   metrics_store_entry_add_label(sentry,
@@ -590,7 +590,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_ss_csig_blocked_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_cwnd_update"));
   metrics_store_entry_add_label(sentry,
@@ -599,7 +599,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_csig_alpha_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_cwnd_update"));
   metrics_store_entry_add_label(sentry,
@@ -608,7 +608,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_csig_beta_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_cwnd_update"));
   metrics_store_entry_add_label(sentry,
@@ -617,7 +617,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_csig_delta_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_estimates"));
   metrics_store_entry_add_label(sentry,
@@ -626,7 +626,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_ss_queue_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_estimates"));
   metrics_store_entry_add_label(sentry,
@@ -635,7 +635,7 @@ fill_cc_gauges_values(void)
                              tor_llround(cc_stats_vegas_queue_ma));
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
           metrics_format_label("state", "cc_estimates"));
   metrics_store_entry_add_label(sentry,
@@ -659,16 +659,16 @@ fill_streams_values(void)
 {
   const relay_metrics_entry_t *rentry =
     &base_metrics[RELAY_METRICS_NUM_STREAMS];
-  metrics_store_entry_t *sentry =
-    metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+  metrics_store_entry_t *sentry = metrics_store_add(
+      the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
   fill_single_stream_value(sentry, RELAY_COMMAND_BEGIN);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   fill_single_stream_value(sentry, RELAY_COMMAND_BEGIN_DIR);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   fill_single_stream_value(sentry, RELAY_COMMAND_RESOLVE);
 }
 
@@ -704,31 +704,31 @@ fill_conn_counter_values(void)
     if (i == 10) {
       continue;
     }
-    metrics_store_entry_t *sentry =
-      metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+    metrics_store_entry_t *sentry = metrics_store_add(
+        the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "initiated", "created", AF_INET,
                                  rep_hist_get_conn_created(false, i, AF_INET));
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "initiated", "created", AF_INET6,
                                  rep_hist_get_conn_created(false, i,
                                                            AF_INET6));
 
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "received", "created", AF_INET,
                                  rep_hist_get_conn_created(true, i, AF_INET));
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "received", "created", AF_INET6,
                                  rep_hist_get_conn_created(true, i, AF_INET6));
 
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "received", "rejected", AF_INET,
                                  rep_hist_get_conn_rejected(i, AF_INET));
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "received", "rejected", AF_INET6,
                                  rep_hist_get_conn_rejected(i, AF_INET6));
 
@@ -748,21 +748,21 @@ fill_conn_gauge_values(void)
     if (i == 10) {
       continue;
     }
-    metrics_store_entry_t *sentry =
-      metrics_store_add(the_store, rentry->type, rentry->name, rentry->help);
+    metrics_store_entry_t *sentry = metrics_store_add(
+        the_store, rentry->type, rentry->name, rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "initiated", "opened", AF_INET,
                                  rep_hist_get_conn_opened(false, i, AF_INET));
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "initiated", "opened", AF_INET6,
                                  rep_hist_get_conn_opened(false, i, AF_INET6));
 
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "received", "opened", AF_INET,
                                  rep_hist_get_conn_opened(true, i, AF_INET));
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     fill_single_connection_value(sentry, i, "received", "opened", AF_INET6,
                                  rep_hist_get_conn_opened(true, i, AF_INET6));
   }
@@ -777,7 +777,7 @@ fill_tcp_exhaustion_values(void)
     &base_metrics[RELAY_METRICS_NUM_TCP_EXHAUSTION];
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_update(sentry, rep_hist_get_n_tcp_exhaustion());
 }
 
@@ -835,7 +835,7 @@ fill_dns_error_values(void)
 
     for (size_t j = 0; j < num_errors; j++) {
       sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                                 rentry->help);
+                                 rentry->help, 0, NULL);
       metrics_store_entry_add_label(sentry, record_label);
       metrics_store_entry_add_label(sentry,
               metrics_format_label("reason", errors[j].name));
@@ -849,7 +849,7 @@ fill_dns_error_values(void)
   /* Put in the DNS errors, unfortunately not per-type for now. */
   for (size_t j = 0; j < num_errors; j++) {
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     metrics_store_entry_add_label(sentry,
             metrics_format_label("reason", errors[j].name));
     metrics_store_entry_update(sentry,
@@ -873,7 +873,7 @@ fill_dns_query_values(void)
     char *record_label =
       tor_strdup(metrics_format_label("record", dns_types[i].name));
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     metrics_store_entry_add_label(sentry, record_label);
     metrics_store_entry_update(sentry,
                                rep_hist_get_n_dns_request(dns_types[i].type));
@@ -882,7 +882,7 @@ fill_dns_query_values(void)
 #endif
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_update(sentry, rep_hist_get_n_dns_request(0));
 }
 
@@ -895,13 +895,13 @@ fill_global_bw_limit_values(void)
     &base_metrics[RELAY_METRICS_NUM_GLOBAL_RW_LIMIT];
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
                                 metrics_format_label("side", "read"));
   metrics_store_entry_update(sentry, rep_hist_get_n_read_limit_reached());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
                                 metrics_format_label("side", "write"));
   metrics_store_entry_update(sentry, rep_hist_get_n_write_limit_reached());
@@ -916,13 +916,13 @@ fill_socket_values(void)
     &base_metrics[RELAY_METRICS_NUM_SOCKETS];
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
                                 metrics_format_label("state", "opened"));
   metrics_store_entry_update(sentry, get_n_open_sockets());
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_update(sentry, get_max_sockets());
 }
 
@@ -940,7 +940,7 @@ fill_onionskins_values(void)
     char *type_label =
       tor_strdup(metrics_format_label("type", handshake_type_to_str(t)));
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     metrics_store_entry_add_label(sentry, type_label);
     metrics_store_entry_add_label(sentry,
                         metrics_format_label("action", "processed"));
@@ -948,7 +948,7 @@ fill_onionskins_values(void)
                                rep_hist_get_circuit_n_handshake_assigned(t));
 
     sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                               rentry->help);
+                               rentry->help, 0, NULL);
     metrics_store_entry_add_label(sentry, type_label);
     metrics_store_entry_add_label(sentry,
                         metrics_format_label("action", "dropped"));
@@ -967,25 +967,25 @@ fill_oom_values(void)
     &base_metrics[RELAY_METRICS_NUM_OOM_BYTES];
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
                                 metrics_format_label("subsys", "cell"));
   metrics_store_entry_update(sentry, oom_stats_n_bytes_removed_cell);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
                                 metrics_format_label("subsys", "dns"));
   metrics_store_entry_update(sentry, oom_stats_n_bytes_removed_dns);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
                                 metrics_format_label("subsys", "geoip"));
   metrics_store_entry_update(sentry, oom_stats_n_bytes_removed_geoip);
 
   sentry = metrics_store_add(the_store, rentry->type, rentry->name,
-                             rentry->help);
+                             rentry->help, 0, NULL);
   metrics_store_entry_add_label(sentry,
                                 metrics_format_label("subsys", "hsdir"));
   metrics_store_entry_update(sentry, oom_stats_n_bytes_removed_hsdir);