nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

metrics: Add traffic related stats to MetricsPort

Browse Source 
At this commit, bytes read and written are exported.

Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2022-10-27 10:00:50 -04:00
parent cd7be492d1
commit 48ab17cc72
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/feature/relay/relay_metrics.c
View File

@ -12,6 +12,7 @@
#include "core/or/or.h" #include "core/or/or.h"
#include "core/mainloop/connection.h" #include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/or/congestion_control_common.h" #include "core/or/congestion_control_common.h"
#include "core/or/dos.h" #include "core/or/dos.h"
#include "core/or/relay.h" #include "core/or/relay.h"
@ -39,6 +40,7 @@ static void fill_onionskins_values(void);
static void fill_oom_values(void); static void fill_oom_values(void);
static void fill_streams_values(void); static void fill_streams_values(void);
static void fill_tcp_exhaustion_values(void); static void fill_tcp_exhaustion_values(void);
static void fill_traffic_values(void);
/** The base metrics that is a static array of metrics added to the metrics /** The base metrics that is a static array of metrics added to the metrics
* store. * store.
@ -123,6 +125,13 @@ static const relay_metrics_entry_t base_metrics[] =
.help = "Denial of Service defenses related counters", .help = "Denial of Service defenses related counters",
.fill_fn = fill_dos_values, .fill_fn = fill_dos_values,
}, },
{
.key = RELAY_METRICS_NUM_TRAFFIC,
.type = METRICS_TYPE_COUNTER,
.name = METRICS_NAME(relay_traffic_bytes),
.help = "Traffic related counters",
.fill_fn = fill_traffic_values,
},
}; };
static const size_t num_base_metrics = ARRAY_LENGTH(base_metrics); static const size_t num_base_metrics = ARRAY_LENGTH(base_metrics);
@ -149,6 +158,26 @@ handshake_type_to_str(const uint16_t type)
} }
} }
/** Fill function for the RELAY_METRICS_NUM_TRAFFIC metric. */
static void
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_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);
metrics_store_entry_add_label(sentry,
metrics_format_label("direction", "written"));
metrics_store_entry_update(sentry, get_bytes_written());
}
/** Fill function for the RELAY_METRICS_NUM_DOS metric. */ /** Fill function for the RELAY_METRICS_NUM_DOS metric. */
static void static void
fill_dos_values(void) fill_dos_values(void)

2
src/feature/relay/relay_metrics.h
View File

@ -37,6 +37,8 @@ typedef enum {
RELAY_METRICS_NUM_CC = 9, RELAY_METRICS_NUM_CC = 9,
/** Denial of Service defenses subsystem. */ /** Denial of Service defenses subsystem. */
RELAY_METRICS_NUM_DOS = 10, RELAY_METRICS_NUM_DOS = 10,
/** Denial of Service defenses subsystem. */
RELAY_METRICS_NUM_TRAFFIC = 11,
} relay_metrics_key_t; } relay_metrics_key_t;
/** The metadata of a relay metric. */ /** The metadata of a relay metric. */