From 2fe0322fe4550e59cb8757fbff6984286bf8e121 Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@torproject.org>
Date: Tue, 20 Oct 2020 14:47:05 -0400
Subject: hs: Collect service traffic metrics

Related to #40063

Signed-off-by: David Goulet <dgoulet@torproject.org>
---
 src/feature/hs/hs_metrics.h       |  8 ++++++++
 src/feature/hs/hs_metrics_entry.c | 14 ++++++++++++++
 src/feature/hs/hs_metrics_entry.h |  4 ++++
 3 files changed, 26 insertions(+)

(limited to 'src/feature/hs')

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. */
-- 
cgit v1.2.3-54-g00ecf