|
| 1 | +//go:build go1.7 |
1 | 2 | // +build go1.7 |
2 | 3 |
|
3 | 4 | package nethttp |
@@ -182,36 +183,36 @@ func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) { |
182 | 183 | return rt.RoundTrip(req) |
183 | 184 | } |
184 | 185 |
|
185 | | - tracer.start(req) |
| 186 | + sp := tracer.start(req) |
186 | 187 |
|
187 | | - ext.HTTPMethod.Set(tracer.sp, req.Method) |
188 | | - ext.HTTPUrl.Set(tracer.sp, tracer.opts.urlTagFunc(req.URL)) |
189 | | - ext.PeerAddress.Set(tracer.sp, req.URL.Host) |
190 | | - tracer.opts.spanObserver(tracer.sp, req) |
| 188 | + ext.HTTPMethod.Set(sp, req.Method) |
| 189 | + ext.HTTPUrl.Set(sp, tracer.opts.urlTagFunc(req.URL)) |
| 190 | + ext.PeerAddress.Set(sp, req.URL.Host) |
| 191 | + tracer.opts.spanObserver(sp, req) |
191 | 192 |
|
192 | 193 | if !tracer.opts.disableInjectSpanContext { |
193 | 194 | carrier := opentracing.HTTPHeadersCarrier(req.Header) |
194 | | - tracer.sp.Tracer().Inject(tracer.sp.Context(), opentracing.HTTPHeaders, carrier) |
| 195 | + sp.Tracer().Inject(sp.Context(), opentracing.HTTPHeaders, carrier) |
195 | 196 | } |
196 | 197 |
|
197 | 198 | resp, err := rt.RoundTrip(req) |
198 | 199 |
|
199 | 200 | if err != nil { |
200 | | - tracer.sp.Finish() |
| 201 | + sp.Finish() |
201 | 202 | return resp, err |
202 | 203 | } |
203 | | - ext.HTTPStatusCode.Set(tracer.sp, uint16(resp.StatusCode)) |
| 204 | + ext.HTTPStatusCode.Set(sp, uint16(resp.StatusCode)) |
204 | 205 | if resp.StatusCode >= http.StatusInternalServerError { |
205 | | - ext.Error.Set(tracer.sp, true) |
| 206 | + ext.Error.Set(sp, true) |
206 | 207 | } |
207 | 208 | if req.Method == "HEAD" { |
208 | | - tracer.sp.Finish() |
| 209 | + sp.Finish() |
209 | 210 | } else { |
210 | 211 | readWriteCloser, ok := resp.Body.(io.ReadWriteCloser) |
211 | 212 | if ok { |
212 | | - resp.Body = writerCloseTracker{readWriteCloser, tracer.sp} |
| 213 | + resp.Body = writerCloseTracker{readWriteCloser, sp} |
213 | 214 | } else { |
214 | | - resp.Body = closeTracker{resp.Body, tracer.sp} |
| 215 | + resp.Body = closeTracker{resp.Body, sp} |
215 | 216 | } |
216 | 217 | } |
217 | 218 | return resp, nil |
|
0 commit comments