Merge pull request #46 from MindscapeHQ/md/sup/update-ignored-urls

Ensure the ignore lists are applied to RUM events

Author: mduncan26

sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "raygun4reactnative",
   "title": "Raygun4reactnative",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Raygun React Native SDK",
   "main": "dist/index.js",
   "typescript": {

sdk/src/RaygunClient.ts

@@ -86,11 +86,10 @@ const init = (raygunClientOptions: RaygunClientOptions) => {
       disableNativeCrashReporting,
       disableUnhandledPromiseRejectionReporting,
       customCrashReportingEndpoint || '',
-            onBeforeSendingCrashReport as BeforeSendHandler,
-            version,
-            maxErrorReportsStoredOnDevice,
-            maxBreadcrumbsPerErrorReport,
-    );
+      onBeforeSendingCrashReport as BeforeSendHandler,
+      version,
+      maxErrorReportsStoredOnDevice,
+      maxBreadcrumbsPerErrorReport);
 
     if (!disableNativeCrashReporting) {
       RaygunNativeBridge.initCrashReportingNativeSupport(apiKey, version, customCrashReportingEndpoint);
@@ -105,8 +104,7 @@ const init = (raygunClientOptions: RaygunClientOptions) => {
       ignoredURLs,
       ignoredViews,
       customRealUserMonitoringEndpoint,
-      version,
-    );
+      version);
 
     // Add the lifecycle event listeners to the bridge.
     RaygunNativeBridge.initRealUserMonitoringNativeSupport();

sdk/src/RealUserMonitor.ts

@@ -6,11 +6,9 @@ import {
 } from './Types';
 import {
   getDeviceId,
-  shouldIgnoreURL,
   getCurrentUser,
   getCurrentTags,
   getRandomGUID,
-  shouldIgnoreView,
 } from './Utils';
 
 // @ts-ignore
@@ -219,6 +217,10 @@ export default class RealUserMonitor {
    * @param {number} duration - The time taken for this event to fully execute.
    */
   sendNetworkTimingEvent(name: string, sendTime: number, duration: number) {
+    if (this.shouldIgnoreURL(name)) {
+      return;
+    }
+
     const data = {name, timing: {type: RealUserMonitoringTimings.NetworkCall, duration}};
     this.transmitRealUserMonitoringEvent(RealUserMonitoringEvents.EventTiming, data, sendTime).catch();
   }
@@ -231,7 +233,7 @@ export default class RealUserMonitor {
    * @param {number} duration - The time taken for this event to fully execute.
    */
   async sendViewLoadedEvent(name : string, duration : number) {
-    if (shouldIgnoreView(name, this.ignoredViews)) {
+    if (this.shouldIgnoreView(name)) {
       return;
     }
     const data = {name: name, timing: {type: RealUserMonitoringTimings.ViewLoaded, duration}};
@@ -308,9 +310,10 @@ export default class RealUserMonitor {
    */
   handleRequestOpen(method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE', url: string, xhr: any) {
     // If this URL is on the IGNORE list, then do nothing.
-    if (shouldIgnoreURL(url, this.ignoredURLs)) {
+    if (this.shouldIgnoreURL(url)) {
       return;
     }
+
     // Obtain the device ID
     const id = getDeviceId();
 
@@ -375,4 +378,22 @@ export default class RealUserMonitor {
     XHRInterceptor.setResponseCallback(this.handleResponse.bind(this));
     XHRInterceptor.enableInterception();
   }
+
+  shouldIgnoreURL(url: string): boolean {
+    for (let i = 0; i < this.ignoredURLs.length; i++) {
+      if (url.includes(this.ignoredURLs[i])) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  shouldIgnoreView(name: string): boolean {
+    for (let i = 0; i < this.ignoredViews.length; i++) {
+      if (name.includes(this.ignoredViews[i])) {
+        return true;
+      }
+    }
+    return false;
+  };
 }

sdk/src/Utils.ts

@@ -108,15 +108,4 @@ export const noAddressAt = ({methodName, ...rest}: StackFrame): StackFrame => {
   };
 };
 
-export const removeProtocol = (url: string) => url.replace(/^http(s)?:\/\//i, '');
-
-export const shouldIgnoreURL = (url: string, ignoredURLs: string[]): boolean => {
-  const target = removeProtocol(url);
-  return ignoredURLs.some((ignored) => target.startsWith(ignored));
-};
-
-export const shouldIgnoreView = (name: string, ignoredViews: string[]): boolean => {
-  return ignoredViews.some((ignored) => name.startsWith(ignored));
-};
-
 export const filterOutReactFrames = (frame: StackFrame): boolean => !!frame.file && !frame.file.match(internalTrace);