refactor: only use shaping dialer for ndt7 and dash (#754)

See https://github.com/ooni/probe/issues/2112 for context. While there, run `go fix -fix buildtag ./...`
2022-05-24 18:23:42 +02:00
parent b68b8e1e8f
commit 6924d1ad81
17 changed files with 126 additions and 65 deletions
@@ -259,8 +259,14 @@ func (m Measurer) Run(
 	httpClient := &http.Client{
 		Transport: netx.NewHTTPTransport(netx.Config{
 			ContextByteCounting: true,
-			DialSaver:           saver,
-			Logger:              sess.Logger(),
+			// Implements shaping if the user builds using `-tags shaping`
+			// See https://github.com/ooni/probe/issues/2112
+			Dialer: netxlite.NewMaybeShapingDialer(netx.NewDialer(netx.Config{
+				ContextByteCounting: true,
+				DialSaver:           saver,
+				Logger:              sess.Logger(),
+			})),
+			Logger: sess.Logger(),
 		}),
 	}
 	defer httpClient.CloseIdleConnections()