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

metrics: Fix naming and documentation

Browse Source 
After nickm's review, minor changes to names and comments.

Related to #40194

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2022-10-27 10:45:08 -04:00
parent 06a26f1872
commit a1c40c8511
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/or/connection_edge.c
View File

@ -4120,7 +4120,7 @@ connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ)
return -1; return -1;
/* Note the RESOLVE stream as seen. */ /* Note the RESOLVE stream as seen. */
rep_hist_note_stream(RELAY_COMMAND_RESOLVE); rep_hist_note_exit_stream(RELAY_COMMAND_RESOLVE);
/* This 'dummy_conn' only exists to remember the stream ID /* This 'dummy_conn' only exists to remember the stream ID
* associated with the resolve request; and to make the * associated with the resolve request; and to make the
@ -4246,7 +4246,7 @@ connection_exit_connect(edge_connection_t *edge_conn)
/* Note the BEGIN stream as seen. We do this after the Exit policy check in /* Note the BEGIN stream as seen. We do this after the Exit policy check in
* order to only account for valid streams. */ * order to only account for valid streams. */
rep_hist_note_stream(RELAY_COMMAND_BEGIN); rep_hist_note_exit_stream(RELAY_COMMAND_BEGIN);
#ifdef HAVE_SYS_UN_H #ifdef HAVE_SYS_UN_H
if (conn->socket_family != AF_UNIX) { if (conn->socket_family != AF_UNIX) {
@ -4344,7 +4344,7 @@ connection_exit_connect_dir(edge_connection_t *exitconn)
log_info(LD_EXIT, "Opening local connection for anonymized directory exit"); log_info(LD_EXIT, "Opening local connection for anonymized directory exit");
/* Note the BEGIN_DIR stream as seen. */ /* Note the BEGIN_DIR stream as seen. */
rep_hist_note_stream(RELAY_COMMAND_BEGIN_DIR); rep_hist_note_exit_stream(RELAY_COMMAND_BEGIN_DIR);
exitconn->base_.state = EXIT_CONN_STATE_OPEN; exitconn->base_.state = EXIT_CONN_STATE_OPEN;

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

@ -160,7 +160,7 @@ fill_single_stream_value(metrics_store_entry_t *sentry, uint8_t cmd)
{ {
metrics_store_entry_add_label(sentry, metrics_store_entry_add_label(sentry,
metrics_format_label("type", relay_command_to_string(cmd))); metrics_format_label("type", relay_command_to_string(cmd)));
metrics_store_entry_update(sentry, rep_hist_get_stream_seen(cmd)); metrics_store_entry_update(sentry, rep_hist_get_exit_stream_seen(cmd));
} }
/** Fill function for the RELAY_METRICS_NUM_STREAMS metric. */ /** Fill function for the RELAY_METRICS_NUM_STREAMS metric. */

7
src/feature/stats/rephist.c
View File

@ -1639,7 +1639,7 @@ rep_hist_note_exit_stream_opened(uint16_t port)
log_debug(LD_HIST, "Opened exit stream to port %d", port); log_debug(LD_HIST, "Opened exit stream to port %d", port);
} }
/*** Streams statistics ***/ /*** Exit streams statistics ***/
/** Number of BEGIN streams seen. */ /** Number of BEGIN streams seen. */
static uint64_t streams_begin_seen; static uint64_t streams_begin_seen;
@ -1650,7 +1650,7 @@ static uint64_t streams_resolve_seen;
/** Note a stream as seen for the given relay command. */ /** Note a stream as seen for the given relay command. */
void void
rep_hist_note_stream(unsigned int cmd) rep_hist_note_exit_stream(unsigned int cmd)
{ {
switch (cmd) { switch (cmd) {
case RELAY_COMMAND_BEGIN: case RELAY_COMMAND_BEGIN:
@ -1663,13 +1663,14 @@ rep_hist_note_stream(unsigned int cmd)
streams_resolve_seen++; streams_resolve_seen++;
break; break;
default: default:
tor_assert_nonfatal_unreached_once();
break; break;
} }
} }
/** Return number of stream seen for the given command. */ /** Return number of stream seen for the given command. */
uint64_t uint64_t
rep_hist_get_stream_seen(unsigned int cmd) rep_hist_get_exit_stream_seen(unsigned int cmd)
{ {
switch (cmd) { switch (cmd) {
case RELAY_COMMAND_BEGIN: case RELAY_COMMAND_BEGIN:

4
src/feature/stats/rephist.h
View File

@ -48,8 +48,8 @@ uint64_t rep_hist_get_conn_created(bool initiated, unsigned int type);
uint64_t rep_hist_get_conn_opened(bool initiated, unsigned int type); uint64_t rep_hist_get_conn_opened(bool initiated, unsigned int type);
uint64_t rep_hist_get_conn_rejected(unsigned int type); uint64_t rep_hist_get_conn_rejected(unsigned int type);
void rep_hist_note_stream(unsigned int cmd); void rep_hist_note_exit_stream(unsigned int cmd);
uint64_t rep_hist_get_stream_seen(unsigned int cmd); uint64_t rep_hist_get_exit_stream_seen(unsigned int cmd);
void rep_hist_buffer_stats_init(time_t now); void rep_hist_buffer_stats_init(time_t now);
void rep_hist_buffer_stats_add_circ(circuit_t *circ, void rep_hist_buffer_stats_add_circ(circuit_t *circ,