[tor-commits] [tor] 04/04: Merge branch 'tor-gitlab/mr/700'

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

commit 59456cb3cf34e09ee3e4f765659d1396d86c544f
Merge: 8f50f490a6 1a60fa547f
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Mon Mar 13 11:22:31 2023 -0400

    Merge branch 'tor-gitlab/mr/700'

 changes/ticket40757                   |   8 ++
 src/feature/hs/hs_metrics.c           |  23 +++--
 src/feature/hs/hs_metrics.h           |  49 ++++++----
 src/feature/hs/hs_metrics_entry.c     |  29 ++++++
 src/feature/hs/hs_metrics_entry.h     |   8 ++
 src/feature/hs/hs_service.c           |  11 +++
 src/feature/relay/relay_metrics.c     | 170 +++++++++++++++++-----------------
 src/lib/metrics/metrics_common.c      |   2 +
 src/lib/metrics/metrics_common.h      |  23 +++++
 src/lib/metrics/metrics_store.c       |   6 +-
 src/lib/metrics/metrics_store.h       |   6 +-
 src/lib/metrics/metrics_store_entry.c | 157 ++++++++++++++++++++++++++++++-
 src/lib/metrics/metrics_store_entry.h |  13 ++-
 src/lib/metrics/prometheus.c          |  70 +++++++++++++-
 src/test/test_hs_metrics.c            |   8 +-
 src/test/test_metrics.c               | 146 ++++++++++++++++++++++++++++-
 16 files changed, 602 insertions(+), 127 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.