Skip to content

fix trace context overriding request context #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2019
Merged

fix trace context overriding request context #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ func createHTTPRequest(c *Client, r *Request) (err error) {
r.RawRequest.URL.Host = r.URL
}

// Use context if it was specified
if r.ctx != nil {
r.RawRequest = r.RawRequest.WithContext(r.ctx)
}

// Enable trace
if c.trace || r.trace {
r.clientTrace = &clientTrace{}
r.RawRequest = r.RawRequest.WithContext(r.clientTrace.createContext())
r.ctx = r.clientTrace.createContext(r.Context())
}

// Use context if it was specified
if r.ctx != nil {
r.RawRequest = r.RawRequest.WithContext(r.ctx)
}

// assign get body func for the underlying raw request instance
Expand Down
4 changes: 2 additions & 2 deletions trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ type clientTrace struct {
// Trace unexported methods
//_______________________________________________________________________

func (t *clientTrace) createContext() context.Context {
func (t *clientTrace) createContext(ctx context.Context) context.Context {
return httptrace.WithClientTrace(
context.Background(),
ctx,
&httptrace.ClientTrace{
GetConn: func(_ string) {
t.getConn = time.Now()
Expand Down