refactor

Author: DominikB2014

packages/tracing-internal/src/browser/metrics/index.ts

@@ -225,9 +225,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
         break;
       }
       case 'resource': {
-        const resourceName = (entry.name as string).replace(WINDOW.location.origin, '');
-        const resourceUrl = parseUrl(entry.name as string);
-        _addResourceSpans(transaction, entry, resourceName, resourceUrl, startTime, duration, timeOrigin);
+        _addResourceSpans(transaction, entry, entry.name as string, startTime, duration, timeOrigin);
         break;
       }
       default:
@@ -402,8 +400,7 @@ export interface ResourceEntry extends Record<string, unknown> {
 export function _addResourceSpans(
   transaction: Transaction,
   entry: ResourceEntry,
-  resourceName: string,
-  resourceUrl: ReturnType<typeof parseUrl>,
+  resourceUrl: string,
   startTime: number,
   duration: number,
   timeOrigin: number,
@@ -414,29 +411,32 @@ export function _addResourceSpans(
     return;
   }
 
+  const parsedUrl = parseUrl(resourceUrl);
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const data: Record<string, any> = {};
   setResourceEntrySizeData(data, entry, 'transferSize', 'http.response_transfer_size');
   setResourceEntrySizeData(data, entry, 'encodedBodySize', 'http.response_content_length');
   setResourceEntrySizeData(data, entry, 'decodedBodySize', 'http.decoded_response_content_length');
+
   if ('renderBlockingStatus' in entry) {
     data['resource.render_blocking_status'] = entry.renderBlockingStatus;
   }
-  if (resourceUrl.protocol) {
-    data['url.scheme'] = resourceUrl.protocol;
+  if (parsedUrl.protocol) {
+    data['url.scheme'] = parsedUrl.protocol;
   }
 
-  if (resourceUrl.host) {
-    data['server.address'] = resourceUrl.host;
+  if (parsedUrl.host) {
+    data['server.address'] = parsedUrl.host;
   }
 
-  data['url.same_origin'] = resourceUrl.host === WINDOW.location.host;
+  data['url.same_origin'] = resourceUrl.includes(WINDOW.location.origin);
 
   const startTimestamp = timeOrigin + startTime;
   const endTimestamp = startTimestamp + duration;
 
   _startChild(transaction, {
-    description: resourceName,
+    description: resourceUrl.replace(WINDOW.location.origin, ''),
     endTimestamp,
     op: entry.initiatorType ? `resource.${entry.initiatorType}` : 'resource.other',
     origin: 'auto.resource.browser.metrics',