|
1 | | -import { getCurrentHub } from '@sentry/hub'; |
2 | 1 | import { addInstrumentationHandler, isInstanceOf, isMatchingPattern } from '@sentry/utils'; |
3 | 2 |
|
4 | 3 | import { Span } from '../span'; |
@@ -145,13 +144,7 @@ export function fetchCallback( |
145 | 144 | shouldCreateSpan: (url: string) => boolean, |
146 | 145 | spans: Record<string, Span>, |
147 | 146 | ): void { |
148 | | - const currentClientOptions = getCurrentHub() |
149 | | - .getClient() |
150 | | - ?.getOptions(); |
151 | | - if ( |
152 | | - !(currentClientOptions && hasTracingEnabled(currentClientOptions)) || |
153 | | - !(handlerData.fetchData && shouldCreateSpan(handlerData.fetchData.url)) |
154 | | - ) { |
| 147 | + if (!hasTracingEnabled() || !(handlerData.fetchData && shouldCreateSpan(handlerData.fetchData.url))) { |
155 | 148 | return; |
156 | 149 | } |
157 | 150 |
|
@@ -219,13 +212,10 @@ export function xhrCallback( |
219 | 212 | shouldCreateSpan: (url: string) => boolean, |
220 | 213 | spans: Record<string, Span>, |
221 | 214 | ): void { |
222 | | - const currentClientOptions = getCurrentHub() |
223 | | - .getClient() |
224 | | - ?.getOptions(); |
225 | 215 | if ( |
226 | | - !(currentClientOptions && hasTracingEnabled(currentClientOptions)) || |
227 | | - !(handlerData.xhr && handlerData.xhr.__sentry_xhr__ && shouldCreateSpan(handlerData.xhr.__sentry_xhr__.url)) || |
228 | | - handlerData.xhr.__sentry_own_request__ |
| 216 | + !hasTracingEnabled() || |
| 217 | + handlerData.xhr?.__sentry_own_request__ || |
| 218 | + !(handlerData.xhr?.__sentry_xhr__ && shouldCreateSpan(handlerData.xhr.__sentry_xhr__.url)) |
229 | 219 | ) { |
230 | 220 | return; |
231 | 221 | } |
|
0 commit comments