Revert "feat!: capture all W3C fields in NavigationEvents (#494)" (#630)

Author: williazz

src/event-cache/__tests__/EventCache.integ.test.ts

@@ -84,6 +84,7 @@ describe('EventCache tests', () => {
                 allowCookies: false,
                 sessionLengthSeconds: 0,
                 sessionAttributes: {
+                    version: '2.0.0',
                     domain: 'overridden.console.aws.amazon.com',
                     browserLanguage: 'en-UK',
                     browserName: 'Chrome',

src/event-schemas/performance-navigation-timing.json renamed to src/event-schemas/navigation-event.json

@@ -1,38 +1,45 @@
 {
-    "$id": "com.amazon.rum.performance_navigation_timing",
+    "$id": "com.amazon.rum.performance_navigation_event",
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "title": "PerformanceNavigationTimingEvent",
+    "title": "NavigationEvent",
     "type": "object",
     "properties": {
-        "name": {
-            "type": "string"
+        "version": {
+            "const": "1.0.0",
+            "type": "string",
+            "description": "Schema version."
         },
-        "entryType": {
-            "const": "navigation",
-            "type": "string"
+        "initiatorType": {
+            "type": "string",
+            "enum": ["navigation", "route_change"]
+        },
+        "navigationType": {
+            "description": "An unsigned short which indicates how the navigation to this page was done. Possible values are:TYPE_NAVIGATE (0), TYPE_RELOAD (1), TYPE_BACK_FORWARD (2), TYPE_RESERVED (255)",
+            "type": "string",
+            "enum": ["navigate", "reload", "back_forward", "reserved"]
         },
         "startTime": {
-            "type": "number",
-            "description": "StartTime value is always '0' for PerformanceNavigationTimingEvents created by the PerformanceAPI. However, non-W3C 'route_changes' created by RUM's polyfill for SinglePageApplications can have startTimes >= 0."
+            "type": "number"
         },
-        "duration": {
+        "unloadEventStart": {
             "type": "number"
         },
-        "initiatorType": {
-            "type": "string",
-            "enum": ["navigation", "route_change"],
-            "description": "InitiatorType value is always 'navigation' for PerformanceNavigationTimingEvents created by the PerformanceAPI. However, RUM adds the non-W3C concept 'route_change' as a polyfill because the PerformanceAPI currently does not support Single Page Applications."
+        "promptForUnload": {
+            "type": "number"
         },
-        "nextHopProtocol": {
-            "type": "string"
+        "redirectCount": {
+            "type": "integer"
         },
-        "workerStart": {
+        "redirectStart": {
             "type": "number"
         },
-        "redirectStart": {
+        "redirectTime": {
+            "type": "number"
+        },
+        "workerStart": {
             "type": "number"
         },
-        "redirectEnd": {
+        "workerTime": {
             "type": "number"
         },
         "fetchStart": {
@@ -41,68 +48,73 @@
         "domainLookupStart": {
             "type": "number"
         },
-        "domainLookupEnd": {
+        "dns": {
             "type": "number"
         },
+        "nextHopProtocol": {
+            "type": "string"
+        },
         "connectStart": {
             "type": "number"
         },
-        "connectEnd": {
+        "connect": {
             "type": "number"
         },
         "secureConnectionStart": {
             "type": "number"
         },
+        "tlsTime": {
+            "type": "number"
+        },
         "requestStart": {
             "type": "number"
         },
+        "timeToFirstByte": {
+            "type": "number"
+        },
         "responseStart": {
             "type": "number"
         },
-        "responseEnd": {
+        "responseTime": {
             "type": "number"
         },
-        "transferSize": {
+        "domInteractive": {
             "type": "number"
         },
-        "encodedBodySize": {
+        "domContentLoadedEventStart": {
             "type": "number"
         },
-        "decodedBodySize": {
+        "domContentLoaded": {
             "type": "number"
         },
         "domComplete": {
             "type": "number"
         },
-        "domContentLoadedEventEnd": {
+        "domProcessingTime": {
             "type": "number"
         },
-        "domContentLoadedEventStart": {
+        "loadEventStart": {
             "type": "number"
         },
-        "domInteractive": {
+        "loadEventTime": {
             "type": "number"
         },
-        "loadEventEnd": {
+        "duration": {
             "type": "number"
         },
-        "loadEventStart": {
+        "headerSize": {
             "type": "number"
         },
-        "redirectCount": {
-            "type": "integer"
-        },
-        "type": {
-            "type": "string",
-            "enum": ["navigate", "reload", "back_forward", "prerender"]
+        "transferSize": {
+            "type": "number"
         },
-        "unloadEventEnd": {
+        "compressionRatio": {
             "type": "number"
         },
-        "unloadEventStart": {
+        "navigationTimingLevel": {
             "type": "number"
         }
     },
     "additionalProperties": false,
-    "required": ["entryType", "startTime", "duration", "initiatorType"]
+    "required": ["version", "initiatorType", "startTime", "duration"]
 }

src/orchestration/__tests__/Orchestration.test.ts

@@ -28,8 +28,7 @@ jest.mock('../../utils/common-utils', () => {
     return {
         __esModule: true,
         ...originalModule,
-        isLCPSupported: jest.fn().mockReturnValue(true),
-        isNavigationSupported: jest.fn().mockReturnValue(true)
+        isLCPSupported: jest.fn().mockReturnValue(true)
     };
 });