Skip to content

Commit 58afac0

Browse files
committed
use stringMatchesSomePattern
1 parent 069bb78 commit 58afac0

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

packages/core/src/integrations/inboundfilters.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Event, EventProcessor, Hub, Integration, StackFrame } from '@sentry/types';
2-
import { getEventDescription, isMatchingPattern, logger } from '@sentry/utils';
2+
import { getEventDescription, logger, stringMatchesSomePattern } from '@sentry/utils';
33

44
// "Script error." is hard coded into browsers for errors that it can't read.
55
// 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<string | RegExp>): b
107107
return false;
108108
}
109109

110-
return _getPossibleEventMessages(event).some(message =>
111-
ignoreErrors.some(pattern => isMatchingPattern(message, pattern)),
112-
);
110+
return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
113111
}
114112

115113
function _isDeniedUrl(event: Event, denyUrls?: Array<string | RegExp>): boolean {
@@ -118,7 +116,7 @@ function _isDeniedUrl(event: Event, denyUrls?: Array<string | RegExp>): boolean
118116
return false;
119117
}
120118
const url = _getEventFilterUrl(event);
121-
return !url ? false : denyUrls.some(pattern => isMatchingPattern(url, pattern));
119+
return !url ? false : stringMatchesSomePattern(url, denyUrls);
122120
}
123121

124122
function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolean {
@@ -127,7 +125,7 @@ function _isAllowedUrl(event: Event, allowUrls?: Array<string | RegExp>): boolea
127125
return true;
128126
}
129127
const url = _getEventFilterUrl(event);
130-
return !url ? true : allowUrls.some(pattern => isMatchingPattern(url, pattern));
128+
return !url ? true : stringMatchesSomePattern(url, allowUrls);
131129
}
132130

133131
function _getPossibleEventMessages(event: Event): string[] {

packages/node/src/integrations/http.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { EventProcessor, Integration, Span, TracePropagationTargets } from '@sen
33
import {
44
dynamicSamplingContextToSentryBaggageHeader,
55
fill,
6-
isMatchingPattern,
76
logger,
87
parseSemver,
8+
stringMatchesSomePattern,
99
} from '@sentry/utils';
1010
import * as http from 'http';
1111
import * as https from 'https';
@@ -169,9 +169,7 @@ function _createWrappedRequestMethodFactory(
169169
return headersUrlMap[url];
170170
}
171171

172-
headersUrlMap[url] = tracingOptions.tracePropagationTargets.some(tracePropagationTarget =>
173-
isMatchingPattern(url, tracePropagationTarget),
174-
);
172+
headersUrlMap[url] = stringMatchesSomePattern(url, tracingOptions.tracePropagationTargets);
175173

176174
return headersUrlMap[url];
177175
};

packages/tracing/src/browser/request.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
BAGGAGE_HEADER_NAME,
66
dynamicSamplingContextToSentryBaggageHeader,
77
isInstanceOf,
8-
isMatchingPattern,
8+
stringMatchesSomePattern,
99
} from '@sentry/utils';
1010

1111
import { getActiveTransaction, hasTracingEnabled } from '../utils';
@@ -123,8 +123,7 @@ export function instrumentOutgoingRequests(_options?: Partial<RequestInstrumenta
123123
typeof shouldCreateSpanForRequest === 'function' ? shouldCreateSpanForRequest : (_: string) => true;
124124

125125
const shouldAttachHeaders = (url: string): boolean =>
126-
tracingOrigins.some(origin => isMatchingPattern(url, origin)) ||
127-
tracePropagationTargets.some(origin => isMatchingPattern(url, origin));
126+
stringMatchesSomePattern(url, tracingOrigins) || stringMatchesSomePattern(url, tracePropagationTargets);
128127

129128
const spans: Record<string, Span> = {};
130129

0 commit comments

Comments
 (0)