feat: Add error mode to session trace - NEWRELIC-8666 NEWRELIC-9283 (#…

…583)

src/common/session/session-entity.js

@@ -186,7 +186,7 @@ export class SessionEntity {
       this.sync(data) // update the parent class "state" properties with the local storage values
       //
       // TODO - compression would need happen here if we decide to do it
-      this.storage.set(this.lookupKey, stringify(data))
+      this.storage.set(this.lookupKey, stringify(this.state))
       return data
     } catch (e) {
       // storage is inaccessible

src/common/timer/interaction-timer.js

@@ -44,8 +44,8 @@ export class InteractionTimer extends Timer {
         if (state === 'hidden') this.pause()
         // vis change --> visible is treated like a new interaction with the page
         else {
-          this.onResume()
           this.refresh()
+          this.onResume() // emit resume event after state updated
         }
       }, false, false, this.abortController?.signal)
     }

src/common/wrap/wrap-raf.js

@@ -4,7 +4,7 @@
  */
 /**
  * @file Wraps `window.requestAnimationFrame` for instrumentation.
- * This module is used by: jserror, session_trace.
+ * This module is used by: jserror.
  */
 
 import { ee as baseEE } from '../event-emitter/contextual-ee'

src/common/wrap/wrap-timer.js

@@ -4,7 +4,7 @@
  */
 /**
  * @file Wraps native timeout and interval methods for instrumentation.
- * This module is used by: jserrors, session_trace, spa.
+ * This module is used by: jserrors, spa.
  */
 
 import { ee as baseEE } from '../event-emitter/contextual-ee'

src/features/session_replay/aggregate/index.js

@@ -328,6 +328,7 @@ export class Aggregate extends AggregateBase {
     this.blocked = true
     this.mode = MODE.OFF
     this.stopRecording()
+    this.ee.emit('REPLAY_ABORTED')
     const { session } = getRuntime(this.agentIdentifier)
     session.state.sessionReplay = this.mode
   }

src/features/session_trace/constants.js

@@ -7,5 +7,4 @@ export const START = '-start'
 export const END = '-end'
 export const FN_START = 'fn' + START
 export const FN_END = 'fn' + END
-export const BST_TIMER = 'bstTimer'
 export const PUSH_STATE = 'pushState'

src/features/session_trace/instrument/index.js

@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { handle } from '../../../common/event-emitter/handle'
-import { wrapHistory, wrapEvents, wrapTimer, wrapRaf } from '../../../common/wrap'
+import { wrapHistory, wrapEvents } from '../../../common/wrap'
 import { now } from '../../../common/timing/now'
 import { InstrumentBase } from '../../utils/instrument-base'
 import * as CONSTANTS from '../constants'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { isBrowserScope } from '../../../common/util/global-scope'
 
 const {
-  BST_RESOURCE, RESOURCE, BST_TIMER, START, END, FEATURE_NAME, FN_END, FN_START, PUSH_STATE
+  BST_RESOURCE, RESOURCE, START, END, FEATURE_NAME, FN_END, FN_START, PUSH_STATE
 } = CONSTANTS
 
 export class Instrument extends InstrumentBase {
@@ -21,8 +21,6 @@ export class Instrument extends InstrumentBase {
     if (!isBrowserScope) return // session traces not supported outside web env
 
     const thisInstrumentEE = this.ee
-    this.timerEE = wrapTimer(thisInstrumentEE)
-    this.rafEE = wrapRaf(thisInstrumentEE)
     wrapHistory(thisInstrumentEE)
     this.eventsEE = wrapEvents(thisInstrumentEE)
 
@@ -35,21 +33,6 @@ export class Instrument extends InstrumentBase {
       handle('bst', [args[0], target, this.bstStart, now()], undefined, FEATURE_NAMES.sessionTrace, thisInstrumentEE)
     })
 
-    this.timerEE.on(FN_START, function (args, obj, type) {
-      this.bstStart = now()
-      this.bstType = type
-    })
-    this.timerEE.on(FN_END, function (args, target) {
-      handle(BST_TIMER, [target, this.bstStart, now(), this.bstType], undefined, FEATURE_NAMES.sessionTrace, thisInstrumentEE)
-    })
-
-    this.rafEE.on(FN_START, function () {
-      this.bstStart = now()
-    })
-    this.rafEE.on(FN_END, function (args, target) {
-      handle(BST_TIMER, [target, this.bstStart, now(), 'requestAnimationFrame'], undefined, FEATURE_NAMES.sessionTrace, thisInstrumentEE)
-    })
-
     thisInstrumentEE.on(PUSH_STATE + START, function (args) {
       this.time = now()
       this.startPath = location.pathname + location.hash

tests/assets/stn/ajax-disabled.html

@@ -28,8 +28,8 @@
       // we need to have >30 nodes in the session trace to ensure it actually gets
       // sent, so make some nodes
       function generateNodes() {
-        for (var i = 0; i < 31; i++) {
-          setTimeout(function () {}, 0)
+        for (var i = 0; i < 30; i++) {
+          window.history.pushState({},"")
         }
       }
     </script>

tests/browser/stn/stn.browser.js

@@ -46,18 +46,14 @@ function runTests () {
 
   test('wait for trace node generation', function (t) {
     ee.emit('feat-err', [])
-    t.plan(4)
+    t.plan(3) // test will wait until all 3 t.ok from below are seen!
     window.history.pushState(null, '', '#foo')
     window.history.pushState(null, '', '#bar')
     setTimeout(() => t.ok(true), 0)
     let interval = setInterval(() => {
       clearInterval(interval)
       t.ok(true)
     }, 0)
-    window.requestAnimationFrame(() => {
-      t.ok(true)
-      throw new Error('raf error')
-    })
     let xhr = new XMLHttpRequest()
     xhr.open('GET', window.location)
     xhr.send()
@@ -99,27 +95,6 @@ function runTests () {
       t.equal(node.o, 'document', 'load node origin ' + node.o)
       t.end()
     })
-    t.test('stn timer', function (t) {
-      let node = res.filter(function (node) { return node.n === 'setInterval' })[0]
-      t.ok(node, 'timer node created')
-      t.ok(node.s > 10, 'timer node has start time ' + node.s)
-      t.equal(node.o, 'window', 'setInterval origin ' + node.o)
-      t.end()
-    })
-    t.test('stn-raf', function (t) {
-      let node = res.filter(function (node) { return node.n === 'requestAnimationFrame' })[0]
-      t.ok(node, 'raf node created')
-      t.ok(node.s > 10, 'raf node has start time ' + node.s)
-      t.equal(node.o, 'window', 'requestAnimationFrame origin ' + node.o)
-      t.end()
-    })
-    t.test('stn error', function (t) {
-      let errorNode = res.filter(function (node) { return node.o === 'raf error' })[0]
-      t.ok(errorNode, 'error node created')
-      t.ok(errorNode.s > 10, 'error node has start time ' + errorNode.s)
-      t.equal(errorNode.s, errorNode.e, 'error node has no duration')
-      t.end()
-    })
     t.test('stn ajax', function (t) {
       let ajax = res.filter(function (node) { return node.t === 'ajax' })[0]
       t.ok(ajax, 'ajax node created')

tests/browser/xhr/fetch.spec.js

@@ -0,0 +1,3 @@
+
+let BrowserMatcher = require('../../../tools/jil/util/browser-matcher')
+module.exports = BrowserMatcher.withFeature('notSafari15')

tests/functional/stn/ajax.test.js

@@ -35,7 +35,7 @@ testDriver.test('session trace resources', supported, function (t, browser, rout
       .elementByCssSelector('body')
       .click()
 
-    resourcePromise = router.expectResources()
+    resourcePromise = router.expectResources(7000)
 
     return Promise.all([resourcePromise, clickPromise])
   })
@@ -89,7 +89,7 @@ testDriver.test('session trace ajax deny list', supported, function (t, browser,
       .elementByCssSelector('body')
       .click()
 
-    resourcePromise = router.expectResources()
+    resourcePromise = router.expectResources(7000)
 
     return Promise.all([resourcePromise, clickPromise])
   })

tests/functional/stn/harvest.test.js

@@ -134,7 +134,6 @@ testDriver.test('session traces are retried when collector returns 429 during sc
 
     let thirdBody = result.request.body
 
-    t.ok(secondBody.res.length > firstBody.res.length, 'second try has more nodes than first')
     t.ok(containsAll(thirdBody, secondBody), 'all nodes have been resent')
 
     // this is really checking that no nodes have been resent

tools/jil/util/browser-matcher.js

@@ -436,3 +436,7 @@ features.npmSrc = new BrowserMatcher([
   new MatcherRule(TYPE_INCLUDE, 'safari@>=15.4'),
   new MatcherRule(TYPE_INCLUDE, 'ios@>=15.4')
 ])
+
+/* Because safari @ 15 is giving us grief on Sauce Labs */
+features.notSafari15 = new BrowserMatcher()
+  .exclude('safari', '15')