Fix race cond on harvester initializedAggregates after optimization

src/common/harvest/__mocks__/harvester.js

@@ -0,0 +1,6 @@
+// create a jest mock of the Harvester class
+export const Harvester = jest.fn().mockImplementation(() => ({
+  startTimer: jest.fn(),
+  triggerHarvestFor: jest.fn(),
+  initializedAggregates: []
+}))

src/features/page_view_event/aggregate/index.js

@@ -13,7 +13,6 @@ import { timeToFirstByte } from '../../../common/vitals/time-to-first-byte'
 import { now } from '../../../common/timing/now'
 import { TimeKeeper } from '../../../common/timing/time-keeper'
 import { applyFnToProps } from '../../../common/util/traverse'
-import { Harvester } from '../../../common/harvest/harvester'
 
 export class Aggregate extends AggregateBase {
   static featureName = CONSTANTS.FEATURE_NAME
@@ -29,7 +28,6 @@ export class Aggregate extends AggregateBase {
       return warn(43)
     }
     agentRef.runtime.timeKeeper = new TimeKeeper(agentRef.agentIdentifier)
-    agentRef.runtime.harvester = new Harvester(agentRef)
 
     if (isBrowserScope) {
       timeToFirstByte.subscribe(({ value, attrs }) => {

src/features/utils/aggregate-base.js

@@ -7,6 +7,7 @@ import { activatedFeatures } from '../../common/util/feature-flags'
 import { Obfuscator } from '../../common/util/obfuscate'
 import { FEATURE_NAMES } from '../../loaders/features/features'
 import { EventStoreManager } from './event-store-manager'
+import { Harvester } from '../../common/harvest/harvester'
 
 export class AggregateBase extends FeatureBase {
   constructor (agentRef, featureName) {
@@ -145,5 +146,7 @@ export class AggregateBase extends FeatureBase {
     if (!agentRef.mainAppKey) agentRef.mainAppKey = { licenseKey: agentRef.info.licenseKey, appId: agentRef.info.applicationID }
     // Create a single Aggregator for this agent if DNE yet; to be used by jserror endpoint features.
     if (!agentRef.sharedAggregator) agentRef.sharedAggregator = new EventStoreManager(agentRef.mainAppKey, 2)
+
+    if (!agentRef.runtime.harvester) agentRef.runtime.harvester = new Harvester(agentRef)
   }
 }

src/features/utils/instrument-base.js

@@ -103,7 +103,7 @@ export class InstrumentBase extends FeatureBase {
         const { Aggregate } = await lazyFeatureLoader(this.featureName, 'aggregate')
         this.featAggregate = new Aggregate(agentRef, argsObjFromInstrument)
 
-        agentRef.runtime.harvester?.initializedAggregates.push(this.featAggregate) // "subscribe" the feature to harvest interval (PVE will start the timer)
+        agentRef.runtime.harvester.initializedAggregates.push(this.featAggregate) // "subscribe" the feature to future harvest intervals (PVE will start the timer)
         loadedSuccessfully(true)
       } catch (e) {
         warn(34, e)

tests/components/page_view_timing/index.test.js

@@ -32,6 +32,7 @@ let triggerVisChange
 jest.mock('../../../src/common/window/page-visibility', () => ({
   subscribeToVisibilityChange: jest.fn(cb => { triggerVisChange ??= cb })
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 const expectedNetworkInfo = {
   'net-type': expect.any(String),
@@ -54,7 +55,8 @@ describe('pvt aggregate tests', () => {
       agentIdentifier,
       info: { licenseKey: 'licenseKey', applicationID: 'applicationID' },
       init: { page_view_timing: {} },
-      runtime: {}
+      ee: { on: jest.fn() },
+      runtime: { harvester: { initializedAggregates: [] } }
     }
     const { Aggregate } = await import('../../../src/features/page_view_timing/aggregate')
 

tests/components/spa/api.test.js

@@ -20,6 +20,7 @@ jest.mock('../../../src/common/config/runtime', () => ({
   __esModule: true,
   getRuntime: jest.fn().mockReturnValue({})
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 let spaInstrument, spaAggregate, newrelic, mockCurrentInfo
 const agentIdentifier = 'abcdefg'

tests/components/spa/capturing.test.js

@@ -16,6 +16,7 @@ jest.mock('../../../src/common/config/runtime', () => ({
   __esModule: true,
   getRuntime: jest.fn().mockReturnValue({})
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 let spaInstrument, spaAggregate, newrelic
 const agentIdentifier = 'abcdefg'

tests/components/spa/initial-page-load.test.js

@@ -16,6 +16,7 @@ jest.mock('../../../src/common/config/runtime', () => ({
   __esModule: true,
   getRuntime: jest.fn().mockReturnValue({})
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 let spaInstrument, spaAggregate, newrelic
 const agentIdentifier = 'abcdefg'

tests/components/spa/mutation-observer.test.js

@@ -16,6 +16,7 @@ jest.mock('../../../src/common/config/runtime', () => ({
   __esModule: true,
   getRuntime: jest.fn().mockReturnValue({})
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 let spaInstrument, spaAggregate, newrelic
 const agentIdentifier = 'abcdefg'

tests/components/spa/promises.test.js

@@ -22,6 +22,7 @@ jest.mock('../../../src/common/config/runtime', () => ({
 jest.mock('../../../src/common/util/feature-flags', () => ({
   activatedFeatures: { [agentIdentifier]: { spa: 1 } }
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 let spaInstrument, spaAggregate, newrelic
 beforeAll(async () => {

tests/components/spa/route-change.test.js

@@ -16,6 +16,7 @@ jest.mock('../../../src/common/config/runtime', () => ({
   __esModule: true,
   getRuntime: jest.fn().mockReturnValue({})
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 let spaInstrument, spaAggregate, newrelic
 const agentIdentifier = 'abcdefg'

tests/components/spa/timers.test.js

@@ -16,6 +16,7 @@ jest.mock('../../../src/common/config/runtime', () => ({
   __esModule: true,
   getRuntime: jest.fn().mockReturnValue({})
 }))
+jest.mock('../../../src/common/harvest/harvester')
 
 let spaInstrument, spaAggregate, newrelic
 const agentIdentifier = 'abcdefg'

tests/unit/features/page_view_timing/aggregate/index.test.js

@@ -7,6 +7,7 @@ jest.mock('../../../../../src/common/config/runtime', () => ({
   getRuntime: jest.fn(() => mockRuntime),
   setRuntime: jest.fn()
 }))
+jest.mock('../../../../../src/common/harvest/harvester')
 
 const pvtAgg = new Aggregate({
   agentIdentifier: 'abcd',