diff options
Diffstat (limited to 'broker/ipc.go')
| -rw-r--r-- | broker/ipc.go | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/broker/ipc.go b/broker/ipc.go index 9116a1a..1752a9b 100644 --- a/broker/ipc.go +++ b/broker/ipc.go @@ -5,7 +5,6 @@ import ( "encoding/hex" "fmt" "log" - "net" "time" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/bridgefingerprint" @@ -101,7 +100,7 @@ func (i *IPC) ProxyPolls(arg messages.Arg, response *[]byte) error { } // Log geoip stats - remoteIP, _, err := net.SplitHostPort(arg.RemoteAddr) + remoteIP := arg.RemoteAddr if err != nil { log.Println("Warning: cannot process proxy IP: ", err.Error()) } else { @@ -196,13 +195,7 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error { snowflake.offerChannel <- offer } else { i.ctx.metrics.lock.Lock() - i.ctx.metrics.clientDeniedCount[arg.RendezvousMethod]++ - i.ctx.metrics.promMetrics.ClientPollTotal.With(prometheus.Labels{"nat": offer.natType, "status": "denied", "rendezvous_method": string(arg.RendezvousMethod)}).Inc() - if offer.natType == NATUnrestricted { - i.ctx.metrics.clientUnrestrictedDeniedCount[arg.RendezvousMethod]++ - } else { - i.ctx.metrics.clientRestrictedDeniedCount[arg.RendezvousMethod]++ - } + i.ctx.metrics.UpdateRendezvousStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, false) i.ctx.metrics.lock.Unlock() resp := &messages.ClientPollResponse{Error: messages.StrNoProxies} return sendClientResponse(resp, response) @@ -212,8 +205,7 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error { select { case answer := <-snowflake.answerChannel: i.ctx.metrics.lock.Lock() - i.ctx.metrics.clientProxyMatchCount[arg.RendezvousMethod]++ - i.ctx.metrics.promMetrics.ClientPollTotal.With(prometheus.Labels{"nat": offer.natType, "status": "matched", "rendezvous_method": string(arg.RendezvousMethod)}).Inc() + i.ctx.metrics.UpdateRendezvousStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, true) i.ctx.metrics.lock.Unlock() resp := &messages.ClientPollResponse{Answer: answer} err = sendClientResponse(resp, response) |