re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make use of pre-existing context in InstrumentRoundTripperTrace 

Fixes #580

Signed-off-by: beorn7 <bjoern@rabenste.in>
This commit is contained in:
beorn7 2019-05-16 11:03:34 +02:00
parent 6c520f6aca
commit bc54582c5e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prometheus/promhttp/instrument_client.go
View File

@ -14,7 +14,6 @@
package promhttp package promhttp
import ( import (
"context"
"crypto/tls" "crypto/tls"
"net/http" "net/http"
"net/http/httptrace" "net/http/httptrace"
@ -213,7 +212,7 @@ func InstrumentRoundTripperTrace(it *InstrumentTrace, next http.RoundTripper) Ro
} }
}, },
} }
r = r.WithContext(httptrace.WithClientTrace(context.Background(), trace)) r = r.WithContext(httptrace.WithClientTrace(r.Context(), trace))
return next.RoundTrip(r) return next.RoundTrip(r)
}) })