From 22861c2f4083e7e29a732a4907c2dcadd6a6a4db Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 6 May 2021 11:17:26 -0400 Subject: relay: Add TCP port exhaustion metrics Signed-off-by: David Goulet --- src/feature/relay/relay_metrics.c | 21 +++++++++++++++++++++ src/feature/relay/relay_metrics.h | 2 ++ 2 files changed, 23 insertions(+) (limited to 'src/feature/relay') diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index 466e4da55e..2c24728d9a 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -30,6 +30,7 @@ static void fill_global_bw_limit_values(void); static void fill_socket_values(void); static void fill_onionskins_values(void); static void fill_oom_values(void); +static void fill_tcp_exhaustion_values(void); /** The base metrics that is a static array of metrics added to the metrics * store. @@ -79,6 +80,13 @@ static const relay_metrics_entry_t base_metrics[] = .help = "Total number of DNS errors encountered by this relay", .fill_fn = fill_dns_error_values, }, + { + .key = RELAY_METRICS_NUM_TCP_EXHAUSTION, + .type = METRICS_TYPE_COUNTER, + .name = METRICS_NAME(relay_load_tcp_exhaustion_total), + .help = "Total number of times we ran out of TCP ports", + .fill_fn = fill_tcp_exhaustion_values, + }, }; static const size_t num_base_metrics = ARRAY_LENGTH(base_metrics); @@ -103,6 +111,19 @@ handshake_type_to_str(const uint16_t type) } } +/** Fill function for the RELAY_METRICS_NUM_DNS metrics. */ +static void +fill_tcp_exhaustion_values(void) +{ + metrics_store_entry_t *sentry; + const relay_metrics_entry_t *rentry = + &base_metrics[RELAY_METRICS_NUM_TCP_EXHAUSTION]; + + sentry = metrics_store_add(the_store, rentry->type, rentry->name, + rentry->help); + metrics_store_entry_update(sentry, rep_hist_get_n_tcp_exhaustion()); +} + /** Helper array containing mapping for the name of the different DNS records * and their corresponding libevent values. */ static struct dns_type { diff --git a/src/feature/relay/relay_metrics.h b/src/feature/relay/relay_metrics.h index 67f58f6029..00dfeaa624 100644 --- a/src/feature/relay/relay_metrics.h +++ b/src/feature/relay/relay_metrics.h @@ -27,6 +27,8 @@ typedef enum { RELAY_METRICS_NUM_DNS = 4, /** Number of DNS query errors. */ RELAY_METRICS_NUM_DNS_ERRORS = 5, + /** Number of TCP exhaustion reached. */ + RELAY_METRICS_NUM_TCP_EXHAUSTION = 6, } relay_metrics_key_t; /** The metadata of a relay metric. */ -- cgit v1.2.3-54-g00ecf