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

Prune metrics that are reported for rendezvous

Browse source 
Signed-off-by: Cecylia Bocovich <cohosh@torproject.org>
This commit is contained in:
Michael Pu 2024-01-31 12:30:51 -05:00 • committed by Cecylia Bocovich
parent dbecefa7d2
commit 5f5cbe6431
No known key found for this signature in database
GPG key ID: 009DE379FD9B7B90
4 changed files with 50 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

19
broker/metrics.go
View file

@ -189,7 +189,11 @@ func (m *Metrics) logMetrics() {
func (m *Metrics) printMetrics() { func (m *Metrics) printMetrics() {
m.lock.Lock() m.lock.Lock()
m.logger.Println("snowflake-stats-end", time.Now().UTC().Format("2006-01-02 15:04:05"), fmt.Sprintf("(%d s)", int(metricsResolution.Seconds()))) m.logger.Println(
"snowflake-stats-end",
time.Now().UTC().Format("2006-01-02 15:04:05"),
fmt.Sprintf("(%d s)", int(metricsResolution.Seconds())),
)
m.logger.Println("snowflake-ips", m.countryStats.Display()) m.logger.Println("snowflake-ips", m.countryStats.Display())
total := len(m.countryStats.unknown) total := len(m.countryStats.unknown)
for pType, addresses := range m.countryStats.proxies { for pType, addresses := range m.countryStats.proxies {
@ -207,11 +211,14 @@ func (m *Metrics) printMetrics() {
m.logger.Println("client-unrestricted-denied-count", binCount(sumMapValues(&m.clientUnrestrictedDeniedCount))) m.logger.Println("client-unrestricted-denied-count", binCount(sumMapValues(&m.clientUnrestrictedDeniedCount)))
m.logger.Println("client-snowflake-match-count", binCount(sumMapValues(&m.clientProxyMatchCount))) m.logger.Println("client-snowflake-match-count", binCount(sumMapValues(&m.clientProxyMatchCount)))
for _, rendezvousMethod := range [3]messages.RendezvousMethod{messages.RendezvousHttp, messages.RendezvousAmpCache, messages.RendezvousSqs} { for _, rendezvousMethod := range [3]messages.RendezvousMethod{
m.logger.Printf("client-%s-denied-count %d\n", rendezvousMethod, binCount(m.clientDeniedCount[rendezvousMethod])) messages.RendezvousHttp,
m.logger.Printf("client-%s-restricted-denied-count %d\n", rendezvousMethod, binCount(m.clientRestrictedDeniedCount[rendezvousMethod])) messages.RendezvousAmpCache,
m.logger.Printf("client-%s-unrestricted-denied-count %d\n", rendezvousMethod, binCount(m.clientUnrestrictedDeniedCount[rendezvousMethod])) messages.RendezvousSqs,
m.logger.Printf("client-snowflake-%s-match-count %d\n", rendezvousMethod, binCount(m.clientProxyMatchCount[rendezvousMethod])) } {
m.logger.Printf("client-%s-count %d\n", rendezvousMethod, binCount(
m.clientDeniedCount[rendezvousMethod]+m.clientProxyMatchCount[rendezvousMethod],
))
} }
m.logger.Println("snowflake-ips-nat-restricted", len(m.countryStats.natRestricted)) m.logger.Println("snowflake-ips-nat-restricted", len(m.countryStats.natRestricted))

135
broker/snowflake-broker_test.go
View file

@ -157,18 +157,9 @@ func TestBroker(t *testing.T) {
client-restricted-denied-count 8 client-restricted-denied-count 8
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 0 client-snowflake-match-count 0
client-http-denied-count 8 client-http-count 8
client-http-restricted-denied-count 8 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 0
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
`) `)
}) })
@ -193,18 +184,9 @@ client-snowflake-sqs-match-count 0
client-restricted-denied-count 0 client-restricted-denied-count 0
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 8 client-snowflake-match-count 8
client-http-denied-count 0 client-http-count 8
client-http-restricted-denied-count 0 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 8
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
`) `)
}) })
@ -278,18 +260,9 @@ client-snowflake-sqs-match-count 0
client-restricted-denied-count 8 client-restricted-denied-count 8
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 0 client-snowflake-match-count 0
client-http-denied-count 8 client-http-count 8
client-http-restricted-denied-count 8 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 0
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
`) `)
}) })
@ -314,18 +287,9 @@ client-snowflake-sqs-match-count 0
client-restricted-denied-count 0 client-restricted-denied-count 0
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 8 client-snowflake-match-count 8
client-http-denied-count 0 client-http-count 8
client-http-restricted-denied-count 0 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 8
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
`) `)
}) })
@ -376,18 +340,9 @@ client-snowflake-sqs-match-count 0
client-restricted-denied-count 8 client-restricted-denied-count 8
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 0 client-snowflake-match-count 0
client-http-denied-count 0 client-http-count 0
client-http-restricted-denied-count 0 client-ampcache-count 8
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 0
client-ampcache-denied-count 8
client-ampcache-restricted-denied-count 8
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
`) `)
}) })
@ -414,18 +369,9 @@ client-snowflake-sqs-match-count 0
client-restricted-denied-count 0 client-restricted-denied-count 0
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 8 client-snowflake-match-count 8
client-http-denied-count 0 client-http-count 0
client-http-restricted-denied-count 0 client-ampcache-count 8
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 0
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 8
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
`) `)
}) })
@ -782,18 +728,9 @@ client-denied-count 0
client-restricted-denied-count 0 client-restricted-denied-count 0
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 0 client-snowflake-match-count 0
client-http-denied-count 0 client-http-count 0
client-http-restricted-denied-count 0 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 0
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
snowflake-ips-nat-restricted 0 snowflake-ips-nat-restricted 0
snowflake-ips-nat-unrestricted 0 snowflake-ips-nat-unrestricted 0
snowflake-ips-nat-unknown 1 snowflake-ips-nat-unknown 1
@ -815,18 +752,9 @@ snowflake-ips-nat-unknown 1
client-restricted-denied-count 8 client-restricted-denied-count 8
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 0 client-snowflake-match-count 0
client-http-denied-count 8 client-http-count 8
client-http-restricted-denied-count 8 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 0
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
`) `)
// Test reset // Test reset
@ -846,18 +774,9 @@ client-denied-count 0
client-restricted-denied-count 0 client-restricted-denied-count 0
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 0 client-snowflake-match-count 0
client-http-denied-count 0 client-http-count 0
client-http-restricted-denied-count 0 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 0
client-snowflake-http-match-count 0
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 0
snowflake-ips-nat-restricted 0 snowflake-ips-nat-restricted 0
snowflake-ips-nat-unrestricted 0 snowflake-ips-nat-unrestricted 0
snowflake-ips-nat-unknown 0 snowflake-ips-nat-unknown 0

15
broker/sqs_test.go
View file

@ -194,18 +194,9 @@ func TestSQS(t *testing.T) {
client-restricted-denied-count 0 client-restricted-denied-count 0
client-unrestricted-denied-count 0 client-unrestricted-denied-count 0
client-snowflake-match-count 8 client-snowflake-match-count 8
client-http-denied-count 0 client-http-count 0
client-http-restricted-denied-count 0 client-ampcache-count 0
client-http-unrestricted-denied-count 0 client-sqs-count 8
client-snowflake-http-match-count 0
client-ampcache-denied-count 0
client-ampcache-restricted-denied-count 0
client-ampcache-unrestricted-denied-count 0
client-snowflake-ampcache-match-count 0
client-sqs-denied-count 0
client-sqs-restricted-denied-count 0
client-sqs-unrestricted-denied-count 0
client-snowflake-sqs-match-count 8
`) `)
wg.Done() wg.Done()
} }

83
doc/broker-spec.txt
View file

@ -82,96 +82,27 @@ Metrics data from the Snowflake broker can be retrieved by sending an HTTP GET r
A count of the number of times a client successfully received a A count of the number of times a client successfully received a
proxy from the broker, rounded up to the nearest multiple of 8. proxy from the broker, rounded up to the nearest multiple of 8.
"client-http-denied-count" NUM NL "client-http-count" NUM NL
[At most once.] [At most once.]
A count of the number of times a client has requested a proxy using A count of the number of times a client has requested a proxy using
the HTTP rendezvous method from the broker but no proxies were the HTTP rendezvous method from the broker, rounded up to the nearest
available, rounded up to the nearest multiple of 8.
"client-http-restricted-denied-count" NUM NL
[At most once.]
A count of the number of times a client with a restricted or
unknown NAT type has requested a proxy using the HTTP rendezvous
method from the broker but no proxies were available, rounded up to
the nearest multiple of 8.
"client-http-unrestricted-denied-count" NUM NL
[At most once.]
A count of the number of times a client with an unrestricted NAT
type has requested a proxy using the HTTP rendezvous method from
the broker but no proxies were available, rounded up to the nearest
multiple of 8. multiple of 8.
"client-snowflake-http-match-count" NUM NL "client-ampcache-count" NUM NL
[At most once.]
A count of the number of times a client successfully received a
proxy using the HTTP rendezvous method from the broker, rounded
up to the nearest multiple of 8.
"client-ampcache-denied-count" NUM NL
[At most once.] [At most once.]
A count of the number of times a client has requested a proxy using A count of the number of times a client has requested a proxy using
the ampcache rendezvous method from the broker but no proxies were the ampcache rendezvous method from the broker, rounded up to the
available, rounded up to the nearest multiple of 8. nearest multiple of 8.
"client-ampcache-restricted-denied-count" NUM NL "client-sqs-count" NUM NL
[At most once.]
A count of the number of times a client with a restricted or
unknown NAT type has requested a proxy using the ampcache rendezvous
method from the broker but no proxies were available, rounded up to
the nearest multiple of 8.
"client-ampcache-unrestricted-denied-count" NUM NL
[At most once.]
A count of the number of times a client with an unrestricted NAT
type has requested a proxy using the ampcache rendezvous method from
the broker but no proxies were available, rounded up to the nearest
multiple of 8.
"client-snowflake-ampcache-match-count" NUM NL
[At most once.]
A count of the number of times a client successfully received a
proxy using the ampcache rendezvous method from the broker, rounded
up to the nearest multiple of 8.
"client-sqs-denied-count" NUM NL
[At most once.] [At most once.]
A count of the number of times a client has requested a proxy using A count of the number of times a client has requested a proxy using
the sqs rendezvous method from the broker but no proxies were the sqs rendezvous method from the broker, rounded up to the nearest
available, rounded up to the nearest multiple of 8.
"client-sqs-restricted-denied-count" NUM NL
[At most once.]
A count of the number of times a client with a restricted or
unknown NAT type has requested a proxy using the sqs rendezvous
method from the broker but no proxies were available, rounded up to
the nearest multiple of 8.
"client-sqs-unrestricted-denied-count" NUM NL
[At most once.]
A count of the number of times a client with an unrestricted NAT
type has requested a proxy using the sqs rendezvous method from
the broker but no proxies were available, rounded up to the nearest
multiple of 8. multiple of 8.
"client-snowflake-sqs-match-count" NUM NL
[At most once.]
A count of the number of times a client successfully received a
proxy using the sqs rendezvous method from the broker, rounded
up to the nearest multiple of 8.
"snowflake-ips-nat-restricted" NUM NL "snowflake-ips-nat-restricted" NUM NL
[At most once.] [At most once.]