1- import { AxiosError , AxiosInstance , AxiosResponse , AxiosRequestConfig } from 'axios'
1+ import { AxiosError , AxiosInstance , AxiosRequestConfig , AxiosResponse } from 'axios'
22import { FORMAT_HTTP_HEADERS , Span } from 'opentracing'
33import { createSpanReference , ErrorReport } from '../../../../../../tracing'
44import { SpanReferenceTypes } from '../../../../../../tracing/spanReference/SpanReferenceTypes'
@@ -31,6 +31,7 @@ const preRequestInterceptor = (http: AxiosInstance) => (
3131 }
3232
3333 const { tracer, rootSpan, requestSpanNameSuffix } = config . tracing
34+
3435 const spanName = requestSpanNameSuffix ? `${ requestSpanPrefix } :${ requestSpanNameSuffix } ` : requestSpanPrefix
3536
3637 const span = rootSpan
@@ -43,7 +44,6 @@ const preRequestInterceptor = (http: AxiosInstance) => (
4344
4445 config . tracing . requestSpan = span
4546 tracer . inject ( span , FORMAT_HTTP_HEADERS , config . headers )
46-
4747 return config
4848}
4949
@@ -55,7 +55,6 @@ const onResponseSuccess = (response: TraceableAxiosResponse): TraceableAxiosResp
5555 const requestSpan = response . config . tracing ?. requestSpan
5656 injectResponseInfoOnSpan ( requestSpan , response )
5757 requestSpan ?. finish ( )
58-
5958 return response
6059}
6160
@@ -68,24 +67,17 @@ const onResponseError = (err: ExtendedAxiosError) => {
6867 injectResponseInfoOnSpan ( requestSpan , err . response )
6968 ErrorReport . create ( { originalError : err } ) . injectOnSpan ( requestSpan , err . config . tracing . logger )
7069 requestSpan . finish ( )
71-
7270 return Promise . reject ( err )
7371}
7472
7573export const addTracingPreRequestInterceptor = ( http : AxiosInstance ) => {
76- const requestTracingInterceptor = http . interceptors . request . use (
77- preRequestInterceptor ( http ) as any ,
78- undefined
79- )
74+ const requestTracingInterceptor = http . interceptors . request . use ( preRequestInterceptor ( http ) , undefined )
8075
8176 return { requestTracingInterceptor }
8277}
8378
8479export const addTracingResponseInterceptor = ( http : AxiosInstance ) => {
85- const responseTracingInterceptor = http . interceptors . response . use (
86- onResponseSuccess as any ,
87- onResponseError as any
88- )
80+ const responseTracingInterceptor = http . interceptors . response . use ( onResponseSuccess , onResponseError )
8981
9082 return { responseTracingInterceptor }
9183}
0 commit comments