fix(webconnectivitylte): always save "connect" network events (#1398)

We're not saving "connect" network events when TCP connect fails. This diff fixes the codebase so that we always save these events. Fix extracted from #1392. Reference issue ooni/probe#2634.
ooni · Nov 28, 2023 · 0a49338 · 0a49338
1 parent c4241a0
commit 0a49338
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/internal/experiment/webconnectivitylte/cleartextflow.go b/internal/experiment/webconnectivitylte/cleartextflow.go
@@ -119,14 +119,12 @@ func (t *CleartextFlow) Run(parentCtx context.Context, index int64) error {
 	tcpDialer := trace.NewDialerWithoutResolver(t.Logger)
 	tcpConn, err := tcpDialer.DialContext(tcpCtx, "tcp", t.Address)
 	t.TestKeys.AppendTCPConnectResults(trace.TCPConnects()...)
+	defer t.TestKeys.AppendNetworkEvents(trace.NetworkEvents()...) // here to include connect events
 	if err != nil {
 		ol.Stop(err)
 		return err
 	}
-	defer func() {
-		t.TestKeys.AppendNetworkEvents(trace.NetworkEvents()...)
-		tcpConn.Close()
-	}()
+	defer tcpConn.Close()
 
 	alpn := "" // no ALPN because we're not using TLS
 

diff --git a/internal/experiment/webconnectivitylte/secureflow.go b/internal/experiment/webconnectivitylte/secureflow.go
@@ -126,14 +126,12 @@ func (t *SecureFlow) Run(parentCtx context.Context, index int64) error {
 	tcpDialer := trace.NewDialerWithoutResolver(t.Logger)
 	tcpConn, err := tcpDialer.DialContext(tcpCtx, "tcp", t.Address)
 	t.TestKeys.AppendTCPConnectResults(trace.TCPConnects()...)
+	defer t.TestKeys.AppendNetworkEvents(trace.NetworkEvents()...) // here to include "connect" events
 	if err != nil {
 		ol.Stop(err)
 		return err
 	}
-	defer func() {
-		t.TestKeys.AppendNetworkEvents(trace.NetworkEvents()...)
-		tcpConn.Close()
-	}()
+	defer tcpConn.Close()
 
 	// perform TLS handshake
 	tlsSNI, err := t.sni()