feat: context-based tracing to record delayed DNS responses (#870)

See https://github.com/ooni/probe/issues/2221

Co-authored-by: decfox <decfox@github.com>
Co-authored-by: Simone Basso <bassosimone@gmail.com>
This commit is contained in:
DecFox
2022-08-22 17:51:32 +05:30
committed by GitHub
parent fe6d378a1f
commit 2301a30630
10 changed files with 508 additions and 327 deletions
+8
View File
@@ -24,6 +24,9 @@ type Trace struct {
MockOnDNSRoundTripForLookupHost func(started time.Time, reso model.Resolver, query model.DNSQuery,
response model.DNSResponse, addrs []string, err error, finished time.Time)
MockOnDelayedDNSResponse func(started time.Time, txp model.DNSTransport, query model.DNSQuery,
response model.DNSResponse, addrs []string, err error, finished time.Time) error
MockOnConnectDone func(
started time.Time, network, domain, remoteAddr string, err error, finished time.Time)
@@ -57,6 +60,11 @@ func (t *Trace) OnDNSRoundTripForLookupHost(started time.Time, reso model.Resolv
t.MockOnDNSRoundTripForLookupHost(started, reso, query, response, addrs, err, finished)
}
func (t *Trace) OnDelayedDNSResponse(started time.Time, txp model.DNSTransport, query model.DNSQuery,
response model.DNSResponse, addrs []string, err error, finished time.Time) error {
return t.MockOnDelayedDNSResponse(started, txp, query, response, addrs, err, finished)
}
func (t *Trace) OnConnectDone(
started time.Time, network, domain, remoteAddr string, err error, finished time.Time) {
t.MockOnConnectDone(started, network, domain, remoteAddr, err, finished)
+24
View File
@@ -71,6 +71,30 @@ func TestTrace(t *testing.T) {
}
})
t.Run("OnDelayedDNSResponse", func(t *testing.T) {
var called bool
tx := &Trace{
MockOnDelayedDNSResponse: func(started time.Time, txp model.DNSTransport,
query model.DNSQuery, response model.DNSResponse,
addrs []string, err error, finished time.Time) error {
called = true
return nil
},
}
tx.OnDelayedDNSResponse(
time.Now(),
&DNSTransport{},
&DNSQuery{},
&DNSResponse{},
[]string{},
nil,
time.Now(),
)
if !called {
t.Fatal("not called")
}
})
t.Run("OnConnectDone", func(t *testing.T) {
var called bool
tx := &Trace{