diff --git a/packages/core/src/integrations/inboundfilters.ts b/packages/core/src/integrations/inboundfilters.ts index f9f91415e18c..ca71d13873ce 100644 --- a/packages/core/src/integrations/inboundfilters.ts +++ b/packages/core/src/integrations/inboundfilters.ts @@ -1,5 +1,5 @@ import { Event, EventProcessor, Hub, Integration, StackFrame } from '@sentry/types'; -import { getEventDescription, isMatchingPattern, logger } from '@sentry/utils'; +import { getEventDescription, logger, stringMatchesSomePattern } from '@sentry/utils'; // "Script error." is hard coded into browsers for errors that it can't read. // this is the result of a script being pulled in from an external domain and CORS. @@ -107,9 +107,7 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array): b return false; } - return _getPossibleEventMessages(event).some(message => - ignoreErrors.some(pattern => isMatchingPattern(message, pattern)), - ); + return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors)); } function _isDeniedUrl(event: Event, denyUrls?: Array): boolean { @@ -118,7 +116,7 @@ function _isDeniedUrl(event: Event, denyUrls?: Array): boolean return false; } const url = _getEventFilterUrl(event); - return !url ? false : denyUrls.some(pattern => isMatchingPattern(url, pattern)); + return !url ? false : stringMatchesSomePattern(url, denyUrls); } function _isAllowedUrl(event: Event, allowUrls?: Array): boolean { @@ -127,7 +125,7 @@ function _isAllowedUrl(event: Event, allowUrls?: Array): boolea return true; } const url = _getEventFilterUrl(event); - return !url ? true : allowUrls.some(pattern => isMatchingPattern(url, pattern)); + return !url ? true : stringMatchesSomePattern(url, allowUrls); } function _getPossibleEventMessages(event: Event): string[] { diff --git a/packages/node/src/integrations/http.ts b/packages/node/src/integrations/http.ts index 634b13db1930..e4da4195f54e 100644 --- a/packages/node/src/integrations/http.ts +++ b/packages/node/src/integrations/http.ts @@ -3,9 +3,9 @@ import { EventProcessor, Integration, Span, TracePropagationTargets } from '@sen import { dynamicSamplingContextToSentryBaggageHeader, fill, - isMatchingPattern, logger, parseSemver, + stringMatchesSomePattern, } from '@sentry/utils'; import * as http from 'http'; import * as https from 'https'; @@ -169,9 +169,7 @@ function _createWrappedRequestMethodFactory( return headersUrlMap[url]; } - headersUrlMap[url] = tracingOptions.tracePropagationTargets.some(tracePropagationTarget => - isMatchingPattern(url, tracePropagationTarget), - ); + headersUrlMap[url] = stringMatchesSomePattern(url, tracingOptions.tracePropagationTargets); return headersUrlMap[url]; }; diff --git a/packages/tracing/src/browser/request.ts b/packages/tracing/src/browser/request.ts index bfcd5e4146d7..c3ebc1e00240 100644 --- a/packages/tracing/src/browser/request.ts +++ b/packages/tracing/src/browser/request.ts @@ -5,7 +5,7 @@ import { BAGGAGE_HEADER_NAME, dynamicSamplingContextToSentryBaggageHeader, isInstanceOf, - isMatchingPattern, + stringMatchesSomePattern, } from '@sentry/utils'; import { getActiveTransaction, hasTracingEnabled } from '../utils'; @@ -123,8 +123,7 @@ export function instrumentOutgoingRequests(_options?: Partial true; const shouldAttachHeaders = (url: string): boolean => - tracingOrigins.some(origin => isMatchingPattern(url, origin)) || - tracePropagationTargets.some(origin => isMatchingPattern(url, origin)); + stringMatchesSomePattern(url, tracingOrigins) || stringMatchesSomePattern(url, tracePropagationTargets); const spans: Record = {};