@sapui5/sap.ushell 1.118.0 → 1.119.2

package/src/main/js/sap/ushell/performance/FesrEnhancer.js

@@ -4,11 +4,6 @@
  * @file The FESR Enhancer attaches to the Front End Sub-Records tracker by UI5.
  * UI5 tracks rendering and request activities and tries to detect what happens.
  * The ushell FESR Enhancer has then the possibility to overwrite and enhance the result with FLP specific information.
- * the following messages to debug log with
- * prefix [fesrEnhFlp] are added
- * - flp has passed on a record to fesr
- * - flp has not overwritten steps of pattern /press/
- * - flp has not overwritten steps of pattern /__cdm/
  * @private
  */
 sap.ui.define([
@@ -26,7 +21,10 @@ sap.ui.define([
 ) {
     "use strict";
 
-    var SCENARIOS = {
+    const sModuleName = "FesrEnhancer";
+    const sLogPrefix = "[FesrFlp]";
+
+    const SCENARIOS = {
         HOME_INITIAL: "FLP@LOAD",
         HOME_LOADING: "FLP@DURING_LOAD",
         FINDER_INITIAL: "FLP@LOAD_FINDER",
@@ -43,13 +41,27 @@ sap.ui.define([
     ];
 
     // type of interaction, more details in "sap/ui/performance/trace/FESR.js"
-    var INTERACTION_TYPE = {
+    const INTERACTION_TYPE = {
         APP_START: 1,
         STEP_IN_APP: 2,
         UNKNOWN: 3
     };
 
-    var oFesrEnhancer = {
+    // only those fields are allowed to change on the fesr record
+    const aSupportedFields = [
+        "stepName",
+        "appNameLong",
+        "appNameShort",
+        "interactionType",
+        "timeToInteractive"
+    ];
+    const oFieldFormatting = {
+        stepName: { maxLength: 20 },
+        // appNameLong does not use any prefixes yet
+        appNameShort: { maxLength: 20 }
+    };
+
+    const oFesrEnhancer = {
         _fnOriginalOnBeforeCreated: null,
         _lastTrackedRecord: null,
 
@@ -89,7 +101,7 @@ sap.ui.define([
             if (bExactName) {
                 return performance.getEntriesByName(sEventName);
             }
-            return performance.getEntriesByType("mark").filter(function (oMark) {
+            return performance.getEntriesByType("mark").filter((oMark) => {
                 return oMark.name.includes(sEventName);
             });
         },
@@ -100,7 +112,7 @@ sap.ui.define([
          * @returns {string} ID of the application.
          */
         _getLastTrackedApplicationId: function () {
-            var oCurrentApplication = ShellAnalytics.getCurrentApplication();
+            const oCurrentApplication = ShellAnalytics.getCurrentApplication();
             if (oCurrentApplication) {
                 return oCurrentApplication.id;
             }
@@ -134,254 +146,303 @@ sap.ui.define([
          * @param {string} oUi5FesrHandle.stepName The step name with <Trigger>_<Event>.
          * @param {string} oUi5FesrHandle.appNameLong The application name with max 70 chars.
          * @param {string} oUi5FesrHandle.appNameShort The application name with max 20 chars.
+         * @param {int} oUi5FesrHandle.interactionType type of interaction
          * @param {int} oUi5FesrHandle.timeToInteractive The detected end-to-end time of the step.
          * @param {object} oUi5Interaction The corresponding interaction object, read-only.
          * @returns {object} Modified header information.
          * @private
          */
         _onBeforeCreatedHandler: function (oUi5FesrHandle, oUi5Interaction) {
-            var oDetectedScenario = this._detectScenario(oUi5FesrHandle, oUi5Interaction);
-            var sApplicationId = this._getLastTrackedApplicationId();
-
-            if (sApplicationId) {
-                // Add the latest remembered Fiori ID to every record until a different Fiori ID is set.
-                // This is needed to relate interactions tracked afterward to the started app.
-                // Restriction: Fiori IDs are also added to not related interactions like FLP button clicks or shell plugin interactions.
-                // Still, this is considered by S/4 and UI5 to be more helpful than not adding it anywhere.
-                oUi5FesrHandle.appNameShort = sApplicationId;
-            }
+            let oFesrHandle = deepExtend({}, oUi5FesrHandle); // copy first to prevent side effects
+
+            try {
+                const { scenario, relatedRecord } = this._detectScenario(oFesrHandle);
+                Log.debug(`${sLogPrefix} identified scenario: ${scenario}`, null, sModuleName);
+
+                const sApplicationId = this._getLastTrackedApplicationId();
+                if (sApplicationId) {
+                    // Add the latest remembered Fiori ID to every record until a different Fiori ID is set.
+                    // This is needed to relate interactions tracked afterward to the started app.
+                    // Restriction: Fiori IDs are also added to not related interactions like FLP button clicks or shell plugin interactions.
+                    // Still, this is considered by S/4 and UI5 to be more helpful than not adding it anywhere.
+                    oFesrHandle.appNameShort = sApplicationId;
+                }
 
-            if (!oDetectedScenario.scenario) {
-                // unknown scenarios cannot be enhanced
-                Log.debug("[fesrEnhFlp] unknown scenario, step name: " + oUi5FesrHandle.stepName);
-                return oUi5FesrHandle;
-            }
-            var oAdjustedFesrRecord = this._enhanceRecord(oDetectedScenario.scenario, oUi5FesrHandle, oDetectedScenario.relatedEvent);
-            Log.debug("[fesrEnhFlp] pass step name: " + oAdjustedFesrRecord.stepName);
-            Log.debug("[fesrEnhFlp] pass short application name: " + oAdjustedFesrRecord.appNameShort);
-            Log.debug("[fesrEnhFlp] pass long application name: " + oAdjustedFesrRecord.appNameLong);
-            if (/tile.*press/.test(oAdjustedFesrRecord.stepName)) {
-                Log.debug("[fesrEnhFlp] did not overwrite press step name");
-            }
-            if (/__cdm/.test(oAdjustedFesrRecord.stepName)) {
-                Log.debug("[fesrEnhFlp] did not overwrite press step name(cdm)");
-            }
+                let oEnhancement;
+                switch (scenario) {
+                    case SCENARIOS.HOME_INITIAL:
+                    case SCENARIOS.CUSTOM_HOME_INITIAL:
+                    case SCENARIOS.FINDER_INITIAL:
+                        oEnhancement = this._enhanceInitialStart(oFesrHandle, scenario, relatedRecord);
+                        break;
+                    case SCENARIOS.APP_INITIAL:
+                        oEnhancement = this._enhanceInitialAppStart(scenario, relatedRecord);
+                        break;
+                    case SCENARIOS.NAVIGATION:
+                    case SCENARIOS.HOME_LOADING:
+                        oEnhancement = this._enhanceNavigationRecord(scenario, relatedRecord);
+                        break;
+                    default:
+                        // unknown scenarios cannot be enhanced
+                        Log.debug(`${sLogPrefix} unknown scenario, step name: ${oFesrHandle.stepName}`, null, sModuleName);
+                        return oFesrHandle;
+                }
+
+                // Consumed in SchedulingAgent
+                if (START_UP_SCENARIOS.includes(scenario)) {
+                    EventHub.emit("startUpFesrEnhanced", Date.now());
+                }
+
+                // Sanitize Enhancements
+                oEnhancement = Object.keys(oEnhancement).reduce((oResult, sKey) => {
+                    const vValue = oEnhancement[sKey];
+                    // only keep supported fields and actual values
+                    if (aSupportedFields.includes(sKey) && !!vValue) {
+                        const oFormat = oFieldFormatting[sKey];
+                        if (oFormat && oFormat.maxLength) {
+                            // FLP uses prefixes we want them to be always visible
+                            oResult[sKey] = vValue.substring(0, oFormat.maxLength);
+                        } else {
+                            oResult[sKey] = vValue;
+                        }
+                    }
+                    return oResult;
+                }, {});
 
-            // Consumed in SchedulingAgent
-            if (START_UP_SCENARIOS.includes(oDetectedScenario.scenario)) {
-                EventHub.emit("startUpFesrEnhanced", Date.now());
+                oFesrHandle = {...oFesrHandle, ...oEnhancement};
+                Log.debug(`${sLogPrefix} passing enhancements:`, JSON.stringify(oEnhancement, null, 2), sModuleName);
+            } catch (oError) {
+                Log.error(`${sLogPrefix} Could not enhance the FESR:`, oError, sModuleName);
             }
 
-            return oAdjustedFesrRecord;
+            Log.debug(`${sLogPrefix}      => UI5: ${oFesrHandle.stepName} - ${oFesrHandle.appNameShort}`, null, sModuleName);
+
+            return oFesrHandle;
         },
 
         /**
-         * Tries to detect the current scenario based on the given information.
+         * Determines the relevant PerformanceMark based on the related record
+         * @param {sap.ushell.performance.StatisticalRecord} oRelatedRecord The related Record
          *
-         * @param {object} oUi5FesrHandle The FESR header information.
-         * @param {object} oUi5Interaction The corresponding interaction object.
-         * @returns {object} Returns an object which has at least a scenario property. This property may be null if the scenario is unknown.
-         *   There may also be a relatedEvent property if an event was used in order to detect the scenario.
+         * @returns {PerformanceMark|undefined} The relevant performance mark
          * @private
+         * @since 1.118
          */
-        _detectScenario: function (oUi5FesrHandle, oUi5Interaction) {
-            function createResultObject (sScenario, oEvent) {
-                var oResult = {
-                    scenario: sScenario
-                };
-                if (oEvent) {
-                    oResult.relatedEvent = oEvent;
-                }
-                return oResult;
+        _getRelevantPerformanceMark: function (oRelatedRecord) {
+            if (!oRelatedRecord) {
+                Log.warning(`${sLogPrefix} Could not determine performance mark`, "No Statistical Record found", sModuleName);
+                return;
             }
 
-            if (oUi5FesrHandle.stepName === "undetermined_startup") {
-                var oLastRecord = ShellAnalytics.getLastClosedRecord();
-                this._setLastTrackedRecord(oLastRecord);
-                // case home app: Home app is detected in a special way.
-                if (!!oLastRecord && oLastRecord.isTargetHomeApp) {
-                    return createResultObject(SCENARIOS.CUSTOM_HOME_INITIAL);
-                }
-                // case app finder, pages, and homepage
-                switch (oUi5FesrHandle.appNameLong) {
-                    case "sap.ushell.components.homepage":
-                    case "sap.ushell.components.pages":
-                        return createResultObject(SCENARIOS.HOME_INITIAL);
-                    case "sap.ushell.components.appfinder":
-                        return createResultObject(SCENARIOS.FINDER_INITIAL);
+            const aMarks = [];
+            if (oRelatedRecord.getTargetIsHomeApp()) {
+                aMarks.push(this._getPerformanceEntries("FLP-TTI-Homepage-Custom", true)[0]);
+            } else {
+                switch (oRelatedRecord.getTargetApplication()) {
+                    case "FLP_HOME":
+                        aMarks.push(this._getPerformanceEntries("FLP-TTI-Homepage", true)[0]);
+                        break;
+                    case "FLP_PAGE":
+                        aMarks.push(this._getPerformanceEntries("FLP-TTI-Homepage", true)[0]);
+                        aMarks.push(this._getPerformanceEntries("FLP-Pages-Service-loadPage-end", false)[0]);
+                        break;
+                    case "FLP_FINDER":
+                        aMarks.push(this._getPerformanceEntries("FLP-TTI-AppFinder", true)[0]);
+                        break;
                     default:
-                        // application direct start
-                        return createResultObject(SCENARIOS.APP_INITIAL, oLastRecord);
                 }
             }
 
-            var oLastTrackedRecord = this._getLastTrackedRecord();
-            var aNavigationRecords = ShellAnalytics.getNextNavigationRecords(oLastTrackedRecord);
-            var sScenario,
-                oNavigationRecord;
-
-            if (aNavigationRecords.length === 1) {
-                oNavigationRecord = aNavigationRecords[0];
-                // consider that if there was navigation the saved navigation and new navigation has different time
-                if ((oNavigationRecord && oLastTrackedRecord && !oNavigationRecord.isEqual(oLastTrackedRecord)) || (!oLastTrackedRecord && oNavigationRecord)) {
-                    this._setLastTrackedRecord(oNavigationRecord);
-                    // specify navigation scenario further when during loading
-                    sScenario = oNavigationRecord.step === SCENARIOS.HOME_LOADING ? SCENARIOS.HOME_LOADING : SCENARIOS.NAVIGATION;
-                    return createResultObject(sScenario, oNavigationRecord);
+            return aMarks.filter((oMark) => {
+                // no mark found
+                if (!oMark) {
+                    return false;
                 }
-            } else if (aNavigationRecords.length > 1) {
-                aNavigationRecords.pop();
-                oNavigationRecord = aNavigationRecords[0];
-                this._setLastTrackedRecord(oNavigationRecord);
-                sScenario = oNavigationRecord.step === SCENARIOS.HOME_LOADING ? SCENARIOS.HOME_LOADING : SCENARIOS.NAVIGATION;
-                return createResultObject(sScenario, oNavigationRecord);
-            }
-            // no scenario detected
-            return createResultObject(null);
+                if (typeof oMark.startTime !== "number") {
+                    return false;
+                }
+                // mark was set after Statistical Record was opened
+                if (oMark.startTime > oRelatedRecord.getTimeStart()) {
+                    return true;
+                }
+                return false;
+            })[0];
         },
 
         /**
-         * Takes the given FESR information oIntermediateResult and returns an enhanced version using the given information.
-         * replaces the time to interactive by
-         * - performance mark FLP-TTI-Homepage in case of spaces & pages or home page
-         * - performance mark FLP-TTI-Homepage-Custom in case of home app
-         * - performance mark FLP-TTI-AppFinder in case of app finder
+         * Tries to detect the current scenario based on the given information.
          *
-         * @param {string} sDetectedScenario The detected scenario which is the basis for the enhancement. See SCENARIOS.
-         * @param {object} oIntermediateResult The header information that can be modified.
-         * @param {string} oIntermediateResult.stepName The step name with <Trigger>_<Event>.
-         * @param {string} oIntermediateResult.appNameLong The application name with max 70 chars.
-         * @param {string} oIntermediateResult.appNameShort The application name with max 20 chars.
-         * @param {int} oIntermediateResult.timeToInteractive The detected end-to-end time of the step.
-         * @param {object} oRelatedEvent Event from _trackedEvents array which was used to detect the scenario.
-         * @returns {object} enhanced oIntermediateResult
+         * @param {object} oFesrHandle The FESR header information.
+         * @returns {object} Returns an object which has at least a scenario property. This property may be null if the scenario is unknown.
          * @private
          */
-        _enhanceRecord: function (sDetectedScenario, oIntermediateResult, oRelatedEvent) {
-            switch (sDetectedScenario) {
-                case SCENARIOS.HOME_INITIAL:
-                    return this._enhanceInitialStart(oIntermediateResult, sDetectedScenario, "FLP-TTI-Homepage");
-                case SCENARIOS.CUSTOM_HOME_INITIAL:
-                    return this._enhanceInitialStart(oIntermediateResult, sDetectedScenario, "FLP-TTI-Homepage-Custom");
-                case SCENARIOS.FINDER_INITIAL:
-                    return this._enhanceInitialStart(oIntermediateResult, sDetectedScenario, "FLP-TTI-AppFinder");
-                case SCENARIOS.APP_INITIAL:
-                    return this._enhanceInitialAppStart(oIntermediateResult, sDetectedScenario, oRelatedEvent || {});
-                case SCENARIOS.NAVIGATION:
-                case SCENARIOS.HOME_LOADING:
-                    return this._enhanceNavigationRecord(oIntermediateResult, sDetectedScenario, oRelatedEvent || {});
-                default:
-                    break;
+        _detectScenario: function (oFesrHandle) {
+            if (oFesrHandle.stepName === "undetermined_startup") {
+                let sDeterminedScenario;
+
+                const oLastClosedRecord = ShellAnalytics.getLastClosedRecord();
+
+                if (oLastClosedRecord) {
+                    this._setLastTrackedRecord(oLastClosedRecord);
+                } else {
+                    Log.warning(`${sLogPrefix} Identified undetermined_startup but could not find a closed StatisticalRecord`, null, sModuleName);
+                    return {
+                        scenario: null,
+                        relatedRecord: null
+                    };
+                }
+
+                // case home app: Home app is detected in a special way.
+                if (oLastClosedRecord.getTargetIsHomeApp()) {
+                    sDeterminedScenario = SCENARIOS.CUSTOM_HOME_INITIAL;
+                } else {
+                    // case app finder, pages, and homepage
+                    switch (oFesrHandle.appNameLong) {
+                        case "sap.ushell.components.homepage":
+                        case "sap.ushell.components.pages":
+                            sDeterminedScenario = SCENARIOS.HOME_INITIAL;
+                            break;
+                        case "sap.ushell.components.appfinder":
+                            sDeterminedScenario = SCENARIOS.FINDER_INITIAL;
+                            break;
+                        default:
+                            // application direct start
+                            sDeterminedScenario = SCENARIOS.APP_INITIAL;
+                    }
+                }
+
+                return {
+                    scenario: sDeterminedScenario,
+                    relatedRecord: oLastClosedRecord
+                };
+            }
+
+            const oLastTrackedRecord = this._getLastTrackedRecord();
+            const aUntrackedNavigationRecords = ShellAnalytics.getNextNavigationRecords(oLastTrackedRecord);
+
+            if (aUntrackedNavigationRecords.length) {
+                // take the last record, with this we stay in sync with the user action
+                const oNavigationRecord = aUntrackedNavigationRecords[aUntrackedNavigationRecords.length - 1];
+                if (aUntrackedNavigationRecords.length > 1) {
+                    const aUntrackedHashes = aUntrackedNavigationRecords.reduce((aHashes, oRecord, iIndex) =>{
+                        if (iIndex < aUntrackedNavigationRecords.length - 1) {
+                            aHashes.push(oRecord.getTargetHash());
+                        }
+                        return aHashes;
+                    }, []);
+                    Log.warning(`${sLogPrefix} skipped Records:`, JSON.stringify(aUntrackedHashes, null, 2), sModuleName);
+                }
+
+                // do not track if last tracked record equals current record
+                if (oLastTrackedRecord && oNavigationRecord.isEqual(oLastTrackedRecord)) {
+                    // no scenario detected
+                    return {
+                        scenario: null,
+                        relatedRecord: null
+                    };
+                }
+
+                this._setLastTrackedRecord(oNavigationRecord);
+                // specify navigation scenario further when during loading
+                const sScenario = oNavigationRecord.getStep() === SCENARIOS.HOME_LOADING ? SCENARIOS.HOME_LOADING : SCENARIOS.NAVIGATION;
+                return {
+                    scenario: sScenario,
+                    relatedRecord: oNavigationRecord
+                };
             }
 
-            // unknown scenario
-            Log.warning("[fesrEnhFlp] Unknown scenario at the end of execution, unnecessary code executed", null, "sap.ushell.performance.FesrEnhancer");
-            return oIntermediateResult;
+            // no scenario detected
+            return {
+                scenario: null,
+                relatedRecord: null
+            };
         },
 
         /**
-         * Takes the given FESR information oIntermediateResult and returns an enhanced version using the given information
+         * Takes the given FESR information and returns an enhancement using the given information
          * for scenario initial start.
          *
-         * @param {object} oIntermediateResult Result that is enhanced.
+         * @param {object} oFesrHandle Result that is enhanced.
          * @param {string} sStepName Name of Step.
-         * @param {string} sPerformanceMarkName Name of performance mark.
-         * @returns {object} The enhanced version using the given information for scenario initial start.
+         * @param {sap.ushell.performance.StatisticalRecord} oRelatedRecord The related StatisticalRecord
+         *
+         * @returns {object} The enhancement for the initial start scenario.
          */
-        _enhanceInitialStart: function (oIntermediateResult, sStepName, sPerformanceMarkName) {
-            var oMark;
-            var oEnhancedFesrHandle = deepExtend({}, oIntermediateResult);
+        _enhanceInitialStart: function (oFesrHandle, sStepName, oRelatedRecord) {
+            const oResult = {};
 
-            // set step name
             if (sStepName === SCENARIOS.CUSTOM_HOME_INITIAL) {
                 // special case: home app
-                oEnhancedFesrHandle.stepName = sStepName + "@" + oIntermediateResult.appNameShort;
+                oResult.stepName = sStepName + "@" + oFesrHandle.appNameShort;
             } else {
                 // ordinary case
-                oEnhancedFesrHandle.stepName = sStepName;
+                oResult.stepName = sStepName;
             }
 
-            // set interaction type
-            oEnhancedFesrHandle.interactionType = INTERACTION_TYPE.APP_START;
-
-            // set performance mark
-            if (sPerformanceMarkName) {
-                // if available also add the exact Time To Interactive
-                oMark = this._getPerformanceEntries(sPerformanceMarkName, true)[0];
-                if (oMark) {
-                    // in case of initial start, the startTime is most accurate
-                    oEnhancedFesrHandle.timeToInteractive = oMark.startTime;
-                    return oEnhancedFesrHandle;
-                }
-                // empty page
-                oMark = this._getPerformanceEntries("FLP-Pages-Service-loadPage-end", false)[0];
-                if (oMark) {
-                    // in case of empty page, the time load page end is most accurate
-                    oEnhancedFesrHandle.timeToInteractive = oMark.startTime;
-                    return oEnhancedFesrHandle;
-                }
+            oResult.interactionType = INTERACTION_TYPE.APP_START;
+            oResult.appNameShort = oRelatedRecord.getTargetAppNameShort() || oRelatedRecord.getTargetApplication();
 
-                Log.warning("[fesrEnhFlp] Scenario '" + sStepName + "' detected but expected performance mark '" +
-                    sPerformanceMarkName + "' does not exist",
-                    null, "sap.ushell.performance.FesrEnhancer"
-                );
+            const oPerformanceMark = this._getRelevantPerformanceMark(oRelatedRecord);
+            if (oPerformanceMark) {
+                Log.debug(`${sLogPrefix} using performance mark: ${oPerformanceMark.name}`, null, sModuleName);
+                oResult.timeToInteractive = oPerformanceMark.startTime;
+            } else {
+                Log.warning(`${sLogPrefix} Scenario ${sStepName} detected did not found a performance mark`, null, sModuleName);
             }
 
-            return oEnhancedFesrHandle;
+            return oResult;
         },
 
         /**
-         * Takes the given FESR information oIntermediateResult and related record and returns an enhanced version
+         * Takes the given FESR information and related record and returns an enhancement
          * using the given information for scenario navigation.
          *
-         * @param {object} oIntermediateResult Intermediate result.
          * @param {string} sDetectedScenario detected scenario
-         * @param {object} oRelatedRecord Related record.
-         * @returns {object} Adjusted FESR record.
+         * @param {sap.ushell.performance.StatisticalRecord} oRelatedRecord Related record.
+         *
+         * @returns {object} The enhancement for the navigation scenario.
          */
-        _enhanceNavigationRecord: function (oIntermediateResult, sDetectedScenario, oRelatedRecord) {
-            var oEnhancedFesrHandle = deepExtend({}, oIntermediateResult);
-            // keep step from FESR
+        _enhanceNavigationRecord: function (sDetectedScenario, oRelatedRecord) {
+            const oResult = {};
             if (sDetectedScenario !== "FLP@DURING_LOAD") {
-                oEnhancedFesrHandle.stepName = oRelatedRecord.step || oIntermediateResult.stepName;
+                oResult.stepName = oRelatedRecord.getStep();
             }
-            oEnhancedFesrHandle.appNameShort = oRelatedRecord.targetApplication || "";
-            if (oRelatedRecord.targetApplicationType === "UI5") {
-                oEnhancedFesrHandle.interactionType = INTERACTION_TYPE.APP_START;
+
+            if (oRelatedRecord.getTargetApplicationType() === "UI5") {
+                oResult.interactionType = INTERACTION_TYPE.APP_START;
             }
 
-            if (/^FLP_BACK/.test(oEnhancedFesrHandle.stepName)) {
-                var oMark = this._getPerformanceEntries("FLP-TTI-Homepage", true)[0];
-                if (oMark) {
-                    if (oMark.startTime > oRelatedRecord.getTimeStart()) {
-                        oEnhancedFesrHandle.timeToInteractive = oMark.startTime - oRelatedRecord.getTimeStart();
-                    }
-                }
+            oResult.appNameShort = oRelatedRecord.getTargetAppNameShort() || oRelatedRecord.getTargetApplication();
+
+            // Adding TTI for navigating back from direct app start to home
+            const oPerformanceMark = this._getRelevantPerformanceMark(oRelatedRecord);
+            if (/^FLP_BACK/.test(oResult.stepName) && oPerformanceMark) {
+                Log.debug(`${sLogPrefix} using performance mark: ${oPerformanceMark.name}`, null, sModuleName);
+                oResult.timeToInteractive = oPerformanceMark.startTime - oRelatedRecord.getTimeStart();
             }
-            return oEnhancedFesrHandle;
+            return oResult;
         },
 
         /**
-         * Takes the given FESR information oIntermediateResult and returns an enhanced version using the given information
+         * Takes the given FESR information and returns an enhancement using the given information
          * for scenario initial app start.
          *
-         * @param {object} oIntermediateResult Intermediate result.
          * @param {string} sStepName Name of the step.
          * @param {object} oRelatedRecord Related record.
-         * @returns {object} Adjusted FESR record.
+         *
+         * @returns {object} The enhancement for the navigation scenario.
          */
-        _enhanceInitialAppStart: function (oIntermediateResult, sStepName, oRelatedRecord) {
-            var oEnhancedFesrHandle = deepExtend({}, oIntermediateResult);
-            oEnhancedFesrHandle.stepName = sStepName;
-            oEnhancedFesrHandle.appNameShort = oIntermediateResult.appNameShort;
+        _enhanceInitialAppStart: function (sStepName, oRelatedRecord) {
+            const oResult = {};
+            oResult.stepName = sStepName;
 
-            if (oRelatedRecord.targetApplicationType === "UI5") {
-                oEnhancedFesrHandle.interactionType = INTERACTION_TYPE.APP_START;
+            if (oRelatedRecord.getTargetApplicationType() === "UI5") {
+                oResult.interactionType = INTERACTION_TYPE.APP_START;
             } else {
-                //Not UI5 applications handle the start flag theirself and we need to avoid duplication in the statistic
-                oEnhancedFesrHandle.interactionType = INTERACTION_TYPE.STEP_IN_APP;
+                //Not UI5 applications handle the start flag themselves and we need to avoid duplication in the statistic
+                oResult.interactionType = INTERACTION_TYPE.STEP_IN_APP;
             }
-            return oEnhancedFesrHandle;
+            return oResult;
         }
     };