@adobe/helix-rum-enhancer 2.18.0 → 2.19.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.19.1](https://github.com/adobe/helix-rum-enhancer/compare/v2.19.0...v2.19.1) (2024-08-15)
+
+
+### Bug Fixes
+
+* **navigation:** remove `leave` checkpoint ([95503de](https://github.com/adobe/helix-rum-enhancer/commit/95503de3dfd83534a8692d6fa3a1af96734e65aa)), closes [/github.com/adobe/helix-rum-enhancer/pull/257#discussion_r1718152824](https://github.com//github.com/adobe/helix-rum-enhancer/pull/257/issues/discussion_r1718152824)
+
+# [2.19.0](https://github.com/adobe/helix-rum-enhancer/compare/v2.18.0...v2.19.0) (2024-08-13)
+
+
+### Features
+
+* **onetrust:** enable on all domains ([6039f11](https://github.com/adobe/helix-rum-enhancer/commit/6039f1198f6484d623a3e42ffdd24807b6ed7c54))
+
 # [2.18.0](https://github.com/adobe/helix-rum-enhancer/compare/v2.17.1...v2.18.0) (2024-08-08)
 
 

package/README.md

@@ -22,7 +22,6 @@ It will add following new checkpoints:
 - `viewmedia`: An image or video hosted by Helix Media Bus has been scrolled into the viewport
 - `reload`, `navigate`, `enter`: depending on how the current page was accessed
 - `formsubmit`: when a form is submitted
-- `leave`: when the user leaves the page
 
 ## Development
 

package/modules/defaults.js

@@ -9,5 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { fflags } from './fflags.js';
+
 export const KNOWN_PROPERTIES = ['weight', 'id', 'referer', 'checkpoint', 't', 'source', 'target', 'cwv', 'CLS', 'FID', 'LCP', 'INP', 'TTFB'];
-export const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'enterleave', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid', 'email'];
+export const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid', 'email', 'consent'];
+fflags.enabled('example', () => DEFAULT_TRACKING_EVENTS.push('example'));

package/modules/fflags.js

@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 export const fflags = {
-  has: (flag) => !!window.origin.match(/localhost/)
-    || fflags[flag].indexOf(Array.from(window.origin)
-      .map((a) => a.charCodeAt(0))
-      .reduce((a, b) => a + b, 1) % 1371) !== -1,
+  has: (flag) => fflags[flag].indexOf(Array.from(window.origin)
+    .map((a) => a.charCodeAt(0))
+    .reduce((a, b) => a + b, 1) % 1371) !== -1
+    || !!window.origin.match(/localhost/),
   enabled: (flag, callback) => fflags.has(flag) && callback(),
+  /* c8 ignore next */
   disabled: (flag, callback) => !fflags.has(flag) && callback(),
-  onetrust: [543, 770, 1136],
+  eagercwv: [683],
+  example: [543, 770, 1136],
 };

package/modules/index.js

@@ -12,31 +12,27 @@
 /* eslint-env browser */
 
 import { KNOWN_PROPERTIES, DEFAULT_TRACKING_EVENTS } from './defaults.js';
-import { fflags } from './fflags.js';
 import { urlSanitizers } from './utils.js';
 import { targetSelector, sourceSelector } from './dom.js';
+import {
+  addAdsParametersTracking,
+  addCookieConsentTracking,
+  addEmailParameterTracking,
+  addUTMParametersTracking,
+} from './martech.js';
+import { fflags } from './fflags.js';
 
-const { sampleRUM, queue, isSelected } = (window.hlx && window.hlx.rum) ? window.hlx.rum : {};
+const { sampleRUM, queue, isSelected } = (window.hlx && window.hlx.rum) ? window.hlx.rum
+  /* c8 ignore next */ : {};
 
 const formSubmitListener = (e) => sampleRUM('formsubmit', { target: targetSelector(e.target), source: sourceSelector(e.target) });
 // eslint-disable-next-line no-use-before-define
-const mutationObserver = window.MutationObserver ? new MutationObserver(mutationsCallback) : null;
-
-// eslint-disable-next-line no-unused-vars
-function optedIn(checkpoint, data) {
-  // TODO: check config service to know if
-  return true;
-}
-// Gets configured collection from the config service for the current domain
-function getCollectionConfig() {
-  // eslint-disable-next-line max-len
-  fflags.enabled('onetrust', () => DEFAULT_TRACKING_EVENTS.push('consent'));
-  return DEFAULT_TRACKING_EVENTS;
-}
+const mutationObserver = window.MutationObserver ? new MutationObserver(mutationsCallback)
+/* c8 ignore next */ : null;
 
 function trackCheckpoint(checkpoint, data, t) {
   const { weight, id } = window.hlx.rum;
-  if (optedIn(checkpoint, data) && isSelected) {
+  if (isSelected) {
     const sendPing = (pdata = data) => {
       // eslint-disable-next-line object-curly-newline, max-len
       const body = JSON.stringify({ weight, id, referer: urlSanitizers[window.hlx.RUM_MASK_URL || 'path'](), checkpoint, t, ...data }, KNOWN_PROPERTIES);
@@ -84,7 +80,6 @@ function addCWVTracking() {
           sampleRUM('cwv', data);
         };
 
-        const featureToggle = () => window.location.hostname === 'blog.adobe.com';
         const isEager = (metric) => ['CLS', 'LCP'].includes(metric);
 
         // When loading `web-vitals` using a classic script, all the public
@@ -92,7 +87,10 @@ function addCWVTracking() {
         ['FID', 'INP', 'TTFB', 'CLS', 'LCP'].forEach((metric) => {
           const metricFn = window.webVitals[`on${metric}`];
           if (typeof metricFn === 'function') {
-            const opts = isEager(metric) ? { reportAllChanges: featureToggle() } : undefined;
+            let opts = {};
+            fflags.enabled('eagercwv', () => {
+              opts = { reportAllChanges: isEager(metric) };
+            });
             metricFn(storeCWV, opts);
           }
         });
@@ -105,7 +103,7 @@ function addCWVTracking() {
   }, 2000); // wait for delayed
 }
 
-function addEnterLeaveTracking() {
+function addNavigationTracking() {
   // enter checkpoint when referrer is not the current page url
   const navigate = (source, type) => {
     const payload = { source, target: document.visibilityState };
@@ -122,22 +120,8 @@ function addEnterLeaveTracking() {
   };
 
   new PerformanceObserver((list) => list
-    .getEntries().map((entry) => navigate(document.referrer, entry.type)))
+    .getEntries().map((entry) => navigate(window.hlx.referrer || document.referrer, entry.type)))
     .observe({ type: 'navigation', buffered: true });
-
-  const leave = ((event) => {
-    try {
-      if (leave.left || (event.type === 'visibilitychange' && document.visibilityState !== 'hidden')) {
-        return;
-      }
-      leave.left = true;
-      sampleRUM('leave');
-    } catch (error) {
-      // something went wrong
-    }
-  });
-  window.addEventListener('visibilitychange', ((event) => leave(event)));
-  window.addEventListener('pagehide', ((event) => leave(event)));
 }
 
 function addLoadResourceTracking() {
@@ -176,9 +160,8 @@ function activateBlocksMutationObserver() {
 }
 
 function getIntersectionObsever(checkpoint) {
-  if (!window.IntersectionObserver) {
-    return null;
-  }
+  /* c8 ignore next */
+  if (!window.IntersectionObserver) return null;
   activateBlocksMutationObserver();
   const observer = new IntersectionObserver((entries) => {
     try {
@@ -216,45 +199,6 @@ function addViewMediaTracking(parent) {
   }
 }
 
-function addUTMParametersTracking() {
-  const usp = new URLSearchParams(window.location.search);
-  [...usp.entries()]
-    .filter(([key]) => key.startsWith('utm_'))
-    // exclude keys that may leak PII
-    .filter(([key]) => key !== 'utm_id')
-    .filter(([key]) => key !== 'utm_term')
-    .forEach(([source, target]) => sampleRUM('utm', { source, target }));
-}
-
-function addAdsParametersTracking() {
-  const networks = {
-    google: /gclid|gclsrc|wbraid|gbraid/,
-    doubleclick: /dclid/,
-    microsoft: /msclkid/,
-    facebook: /fb(cl|ad_|pxl_)id/,
-    twitter: /tw(clid|src|term)/,
-    linkedin: /li_fat_id/,
-    pinterest: /epik/,
-    tiktok: /ttclid/,
-  };
-  const params = Array.from(new URLSearchParams(window.location.search).keys());
-  Object.entries(networks).forEach(([network, regex]) => {
-    params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('paid', { source: network, target: param }));
-  });
-}
-
-function addEmailParameterTracking() {
-  const networks = {
-    mailchimp: /mc_(c|e)id/,
-    marketo: /mkt_tok/,
-
-  };
-  const params = Array.from(new URLSearchParams(window.location.search).keys());
-  Object.entries(networks).forEach(([network, regex]) => {
-    params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('email', { source: network, target: param }));
-  });
-}
-
 function addFormTracking(parent) {
   activateBlocksMutationObserver();
   parent.querySelectorAll('form').forEach((form) => {
@@ -263,42 +207,7 @@ function addFormTracking(parent) {
   });
 }
 
-function addCookieConsentTracking() {
-  const cmpCookie = document.cookie.split(';')
-    .map((c) => c.trim())
-    .find((cookie) => cookie.startsWith('OptanonAlertBoxClosed='));
-
-  if (cmpCookie) {
-    sampleRUM('consent', { source: 'onetrust', target: 'hidden' });
-    return;
-  }
-
-  let consentMutationObserver;
-  const trackShowConsent = () => {
-    if (document.querySelector('body > div#onetrust-consent-sdk')) {
-      sampleRUM('consent', { source: 'onetrust', target: 'show' });
-      if (consentMutationObserver) {
-        consentMutationObserver.disconnect();
-      }
-      return true;
-    }
-    return false;
-  };
-
-  if (!trackShowConsent()) {
-    // eslint-disable-next-line max-len
-    consentMutationObserver = window.MutationObserver ? new MutationObserver(trackShowConsent) : null;
-    if (consentMutationObserver) {
-      consentMutationObserver.observe(
-        document.body,
-        // eslint-disable-next-line object-curly-newline
-        { attributes: false, childList: true, subtree: false },
-      );
-    }
-  }
-}
-
-const addObserver = (ck, fn, block) => getCollectionConfig().includes(ck) && fn(block);
+const addObserver = (ck, fn, block) => DEFAULT_TRACKING_EVENTS.includes(ck) && fn(block);
 function mutationsCallback(mutations) {
   mutations.filter((m) => m.type === 'attributes' && m.attributeName === 'data-block-status')
     .filter((m) => m.target.dataset.blockStatus === 'loaded')
@@ -310,26 +219,19 @@ function mutationsCallback(mutations) {
 }
 
 function addTrackingFromConfig() {
-  const trackingFunctions = {
-    click: () => {
-      document.addEventListener('click', (event) => {
-        sampleRUM('click', { target: targetSelector(event.target), source: sourceSelector(event.target) });
-      });
-    },
-    cwv: () => addCWVTracking(),
-    form: () => addFormTracking(window.document.body),
-    enterleave: () => addEnterLeaveTracking(),
-    loadresource: () => addLoadResourceTracking(),
-    utm: () => addUTMParametersTracking(),
-    viewblock: () => addViewBlockTracking(window.document.body),
-    viewmedia: () => addViewMediaTracking(window.document.body),
-    consent: () => addCookieConsentTracking(),
-    paid: () => addAdsParametersTracking(),
-    email: () => addEmailParameterTracking(),
-  };
-
-  getCollectionConfig().filter((ck) => trackingFunctions[ck])
-    .forEach((ck) => trackingFunctions[ck]());
+  document.addEventListener('click', (event) => {
+    sampleRUM('click', { target: targetSelector(event.target), source: sourceSelector(event.target) });
+  });
+  addCWVTracking();
+  addFormTracking(window.document.body);
+  addNavigationTracking();
+  addLoadResourceTracking();
+  addUTMParametersTracking(sampleRUM);
+  addViewBlockTracking(window.document.body);
+  addViewMediaTracking(window.document.body);
+  addCookieConsentTracking(sampleRUM);
+  addAdsParametersTracking(sampleRUM);
+  addEmailParameterTracking(sampleRUM);
 }
 
 function initEnhancer() {

package/modules/martech.js

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export function addCookieConsentTracking(sampleRUM) {
+  const cmpCookie = document.cookie.split(';')
+    .map((c) => c.trim())
+    .find((cookie) => cookie.startsWith('OptanonAlertBoxClosed='));
+
+  if (cmpCookie) {
+    sampleRUM('consent', { source: 'onetrust', target: 'hidden' });
+    return;
+  }
+
+  let consentMutationObserver;
+  const trackShowConsent = () => {
+    if (document.querySelector('body > div#onetrust-consent-sdk')) {
+      sampleRUM('consent', { source: 'onetrust', target: 'show' });
+      if (consentMutationObserver) {
+        consentMutationObserver.disconnect();
+      }
+      return true;
+    }
+    return false;
+  };
+
+  if (!trackShowConsent()) {
+    // eslint-disable-next-line max-len
+    consentMutationObserver = window.MutationObserver
+      ? new MutationObserver(trackShowConsent)
+      : /* c8 ignore next */ null;
+    if (consentMutationObserver) {
+      consentMutationObserver.observe(
+        document.body,
+        // eslint-disable-next-line object-curly-newline
+        { attributes: false, childList: true, subtree: false },
+      );
+    }
+  }
+}
+
+export function addUTMParametersTracking(sampleRUM) {
+  const usp = new URLSearchParams(window.location.search);
+  [...usp.entries()]
+    .filter(([key]) => key.startsWith('utm_'))
+    // exclude keys that may leak PII
+    .filter(([key]) => key !== 'utm_id')
+    .filter(([key]) => key !== 'utm_term')
+    .forEach(([source, target]) => sampleRUM('utm', { source, target }));
+}
+export function addAdsParametersTracking(sampleRUM) {
+  const networks = {
+    google: /gclid|gclsrc|wbraid|gbraid/,
+    doubleclick: /dclid/,
+    microsoft: /msclkid/,
+    facebook: /fb(cl|ad_|pxl_)id/,
+    twitter: /tw(clid|src|term)/,
+    linkedin: /li_fat_id/,
+    pinterest: /epik/,
+    tiktok: /ttclid/,
+  };
+  const params = Array.from(new URLSearchParams(window.location.search).keys());
+  Object.entries(networks).forEach(([network, regex]) => {
+    params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('paid', { source: network, target: param }));
+  });
+}
+export function addEmailParameterTracking(sampleRUM) {
+  const networks = {
+    mailchimp: /mc_(c|e)id/,
+    marketo: /mkt_tok/,
+  };
+  const params = Array.from(new URLSearchParams(window.location.search).keys());
+  Object.entries(networks).forEach(([network, regex]) => {
+    params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('email', { source: network, target: param }));
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-rum-enhancer",
-  "version": "2.18.0",
+  "version": "2.19.1",
   "description": "Helix RUM Enhancer",
   "main": "src/index.js",
   "type": "module",
@@ -34,12 +34,12 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.6",
-    "@adobe/helix-rum-js": "2.1.4",
+    "@adobe/helix-rum-js": "2.2.0",
     "@esm-bundle/chai": "4.3.4-fix.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
-    "@web/test-runner": "0.18.2",
+    "@web/test-runner": "0.18.3",
     "@web/test-runner-commands": "0.9.0",
     "@web/test-runner-mocha": "0.9.0",
     "@web/test-runner-playwright": "0.11.0",
@@ -50,15 +50,15 @@
     "eslint-plugin-import": "2.29.1",
     "husky": "9.1.4",
     "jsdoc-to-markdown": "8.0.3",
-    "junit-report-builder": "4.0.1",
+    "junit-report-builder": "5.0.0",
     "lint-staged": "15.2.8",
-    "mocha": "10.7.0",
+    "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",
     "rollup": "4.20.0",
     "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-eslint-bundle": "9.0.0",
     "semantic-release": "24.0.0",
-    "web-vitals": "4.2.2"
+    "web-vitals": "4.2.3"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/index.js

@@ -15,19 +15,22 @@
 (function () {
   'use strict';
 
-  const KNOWN_PROPERTIES = ['weight', 'id', 'referer', 'checkpoint', 't', 'source', 'target', 'cwv', 'CLS', 'FID', 'LCP', 'INP', 'TTFB'];
-  const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'enterleave', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid', 'email'];
-
   const fflags = {
-    has: (flag) => !!window.origin.match(/localhost/)
-      || fflags[flag].indexOf(Array.from(window.origin)
-        .map((a) => a.charCodeAt(0))
-        .reduce((a, b) => a + b, 1) % 1371) !== -1,
+    has: (flag) => fflags[flag].indexOf(Array.from(window.origin)
+      .map((a) => a.charCodeAt(0))
+      .reduce((a, b) => a + b, 1) % 1371) !== -1
+      || !!window.origin.match(/localhost/),
     enabled: (flag, callback) => fflags.has(flag) && callback(),
+
     disabled: (flag, callback) => !fflags.has(flag) && callback(),
-    onetrust: [543, 770, 1136],
+    eagercwv: [683],
+    example: [543, 770, 1136],
   };
 
+  const KNOWN_PROPERTIES = ['weight', 'id', 'referer', 'checkpoint', 't', 'source', 'target', 'cwv', 'CLS', 'FID', 'LCP', 'INP', 'TTFB'];
+  const DEFAULT_TRACKING_EVENTS = ['click', 'cwv', 'form', 'viewblock', 'viewmedia', 'loadresource', 'utm', 'paid', 'email', 'consent'];
+  fflags.enabled('example', () => DEFAULT_TRACKING_EVENTS.push('example'));
+
   const urlSanitizers = {
     /**
      * Returns the full url.
@@ -123,17 +126,86 @@
     }
   };
 
-  const { sampleRUM, queue, isSelected } = (window.hlx && window.hlx.rum) ? window.hlx.rum : {};
+  function addCookieConsentTracking(sampleRUM) {
+    const cmpCookie = document.cookie.split(';')
+      .map((c) => c.trim())
+      .find((cookie) => cookie.startsWith('OptanonAlertBoxClosed='));
+
+    if (cmpCookie) {
+      sampleRUM('consent', { source: 'onetrust', target: 'hidden' });
+      return;
+    }
+
+    let consentMutationObserver;
+    const trackShowConsent = () => {
+      if (document.querySelector('body > div#onetrust-consent-sdk')) {
+        sampleRUM('consent', { source: 'onetrust', target: 'show' });
+        if (consentMutationObserver) {
+          consentMutationObserver.disconnect();
+        }
+        return true;
+      }
+      return false;
+    };
+
+    if (!trackShowConsent()) {
+      // eslint-disable-next-line max-len
+      consentMutationObserver = window.MutationObserver
+        ? new MutationObserver(trackShowConsent)
+        : null;
+      if (consentMutationObserver) {
+        consentMutationObserver.observe(
+          document.body,
+          // eslint-disable-next-line object-curly-newline
+          { attributes: false, childList: true, subtree: false },
+        );
+      }
+    }
+  }
+
+  function addUTMParametersTracking(sampleRUM) {
+    const usp = new URLSearchParams(window.location.search);
+    [...usp.entries()]
+      .filter(([key]) => key.startsWith('utm_'))
+      // exclude keys that may leak PII
+      .filter(([key]) => key !== 'utm_id')
+      .filter(([key]) => key !== 'utm_term')
+      .forEach(([source, target]) => sampleRUM('utm', { source, target }));
+  }
+  function addAdsParametersTracking(sampleRUM) {
+    const networks = {
+      google: /gclid|gclsrc|wbraid|gbraid/,
+      doubleclick: /dclid/,
+      microsoft: /msclkid/,
+      facebook: /fb(cl|ad_|pxl_)id/,
+      twitter: /tw(clid|src|term)/,
+      linkedin: /li_fat_id/,
+      pinterest: /epik/,
+      tiktok: /ttclid/,
+    };
+    const params = Array.from(new URLSearchParams(window.location.search).keys());
+    Object.entries(networks).forEach(([network, regex]) => {
+      params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('paid', { source: network, target: param }));
+    });
+  }
+  function addEmailParameterTracking(sampleRUM) {
+    const networks = {
+      mailchimp: /mc_(c|e)id/,
+      marketo: /mkt_tok/,
+    };
+    const params = Array.from(new URLSearchParams(window.location.search).keys());
+    Object.entries(networks).forEach(([network, regex]) => {
+      params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('email', { source: network, target: param }));
+    });
+  }
+
+  const { sampleRUM, queue, isSelected } = (window.hlx && window.hlx.rum) ? window.hlx.rum
+    : {};
 
   const formSubmitListener = (e) => sampleRUM('formsubmit', { target: targetSelector(e.target), source: sourceSelector(e.target) });
   // eslint-disable-next-line no-use-before-define
-  const mutationObserver = window.MutationObserver ? new MutationObserver(mutationsCallback) : null;
-  // Gets configured collection from the config service for the current domain
-  function getCollectionConfig() {
-    // eslint-disable-next-line max-len
-    fflags.enabled('onetrust', () => DEFAULT_TRACKING_EVENTS.push('consent'));
-    return DEFAULT_TRACKING_EVENTS;
-  }
+  const mutationObserver = window.MutationObserver ? new MutationObserver(mutationsCallback)
+    : null;
 
   function trackCheckpoint(checkpoint, data, t) {
     const { weight, id } = window.hlx.rum;
@@ -184,7 +256,6 @@
             sampleRUM('cwv', data);
           };
 
-          const featureToggle = () => window.location.hostname === 'blog.adobe.com';
           const isEager = (metric) => ['CLS', 'LCP'].includes(metric);
 
           // When loading `web-vitals` using a classic script, all the public
@@ -192,7 +263,10 @@
           ['FID', 'INP', 'TTFB', 'CLS', 'LCP'].forEach((metric) => {
             const metricFn = window.webVitals[`on${metric}`];
             if (typeof metricFn === 'function') {
-              const opts = isEager(metric) ? { reportAllChanges: featureToggle() } : undefined;
+              let opts = {};
+              fflags.enabled('eagercwv', () => {
+                opts = { reportAllChanges: isEager(metric) };
+              });
               metricFn(storeCWV, opts);
             }
           });
@@ -204,7 +278,7 @@
     }, 2000); // wait for delayed
   }
 
-  function addEnterLeaveTracking() {
+  function addNavigationTracking() {
     // enter checkpoint when referrer is not the current page url
     const navigate = (source, type) => {
       const payload = { source, target: document.visibilityState };
@@ -221,22 +295,8 @@
     };
 
     new PerformanceObserver((list) => list
-      .getEntries().map((entry) => navigate(document.referrer, entry.type)))
+      .getEntries().map((entry) => navigate(window.hlx.referrer || document.referrer, entry.type)))
       .observe({ type: 'navigation', buffered: true });
-
-    const leave = ((event) => {
-      try {
-        if (leave.left || (event.type === 'visibilitychange' && document.visibilityState !== 'hidden')) {
-          return;
-        }
-        leave.left = true;
-        sampleRUM('leave');
-      } catch (error) {
-        // something went wrong
-      }
-    });
-    window.addEventListener('visibilitychange', ((event) => leave(event)));
-    window.addEventListener('pagehide', ((event) => leave(event)));
   }
 
   function addLoadResourceTracking() {
@@ -274,9 +334,7 @@
   }
 
   function getIntersectionObsever(checkpoint) {
-    if (!window.IntersectionObserver) {
-      return null;
-    }
+    if (!window.IntersectionObserver) return null;
     activateBlocksMutationObserver();
     const observer = new IntersectionObserver((entries) => {
       try {
@@ -313,45 +371,6 @@
     }
   }
 
-  function addUTMParametersTracking() {
-    const usp = new URLSearchParams(window.location.search);
-    [...usp.entries()]
-      .filter(([key]) => key.startsWith('utm_'))
-      // exclude keys that may leak PII
-      .filter(([key]) => key !== 'utm_id')
-      .filter(([key]) => key !== 'utm_term')
-      .forEach(([source, target]) => sampleRUM('utm', { source, target }));
-  }
-
-  function addAdsParametersTracking() {
-    const networks = {
-      google: /gclid|gclsrc|wbraid|gbraid/,
-      doubleclick: /dclid/,
-      microsoft: /msclkid/,
-      facebook: /fb(cl|ad_|pxl_)id/,
-      twitter: /tw(clid|src|term)/,
-      linkedin: /li_fat_id/,
-      pinterest: /epik/,
-      tiktok: /ttclid/,
-    };
-    const params = Array.from(new URLSearchParams(window.location.search).keys());
-    Object.entries(networks).forEach(([network, regex]) => {
-      params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('paid', { source: network, target: param }));
-    });
-  }
-
-  function addEmailParameterTracking() {
-    const networks = {
-      mailchimp: /mc_(c|e)id/,
-      marketo: /mkt_tok/,
-
-    };
-    const params = Array.from(new URLSearchParams(window.location.search).keys());
-    Object.entries(networks).forEach(([network, regex]) => {
-      params.filter((param) => regex.test(param)).forEach((param) => sampleRUM('email', { source: network, target: param }));
-    });
-  }
-
   function addFormTracking(parent) {
     activateBlocksMutationObserver();
     parent.querySelectorAll('form').forEach((form) => {
@@ -360,42 +379,7 @@
     });
   }
 
-  function addCookieConsentTracking() {
-    const cmpCookie = document.cookie.split(';')
-      .map((c) => c.trim())
-      .find((cookie) => cookie.startsWith('OptanonAlertBoxClosed='));
-
-    if (cmpCookie) {
-      sampleRUM('consent', { source: 'onetrust', target: 'hidden' });
-      return;
-    }
-
-    let consentMutationObserver;
-    const trackShowConsent = () => {
-      if (document.querySelector('body > div#onetrust-consent-sdk')) {
-        sampleRUM('consent', { source: 'onetrust', target: 'show' });
-        if (consentMutationObserver) {
-          consentMutationObserver.disconnect();
-        }
-        return true;
-      }
-      return false;
-    };
-
-    if (!trackShowConsent()) {
-      // eslint-disable-next-line max-len
-      consentMutationObserver = window.MutationObserver ? new MutationObserver(trackShowConsent) : null;
-      if (consentMutationObserver) {
-        consentMutationObserver.observe(
-          document.body,
-          // eslint-disable-next-line object-curly-newline
-          { attributes: false, childList: true, subtree: false },
-        );
-      }
-    }
-  }
-
-  const addObserver = (ck, fn, block) => getCollectionConfig().includes(ck) && fn(block);
+  const addObserver = (ck, fn, block) => DEFAULT_TRACKING_EVENTS.includes(ck) && fn(block);
   function mutationsCallback(mutations) {
     mutations.filter((m) => m.type === 'attributes' && m.attributeName === 'data-block-status')
       .filter((m) => m.target.dataset.blockStatus === 'loaded')
@@ -407,26 +391,19 @@
   }
 
   function addTrackingFromConfig() {
-    const trackingFunctions = {
-      click: () => {
-        document.addEventListener('click', (event) => {
-          sampleRUM('click', { target: targetSelector(event.target), source: sourceSelector(event.target) });
-        });
-      },
-      cwv: () => addCWVTracking(),
-      form: () => addFormTracking(window.document.body),
-      enterleave: () => addEnterLeaveTracking(),
-      loadresource: () => addLoadResourceTracking(),
-      utm: () => addUTMParametersTracking(),
-      viewblock: () => addViewBlockTracking(window.document.body),
-      viewmedia: () => addViewMediaTracking(window.document.body),
-      consent: () => addCookieConsentTracking(),
-      paid: () => addAdsParametersTracking(),
-      email: () => addEmailParameterTracking(),
-    };
-
-    getCollectionConfig().filter((ck) => trackingFunctions[ck])
-      .forEach((ck) => trackingFunctions[ck]());
+    document.addEventListener('click', (event) => {
+      sampleRUM('click', { target: targetSelector(event.target), source: sourceSelector(event.target) });
+    });
+    addCWVTracking();
+    addFormTracking(window.document.body);
+    addNavigationTracking();
+    addLoadResourceTracking();
+    addUTMParametersTracking(sampleRUM);
+    addViewBlockTracking(window.document.body);
+    addViewMediaTracking(window.document.body);
+    addCookieConsentTracking(sampleRUM);
+    addAdsParametersTracking(sampleRUM);
+    addEmailParameterTracking(sampleRUM);
   }
 
   function initEnhancer() {