fix tracer tests

Signed-off-by: Eliott Bouhana <[email protected]>

Author: eliottness

ddtrace/tracer/civisibility_transport_test.go

@@ -15,6 +15,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/DataDog/dd-trace-go/v2/internal"
 	"github.com/stretchr/testify/assert"
 	"github.com/tinylib/msgp/msgp"
 
@@ -83,7 +84,7 @@ func runTransportTest(t *testing.T, agentless, shouldSetAPIKey bool) {
 	parsedURL, _ := url.Parse(srv.URL)
 	c := config{
 		ciVisibilityEnabled: true,
-		httpClient:          defaultHTTPClient(0, false),
+		httpClient:          internal.DefaultHTTPClient(defaultHTTPTimeout, false),
 		agentURL:            parsedURL,
 	}
 

ddtrace/tracer/option_test.go

@@ -369,21 +369,21 @@ func TestTracerOptionsDefaults(t *testing.T) {
 		assert.Equal("localhost:8125", c.dogstatsdAddr)
 		assert.Nil(nil, c.httpClient)
 		x := *c.httpClient
-		y := *defaultHTTPClient(0, false)
+		y := *internal.DefaultHTTPClient(defaultHTTPTimeout, false)
 		assert.Equal(10*time.Second, x.Timeout)
 		assert.Equal(x.Timeout, y.Timeout)
 		compareHTTPClients(t, x, y)
-		assert.True(getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(defaultDialer(30*time.Second).DialContext))
+		assert.True(getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(internal.DefaultDialer(30*time.Second).DialContext))
 		assert.False(c.debug)
 	})
 
 	t.Run("http-client", func(t *testing.T) {
 		c, err := newTestConfig(WithAgentTimeout(2))
 		assert.NoError(t, err)
 		x := *c.httpClient
-		y := *defaultHTTPClient(2*time.Second, false)
+		y := *internal.DefaultHTTPClient(2*time.Second, false)
 		compareHTTPClients(t, x, y)
-		assert.True(t, getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(defaultDialer(30*time.Second).DialContext))
+		assert.True(t, getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(internal.DefaultDialer(30*time.Second).DialContext))
 		client := &http.Client{}
 		WithHTTPClient(client)(c)
 		assert.Equal(t, client, c.httpClient)
@@ -942,19 +942,19 @@ func TestDefaultHTTPClient(t *testing.T) {
 	defTracerClient := func(timeout int) *http.Client {
 		if _, err := os.Stat(internal.DefaultTraceAgentUDSPath); err == nil {
 			// we have the UDS socket file, use it
-			return udsClient(internal.DefaultTraceAgentUDSPath, 0)
+			return internal.UDSClient(internal.DefaultTraceAgentUDSPath, 0)
 		}
-		return defaultHTTPClient(time.Second*time.Duration(timeout), false)
+		return internal.DefaultHTTPClient(time.Second*time.Duration(timeout), false)
 	}
 	t.Run("no-socket", func(t *testing.T) {
 		// We care that whether clients are different, but doing a deep
 		// comparison is overkill and can trigger the race detector, so
 		// just compare the pointers.
 
 		x := *defTracerClient(2)
-		y := *defaultHTTPClient(2, false)
+		y := *internal.DefaultHTTPClient(2, false)
 		compareHTTPClients(t, x, y)
-		assert.True(t, getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(defaultDialer(30*time.Second).DialContext))
+		assert.True(t, getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(internal.DefaultDialer(30*time.Second).DialContext))
 	})
 
 	t.Run("socket", func(t *testing.T) {
@@ -969,9 +969,9 @@ func TestDefaultHTTPClient(t *testing.T) {
 		defer func(old string) { internal.DefaultTraceAgentUDSPath = old }(internal.DefaultTraceAgentUDSPath)
 		internal.DefaultTraceAgentUDSPath = f.Name()
 		x := *defTracerClient(2)
-		y := *defaultHTTPClient(2, false)
+		y := *internal.DefaultHTTPClient(2, false)
 		compareHTTPClients(t, x, y)
-		assert.False(t, getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(defaultDialer(30*time.Second).DialContext))
+		assert.False(t, getFuncName(x.Transport.(*http.Transport).DialContext) == getFuncName(internal.DefaultDialer(30*time.Second).DialContext))
 
 	})
 }
@@ -1625,7 +1625,6 @@ func TestWithHeaderTags(t *testing.T) {
 		newTestConfig()
 
 		assert.Equal(1, globalconfig.HeaderTagsLen())
-		fmt.Println(globalconfig.HeaderTagMap())
 		assert.Equal(ext.HTTPRequestHeaders+".header1", globalconfig.HeaderTag("Header1"))
 	})
 

ddtrace/tracer/tracer_test.go

@@ -1238,7 +1238,7 @@ func TestTracerNoDebugStack(t *testing.T) {
 
 // newDefaultTransport return a default transport for this tracing client
 func newDefaultTransport() transport {
-	return newHTTPTransport(defaultURL, defaultHTTPClient(0, true))
+	return newHTTPTransport(defaultURL, internal.DefaultHTTPClient(defaultHTTPTimeout, true))
 }
 
 func TestNewSpan(t *testing.T) {
@@ -1357,7 +1357,7 @@ func TestTracerPrioritySampler(t *testing.T) {
 	url := "http://" + srv.Listener.Addr().String()
 
 	tr, _, flush, stop, err := startTestTracer(t,
-		withTransport(newHTTPTransport(url, defaultHTTPClient(0, false))),
+		withTransport(newHTTPTransport(url, internal.DefaultHTTPClient(defaultHTTPTimeout, false))),
 	)
 	assert.Nil(err)
 	defer stop()
@@ -2350,7 +2350,7 @@ func startTestTracer(t testing.TB, opts ...StartOption) (trc *tracer, transport
 		withTransport(transport),
 		withTickChan(tick),
 		// disable keep-alives to avoid goroutine leaks between tests
-		WithHTTPClient(defaultHTTPClient(0, true)),
+		WithHTTPClient(internal.DefaultHTTPClient(defaultHTTPTimeout, true)),
 	}, opts...)
 	tracer, err := newTracer(o...)
 	if err != nil {
@@ -2393,7 +2393,7 @@ func startTestTracer(t testing.TB, opts ...StartOption) (trc *tracer, transport
 // disabled. This is necessary to avoid goroutine leaks between tests, see
 // TestMain.
 func newTestConfig(opts ...StartOption) (*config, error) {
-	opts = append([]StartOption{WithHTTPClient(defaultHTTPClient(0, true))}, opts...)
+	opts = append([]StartOption{WithHTTPClient(internal.DefaultHTTPClient(defaultHTTPTimeout, true))}, opts...)
 	return newConfig(opts...)
 }
 

ddtrace/tracer/transport_bench_test.go

@@ -13,6 +13,8 @@ import (
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/DataDog/dd-trace-go/v2/internal"
 )
 
 func BenchmarkHTTPTransportSend(b *testing.B) {
@@ -22,7 +24,7 @@ func BenchmarkHTTPTransportSend(b *testing.B) {
 	}))
 	defer server.Close()
 
-	transport := newHTTPTransport(server.URL, defaultHTTPClient(5*time.Second, false))
+	transport := newHTTPTransport(server.URL, internal.DefaultHTTPClient(5*time.Second, false))
 
 	payloadSizes := []struct {
 		name     string
@@ -67,7 +69,7 @@ func BenchmarkTransportSendConcurrent(b *testing.B) {
 	}))
 	defer server.Close()
 
-	transport := newHTTPTransport(server.URL, defaultHTTPClient(5*time.Second, false))
+	transport := newHTTPTransport(server.URL, internal.DefaultHTTPClient(5*time.Second, false))
 	concurrencyLevels := []int{1, 2, 4, 8}
 
 	for _, concurrency := range concurrencyLevels {

ddtrace/tracer/transport_test.go

@@ -85,7 +85,7 @@ func TestTracesAgentIntegration(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		transport := newHTTPTransport(defaultURL, defaultHTTPClient(0, false))
+		transport := newHTTPTransport(defaultURL, internal.DefaultHTTPClient(defaultHTTPTimeout, false))
 		p, err := encode(tc.payload)
 		assert.NoError(err)
 		body, err := transport.send(p)
@@ -159,7 +159,7 @@ func TestTransportResponse(t *testing.T) {
 				w.Write([]byte(tt.body))
 			}))
 			defer srv.Close()
-			transport := newHTTPTransport(srv.URL, defaultHTTPClient(0, false))
+			transport := newHTTPTransport(srv.URL, internal.DefaultHTTPClient(defaultHTTPTimeout, false))
 			rc, err := transport.send(newPayload(traceProtocolV04))
 			if tt.err != "" {
 				assert.Equal(tt.err, err.Error())
@@ -199,7 +199,7 @@ func TestTraceCountHeader(t *testing.T) {
 	}))
 	defer srv.Close()
 	for _, tc := range testCases {
-		transport := newHTTPTransport(srv.URL, defaultHTTPClient(0, false))
+		transport := newHTTPTransport(srv.URL, internal.DefaultHTTPClient(defaultHTTPTimeout, false))
 		p, err := encode(tc.payload)
 		assert.NoError(err)
 		_, err = transport.send(p)