From fa212e3c362b1c6ca67bb3fb23a5a9e70f842537 Mon Sep 17 00:00:00 2001 From: Patrick Housley Date: Tue, 6 Jun 2023 10:14:45 -0500 Subject: [PATCH 1/2] feat: remove unused data from stn requests --- package-lock.json | 12 ++++++------ src/features/session_trace/aggregate/index.js | 11 +---------- tests/functional/stn/index.test.js | 2 -- tests/functional/xhr/ajax-events.test.js | 8 ++++---- tools/browsers-lists/browsers-supported.json | 16 ++++++++-------- 5 files changed, 19 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index a74b80a13..9b69865e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10870,9 +10870,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001492", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001492.tgz", - "integrity": "sha512-2efF8SAZwgAX1FJr87KWhvuJxnGJKOnctQa8xLOskAXNXq8oiuqgl6u1kk3fFpsp3GgvzlRjiK1sl63hNtFADw==", + "version": "1.0.30001495", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001495.tgz", + "integrity": "sha512-F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg==", "dev": true, "funding": [ { @@ -37982,9 +37982,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001492", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001492.tgz", - "integrity": "sha512-2efF8SAZwgAX1FJr87KWhvuJxnGJKOnctQa8xLOskAXNXq8oiuqgl6u1kk3fFpsp3GgvzlRjiK1sl63hNtFADw==", + "version": "1.0.30001495", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001495.tgz", + "integrity": "sha512-F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg==", "dev": true }, "capital-case": { diff --git a/src/features/session_trace/aggregate/index.js b/src/features/session_trace/aggregate/index.js index e662c6e77..c3c5c1e04 100644 --- a/src/features/session_trace/aggregate/index.js +++ b/src/features/session_trace/aggregate/index.js @@ -4,7 +4,6 @@ */ import { registerHandler } from '../../../common/event-emitter/register-handler' import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler' -import { stringify } from '../../../common/util/stringify' import { parseUrl } from '../../../common/url/parse-url' import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config' import { now } from '../../../common/timing/now' @@ -325,18 +324,10 @@ export class Aggregate extends AggregateBase { this.trace = {} this.nodeCount = 0 - const stnInfo = { + return { qs: { st: String(getRuntime(this.agentIdentifier).offset) }, body: { res: stns } } - if (!this.ptid) { // send custom and user attributes on the very first ST harvest only - const { userAttributes, atts, jsAttributes } = getInfo(this.agentIdentifier) - stnInfo.qs.ua = userAttributes - stnInfo.qs.at = atts - const ja = stringify(jsAttributes) - stnInfo.qs.ja = ja === '{}' ? null : ja - } - return stnInfo } smearEvtsByOrigin (name) { diff --git a/tests/functional/stn/index.test.js b/tests/functional/stn/index.test.js index b0918c601..3e3f0c50f 100644 --- a/tests/functional/stn/index.test.js +++ b/tests/functional/stn/index.test.js @@ -17,10 +17,8 @@ testDriver.test('posts session traces', supported, function (t, browser, router) Promise.all([resourcePromise, rumPromise, loadPromise]).then(([{ request: { query } }]) => { t.ok(+query.st > 1408126770885, `Got start time ${query.st}`) t.notok(query.ptid, 'No ptid on first harvest') - t.equal(query.ja, '{"aargh":"somanytimers"}', 'custom javascript attributes (on stn first post)') return router.expectResources().then(({ request: { query } }) => { t.ok(query.ptid, `ptid on second harvest ${query.ptid}`) - t.equal(query.ja, undefined, 'no javascript attributes (on stn second post)') t.end() }) }).catch(fail) diff --git a/tests/functional/xhr/ajax-events.test.js b/tests/functional/xhr/ajax-events.test.js index 013035b2e..7635ef96d 100644 --- a/tests/functional/xhr/ajax-events.test.js +++ b/tests/functional/xhr/ajax-events.test.js @@ -30,13 +30,13 @@ testDriver.test('Disabled ajax events', function (t, browser, router) { }) testDriver.test('capturing XHR ajax events', function (t, browser, router) { - const ajaxPromise = router.expectAjaxEvents(5000) + const ajaxPromise = router.expectAjaxEvents(10000) const rumPromise = router.expectRum() const loadPromise = browser.safeGet(router.assetURL('xhr-outside-interaction.html', { loader: 'spa', init: { ajax: { - harvestTimeSeconds: 2, + harvestTimeSeconds: 5, enabled: true } } @@ -53,8 +53,8 @@ testDriver.test('capturing XHR ajax events', function (t, browser, router) { testDriver.test('capturing large payload of XHR ajax events', function (t, browser, router) { const ajaxPromises = Promise.all([ - router.expectAjaxEvents(8000), - router.expectAjaxEvents(16000) + router.expectAjaxEvents(10000), + router.expectAjaxEvents(20000) ]) const rumPromise = router.expectRum() const loadPromise = browser.safeGet(router.assetURL('xhr-large-payload.html', { diff --git a/tools/browsers-lists/browsers-supported.json b/tools/browsers-lists/browsers-supported.json index 1b63c7d8f..2c9850b4d 100644 --- a/tools/browsers-lists/browsers-supported.json +++ b/tools/browsers-lists/browsers-supported.json @@ -4,15 +4,15 @@ "browserName": "chrome", "platformName": "Windows 11", "platform": "Windows 11", - "version": "104", - "browserVersion": "104" + "version": "105", + "browserVersion": "105" }, { "browserName": "chrome", "platformName": "Windows 11", "platform": "Windows 11", - "version": "107", - "browserVersion": "107" + "version": "108", + "browserVersion": "108" }, { "browserName": "chrome", @@ -34,15 +34,15 @@ "browserName": "MicrosoftEdge", "platformName": "Windows 11", "platform": "Windows 11", - "version": "104", - "browserVersion": "104" + "version": "105", + "browserVersion": "105" }, { "browserName": "MicrosoftEdge", "platformName": "Windows 11", "platform": "Windows 11", - "version": "107", - "browserVersion": "107" + "version": "108", + "browserVersion": "108" }, { "browserName": "MicrosoftEdge", From 87022fa6f4f5082a99f86cbf2fbd393dc73e3b88 Mon Sep 17 00:00:00 2001 From: Patrick Housley Date: Tue, 6 Jun 2023 10:32:30 -0500 Subject: [PATCH 2/2] fix ie tests --- tests/functional/stn/index.test.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/functional/stn/index.test.js b/tests/functional/stn/index.test.js index 3e3f0c50f..6d336f3d6 100644 --- a/tests/functional/stn/index.test.js +++ b/tests/functional/stn/index.test.js @@ -8,8 +8,6 @@ const testDriver = require('../../../tools/jil/index') let supported = testDriver.Matcher.withFeature('stn') testDriver.test('posts session traces', supported, function (t, browser, router) { - t.plan(5) - let rumPromise = router.expectRum() let resourcePromise = router.expectResources() let loadPromise = browser.get(router.assetURL('lotsatimers.html')).waitForFeature('loaded')