internal: remove the retrying dialer

This is part of #302
ooni · Mar 3, 2020 · 72f566d · 72f566d
1 parent b5df0f0
commit 72f566d
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 83 deletions.
diff --git a/go.mod b/go.mod
@@ -19,7 +19,6 @@ require (
 	github.com/aristanetworks/goarista v0.0.0-20200214154357-2151774b0d85 // indirect
 	github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f // indirect
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
-	github.com/avast/retry-go v2.5.0+incompatible
 	github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect
 	github.com/boltdb/bolt v1.3.1 // indirect
 	github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea // indirect

diff --git a/go.sum b/go.sum
@@ -73,8 +73,6 @@ github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f h1:SaJ6yqg936T
 github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/avast/retry-go v2.5.0+incompatible h1:8SaFqliw34WeeaPs+GEtMMkiwEsC2S6+YyqnLqI55Ks=
-github.com/avast/retry-go v2.5.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

diff --git a/internal/httpx/httpx.go b/internal/httpx/httpx.go
@@ -8,11 +8,11 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"net"
 	"time"
 
 	"github.com/ooni/probe-engine/internal/httplog"
 	"github.com/ooni/probe-engine/internal/httptracex"
-	"github.com/ooni/probe-engine/internal/netx"
 	"github.com/ooni/probe-engine/log"
 )
 
@@ -28,7 +28,7 @@ func NewTransport(
 		Proxy: proxy,
 		// We use a custom dialer that retries failed
 		// dialing attempts for extra robustness.
-		DialContext:     (&netx.RetryingDialer{}).DialContext,
+		DialContext:     (&net.Dialer{}).DialContext,
 		TLSClientConfig: tlsConfig,
 		// These are the same settings of Go stdlib.
 		MaxIdleConns:        100,

diff --git a/internal/netx/netx.go b/internal/netx/netx.go
diff --git a/internal/netx/netx_test.go b/internal/netx/netx_test.go
diff --git a/internal/retryx/retryx.go b/internal/retryx/retryx.go