archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 11:11:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement binned counts for polling metrics

Browse source
This commit is contained in:
Cecylia Bocovich 2021-03-31 10:52:01 -04:00
parent 83ef0b6f6d
commit 92bd900bc5
4 changed files with 108 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
broker/metrics.go
View file

@ -20,11 +20,11 @@ import (
var (
once sync.Once
promMetrics *PromMetrics
promMetrics = initPrometheus()
)
const (
PrometheusNamespace = "snowflake"
prometheusNamespace = "snowflake"
metricsResolution = 60 * 60 * 24 * time.Second //86400 seconds
)
@ -147,6 +147,7 @@ func (m *Metrics) UpdateCountryStats(addr string, proxyType string, natType stri
} else {
m.countryStats.unknown[addr] = true
}
promMetrics.ProxyTotal.With(prometheus.Labels{
"nat": natType,
"type": proxyType,
@ -261,40 +262,47 @@ func binCount(count uint) uint {
type PromMetrics struct {
ProxyTotal *prometheus.CounterVec
ProxyPollTotal *prometheus.CounterVec
ClientPollTotal *prometheus.CounterVec
ProxyPollTotal *RoundedCounterVec
ClientPollTotal *RoundedCounterVec
}
//Initialize metrics for prometheus exporter
func InitPrometheus() {
func initPrometheus() *PromMetrics {
promMetrics = &PromMetrics{}
promMetrics := &PromMetrics{}
promMetrics.ProxyTotal = promauto.NewCounterVec(
prometheus.CounterOpts{
Namespace: PrometheusNamespace,
Namespace: prometheusNamespace,
Name: "proxy_total",
Help: "The number of unique snowflake IPs",
},
[]string{"type", "nat", "cc"},
)
promMetrics.ProxyPollTotal = promauto.NewCounterVec(
promMetrics.ProxyPollTotal = NewRoundedCounterVec(
prometheus.CounterOpts{
Namespace: PrometheusNamespace,
Name: "proxy_poll_total",
Help: "The number of snowflake proxy polls",
Namespace: prometheusNamespace,
Name: "rounded_proxy_poll_total",
Help: "The number of snowflake proxy polls, rounded up to a multiple of 8",
},
[]string{"nat", "status"},
)
promMetrics.ClientPollTotal = promauto.NewCounterVec(
promMetrics.ClientPollTotal = NewRoundedCounterVec(
prometheus.CounterOpts{
Namespace: PrometheusNamespace,
Name: "client_poll_total",
Help: "The number of snowflake client polls",
Namespace: prometheusNamespace,
Name: "rounded_client_poll_total",
Help: "The number of snowflake client polls, rounded up to a multiple of 8",
},
[]string{"nat", "status"},
)
// We need to register this new metric type because there is no constructor
// for it in promauto.
prometheus.DefaultRegisterer.MustRegister(promMetrics.ClientPollTotal)
prometheus.DefaultRegisterer.MustRegister(promMetrics.ProxyPollTotal)
return promMetrics
}