c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(measurexlite): emit resolve_start and resolve_done (#944)

Browse source 
Part of https://github.com/ooni/probe/issues/2238
This commit is contained in:
Simone Basso 2022-09-08 11:05:38 +02:00 • committed by GitHub
commit 8167de5805
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
internal/measurexlite/dns.go
View file

@ -49,18 +49,44 @@ func (r *resolverTrace) CloseIdleConnections() {
r.r.CloseIdleConnections()
}
// emits the resolve_start event
func (r *resolverTrace) emitResolveStart() {
select {
case r.tx.networkEvent <- NewAnnotationArchivalNetworkEvent(
r.tx.Index, r.tx.TimeSince(r.tx.ZeroTime), "resolve_start",
):
default: // buffer is full
}
}
// emits the resolve_done event
func (r *resolverTrace) emiteResolveDone() {
select {
case r.tx.networkEvent <- NewAnnotationArchivalNetworkEvent(
r.tx.Index, r.tx.TimeSince(r.tx.ZeroTime), "resolve_done",
):
default: // buffer is full
}
}
// LookupHost implements model.Resolver.LookupHost
func (r *resolverTrace) LookupHost(ctx context.Context, hostname string) ([]string, error) {
defer r.emiteResolveDone()
r.emitResolveStart()
return r.r.LookupHost(netxlite.ContextWithTrace(ctx, r.tx), hostname)
}
// LookupHTTPS implements model.Resolver.LookupHTTPS
func (r *resolverTrace) LookupHTTPS(ctx context.Context, domain string) (*model.HTTPSSvc, error) {
defer r.emiteResolveDone()
r.emitResolveStart()
return r.r.LookupHTTPS(netxlite.ContextWithTrace(ctx, r.tx), domain)
}
// LookupNS implements model.Resolver.LookupNS
func (r *resolverTrace) LookupNS(ctx context.Context, domain string) ([]*net.NS, error) {
defer r.emiteResolveDone()
r.emitResolveStart()
return r.r.LookupNS(netxlite.ContextWithTrace(ctx, r.tx), domain)
}