Skip to content

Commit 4180537

Browse files
committed
Use full URL instead of extracting domain name.
1 parent 8b8c321 commit 4180537

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

packages/performance/src/services/perf_logger.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ describe('Performance Monitoring > perf_logger', () => {
317317
entryType: 'resource',
318318
fetchStart: 5645.689999917522,
319319
initiatorType: 'fetch',
320-
name: 'http://firebaselogging.googleapis.com/some/path?message=a',
320+
name: 'https://firebaselogging.googleapis.com/v0cc/log?message=a',
321321
nextHopProtocol: 'http/2+quic/43',
322322
redirectEnd: 0,
323323
redirectStart: 0,
@@ -355,8 +355,8 @@ describe('Performance Monitoring > perf_logger', () => {
355355
fetchStart: 5645.689999917522,
356356
initiatorType: 'fetch',
357357
name: mergeStrings(
358-
'hts/frbslgigp.ogepscmti/sapt?aa=2',
359-
'tp:/ieaeogn-agolai.o/hsi//ahprm13'
358+
'hts/frbslgigp.ogepscmv/ieo/eaylg',
359+
'tp:/ieaeogn-agolai.o/1frlglgc/o'
360360
),
361361
nextHopProtocol: 'http/2+quic/43',
362362
redirectEnd: 0,

packages/performance/src/services/perf_logger.ts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ export function logNetworkRequest(networkRequest: NetworkRequest): void {
153153

154154
// Do not log the js sdk's call to transport service domain to avoid unnecessary cycle.
155155
// Need to blacklist both old and new endpoints to avoid migration gap.
156-
const networkRequestHostName = extractDomain(networkRequest.url);
156+
const networkRequestUrl = networkRequest.url;
157157

158158
// Blacklist old log endpoint and new transport endpoint.
159159
// Because Performance SDK doesn't instrument requests sent from SDK itself.
160-
const logEndpointHostName = extractDomain(settingsService.logEndPointUrl);
161-
const flEndpointHostName = extractDomain(settingsService.flTransportEndpointUrl);
160+
const logEndpointUrl = settingsService.logEndPointUrl.split('?')[0];
161+
const flEndpointUrl = settingsService.flTransportEndpointUrl.split('?')[0];
162162
if (
163-
networkRequestHostName === logEndpointHostName ||
164-
networkRequestHostName === flEndpointHostName
163+
networkRequestUrl === logEndpointUrl ||
164+
networkRequestUrl === flEndpointUrl
165165
) {
166166
return;
167167
}
@@ -176,14 +176,6 @@ export function logNetworkRequest(networkRequest: NetworkRequest): void {
176176
setTimeout(() => sendLog(networkRequest, ResourceType.NetworkRequest), 0);
177177
}
178178

179-
function extractDomain(url: string): string {
180-
const urlRegex = /(https?:\/\/)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4})\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
181-
let matched = urlRegex.exec(url);
182-
if (matched && matched[1]) {
183-
return matched[1];
184-
}
185-
return "";
186-
}
187179

188180
function serializer(
189181
resource: NetworkRequest | Trace,

0 commit comments

Comments
 (0)