@microsoft/applicationinsights-analytics-js 3.4.0-nightlybeta3.2505-35 → 3.4.0-nightlybeta3.2507-23

package/browser/es5/applicationinsights-analytics-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Web Analytics, 3.4.0-nightlybeta3.2505-35
+ * Application Insights JavaScript SDK - Web Analytics, 3.4.0-nightlybeta3.2507-23
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -7,8 +7,8 @@
     typeof exports === "object" && typeof module !== undef ? factory(exports) :
     typeof define === "function" && define.amd ? define(["exports"], factory) :
     (function(global){
-        var nsKey, key, nm, theExports = {}, modName = "es5_applicationinsights_analytics_js_3_4_0_nightlybeta3_2505_35", msMod="__ms$mod__";
-        var mods={}, modDetail=mods[modName]={}, ver="3.4.0-nightlybeta3.2505-35";
+        var nsKey, key, nm, theExports = {}, modName = "es5_applicationinsights_analytics_js_3_4_0_nightlybeta3_2507_23", msMod="__ms$mod__";
+        var mods={}, modDetail=mods[modName]={}, ver="3.4.0-nightlybeta3.2507-23";
         var baseNs=global, nsKey="Microsoft", baseNs=baseNs[nsKey]=(baseNs[nsKey]||{});
         // Versioned namespace "Microsoft.ApplicationInsights3"
         var exportNs=baseNs, nsKey="ApplicationInsights3", exportNs=exportNs[nsKey]=(exportNs[nsKey]||{});
@@ -1222,6 +1222,8 @@ var _DYN_SET_NEXT_PLUGIN = "setNextPlugin";
 var _DYN_USER_AGENT = "userAgent";
 var _DYN_SPLIT$1 = "split";
 var _DYN_REPLACE = "replace";
+var _DYN_SUBSTRING = "substring";
+var _DYN_INDEX_OF = "indexOf";
 var _DYN_TYPE = "type";
 var _DYN_EVT_NAME = "evtName";
 var _DYN_IS_CHILD_EVT = "isChildEvt";
@@ -1256,6 +1258,8 @@ var STR_GET_PERF_MGR = "getPerfMgr";
 var STR_DOMAIN = "domain";
 var STR_PATH = "path";
 var STR_NOT_DYNAMIC_ERROR = "Not dynamic - ";
+var STR_REDACTED = "REDACTED";
+var DEFAULT_SENSITIVE_PARAMS = ["sig", "Signature", "AWSAccessKeyId", "X-Goog-Signature"];
 
 var strGetPrototypeOf = "getPrototypeOf";
 var rCamelCase = /-([a-z])/g;
@@ -1383,6 +1387,110 @@ function isIE() {
     }
     return _isTrident;
 }
+function redactUserInfo(url) {
+    return url.replace(/^([a-zA-Z][a-zA-Z0-9+.-]*:\/\/)([^:@]{1,200}):([^@]{1,200})@(.*)$/, "$1REDACTED:REDACTED@$4");
+}
+function redactQueryParameters(url, config) {
+    var sensitiveParams;
+    var questionMarkIndex = strIndexOf(url, "?");
+    if (questionMarkIndex === -1) {
+        return url;
+    }
+    if (config && config.redactQueryParams) {
+        sensitiveParams = DEFAULT_SENSITIVE_PARAMS.concat(config.redactQueryParams);
+    }
+    else {
+        sensitiveParams = DEFAULT_SENSITIVE_PARAMS;
+    }
+    var baseUrl = strSubstring(url, 0, questionMarkIndex + 1);
+    var queryString = strSubstring(url, questionMarkIndex + 1);
+    var fragment = STR_EMPTY;
+    var hashIndex = strIndexOf(queryString, "#");
+    if (hashIndex !== -1) {
+        fragment = strSubstring(queryString, hashIndex);
+        queryString = strSubstring(queryString, 0, hashIndex);
+    }
+    var hasPotentialSensitiveParam = false;
+    for (var i = 0; i < sensitiveParams[_DYN_LENGTH$2 ]; i++) {
+        var paramCheck = sensitiveParams[i] + "=";
+        if (strIndexOf(queryString, paramCheck) !== -1) {
+            hasPotentialSensitiveParam = true;
+            break;
+        }
+    }
+    if (!hasPotentialSensitiveParam) {
+        return url;
+    }
+    var resultParts = [];
+    var anyParamRedacted = false;
+    if (queryString && queryString[_DYN_LENGTH$2 ]) {
+        var pairs = queryString[_DYN_SPLIT$1 ]("&");
+        for (var i = 0; i < pairs[_DYN_LENGTH$2 ]; i++) {
+            var pair = pairs[i];
+            if (!pair) {
+                continue;
+            }
+            var equalsIndex = strIndexOf(pair, "=");
+            if (equalsIndex === -1) {
+                resultParts[_DYN_PUSH ](pair);
+            }
+            else {
+                var paramName = pair[_DYN_SUBSTRING ](0, equalsIndex);
+                var paramValue = pair[_DYN_SUBSTRING ](equalsIndex + 1);
+                if (paramValue === STR_EMPTY) {
+                    resultParts[_DYN_PUSH ](pair);
+                }
+                else {
+                    var shouldRedact = false;
+                    for (var j = 0; j < sensitiveParams[_DYN_LENGTH$2 ]; j++) {
+                        if (paramName === sensitiveParams[j]) {
+                            shouldRedact = true;
+                            anyParamRedacted = true;
+                            break;
+                        }
+                    }
+                    if (shouldRedact) {
+                        resultParts[_DYN_PUSH ](paramName + "=" + STR_REDACTED);
+                    }
+                    else {
+                        resultParts[_DYN_PUSH ](pair);
+                    }
+                }
+            }
+        }
+    }
+    if (!anyParamRedacted) {
+        return url;
+    }
+    return baseUrl + resultParts.join("&") + fragment;
+}
+function fieldRedaction(input, config) {
+    if (!input || input[_DYN_INDEX_OF ](" ") !== -1) {
+        return input;
+    }
+    var isRedactionDisabled = config && config.redactUrls === false;
+    if (isRedactionDisabled) {
+        return input;
+    }
+    var hasCredentials = strIndexOf(input, "@") !== -1;
+    var hasQueryParams = strIndexOf(input, "?") !== -1;
+    if (!hasCredentials && !hasQueryParams) {
+        return input;
+    }
+    try {
+        var result = input;
+        if (hasCredentials) {
+            result = redactUserInfo(input);
+        }
+        if (hasQueryParams) {
+            result = redactQueryParameters(result, config);
+        }
+        return result;
+    }
+    catch (e) {
+        return input;
+    }
+}
 
 var UInt32Mask = 0x100000000;
 var MaxUInt32 = 0xffffffff;
@@ -1454,7 +1562,7 @@ function newId(maxLength) {
     return result;
 }
 
-var version = '3.4.0-nightlybeta3.2505-35';
+var version = '3.4.0-nightlybeta3.2507-23';
 var instanceName = "." + newId(6);
 var _dataUid = 0;
 function _canAcceptData(target) {
@@ -2120,6 +2228,54 @@ function onConfigChange(config, configHandler, logger) {
     return createDynamicConfig(config, null, logger)[_DYN_WATCH ](configHandler);
 }
 
+function generateW3CId() {
+    var hexValues = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"];
+    var oct = STR_EMPTY, tmp;
+    for (var a = 0; a < 4; a++) {
+        tmp = random32();
+        oct +=
+            hexValues[tmp & 0xF] +
+                hexValues[tmp >> 4 & 0xF] +
+                hexValues[tmp >> 8 & 0xF] +
+                hexValues[tmp >> 12 & 0xF] +
+                hexValues[tmp >> 16 & 0xF] +
+                hexValues[tmp >> 20 & 0xF] +
+                hexValues[tmp >> 24 & 0xF] +
+                hexValues[tmp >> 28 & 0xF];
+    }
+    var clockSequenceHi = hexValues[8 + (random32() & 0x03) | 0];
+    return strSubstr(oct, 0, 8) + strSubstr(oct, 9, 4) + "4" + strSubstr(oct, 13, 3) + clockSequenceHi + strSubstr(oct, 16, 3) + strSubstr(oct, 19, 12);
+}
+
+function findAllScripts(doc) {
+    var scripts = doc.getElementsByTagName("script");
+    var result = [];
+    arrForEach(scripts, function (script) {
+        var src = script[_DYN_GET_ATTRIBUTE ]("src");
+        if (src) {
+            var crossOrigin = script[_DYN_GET_ATTRIBUTE ]("crossorigin");
+            var async = script.hasAttribute("async") === true;
+            var defer = script.hasAttribute("defer") === true;
+            var referrerPolicy = script[_DYN_GET_ATTRIBUTE ]("referrerpolicy");
+            var info = { url: src };
+            if (crossOrigin) {
+                info.crossOrigin = crossOrigin;
+            }
+            if (async) {
+                info.async = async;
+            }
+            if (defer) {
+                info.defer = defer;
+            }
+            if (referrerPolicy) {
+                info.referrerPolicy = referrerPolicy;
+            }
+            result[_DYN_PUSH ](info);
+        }
+    });
+    return result;
+}
+
 function _stringToBoolOrDefault(theValue, defaultValue, theConfig) {
     if (!theValue && isNullOrUndefined(theValue)) {
         return defaultValue;
@@ -2769,68 +2925,6 @@ function doPerf(mgrSource, getSource, func, details, isAsync) {
     return func();
 }
 
-function generateW3CId() {
-    var hexValues = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"];
-    var oct = STR_EMPTY, tmp;
-    for (var a = 0; a < 4; a++) {
-        tmp = random32();
-        oct +=
-            hexValues[tmp & 0xF] +
-                hexValues[tmp >> 4 & 0xF] +
-                hexValues[tmp >> 8 & 0xF] +
-                hexValues[tmp >> 12 & 0xF] +
-                hexValues[tmp >> 16 & 0xF] +
-                hexValues[tmp >> 20 & 0xF] +
-                hexValues[tmp >> 24 & 0xF] +
-                hexValues[tmp >> 28 & 0xF];
-    }
-    var clockSequenceHi = hexValues[8 + (random32() & 0x03) | 0];
-    return strSubstr(oct, 0, 8) + strSubstr(oct, 9, 4) + "4" + strSubstr(oct, 13, 3) + clockSequenceHi + strSubstr(oct, 16, 3) + strSubstr(oct, 19, 12);
-}
-
-var INVALID_TRACE_ID = "00000000000000000000000000000000";
-var INVALID_SPAN_ID = "0000000000000000";
-function _isValid(value, len, invalidValue) {
-    if (value && value[_DYN_LENGTH$2 ] === len && value !== invalidValue) {
-        return !!value.match(/^[\da-f]*$/i);
-    }
-    return false;
-}
-function isValidTraceId(value) {
-    return _isValid(value, 32, INVALID_TRACE_ID);
-}
-function isValidSpanId(value) {
-    return _isValid(value, 16, INVALID_SPAN_ID);
-}
-function findAllScripts(doc) {
-    var scripts = doc.getElementsByTagName("script");
-    var result = [];
-    arrForEach(scripts, function (script) {
-        var src = script[_DYN_GET_ATTRIBUTE ]("src");
-        if (src) {
-            var crossOrigin = script[_DYN_GET_ATTRIBUTE ]("crossorigin");
-            var async = script.hasAttribute("async") === true;
-            var defer = script.hasAttribute("defer") === true;
-            var referrerPolicy = script[_DYN_GET_ATTRIBUTE ]("referrerpolicy");
-            var info = { url: src };
-            if (crossOrigin) {
-                info.crossOrigin = crossOrigin;
-            }
-            if (async) {
-                info.async = async;
-            }
-            if (defer) {
-                info.defer = defer;
-            }
-            if (referrerPolicy) {
-                info.referrerPolicy = referrerPolicy;
-            }
-            result[_DYN_PUSH ](info);
-        }
-    });
-    return result;
-}
-
 var pluginStateData = createElmNodeData("plugin");
 function _getPluginState(plugin) {
     return pluginStateData.get(plugin, "state", {}, true);
@@ -2919,27 +3013,26 @@ function _createInternalContext(telemetryChain, dynamicHandler, core, startAt) {
     }
     function _getExtCfg(identifier, createIfMissing) {
         var idCfg = null;
-        var cfg = dynamicHandler.cfg;
+        var extCfg = _getCfg(dynamicHandler.cfg, "extensionConfig", createIfMissing);
+        if (extCfg) {
+            idCfg = _getCfg(extCfg, identifier, createIfMissing);
+        }
+        return idCfg;
+    }
+    function _getCfg(cfg, identifier, createIfMissing) {
+        var idCfg = null;
         if (cfg && identifier) {
-            var extCfg = cfg[STR_EXTENSION_CONFIG ];
-            if (!extCfg && createIfMissing) {
-                extCfg = {};
-            }
-            cfg[STR_EXTENSION_CONFIG] = extCfg;
-            extCfg = dynamicHandler.ref(cfg, STR_EXTENSION_CONFIG);
-            if (extCfg) {
-                idCfg = extCfg[identifier];
-                if (!idCfg && createIfMissing) {
-                    idCfg = {};
-                }
-                extCfg[identifier] = idCfg;
-                idCfg = dynamicHandler.ref(extCfg, identifier);
+            idCfg = cfg[identifier];
+            if (!idCfg && createIfMissing) {
+                idCfg = {};
             }
+            cfg[identifier] = idCfg;
+            idCfg = dynamicHandler.ref(cfg, identifier);
         }
         return idCfg;
     }
-    function _resolveExtCfg(identifier, defaultValues) {
-        var newConfig = _getExtCfg(identifier, true);
+    function _resolveExtCfg(identifier, defaultValues, rootOnly) {
+        var newConfig = rootOnly ? _getCfg(dynamicHandler.cfg, identifier, true) : _getExtCfg(identifier, true);
         if (defaultValues) {
             objForEachKey(defaultValues, function (field, defaultValue) {
                 if (isNullOrUndefined(newConfig[field])) {
@@ -3760,7 +3853,10 @@ function dataSanitizeString(logger, value, maxLength) {
     }
     return valueTrunc || value;
 }
-function dataSanitizeUrl(logger, url) {
+function dataSanitizeUrl(logger, url, config) {
+    if (isString(url)) {
+        url = fieldRedaction(url, config);
+    }
     return dataSanitizeInput(logger, url, 2048 , 66 );
 }
 function dataSanitizeMessage(logger, message) {
@@ -3923,48 +4019,11 @@ function dateTimeUtilsDuration(start, end) {
     }
     return result;
 }
-function createDistributedTraceContextFromTrace(telemetryTrace, parentCtx) {
-    var trace = telemetryTrace || {};
-    return {
-        getName: function () {
-            return trace[_DYN_NAME ];
-        },
-        setName: function (newValue) {
-            parentCtx && parentCtx.setName(newValue);
-            trace[_DYN_NAME ] = newValue;
-        },
-        getTraceId: function () {
-            return trace.traceID;
-        },
-        setTraceId: function (newValue) {
-            parentCtx && parentCtx.setTraceId(newValue);
-            if (isValidTraceId(newValue)) {
-                trace.traceID = newValue;
-            }
-        },
-        getSpanId: function () {
-            return trace.parentID;
-        },
-        setSpanId: function (newValue) {
-            parentCtx && parentCtx.setSpanId(newValue);
-            if (isValidSpanId(newValue)) {
-                trace.parentID = newValue;
-            }
-        },
-        getTraceFlags: function () {
-            return trace.traceFlags;
-        },
-        setTraceFlags: function (newTraceFlags) {
-            parentCtx && parentCtx.setTraceFlags(newTraceFlags);
-            trace.traceFlags = newTraceFlags;
-        }
-    };
-}
 
-var StorageType = createEnumStyle({
+var StorageType = ( /* @__PURE__ */createEnumStyle({
     LocalStorage: 0 ,
     SessionStorage: 1
-});
+}));
 
 var _canUseLocalStorage = undefined;
 var _canUseSessionStorage = undefined;
@@ -4897,7 +4956,6 @@ function createDomEvent(eventName) {
     return event;
 }
 
-var PropertiesPluginIdentifier = "AppInsightsPropertiesPlugin";
 var AnalyticsPluginIdentifier = "ApplicationInsightsAnalytics";
 
 var _DYN_TO_STRING = "toString";
@@ -4909,8 +4967,10 @@ var _DYN_ENVELOPE_TYPE = "envelopeType";
 var _DYN_DIAG_LOG = "diagLog";
 var _DYN_TRACK = "track";
 var _DYN_TRACK_PAGE_VIEW = "trackPageView";
+var _DYN_CONFIG = "config";
 var _DYN_TRACK_PREVIOUS_PAGE_1 = "trackPreviousPageVisit";
 var _DYN_SEND_PAGE_VIEW_INTER2 = "sendPageViewInternal";
+var _DYN_REF_URI = "refUri";
 var _DYN_START_TIME = "startTime";
 var _DYN_PROPERTIES = "properties";
 var _DYN_DURATION = "duration";
@@ -4942,168 +5002,168 @@ var _DYN_REQUEST_START = "requestStart";
 var _DYN_LOAD_EVENT_END = "loadEventEnd";
 var _DYN_RESPONSE_END = "responseEnd";
 var _DYN_CONNECT_END = "connectEnd";
+var _DYN_PAGE_VISIT_TIME = "pageVisitTime";
 
-var PageViewManager = /** @class */ (function () {
-    function PageViewManager(appInsights, overridePageViewDuration, core, pageViewPerformanceManager) {
-        dynamicProto(PageViewManager, this, function (_self) {
-            var queueTimer = null;
-            var itemQueue = [];
-            var pageViewPerformanceSent = false;
-            var firstPageViewSent = false;
-            var _logger;
-            if (core) {
-                _logger = core.logger;
-            }
-            function _flushChannels(isAsync) {
-                if (core) {
-                    core.flush(isAsync, function () {
-                    });
-                }
-            }
-            function _startTimer() {
-                if (!queueTimer) {
-                    queueTimer = scheduleTimeout((function () {
-                        queueTimer = null;
-                        var allItems = itemQueue.slice(0);
-                        var doFlush = false;
-                        itemQueue = [];
-                        arrForEach(allItems, function (item) {
-                            if (!item()) {
-                                itemQueue.push(item);
-                            }
-                            else {
-                                doFlush = true;
-                            }
-                        });
-                        if (itemQueue[_DYN_LENGTH ] > 0) {
-                            _startTimer();
-                        }
-                        if (doFlush) {
-                            _flushChannels(true);
-                        }
-                    }), 100);
-                }
-            }
-            function _addQueue(cb) {
-                itemQueue.push(cb);
-                _startTimer();
-            }
-            _self[_DYN_TRACK_PAGE_VIEW ] = function (pageView, customProperties) {
-                var name = pageView.name;
-                if (isNullOrUndefined(name) || typeof name !== "string") {
-                    var doc = getDocument();
-                    name = pageView.name = doc && doc.title || "";
-                }
-                var uri = pageView.uri;
-                if (isNullOrUndefined(uri) || typeof uri !== "string") {
-                    var location_1 = getLocation();
-                    uri = pageView.uri = location_1 && location_1[_DYN_HREF ] || "";
-                }
-                if (!firstPageViewSent) {
-                    var perf = getPerformance();
-                    var navigationEntries = (perf && perf[_DYN_GET_ENTRIES_BY_TYPE ] && perf[_DYN_GET_ENTRIES_BY_TYPE ]("navigation"));
-                    if (navigationEntries && navigationEntries[0] && !isUndefined(perf.timeOrigin)) {
-                        var loadEventStart = navigationEntries[0].loadEventStart;
-                        pageView[_DYN_START_TIME ] = new Date(perf.timeOrigin + loadEventStart);
+function createPageViewManager(appInsights, overridePageViewDuration, core, pageViewPerformanceManager) {
+    var queueTimer = null;
+    var itemQueue = [];
+    var pageViewPerformanceSent = false;
+    var firstPageViewSent = false;
+    var _logger;
+    if (core) {
+        _logger = core.logger;
+    }
+    function _flushChannels(isAsync) {
+        if (core) {
+            core.flush(isAsync, function () {
+            });
+        }
+    }
+    function _startTimer() {
+        if (!queueTimer) {
+            queueTimer = scheduleTimeout((function () {
+                queueTimer = null;
+                var allItems = itemQueue.slice(0);
+                var doFlush = false;
+                itemQueue = [];
+                arrForEach(allItems, function (item) {
+                    if (!item()) {
+                        itemQueue.push(item);
                     }
                     else {
-                        var duration_1 = ((customProperties || pageView[_DYN_PROPERTIES ] || {})[_DYN_DURATION ] || 0);
-                        pageView[_DYN_START_TIME ] = new Date(new Date().getTime() - duration_1);
+                        doFlush = true;
                     }
-                    firstPageViewSent = true;
+                });
+                if (itemQueue[_DYN_LENGTH ] > 0) {
+                    _startTimer();
                 }
-                if (!pageViewPerformanceManager[_DYN_IS_PERFORMANCE_TIMIN15 ]()) {
-                    appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
+                if (doFlush) {
                     _flushChannels(true);
-                    if (!isWebWorker()) {
-                        _throwInternal(_logger, 2 , 25 , "trackPageView: navigation timing API used for calculation of page duration is not supported in this browser. This page view will be collected without duration and timing info.");
-                    }
-                    return;
                 }
-                var pageViewSent = false;
-                var customDuration;
-                var start = pageViewPerformanceManager[_DYN_GET_PERFORMANCE_TIMI16 ]()[_DYN_NAVIGATION_START ];
-                if (start > 0) {
-                    customDuration = dateTimeUtilsDuration(start, +new Date);
-                    if (!pageViewPerformanceManager[_DYN_SHOULD_COLLECT_DURAT17 ](customDuration)) {
-                        customDuration = undefined;
-                    }
+            }), 100);
+        }
+    }
+    function _addQueue(cb) {
+        itemQueue.push(cb);
+        _startTimer();
+    }
+    return {
+        trackPageView: function (pageView, customProperties) {
+            var name = pageView.name;
+            if (isNullOrUndefined(name) || typeof name !== "string") {
+                var doc = getDocument();
+                name = pageView.name = doc && doc.title || "";
+            }
+            var uri = pageView.uri;
+            if (isNullOrUndefined(uri) || typeof uri !== "string") {
+                var location_1 = getLocation();
+                uri = pageView.uri = location_1 && location_1[_DYN_HREF ] || "";
+            }
+            if (core && core[_DYN_CONFIG ]) {
+                uri = pageView.uri = fieldRedaction(pageView.uri, core[_DYN_CONFIG ]);
+            }
+            if (!firstPageViewSent) {
+                var perf = getPerformance();
+                var navigationEntries = (perf && perf[_DYN_GET_ENTRIES_BY_TYPE ] && perf[_DYN_GET_ENTRIES_BY_TYPE ]("navigation"));
+                if (navigationEntries && navigationEntries[0] && !isUndefined(perf.timeOrigin)) {
+                    var loadEventStart = navigationEntries[0].loadEventStart;
+                    pageView[_DYN_START_TIME ] = new Date(perf.timeOrigin + loadEventStart);
                 }
-                var duration;
-                if (!isNullOrUndefined(customProperties) &&
-                    !isNullOrUndefined(customProperties[_DYN_DURATION ])) {
-                    duration = customProperties[_DYN_DURATION ];
+                else {
+                    var duration_1 = ((customProperties || pageView[_DYN_PROPERTIES ] || {})[_DYN_DURATION ] || 0);
+                    pageView[_DYN_START_TIME ] = new Date(new Date().getTime() - duration_1);
                 }
-                if (overridePageViewDuration || !isNaN(duration)) {
-                    if (isNaN(duration)) {
-                        if (!customProperties) {
-                            customProperties = {};
-                        }
-                        customProperties[_DYN_DURATION ] = customDuration;
-                    }
-                    appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
-                    _flushChannels(true);
-                    pageViewSent = true;
+                firstPageViewSent = true;
+            }
+            if (!pageViewPerformanceManager[_DYN_IS_PERFORMANCE_TIMIN15 ]()) {
+                appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
+                _flushChannels(true);
+                if (!isWebWorker()) {
+                    _throwInternal(_logger, 2 , 25 , "trackPageView: navigation timing API used for calculation of page duration is not supported in this browser. This page view will be collected without duration and timing info.");
                 }
-                var maxDurationLimit = 60000;
-                if (!customProperties) {
-                    customProperties = {};
+                return;
+            }
+            var pageViewSent = false;
+            var customDuration;
+            var start = pageViewPerformanceManager[_DYN_GET_PERFORMANCE_TIMI16 ]()[_DYN_NAVIGATION_START ];
+            if (start > 0) {
+                customDuration = dateTimeUtilsDuration(start, +new Date);
+                if (!pageViewPerformanceManager[_DYN_SHOULD_COLLECT_DURAT17 ](customDuration)) {
+                    customDuration = undefined;
                 }
-                _addQueue(function () {
-                    var processed = false;
-                    try {
-                        if (pageViewPerformanceManager[_DYN_IS_PERFORMANCE_TIMIN18 ]()) {
-                            processed = true;
-                            var pageViewPerformance = {
-                                name: name,
-                                uri: uri
-                            };
-                            pageViewPerformanceManager[_DYN_POPULATE_PAGE_VIEW_P4 ](pageViewPerformance);
-                            if (!pageViewPerformance.isValid && !pageViewSent) {
-                                customProperties[_DYN_DURATION ] = customDuration;
-                                appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
-                            }
-                            else {
-                                if (!pageViewSent) {
-                                    customProperties[_DYN_DURATION ] = pageViewPerformance.durationMs;
-                                    appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
-                                }
-                                if (!pageViewPerformanceSent) {
-                                    appInsights[_DYN_SEND_PAGE_VIEW_PERFO3 ](pageViewPerformance, customProperties);
-                                    pageViewPerformanceSent = true;
-                                }
-                            }
+            }
+            var duration;
+            if (!isNullOrUndefined(customProperties) &&
+                !isNullOrUndefined(customProperties[_DYN_DURATION ])) {
+                duration = customProperties[_DYN_DURATION ];
+            }
+            if (overridePageViewDuration || !isNaN(duration)) {
+                if (isNaN(duration)) {
+                    if (!customProperties) {
+                        customProperties = {};
+                    }
+                    customProperties[_DYN_DURATION ] = customDuration;
+                }
+                appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
+                _flushChannels(true);
+                pageViewSent = true;
+            }
+            var maxDurationLimit = 60000;
+            if (!customProperties) {
+                customProperties = {};
+            }
+            _addQueue(function () {
+                var processed = false;
+                try {
+                    if (pageViewPerformanceManager[_DYN_IS_PERFORMANCE_TIMIN18 ]()) {
+                        processed = true;
+                        var pageViewPerformance = {
+                            name: name,
+                            uri: uri
+                        };
+                        pageViewPerformanceManager[_DYN_POPULATE_PAGE_VIEW_P4 ](pageViewPerformance);
+                        if (!pageViewPerformance.isValid && !pageViewSent) {
+                            customProperties[_DYN_DURATION ] = customDuration;
+                            appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
                         }
-                        else if (start > 0 && dateTimeUtilsDuration(start, +new Date) > maxDurationLimit) {
-                            processed = true;
+                        else {
                             if (!pageViewSent) {
-                                customProperties[_DYN_DURATION ] = maxDurationLimit;
+                                customProperties[_DYN_DURATION ] = pageViewPerformance.durationMs;
                                 appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
                             }
+                            if (!pageViewPerformanceSent) {
+                                appInsights[_DYN_SEND_PAGE_VIEW_PERFO3 ](pageViewPerformance, customProperties);
+                                pageViewPerformanceSent = true;
+                            }
                         }
                     }
-                    catch (e) {
-                        _throwInternal(_logger, 1 , 38 , "trackPageView failed on page load calculation: " + getExceptionName(e), { exception: dumpObj(e) });
+                    else if (start > 0 && dateTimeUtilsDuration(start, +new Date) > maxDurationLimit) {
+                        processed = true;
+                        if (!pageViewSent) {
+                            customProperties[_DYN_DURATION ] = maxDurationLimit;
+                            appInsights[_DYN_SEND_PAGE_VIEW_INTER2 ](pageView, customProperties);
+                        }
                     }
-                    return processed;
-                });
-            };
-            _self.teardown = function (unloadCtx, unloadState) {
-                if (queueTimer) {
-                    queueTimer.cancel();
-                    queueTimer = null;
-                    var allItems = itemQueue.slice(0);
-                    itemQueue = [];
-                    arrForEach(allItems, function (item) {
-                        if (item()) ;
-                    });
                 }
-            };
-        });
-    }
-    PageViewManager.__ieDyn=1;
-    return PageViewManager;
-}());
+                catch (e) {
+                    _throwInternal(_logger, 1 , 38 , "trackPageView failed on page load calculation: " + getExceptionName(e), { exception: dumpObj(e) });
+                }
+                return processed;
+            });
+        },
+        teardown: function (unloadCtx, unloadState) {
+            if (queueTimer) {
+                queueTimer.cancel();
+                queueTimer = null;
+                var allItems = itemQueue.slice(0);
+                itemQueue = [];
+                arrForEach(allItems, function (item) {
+                    if (item()) ;
+                });
+            }
+        }
+    };
+}
 
 var MAX_DURATION_ALLOWED = 3600000;
 var botAgentNames = ["googlebot", "adsbot-google", "apis-google", "mediapartners-google"];
@@ -5165,143 +5225,136 @@ function _shouldCollectDuration() {
     }
     return true;
 }
-var PageViewPerformanceManager = /** @class */ (function () {
-    function PageViewPerformanceManager(core) {
-        var _logger = safeGetLogger(core);
-        dynamicProto(PageViewPerformanceManager, this, function (_self) {
-            _self[_DYN_POPULATE_PAGE_VIEW_P4 ] = function (pageViewPerformance) {
-                pageViewPerformance.isValid = false;
-                var navigationTiming = _getPerformanceNavigationTiming();
-                var timing = _getPerformanceTiming();
-                var total = 0;
-                var network = 0;
-                var request = 0;
-                var response = 0;
-                var dom = 0;
-                if (navigationTiming || timing) {
-                    if (navigationTiming) {
-                        total = navigationTiming[_DYN_DURATION ];
-                        network = navigationTiming[_DYN_START_TIME ] === 0 ? navigationTiming[_DYN_CONNECT_END ] : dateTimeUtilsDuration(navigationTiming[_DYN_START_TIME ], navigationTiming[_DYN_CONNECT_END ]);
-                        request = dateTimeUtilsDuration(navigationTiming.requestStart, navigationTiming[_DYN_RESPONSE_START ]);
-                        response = dateTimeUtilsDuration(navigationTiming[_DYN_RESPONSE_START ], navigationTiming[_DYN_RESPONSE_END ]);
-                        dom = dateTimeUtilsDuration(navigationTiming.responseEnd, navigationTiming[_DYN_LOAD_EVENT_END ]);
-                    }
-                    else {
-                        total = dateTimeUtilsDuration(timing[_DYN_NAVIGATION_START ], timing[_DYN_LOAD_EVENT_END ]);
-                        network = dateTimeUtilsDuration(timing[_DYN_NAVIGATION_START ], timing[_DYN_CONNECT_END ]);
-                        request = dateTimeUtilsDuration(timing.requestStart, timing[_DYN_RESPONSE_START ]);
-                        response = dateTimeUtilsDuration(timing[_DYN_RESPONSE_START ], timing[_DYN_RESPONSE_END ]);
-                        dom = dateTimeUtilsDuration(timing.responseEnd, timing[_DYN_LOAD_EVENT_END ]);
-                    }
-                    if (total === 0) {
-                        _throwInternal(_logger, 2 , 10 , "error calculating page view performance.", { total: total, network: network, request: request, response: response, dom: dom });
-                    }
-                    else if (!_self[_DYN_SHOULD_COLLECT_DURAT17 ](total, network, request, response, dom)) {
-                        _throwInternal(_logger, 2 , 45 , "Invalid page load duration value. Browser perf data won't be sent.", { total: total, network: network, request: request, response: response, dom: dom });
-                    }
-                    else if (total < mathFloor(network) + mathFloor(request) + mathFloor(response) + mathFloor(dom)) {
-                        _throwInternal(_logger, 2 , 8 , "client performance math error.", { total: total, network: network, request: request, response: response, dom: dom });
-                    }
-                    else {
-                        pageViewPerformance.durationMs = total;
-                        pageViewPerformance.perfTotal = pageViewPerformance[_DYN_DURATION ] = msToTimeSpan(total);
-                        pageViewPerformance.networkConnect = msToTimeSpan(network);
-                        pageViewPerformance.sentRequest = msToTimeSpan(request);
-                        pageViewPerformance.receivedResponse = msToTimeSpan(response);
-                        pageViewPerformance.domProcessing = msToTimeSpan(dom);
-                        pageViewPerformance.isValid = true;
-                    }
+function createPageViewPerformanceManager(core) {
+    var _a;
+    var _logger = safeGetLogger(core);
+    return _a = {},
+        _a[_DYN_POPULATE_PAGE_VIEW_P4 ] = function (pageViewPerformance) {
+            pageViewPerformance.isValid = false;
+            var navigationTiming = _getPerformanceNavigationTiming();
+            var timing = _getPerformanceTiming();
+            var total = 0;
+            var network = 0;
+            var request = 0;
+            var response = 0;
+            var dom = 0;
+            if (navigationTiming || timing) {
+                if (navigationTiming) {
+                    total = navigationTiming[_DYN_DURATION ];
+                    network = navigationTiming[_DYN_START_TIME ] === 0 ? navigationTiming[_DYN_CONNECT_END ] : dateTimeUtilsDuration(navigationTiming[_DYN_START_TIME ], navigationTiming[_DYN_CONNECT_END ]);
+                    request = dateTimeUtilsDuration(navigationTiming.requestStart, navigationTiming[_DYN_RESPONSE_START ]);
+                    response = dateTimeUtilsDuration(navigationTiming[_DYN_RESPONSE_START ], navigationTiming[_DYN_RESPONSE_END ]);
+                    dom = dateTimeUtilsDuration(navigationTiming.responseEnd, navigationTiming[_DYN_LOAD_EVENT_END ]);
                 }
-            };
-            _self[_DYN_GET_PERFORMANCE_TIMI16 ] = _getPerformanceTiming;
-            _self[_DYN_IS_PERFORMANCE_TIMIN15 ] = _isPerformanceTimingSupported;
-            _self[_DYN_IS_PERFORMANCE_TIMIN18 ] = _isPerformanceTimingDataReady;
-            _self[_DYN_SHOULD_COLLECT_DURAT17 ] = _shouldCollectDuration;
-        });
-    }
-    PageViewPerformanceManager.__ieDyn=1;
-    return PageViewPerformanceManager;
-}());
-
-var PageVisitTimeManager = /** @class */ (function () {
-    function PageVisitTimeManager(logger, pageVisitTimeTrackingHandler) {
-        var prevPageVisitDataKeyName = "prevPageVisitData";
-        dynamicProto(PageVisitTimeManager, this, function (_self) {
-            _self[_DYN_TRACK_PREVIOUS_PAGE_1 ] = function (currentPageName, currentPageUrl) {
-                try {
-                    var prevPageVisitTimeData = restartPageVisitTimer(currentPageName, currentPageUrl);
-                    if (prevPageVisitTimeData) {
-                        pageVisitTimeTrackingHandler(prevPageVisitTimeData.pageName, prevPageVisitTimeData.pageUrl, prevPageVisitTimeData.pageVisitTime);
-                    }
+                else {
+                    total = dateTimeUtilsDuration(timing[_DYN_NAVIGATION_START ], timing[_DYN_LOAD_EVENT_END ]);
+                    network = dateTimeUtilsDuration(timing[_DYN_NAVIGATION_START ], timing[_DYN_CONNECT_END ]);
+                    request = dateTimeUtilsDuration(timing.requestStart, timing[_DYN_RESPONSE_START ]);
+                    response = dateTimeUtilsDuration(timing[_DYN_RESPONSE_START ], timing[_DYN_RESPONSE_END ]);
+                    dom = dateTimeUtilsDuration(timing.responseEnd, timing[_DYN_LOAD_EVENT_END ]);
                 }
-                catch (e) {
-                    _warnToConsole(logger, "Auto track page visit time failed, metric will not be collected: " + dumpObj(e));
+                if (total === 0) {
+                    _throwInternal(_logger, 2 , 10 , "error calculating page view performance.", { total: total, network: network, request: request, response: response, dom: dom });
                 }
-            };
-            function restartPageVisitTimer(pageName, pageUrl) {
-                var prevPageVisitData = null;
-                try {
-                    prevPageVisitData = stopPageVisitTimer();
-                    if (utlCanUseSessionStorage()) {
-                        if (utlGetSessionStorage(logger, prevPageVisitDataKeyName) != null) {
-                            throwError("Cannot call startPageVisit consecutively without first calling stopPageVisit");
-                        }
-                        var currPageVisitDataStr = getJSON().stringify(new PageVisitData(pageName, pageUrl));
-                        utlSetSessionStorage(logger, prevPageVisitDataKeyName, currPageVisitDataStr);
-                    }
+                else if (!_shouldCollectDuration(total, network, request, response, dom)) {
+                    _throwInternal(_logger, 2 , 45 , "Invalid page load duration value. Browser perf data won't be sent.", { total: total, network: network, request: request, response: response, dom: dom });
                 }
-                catch (e) {
-                    _warnToConsole(logger, "Call to restart failed: " + dumpObj(e));
-                    prevPageVisitData = null;
+                else if (total < mathFloor(network) + mathFloor(request) + mathFloor(response) + mathFloor(dom)) {
+                    _throwInternal(_logger, 2 , 8 , "client performance math error.", { total: total, network: network, request: request, response: response, dom: dom });
                 }
-                return prevPageVisitData;
-            }
-            function stopPageVisitTimer() {
-                var prevPageVisitData = null;
-                try {
-                    if (utlCanUseSessionStorage()) {
-                        var pageVisitEndTime = utcNow();
-                        var pageVisitDataJsonStr = utlGetSessionStorage(logger, prevPageVisitDataKeyName);
-                        if (pageVisitDataJsonStr && hasJSON()) {
-                            prevPageVisitData = getJSON().parse(pageVisitDataJsonStr);
-                            prevPageVisitData.pageVisitTime = pageVisitEndTime - prevPageVisitData.pageVisitStartTime;
-                            utlRemoveSessionStorage(logger, prevPageVisitDataKeyName);
-                        }
-                    }
+                else {
+                    pageViewPerformance.durationMs = total;
+                    pageViewPerformance.perfTotal = pageViewPerformance[_DYN_DURATION ] = msToTimeSpan(total);
+                    pageViewPerformance.networkConnect = msToTimeSpan(network);
+                    pageViewPerformance.sentRequest = msToTimeSpan(request);
+                    pageViewPerformance.receivedResponse = msToTimeSpan(response);
+                    pageViewPerformance.domProcessing = msToTimeSpan(dom);
+                    pageViewPerformance.isValid = true;
                 }
-                catch (e) {
-                    _warnToConsole(logger, "Stop page visit timer failed: " + dumpObj(e));
-                    prevPageVisitData = null;
+            }
+        },
+        _a[_DYN_GET_PERFORMANCE_TIMI16 ] = _getPerformanceTiming,
+        _a[_DYN_IS_PERFORMANCE_TIMIN15 ] = _isPerformanceTimingSupported,
+        _a[_DYN_IS_PERFORMANCE_TIMIN18 ] = _isPerformanceTimingDataReady,
+        _a[_DYN_SHOULD_COLLECT_DURAT17 ] = _shouldCollectDuration,
+        _a;
+}
+
+function createPageVisitData(pageName, pageUrl) {
+    return {
+        pageVisitStartTime: utcNow(),
+        pageName: pageName,
+        pageUrl: pageUrl,
+        pageVisitTime: 0
+    };
+}
+function createPageVisitTimeManager(logger, pageVisitTimeTrackingHandler) {
+    var prevPageVisitDataKeyName = "prevPageVisitData";
+    function restartPageVisitTimer(pageName, pageUrl) {
+        var prevPageVisitData = null;
+        try {
+            prevPageVisitData = stopPageVisitTimer();
+            if (utlCanUseSessionStorage()) {
+                if (utlGetSessionStorage(logger, prevPageVisitDataKeyName) != null) {
+                    throwError("Cannot call startPageVisit consecutively without first calling stopPageVisit");
                 }
-                return prevPageVisitData;
+                var currPageVisitDataStr = getJSON().stringify(createPageVisitData(pageName, pageUrl));
+                utlSetSessionStorage(logger, prevPageVisitDataKeyName, currPageVisitDataStr);
             }
-            objDefine(_self, "_logger", { g: function () { return logger; } });
-            objDefine(_self, "pageVisitTimeTrackingHandler", { g: function () { return pageVisitTimeTrackingHandler; } });
-        });
+        }
+        catch (e) {
+            _warnToConsole(logger, "Call to restart failed: " + dumpObj(e));
+            prevPageVisitData = null;
+        }
+        return prevPageVisitData;
     }
-    PageVisitTimeManager.__ieDyn=1;
-    return PageVisitTimeManager;
-}());
-var PageVisitData = /** @class */ (function () {
-    function PageVisitData(pageName, pageUrl) {
-        this.pageVisitStartTime = utcNow();
-        this.pageName = pageName;
-        this.pageUrl = pageUrl;
+    function stopPageVisitTimer() {
+        var prevPageVisitData = null;
+        try {
+            if (utlCanUseSessionStorage()) {
+                var pageVisitEndTime = utcNow();
+                var pageVisitDataJsonStr = utlGetSessionStorage(logger, prevPageVisitDataKeyName);
+                if (pageVisitDataJsonStr && hasJSON()) {
+                    prevPageVisitData = getJSON().parse(pageVisitDataJsonStr);
+                    prevPageVisitData[_DYN_PAGE_VISIT_TIME ] = pageVisitEndTime - prevPageVisitData.pageVisitStartTime;
+                    utlRemoveSessionStorage(logger, prevPageVisitDataKeyName);
+                }
+            }
+        }
+        catch (e) {
+            _warnToConsole(logger, "Stop page visit timer failed: " + dumpObj(e));
+            prevPageVisitData = null;
+        }
+        return prevPageVisitData;
     }
-    return PageVisitData;
-}());
+    return {
+        trackPreviousPageVisit: function (currentPageName, currentPageUrl) {
+            try {
+                var prevPageVisitTimeData = restartPageVisitTimer(currentPageName, currentPageUrl);
+                if (prevPageVisitTimeData) {
+                    pageVisitTimeTrackingHandler(prevPageVisitTimeData.pageName, prevPageVisitTimeData.pageUrl, prevPageVisitTimeData[_DYN_PAGE_VISIT_TIME ]);
+                }
+            }
+            catch (e) {
+                _warnToConsole(logger, "Auto track page visit time failed, metric will not be collected: " + dumpObj(e));
+            }
+        },
+        _logger: logger,
+        pageVisitTimeTrackingHandler: pageVisitTimeTrackingHandler
+    };
+}
 
-var Timing = /** @class */ (function () {
-    function Timing(logger, name) {
-        var _self = this;
-        var _events = {};
-        _self.start = function (name) {
+function createTiming(logger, name) {
+    var _events = {};
+    var timing = {
+        action: null,
+        start: function (name) {
             if (typeof _events[name] !== "undefined") {
                 _throwInternal(logger, 2 , 62 , "start was called more than once for this event without calling stop.", { name: name, key: name }, true);
             }
             _events[name] = +new Date;
-        };
-        _self.stop = function (name, url, properties, measurements) {
+        },
+        stop: function (name, url, properties, measurements) {
             var start = _events[name];
             if (isNaN(start)) {
                 _throwInternal(logger, 2 , 63 , "stop was called without a corresponding start.", { name: name, key: name }, true);
@@ -5309,14 +5362,14 @@ var Timing = /** @class */ (function () {
             else {
                 var end = +new Date;
                 var duration = dateTimeUtilsDuration(start, end);
-                _self.action(name, url, duration, properties, measurements);
+                timing.action(name, url, duration, properties, measurements);
             }
             delete _events[name];
             _events[name] = undefined;
-        };
-    }
-    return Timing;
-}());
+        }
+    };
+    return timing;
+}
 
 var _a;
 var strEvent = "event";
@@ -5458,6 +5511,9 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
             _self[_DYN_TRACK_PAGE_VIEW ] = function (pageView, customProperties) {
                 try {
                     var inPv = pageView || {};
+                    if (_self[_DYN_CORE ] && _self[_DYN_CORE ][_DYN_CONFIG ]) {
+                        inPv.uri = fieldRedaction(inPv.uri, _self[_DYN_CORE ][_DYN_CONFIG ]);
+                    }
                     _pageViewManager[_DYN_TRACK_PAGE_VIEW ](inPv, __assignFn(__assignFn(__assignFn({}, inPv.properties), inPv.measurements), customProperties));
                     if (_autoTrackPageVisitTime) {
                         _pageVisitTimeManager[_DYN_TRACK_PREVIOUS_PAGE_1 ](inPv.name, inPv.uri);
@@ -5470,7 +5526,10 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
             _self[_DYN_SEND_PAGE_VIEW_INTER2 ] = function (pageView, properties, systemProperties) {
                 var doc = getDocument();
                 if (doc) {
-                    pageView.refUri = pageView.refUri === undefined ? doc.referrer : pageView.refUri;
+                    pageView[_DYN_REF_URI ] = pageView[_DYN_REF_URI ] === undefined ? doc.referrer : pageView[_DYN_REF_URI ];
+                }
+                if (_self[_DYN_CORE ] && _self[_DYN_CORE ][_DYN_CONFIG ]) {
+                    pageView.refUri = fieldRedaction(pageView.refUri, _self[_DYN_CORE ][_DYN_CONFIG ]);
                 }
                 if (isNullOrUndefined(pageView[_DYN_START_TIME ])) {
                     var duration = ((properties || pageView[_DYN_PROPERTIES ] || {})[_DYN_DURATION ] || 0);
@@ -5515,6 +5574,9 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
                         var loc = getLocation();
                         url = loc && loc[_DYN_HREF ] || "";
                     }
+                    if (_self[_DYN_CORE ] && _self[_DYN_CORE ][_DYN_CONFIG ]) {
+                        url = fieldRedaction(url, _self[_DYN_CORE ][_DYN_CONFIG ]);
+                    }
                     _pageTracking.stop(name, url, properties, measurement);
                     if (_autoTrackPageVisitTime) {
                         _pageVisitTimeManager[_DYN_TRACK_PREVIOUS_PAGE_1 ](name, url);
@@ -5616,10 +5678,10 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
                         _preInitTelemetryInitializers = null;
                     }
                     _populateDefaults(config);
-                    _pageViewPerformanceManager = new PageViewPerformanceManager(_self[_DYN_CORE ]);
-                    _pageViewManager = new PageViewManager(_self, _extConfig.overridePageViewDuration, _self[_DYN_CORE ], _pageViewPerformanceManager);
-                    _pageVisitTimeManager = new PageVisitTimeManager(_self[_DYN_DIAG_LOG ](), function (pageName, pageUrl, pageVisitTime) { return trackPageVisitTime(pageName, pageUrl, pageVisitTime); });
-                    _eventTracking = new Timing(_self[_DYN_DIAG_LOG ](), "trackEvent");
+                    _pageViewPerformanceManager = createPageViewPerformanceManager(_self[_DYN_CORE ]);
+                    _pageViewManager = createPageViewManager(_self, _extConfig.overridePageViewDuration, _self[_DYN_CORE ], _pageViewPerformanceManager);
+                    _pageVisitTimeManager = createPageVisitTimeManager(_self[_DYN_DIAG_LOG ](), function (pageName, pageUrl, pageVisitTime) { return trackPageVisitTime(pageName, pageUrl, pageVisitTime); });
+                    _eventTracking = createTiming(_self[_DYN_DIAG_LOG ]());
                     _eventTracking.action =
                         function (name, url, duration, properties, measurements) {
                             if (!properties) {
@@ -5631,7 +5693,7 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
                             properties.duration = duration[_DYN_TO_STRING ]();
                             _self.trackEvent({ name: name, properties: properties, measurements: measurements });
                         };
-                    _pageTracking = new Timing(_self[_DYN_DIAG_LOG ](), "trackPageView");
+                    _pageTracking = createTiming(_self[_DYN_DIAG_LOG ]());
                     _pageTracking.action = function (name, url, duration, properties, measurements) {
                         if (isNullOrUndefined(properties)) {
                             properties = {};
@@ -5747,22 +5809,6 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
                     }
                 }));
             }
-            function _getDistributedTraceCtx() {
-                var distributedTraceCtx = null;
-                if (_self[_DYN_CORE ] && _self[_DYN_CORE ].getTraceCtx) {
-                    distributedTraceCtx = _self[_DYN_CORE ].getTraceCtx(false);
-                }
-                if (!distributedTraceCtx) {
-                    var properties = _self[_DYN_CORE ].getPlugin(PropertiesPluginIdentifier);
-                    if (properties) {
-                        var context = properties.plugin.context;
-                        if (context) {
-                            distributedTraceCtx = createDistributedTraceContextFromTrace(context.telemetryTrace);
-                        }
-                    }
-                }
-                return distributedTraceCtx;
-            }
             function _addHistoryListener(win, history, locn) {
                 if (_historyListenerAdded) {
                     return;
@@ -5781,15 +5827,15 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
                     else {
                         _currUri = locn && locn[_DYN_HREF ] || "";
                     }
+                    if (_self[_DYN_CORE ] && _self[_DYN_CORE ][_DYN_CONFIG ]) {
+                        _currUri = fieldRedaction(_currUri, _self[_DYN_CORE ][_DYN_CONFIG ]);
+                    }
                     if (_enableAutoRouteTracking) {
-                        var distributedTraceCtx = _getDistributedTraceCtx();
-                        if (distributedTraceCtx) {
-                            distributedTraceCtx.setTraceId(generateW3CId());
-                            var traceLocationName = "_unknown_";
-                            if (locn && locn.pathname) {
-                                traceLocationName = locn.pathname + (locn.hash || "");
-                            }
-                            distributedTraceCtx.setName(dataSanitizeString(_self[_DYN_DIAG_LOG ](), traceLocationName));
+                        var newContext = _self[_DYN_CORE ].getTraceCtx(true);
+                        newContext.setTraceId(generateW3CId());
+                        newContext.pageName = dataSanitizeString(_self[_DYN_DIAG_LOG ](), newContext.pageName || "_unknown_");
+                        if (_self[_DYN_CORE ] && _self[_DYN_CORE ].getTraceCtx) {
+                            _self[_DYN_CORE ].setTraceCtx(newContext);
                         }
                         scheduleTimeout((function (uri) {
                             _self[_DYN_TRACK_PAGE_VIEW ]({ refUri: uri, properties: { duration: 0 } });
@@ -5857,6 +5903,9 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
                 _autoTrackPageVisitTime = false;
                 var location = getLocation(true);
                 _prevUri = location && location[_DYN_HREF ] || "";
+                if (_self[_DYN_CORE ] && _self[_DYN_CORE ][_DYN_CONFIG ]) {
+                    _prevUri = fieldRedaction(_prevUri, _self[_DYN_CORE ][_DYN_CONFIG ]);
+                }
                 _currUri = null;
                 _evtNamespace = null;
                 _extConfig = null;
@@ -5872,7 +5921,7 @@ var AnalyticsPlugin = /** @class */ (function (_super) {
         });
         return _this;
     }
-    AnalyticsPlugin.Version = '3.4.0-nightlybeta3.2505-35';
+    AnalyticsPlugin.Version = '3.4.0-nightlybeta3.2507-23';
     return AnalyticsPlugin;
 }(BaseTelemetryPlugin));