Merge b0e8457 into 7d131d6

grafana · Dec 29, 2023 · 2641660 · 2641660
2 parents 7d131d6 + b0e8457
commit 2641660
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/js/initcontext_test.go b/js/initcontext_test.go
@@ -360,7 +360,6 @@ func TestRequestWithBinaryFile(t *testing.T) {
 				net.Dialer{
 					Timeout:   10 * time.Second,
 					KeepAlive: 60 * time.Second,
-					DualStack: true,
 				},
 				netext.NewResolver(net.LookupIP, 0, types.DNSfirst, types.DNSpreferIPv4),
 			)).DialContext,
@@ -507,7 +506,6 @@ func TestRequestWithMultipleBinaryFiles(t *testing.T) {
 				net.Dialer{
 					Timeout:   10 * time.Second,
 					KeepAlive: 60 * time.Second,
-					DualStack: true,
 				},
 				netext.NewResolver(net.LookupIP, 0, types.DNSfirst, types.DNSpreferIPv4),
 			)).DialContext,

diff --git a/js/runner.go b/js/runner.go
@@ -97,7 +97,6 @@ func NewFromBundle(piState *lib.TestPreInitState, b *Bundle) (*Runner, error) {
 		BaseDialer: net.Dialer{
 			Timeout:   30 * time.Second,
 			KeepAlive: 30 * time.Second,
-			DualStack: true,
 		},
 		console: newConsole(piState.Logger),
 		Resolver: netext.NewResolver(

diff --git a/lib/netext/httpext/error_codes_test.go b/lib/netext/httpext/error_codes_test.go
@@ -362,7 +362,6 @@ func getHTTP2ServerWithCustomConnContext(t *testing.T) *httpmultibin.HTTPMultiBi
 	dialer := netext.NewDialer(net.Dialer{
 		Timeout:   2 * time.Second,
 		KeepAlive: 10 * time.Second,
-		DualStack: true,
 	}, netext.NewResolver(net.LookupIP, 0, types.DNSfirst, types.DNSpreferIPv4))
 	dialer.Hosts, err = types.NewHosts(map[string]types.Host{
 		http2Domain: *http2DomainValue,

diff --git a/lib/netext/httpext/tracer.go b/lib/netext/httpext/tracer.go
@@ -190,7 +190,7 @@ func (t *Tracer) GetConn(_ string) {
 
 // ConnectStart is called when a new connection's Dial begins.
 // If net.Dialer.DualStack (IPv6 "Happy Eyeballs") support is
-// enabled, this may be called multiple times.
+// enabled (default), this may be called multiple times.
 //
 // If the connection is reused, this won't be called. Otherwise,
 // it will be called after GetConn() and before ConnectDone().
@@ -203,9 +203,9 @@ func (t *Tracer) ConnectStart(_, _ string) {
 
 // ConnectDone is called when a new connection's Dial
 // completes. The provided err indicates whether the
-// connection completedly successfully.
+// connection completed successfully.
 // If net.Dialer.DualStack ("Happy Eyeballs") support is
-// enabled, this may be called multiple times.
+// enabled (default), this may be called multiple times.
 //
 // If the connection is reused, this won't be called. Otherwise,
 // it will be called after ConnectStart() and before either

diff --git a/lib/testutils/httpmultibin/httpmultibin.go b/lib/testutils/httpmultibin/httpmultibin.go
@@ -1,4 +1,4 @@
-// Package httpmultibin is indended only for use in tests, do not import in production code!
+// Package httpmultibin is intended only for use in tests, do not import in production code!
 package httpmultibin
 
 import (
@@ -350,7 +350,6 @@ func NewHTTPMultiBin(t testing.TB) *HTTPMultiBin {
 	dialer := netext.NewDialer(net.Dialer{
 		Timeout:   2 * time.Second,
 		KeepAlive: 10 * time.Second,
-		DualStack: true,
 	}, netext.NewResolver(net.LookupIP, 0, types.DNSfirst, types.DNSpreferIPv4))
 	dialer.Hosts, err = types.NewHosts(map[string]types.Host{
 		httpDomain:  *httpDomainValue,