Move two utilities back into timing data section

MindscapeHQ · Nov 2, 2018 · 0a9dd7a · 0a9dd7a
1 parent c13a3a9
commit 0a9dd7a
Showing 1 changed file with 50 additions and 48 deletions.
diff --git a/src/raygun.rum.js b/src/raygun.rum.js
@@ -585,6 +585,26 @@ var raygunRumFactory = function(window, $, Raygun) {
       return data;
     }
 
+    function extractChildData(collection, fromVirtualPage) {
+      if (!performanceEntryExists('getEntries', 'function')) {
+        return;
+      }
+
+      try {
+        var resources = window.performance.getEntries();
+
+        for (var i = self.offset; i < resources.length; i++) {
+          var segment = resources[i].name.split('?')[0];
+          if (!shouldIgnoreResource(segment)) {
+            collection.push(getSecondaryTimingData(resources[i], fromVirtualPage));
+          }
+        }
+
+        self.offset = resources.length;
+      } catch (e) {}
+    }
+
+
     function getPrimaryTimingData() {
       var pathName = window.location.pathname;
 
@@ -629,6 +649,36 @@ var raygunRumFactory = function(window, $, Raygun) {
       };
     }
 
+    function getPerformanceData(virtualPage, firstLoad) {
+      if (
+        !performanceEntryExists('timing', 'object') ||
+        window.performance.timing.fetchStart === undefined ||
+        isNaN(window.performance.timing.fetchStart)
+      ) {
+        return null;
+      }
+
+      var data = [];
+
+      if (firstLoad) {
+        // Called by the static onLoad event being fired, persist itself
+        data.push(getPrimaryTimingData());
+      }
+
+      // Called during both the static load event and the virtual load calls
+      // Associates all data loaded up to this point with the previous page
+      // Eg: Page load if it is this is a new load, or the last view if a virtual page was freshly triggered
+      extractChildData(data);
+
+      if (virtualPage) {
+        data.push(getVirtualPrimaryTimingData(virtualPage, getPerformanceNow(0)));
+        extractChildData(data, true);
+      }
+
+      return data;
+    }
+
+
     function getSecondaryTimingData(timing, fromZero) {
       var url = timing.name.split('?')[0];
 
@@ -676,35 +726,6 @@ var raygunRumFactory = function(window, $, Raygun) {
       return false;
     }
 
-    function getPerformanceData(virtualPage, firstLoad) {
-      if (
-        !performanceEntryExists('timing', 'object') ||
-        window.performance.timing.fetchStart === undefined ||
-        isNaN(window.performance.timing.fetchStart)
-      ) {
-        return null;
-      }
-
-      var data = [];
-
-      if (firstLoad) {
-        // Called by the static onLoad event being fired, persist itself
-        data.push(getPrimaryTimingData());
-      }
-
-      // Called during both the static load event and the virtual load calls
-      // Associates all data loaded up to this point with the previous page
-      // Eg: Page load if it is this is a new load, or the last view if a virtual page was freshly triggered
-      extractChildData(data);
-
-      if (virtualPage) {
-        data.push(getVirtualPrimaryTimingData(virtualPage, getPerformanceNow(0)));
-        extractChildData(data, true);
-      }
-
-      return data;
-    }
-
     function sanitizeNaNs(data) {
       for (var i in data) {
         if (isNaN(data[i]) && typeof data[i] !== 'string') {
@@ -813,25 +834,6 @@ var raygunRumFactory = function(window, $, Raygun) {
       return null;
     }
 
-    function extractChildData(collection, fromVirtualPage) {
-      if (!performanceEntryExists('getEntries', 'function')) {
-        return;
-      }
-
-      try {
-        var resources = window.performance.getEntries();
-
-        for (var i = self.offset; i < resources.length; i++) {
-          var segment = resources[i].name.split('?')[0];
-          if (!shouldIgnoreResource(segment)) {
-            collection.push(getSecondaryTimingData(resources[i], fromVirtualPage));
-          }
-        }
-
-        self.offset = resources.length;
-      } catch (e) {}
-    }
-
     function getSecondaryTimingType(timing) {
       if (timing.initiatorType === 'xmlhttprequest' || timing.initiatorType === "fetch") {
         return Timings.XHR;