c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: remove ConnID, DialID, TransactionID (#395)

Browse Source 
We are not using them anymore. The only nettest still using the
legacy netx implementation is tor, for which setting these fields
is useless, because it performs each measurement into a separate
goroutine. Hence, let us start removing this part of the legacy
netx codebase, which is hampering progress in other areas.

Occurred to me while doing testing for the recent changes in
error mapping (https://github.com/ooni/probe/issues/1505).
This commit is contained in:
Simone Basso
2021-06-23 13:36:45 +02:00
committed by GitHub
parent 1fefe5d9b8
commit c74c94d616
32 changed files with 78 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/engine/legacy/netxlogger/netxlogger.go
+17 -37
View File
@@ -33,15 +33,13 @@ func (h *Handler) OnMeasurement(m modelx.Measurement) {
// DNS
if m.ResolveStart != nil {
h.logger.Debugf(
"[httpTxID: %d] resolving: %s",
m.ResolveStart.TransactionID,
"resolving: %s",
m.ResolveStart.Hostname,
)
}
if m.ResolveDone != nil {
h.logger.Debugf(
"[httpTxID: %d] resolve done: %s, %s",
m.ResolveDone.TransactionID,
"resolve done: %s, %s",
fmtError(m.ResolveDone.Error),
m.ResolveDone.Addresses,
)
@@ -50,8 +48,7 @@ func (h *Handler) OnMeasurement(m modelx.Measurement) {
// Syscalls
if m.Connect != nil {
h.logger.Debugf(
"[httpTxID: %d] connect done: %s, %s (rtt=%s)",
m.Connect.TransactionID,
"connect done: %s, %s (rtt=%s)",
fmtError(m.Connect.Error),
m.Connect.RemoteAddress,
m.Connect.SyscallDuration,
@@ -61,15 +58,13 @@ func (h *Handler) OnMeasurement(m modelx.Measurement) {
// TLS
if m.TLSHandshakeStart != nil {
h.logger.Debugf(
"[httpTxID: %d] TLS handshake: (forceSNI='%s')",
m.TLSHandshakeStart.TransactionID,
"TLS handshake: (forceSNI='%s')",
m.TLSHandshakeStart.SNI,
)
}
if m.TLSHandshakeDone != nil {
h.logger.Debugf(
"[httpTxID: %d] TLS done: %s, %s (alpn='%s')",
m.TLSHandshakeDone.TransactionID,
"TLS done: %s, %s (alpn='%s')",
fmtError(m.TLSHandshakeDone.Error),
tlsx.VersionString(m.TLSHandshakeDone.ConnectionState.Version),
m.TLSHandshakeDone.ConnectionState.NegotiatedProtocol,
@@ -86,16 +81,14 @@ func (h *Handler) OnMeasurement(m modelx.Measurement) {
}
}
h.logger.Debugf(
"[httpTxID: %d] > %s %s %s",
m.HTTPRequestHeadersDone.TransactionID,
"> %s %s %s",
m.HTTPRequestHeadersDone.Method,
m.HTTPRequestHeadersDone.URL.RequestURI(),
proto,
)
if proto == "HTTP/2.0" {
h.logger.Debugf(
"[httpTxID: %d] > Host: %s",
m.HTTPRequestHeadersDone.TransactionID,
"> Host: %s",
m.HTTPRequestHeadersDone.URL.Host,
)
}
@@ -105,31 +98,22 @@ func (h *Handler) OnMeasurement(m modelx.Measurement) {
}
for _, value := range values {
h.logger.Debugf(
"[httpTxID: %d] > %s: %s",
m.HTTPRequestHeadersDone.TransactionID,
"> %s: %s",
key, value,
)
}
}
h.logger.Debugf(
"[httpTxID: %d] >", m.HTTPRequestHeadersDone.TransactionID)
h.logger.Debug(">")
}
if m.HTTPRequestDone != nil {
h.logger.Debugf(
"[httpTxID: %d] request sent; waiting for response",
m.HTTPRequestDone.TransactionID,
)
h.logger.Debug("request sent; waiting for response")
}
if m.HTTPResponseStart != nil {
h.logger.Debugf(
"[httpTxID: %d] start receiving response",
m.HTTPResponseStart.TransactionID,
)
h.logger.Debug("start receiving response")
}
if m.HTTPRoundTripDone != nil && m.HTTPRoundTripDone.Error == nil {
h.logger.Debugf(
"[httpTxID: %d] < %s %d %s",
m.HTTPRoundTripDone.TransactionID,
"< %s %d %s",
m.HTTPRoundTripDone.ResponseProto,
m.HTTPRoundTripDone.ResponseStatusCode,
http.StatusText(int(m.HTTPRoundTripDone.ResponseStatusCode)),
@@ -137,29 +121,25 @@ func (h *Handler) OnMeasurement(m modelx.Measurement) {
for key, values := range m.HTTPRoundTripDone.ResponseHeaders {
for _, value := range values {
h.logger.Debugf(
"[httpTxID: %d] < %s: %s",
m.HTTPRoundTripDone.TransactionID,
"< %s: %s",
key, value,
)
}
}
h.logger.Debugf(
"[httpTxID: %d] <", m.HTTPRoundTripDone.TransactionID)
h.logger.Debug("<")
}
// HTTP response body
if m.HTTPResponseBodyPart != nil {
h.logger.Debugf(
"[httpTxID: %d] body part: %s, %d",
m.HTTPResponseBodyPart.TransactionID,
"body part: %s, %d",
fmtError(m.HTTPResponseBodyPart.Error),
len(m.HTTPResponseBodyPart.Data),
)
}
if m.HTTPResponseDone != nil {
h.logger.Debugf(
"[httpTxID: %d] end of response",
m.HTTPResponseDone.TransactionID,
h.logger.Debug(
"end of response",
)
}
}