From 21c49009c08763496be93484d3194bb6482f7bc9 Mon Sep 17 00:00:00 2001 From: chen quan Date: Thu, 5 Jan 2023 22:12:07 +0800 Subject: [PATCH] chore: remove unnecessary code (#2754) --- rest/httpc/requests.go | 6 ------ rest/httpc/requests_test.go | 9 ++++++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/rest/httpc/requests.go b/rest/httpc/requests.go index a4ae197d..4ddb15a8 100644 --- a/rest/httpc/requests.go +++ b/rest/httpc/requests.go @@ -7,7 +7,6 @@ import ( "fmt" "io" "net/http" - "net/http/httptrace" nurl "net/url" "strings" @@ -176,11 +175,6 @@ func request(r *http.Request, cli client) (*http.Response, error) { respHandlers[i] = h } - clientTrace := httptrace.ContextClientTrace(ctx) - if clientTrace != nil { - ctx = httptrace.WithClientTrace(ctx, clientTrace) - } - r = r.WithContext(ctx) propagator.Inject(ctx, propagation.HeaderCarrier(r.Header)) diff --git a/rest/httpc/requests_test.go b/rest/httpc/requests_test.go index b5bf9612..59fdfed5 100644 --- a/rest/httpc/requests_test.go +++ b/rest/httpc/requests_test.go @@ -5,6 +5,7 @@ import ( "net/http" "net/http/httptest" "net/http/httptrace" + "strings" "testing" "github.com/stretchr/testify/assert" @@ -205,12 +206,14 @@ func TestDo_WithClientHttpTrace(t *testing.T) { svr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})) defer svr.Close() + enter := false _, err := Do(httptrace.WithClientTrace(context.Background(), &httptrace.ClientTrace{ - DNSStart: func(info httptrace.DNSStartInfo) { - assert.Equal(t, "localhost", info.Host) + GetConn: func(hostPort string) { + assert.Equal(t, "127.0.0.1", strings.Split(hostPort, ":")[0]) + enter = true }, }), http.MethodGet, svr.URL, nil) assert.Nil(t, err) - + assert.True(t, enter) }