554ae47c5a
This diff addresses two items of https://github.com/ooni/probe/issues/1956: > - [ ] we can remove legacy names from `./internal/engine/netx/resolver/legacy.go` > > - [ ] we can remove `DialTLSContext` from `./internal/engine/netx/resolver/tls_test.go` More cleanups may follow.
75 lines
1.8 KiB
Go
75 lines
1.8 KiB
Go
package resolver
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// SaverResolver is a resolver that saves events
|
|
type SaverResolver struct {
|
|
model.Resolver
|
|
Saver *trace.Saver
|
|
}
|
|
|
|
// LookupHost implements Resolver.LookupHost
|
|
func (r SaverResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
|
start := time.Now()
|
|
r.Saver.Write(trace.Event{
|
|
Address: r.Resolver.Address(),
|
|
Hostname: hostname,
|
|
Name: "resolve_start",
|
|
Proto: r.Resolver.Network(),
|
|
Time: start,
|
|
})
|
|
addrs, err := r.Resolver.LookupHost(ctx, hostname)
|
|
stop := time.Now()
|
|
r.Saver.Write(trace.Event{
|
|
Addresses: addrs,
|
|
Address: r.Resolver.Address(),
|
|
Duration: stop.Sub(start),
|
|
Err: err,
|
|
Hostname: hostname,
|
|
Name: "resolve_done",
|
|
Proto: r.Resolver.Network(),
|
|
Time: stop,
|
|
})
|
|
return addrs, err
|
|
}
|
|
|
|
// SaverDNSTransport is a DNS transport that saves events
|
|
type SaverDNSTransport struct {
|
|
model.DNSTransport
|
|
Saver *trace.Saver
|
|
}
|
|
|
|
// RoundTrip implements RoundTripper.RoundTrip
|
|
func (txp SaverDNSTransport) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
|
|
start := time.Now()
|
|
txp.Saver.Write(trace.Event{
|
|
Address: txp.Address(),
|
|
DNSQuery: query,
|
|
Name: "dns_round_trip_start",
|
|
Proto: txp.Network(),
|
|
Time: start,
|
|
})
|
|
reply, err := txp.DNSTransport.RoundTrip(ctx, query)
|
|
stop := time.Now()
|
|
txp.Saver.Write(trace.Event{
|
|
Address: txp.Address(),
|
|
DNSQuery: query,
|
|
DNSReply: reply,
|
|
Duration: stop.Sub(start),
|
|
Err: err,
|
|
Name: "dns_round_trip_done",
|
|
Proto: txp.Network(),
|
|
Time: stop,
|
|
})
|
|
return reply, err
|
|
}
|
|
|
|
var _ model.Resolver = SaverResolver{}
|
|
var _ model.DNSTransport = SaverDNSTransport{}
|