diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-10-20 14:47:05 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-10-27 10:43:42 -0400 |
| commit | 2fe0322fe4550e59cb8757fbff6984286bf8e121 (patch) | |
| tree | aba4c9b3857465aa1a6d5adb52513a567ffe6d5a /src/feature/hs | |
| parent | 695957511b95d5b6cbe4a13d30b591aed572c9e5 (diff) | |
| download | tor-2fe0322fe4550e59cb8757fbff6984286bf8e121.tar.gz tor-2fe0322fe4550e59cb8757fbff6984286bf8e121.zip | |
hs: Collect service traffic metrics
Related to #40063
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/hs')
| -rw-r--r-- | src/feature/hs/hs_metrics.h | 8 | ||||
| -rw-r--r-- | src/feature/hs/hs_metrics_entry.c | 14 | ||||
| -rw-r--r-- | src/feature/hs/hs_metrics_entry.h | 4 |
3 files changed, 26 insertions, 0 deletions
diff --git a/src/feature/hs/hs_metrics.h b/src/feature/hs/hs_metrics.h index 991b66a7ee..76eb68a2b1 100644 --- a/src/feature/hs/hs_metrics.h +++ b/src/feature/hs/hs_metrics.h @@ -35,4 +35,12 @@ void hs_metrics_update_by_service(const hs_metrics_key_t key, #define hs_metrics_new_introduction(s) \ hs_metrics_update_by_service(HS_METRICS_NUM_INTRODUCTIONS, (s), 0, 1) +/** Number of bytes written to the application from the service. */ +#define hs_metrics_app_write_bytes(i, port, n) \ + hs_metrics_update_by_ident(HS_METRICS_APP_WRITE_BYTES, (i), (port), (n)) + +/** Number of bytes read from the application to the service. */ +#define hs_metrics_app_read_bytes(i, port, n) \ + hs_metrics_update_by_ident(HS_METRICS_APP_READ_BYTES, (i), (port), (n)) + #endif /* !defined(TOR_FEATURE_HS_HS_METRICS_H) */ diff --git a/src/feature/hs/hs_metrics_entry.c b/src/feature/hs/hs_metrics_entry.c index d6b2e0e62b..6d0a143503 100644 --- a/src/feature/hs/hs_metrics_entry.c +++ b/src/feature/hs/hs_metrics_entry.c @@ -27,6 +27,20 @@ const hs_metrics_entry_t base_metrics[] = .help = "Total number of introduction received", .port_as_label = false, }, + { + .key = HS_METRICS_APP_WRITE_BYTES, + .type = METRICS_TYPE_COUNTER, + .name = "hs_app_write_bytes_total", + .help = "Total number of bytes written to the application", + .port_as_label = true, + }, + { + .key = HS_METRICS_APP_READ_BYTES, + .type = METRICS_TYPE_COUNTER, + .name = "hs_app_read_bytes_total", + .help = "Total number of bytes read from the application", + .port_as_label = true, + }, }; /** Size of base_metrics array that is number of entries. */ diff --git a/src/feature/hs/hs_metrics_entry.h b/src/feature/hs/hs_metrics_entry.h index 96dce36ffa..e4b999fc46 100644 --- a/src/feature/hs/hs_metrics_entry.h +++ b/src/feature/hs/hs_metrics_entry.h @@ -17,6 +17,10 @@ typedef enum { /** Number of introduction requests. */ HS_METRICS_NUM_INTRODUCTIONS = 0, + /** Number of bytes written from onion service to application. */ + HS_METRICS_APP_WRITE_BYTES = 1, + /** Number of bytes read from application to onion service. */ + HS_METRICS_APP_READ_BYTES = 2, } hs_metrics_key_t; /** The metadata of an HS metrics. */ |