address pr comments

newrelic · Sep 30, 2024 · d84c008 · d84c008
1 parent a15ac86
commit d84c008
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/features/generic_events/aggregate/index.js b/src/features/generic_events/aggregate/index.js
@@ -20,6 +20,7 @@ import { EventBuffer } from '../../utils/event-buffer'
 import { applyFnToProps } from '../../../common/util/traverse'
 import { IDEAL_PAYLOAD_SIZE } from '../../../common/constants/agent-constants'
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator'
+import { isIFrameWindow } from '../../../common/dom/iframe'
 
 export class Aggregate extends AggregateBase {
   #agentRuntime
@@ -72,7 +73,7 @@ export class Aggregate extends AggregateBase {
             /** The aggregator process only returns an event when it is "done" aggregating -
              * so we still need to validate that an event was given to this method before we try to add */
             if (aggregatedUserAction?.event) {
-              const { target, timeStamp, type } = aggregatedUserAction.event
+              const { target, timeStamp, type, view } = aggregatedUserAction.event
               this.addEvent({
                 eventType: 'UserAction',
                 timestamp: Math.floor(this.#agentRuntime.timeKeeper.correctRelativeTimestamp(timeStamp)),
@@ -82,7 +83,7 @@ export class Aggregate extends AggregateBase {
                 rageClick: aggregatedUserAction.rageClick,
                 relativeMs: aggregatedUserAction.relativeMs,
                 target: aggregatedUserAction.selectorPath,
-                ...(aggregatedUserAction.iframe && { iframe: true }),
+                ...(isIFrameWindow(view) && { iframe: true }),
                 ...(target?.id && { targetId: target.id }),
                 ...(target?.tagName && { targetTag: target.tagName }),
                 ...(target?.type && { targetType: target.type }),

diff --git a/src/features/generic_events/aggregate/user-actions/aggregated-user-action.js b/src/features/generic_events/aggregate/user-actions/aggregated-user-action.js
@@ -1,4 +1,3 @@
-import { isIFrameWindow } from '../../../../common/dom/iframe'
 import { RAGE_CLICK_THRESHOLD_EVENTS, RAGE_CLICK_THRESHOLD_MS } from '../../constants'
 
 export class AggregatedUserAction {
@@ -9,7 +8,6 @@ export class AggregatedUserAction {
     this.relativeMs = [0]
     this.selectorPath = selectorPath
     this.rageClick = undefined
-    this.iframe = isIFrameWindow(evt.view)
   }
 
   /**

diff --git a/tests/specs/ins/harvesting.e2e.js b/tests/specs/ins/harvesting.e2e.js
@@ -37,7 +37,7 @@ describe('ins harvesting', () => {
     await browser.url(testUrl).then(() => browser.waitForAgentLoad())
 
     const [insHarvests] = await Promise.all([
-      insightsCapture.waitForResult({ timeout: 5000 }),
+      insightsCapture.waitForResult({ timeout: 7500 }),
       $('#pay-btn').click().then(async () => {
         // rage click
         await browser.execute(function () {