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

Record proxy type for proxy relay stats

Browse source
This commit is contained in:
Shelikhoo 2022-09-23 12:44:02 +01:00
parent 03b2b56f87
commit 36f03dfd44
No known key found for this signature in database
GPG key ID: C4D5E79D22B25316
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
broker/ipc.go
View file

@ -75,19 +75,19 @@ func (i *IPC) ProxyPolls(arg messages.Arg, response *[]byte) error {
if !relayPatternSupported { if !relayPatternSupported {
i.ctx.metrics.lock.Lock() i.ctx.metrics.lock.Lock()
i.ctx.metrics.proxyPollWithoutRelayURLExtension++ i.ctx.metrics.proxyPollWithoutRelayURLExtension++
i.ctx.metrics.promMetrics.ProxyPollWithoutRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType}).Inc() i.ctx.metrics.promMetrics.ProxyPollWithoutRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType, "type": proxyType}).Inc()
i.ctx.metrics.lock.Unlock() i.ctx.metrics.lock.Unlock()
} else { } else {
i.ctx.metrics.lock.Lock() i.ctx.metrics.lock.Lock()
i.ctx.metrics.proxyPollWithRelayURLExtension++ i.ctx.metrics.proxyPollWithRelayURLExtension++
i.ctx.metrics.promMetrics.ProxyPollWithRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType}).Inc() i.ctx.metrics.promMetrics.ProxyPollWithRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType, "type": proxyType}).Inc()
i.ctx.metrics.lock.Unlock() i.ctx.metrics.lock.Unlock()
} }
if !i.ctx.CheckProxyRelayPattern(relayPattern, !relayPatternSupported) { if !i.ctx.CheckProxyRelayPattern(relayPattern, !relayPatternSupported) {
i.ctx.metrics.lock.Lock() i.ctx.metrics.lock.Lock()
i.ctx.metrics.proxyPollRejectedWithRelayURLExtension++ i.ctx.metrics.proxyPollRejectedWithRelayURLExtension++
i.ctx.metrics.promMetrics.ProxyPollRejectedForRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType}).Inc() i.ctx.metrics.promMetrics.ProxyPollRejectedForRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType, "type": proxyType}).Inc()
i.ctx.metrics.lock.Unlock() i.ctx.metrics.lock.Unlock()
log.Printf("bad request: rejected relay pattern from proxy = %v", messages.ErrBadRequest) log.Printf("bad request: rejected relay pattern from proxy = %v", messages.ErrBadRequest)

6
broker/metrics.go
View file

@ -286,7 +286,7 @@ func initPrometheus() *PromMetrics {
Name: "rounded_proxy_poll_with_relay_url_extension_total", Name: "rounded_proxy_poll_with_relay_url_extension_total",
Help: "The number of snowflake proxy polls with Relay URL Extension, rounded up to a multiple of 8", Help: "The number of snowflake proxy polls with Relay URL Extension, rounded up to a multiple of 8",
}, },
[]string{"nat"}, []string{"nat", "type"},
) )
promMetrics.ProxyPollWithoutRelayURLExtensionTotal = NewRoundedCounterVec( promMetrics.ProxyPollWithoutRelayURLExtensionTotal = NewRoundedCounterVec(
@ -295,7 +295,7 @@ func initPrometheus() *PromMetrics {
Name: "rounded_proxy_poll_without_relay_url_extension_total", Name: "rounded_proxy_poll_without_relay_url_extension_total",
Help: "The number of snowflake proxy polls without Relay URL Extension, rounded up to a multiple of 8", Help: "The number of snowflake proxy polls without Relay URL Extension, rounded up to a multiple of 8",
}, },
[]string{"nat"}, []string{"nat", "type"},
) )
promMetrics.ProxyPollRejectedForRelayURLExtensionTotal = NewRoundedCounterVec( promMetrics.ProxyPollRejectedForRelayURLExtensionTotal = NewRoundedCounterVec(
@ -304,7 +304,7 @@ func initPrometheus() *PromMetrics {
Name: "rounded_proxy_poll_rejected_relay_url_extension_total", Name: "rounded_proxy_poll_rejected_relay_url_extension_total",
Help: "The number of snowflake proxy polls rejected by Relay URL Extension, rounded up to a multiple of 8", Help: "The number of snowflake proxy polls rejected by Relay URL Extension, rounded up to a multiple of 8",
}, },
[]string{"nat"}, []string{"nat", "type"},
) )
promMetrics.ClientPollTotal = NewRoundedCounterVec( promMetrics.ClientPollTotal = NewRoundedCounterVec(