@openui5/sap.ui.core 1.141.2 → 1.142.1

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -76,6 +76,8 @@ sap.ui.define([
 	 *   {@link sap.ui.model.odata.v4.lib._Helper.buildQuery}; used only to request the CSRF token
 	 * @param {object} oModelInterface
 	 *   An interface allowing to call back to the owning model (see {@link .create})
+	 * @param {string} sODataVersion
+	 *   The version of the OData service. Supported values are "2.0", "4.0", and "4.01".
 	 * @param {boolean} [bWithCredentials]
 	 *   Whether the XHR should be called with <code>withCredentials</code>
 	 *
@@ -83,12 +85,14 @@ sap.ui.define([
 	 * @constructor
 	 * @private
 	 */
-	function _Requestor(sServiceUrl, mHeaders, mQueryParams, oModelInterface, bWithCredentials) {
+	function _Requestor(sServiceUrl, mHeaders, mQueryParams, oModelInterface, sODataVersion,
+			bWithCredentials) {
 		this.mBatchQueue = {};
 		this.bBatchSent = false;
 		this.mHeaders = mHeaders || {};
 		this.aLockedGroupLocks = [];
 		this.oModelInterface = oModelInterface;
+		this.sODataVersion = sODataVersion;
 		this.oOptimisticBatch = null; // optimistic batch processing off
 		this.sQueryParams = _Helper.buildQuery(mQueryParams); // Used for $batch and CSRF token only
 		this.mRunningChangeRequests = {}; // map from group ID to a SyncPromise[]
@@ -98,36 +102,52 @@ sap.ui.define([
 		this.vStatistics = mQueryParams && mQueryParams["sap-statistics"];
 		this.bWithCredentials = bWithCredentials;
 		this.processSecurityTokenHandlers(); // sets this.oSecurityTokenPromise
+
+		if (sODataVersion === "4.01") {
+			this.mPredefinedRequestHeaders = Object.freeze({
+				...this.mPredefinedRequestHeaders,
+				"OData-MaxVersion" : "4.01",
+				"OData-Version" : "4.01"
+			});
+		}
 	}
 
 	/**
 	 * Final (cannot be overridden) request headers for OData V4.
+	 *
+	 * @private
 	 */
-	_Requestor.prototype.mFinalHeaders = {
+	_Requestor.prototype.mFinalHeaders = Object.freeze({
 		"Content-Type" : "application/json;charset=UTF-8;IEEE754Compatible=true"
-	};
+	});
 
 	/**
 	 * Predefined request headers in $batch parts for OData V4.
+	 *
+	 * @private
 	 */
-	_Requestor.prototype.mPredefinedPartHeaders = {
+	_Requestor.prototype.mPredefinedPartHeaders = Object.freeze({
 		Accept : "application/json;odata.metadata=minimal;IEEE754Compatible=true"
-	};
+	});
 
 	/**
 	 * Predefined request headers for all requests for OData V4.
+	 *
+	 * @private
 	 */
-	_Requestor.prototype.mPredefinedRequestHeaders = {
+	_Requestor.prototype.mPredefinedRequestHeaders = Object.freeze({
 		Accept : "application/json;odata.metadata=minimal;IEEE754Compatible=true",
-		"OData-MaxVersion" : "4.0",
-		"OData-Version" : "4.0",
+		"OData-MaxVersion" : "4.0", // Note: may be "overridden" in c'tor
+		"OData-Version" : "4.0", // dito
 		"X-CSRF-Token" : "Fetch"
-	};
+	});
 
 	/**
 	 * OData V4 request headers reserved for internal use.
+	 *
+	 * @private
 	 */
-	_Requestor.prototype.mReservedHeaders = {
+	_Requestor.prototype.mReservedHeaders = Object.freeze({
 		accept : true,
 		"accept-charset" : true,
 		"content-encoding" : true,
@@ -144,7 +164,7 @@ sap.ui.define([
 		"odata-version" : true,
 		prefer : true,
 		"sap-contextid" : true
-	};
+	});
 
 	/**
 	 * Adds a change set to the batch queue for the given group. All modifying requests created
@@ -757,7 +777,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Checks whether the "OData-Version" header is set to "4.0" otherwise an error is thrown.
+	 * Checks whether the "OData-Version" header is as expected, otherwise an error is thrown.
 	 *
 	 * @param {function} fnGetHeader
 	 *   A callback function to get a header attribute for a given header name with case-insensitive
@@ -767,7 +787,8 @@ sap.ui.define([
 	 * @param {boolean} [bVersionOptional]
 	 *   Indicates whether the OData service version is optional, which is the case for responses
 	 *   contained in a response for a $batch request
-	 * @throws {Error} If the "OData-Version" header is not "4.0"
+	 * @returns {string} The response's "OData-Version" header value
+	 * @throws {Error} If the "OData-Version" header is not as expected
 	 *
 	 * @private
 	 */
@@ -781,8 +802,9 @@ sap.ui.define([
 				+ " 'DataServiceVersion' header with value '" + vDataServiceVersion
 				+ "' in response for " + this.sServiceUrl + sResourcePath);
 		}
-		if (sODataVersion === "4.0" || !sODataVersion && bVersionOptional) {
-			return;
+		if (!sODataVersion && bVersionOptional || sODataVersion === this.sODataVersion
+				|| sODataVersion === "4.0") {
+			return sODataVersion;
 		}
 		throw new Error("Expected 'OData-Version' header with value '4.0' but received value '"
 			+ sODataVersion + "' in response for " + this.sServiceUrl + sResourcePath);
@@ -932,12 +954,12 @@ sap.ui.define([
 	 * Formats a given internal value into a literal suitable for usage in URLs.
 	 *
 	 * @param {any} vValue
-	 *   The value according to "OData JSON Format Version 4.0" section "7.1 Primitive Value"
+	 *   The value according to "OData JSON Format Version 4.01" section "7.1 Primitive Value"
 	 * @param {object} oProperty
 	 *   The OData property
 	 * @returns {string}
-	 *   The literal according to "OData Version 4.0 Part 2: URL Conventions" section
-	 *   "5.1.1.6.1 Primitive Literals"
+	 *   The literal according to "OData Version 4.01 Part 2: URL Conventions" section
+	 *   "5.1.1.14.1 Primitive Literals"
 	 * @throws {Error}
 	 *   If the value is undefined or the type is not supported
 	 *
@@ -1413,9 +1435,13 @@ sap.ui.define([
 					that.oModelInterface.onHttpResponse(vResponse.headers);
 					if (vResponse.responseText) {
 						try {
-							that.doCheckVersionHeader(getResponseHeader.bind(vResponse),
-								vRequest.url, true);
-							oResponse = that.doConvertResponse(JSON.parse(vResponse.responseText),
+							const sODataVersion = that.doCheckVersionHeader(
+								getResponseHeader.bind(vResponse), vRequest.url, true);
+							const fnReviver = sODataVersion === "4.01"
+								? _Requestor.reviver
+								: undefined;
+							oResponse = that.doConvertResponse(
+								JSON.parse(vResponse.responseText, fnReviver),
 								vRequest.$metaPath);
 						} catch (oErr) {
 							vRequest.$reject(oErr);
@@ -1427,7 +1453,7 @@ sap.ui.define([
 						oResponse = vRequest.method === "GET" ? null : {};
 					}
 					that.reportHeaderMessages(vRequest.$resourcePath,
-						getResponseHeader.call(vResponse, "sap-messages"), oResponse);
+						getResponseHeader.call(vResponse, "sap-messages"), oResponse, vRequest.url);
 					sETag = getResponseHeader.call(vResponse, "ETag");
 					if (sETag) {
 						oResponse["@odata.etag"] = sETag;
@@ -1781,7 +1807,8 @@ sap.ui.define([
 
 	/**
 	 * Reports OData messages from the "sap-messages" response header (or forwards them via the
-	 * response object).
+	 * response object). When reporting, the longtext URL is already resolved w.r.t. the request URL
+	 * and the original message is preserved early on.
 	 *
 	 * @param {string} sResourcePath
 	 *   The resource path of the request whose response contained the messages, see also
@@ -1791,15 +1818,24 @@ sap.ui.define([
 	 * @param {object} oResponse
 	 *   The response object, needed in case <code>sResourcePath === "R#V#C"</code> as described
 	 *   at {@link #request}
+	 * @param {string} [sRequestUrl]
+	 *   A resource path relative to the service URL for which this requestor has been created
 	 *
 	 * @private
 	 */
-	_Requestor.prototype.reportHeaderMessages = function (sResourcePath, sMessages, oResponse) {
+	_Requestor.prototype.reportHeaderMessages = function (sResourcePath, sMessages, oResponse,
+			sRequestUrl) {
 		if (sMessages) {
 			const aMessages = JSON.parse(sMessages);
 			if (sResourcePath === "R#V#C") {
 				_Helper.setPrivateAnnotation(oResponse, "headerMessages", aMessages);
 			} else {
+				const sAbsoluteRequestUrl = this.sServiceUrl + sRequestUrl;
+				aMessages.forEach((oMessage) => {
+					oMessage["@$ui5.originalMessage"] = _Helper.clone(oMessage);
+					oMessage.longtextUrl
+						&&= _Helper.makeAbsolute(oMessage.longtextUrl, sAbsoluteRequestUrl);
+				});
 				this.oModelInterface.reportTransitionMessages(aMessages, sResourcePath);
 			}
 		}
@@ -1823,8 +1859,8 @@ sap.ui.define([
 	 *   other group ID values, the request is added to the given group and you can use
 	 *   {@link #submitBatch} to send all requests in that group. This group lock will be unlocked
 	 *   immediately, even if the request itself is queued. The request is rejected if the lock is
-	 *   already canceled. For a group lock w/o a serial number, a non-GET is put into a change set
-	 *   of its own (unless <code>bAtFront</code> is used).
+	 *   already canceled. For a group lock with a negative serial number, a non-GET is put into a
+	 *   change set of its own (unless <code>bAtFront</code> is used).
 	 * @param {object} [mHeaders]
 	 *   Map of request-specific headers, overriding both the mandatory OData V4 headers and the
 	 *   default headers given to the factory. This map of headers must not contain
@@ -1881,6 +1917,7 @@ sap.ui.define([
 	 *     <li>the {@link #checkConflictingStrictRequest rules for strict handling} w.r.t. change
 	 *       sets are violated
 	 *   </ul>
+	 *
 	 * @public
 	 */
 	_Requestor.prototype.request = function (sMethod, sResourcePath, oGroupLock, mHeaders, oPayload,
@@ -1946,18 +1983,19 @@ sap.ui.define([
 				} else if (bAtFront) { // add at front of first change set
 					aRequests[0].unshift(oRequest);
 				} else { // push into change set which was current when the request was initiated
-					if (!iRequestSerialNumber && aRequests[aRequests.iChangeSet].length) {
-						that.addChangeSet(sGroupId);
-					}
 					iChangeSetNo = aRequests.iChangeSet;
-					while (aRequests[iChangeSetNo].iSerialNumber > iRequestSerialNumber) {
+					while (aRequests[iChangeSetNo].iSerialNumber > Math.abs(iRequestSerialNumber)) {
 						iChangeSetNo -= 1;
 					}
+					if (iRequestSerialNumber < 0) {
+						iChangeSetNo += 1; // insert own change set *afterwards*
+						const aChangeSet = [];
+						aChangeSet.iSerialNumber = -iRequestSerialNumber;
+						aRequests.iChangeSet += 1;
+						aRequests.splice(iChangeSetNo, 0, aChangeSet);
+					}
 					that.checkConflictingStrictRequest(oRequest, aRequests, iChangeSetNo);
 					aRequests[iChangeSetNo].push(oRequest);
-					if (!iRequestSerialNumber) {
-						that.addChangeSet(sGroupId);
-					}
 				}
 				if (sGroupId === "$single") {
 					that.submitBatch("$single").catch(that.oModelInterface.getReporter());
@@ -1989,7 +2027,8 @@ sap.ui.define([
 				// Note: "text/plain" used for $count
 				typeof oResponse.body === "string" ? JSON.parse(oResponse.body) : oResponse.body,
 				sMetaPath);
-			that.reportHeaderMessages(sOriginalResourcePath, oResponse.messages, oResult);
+			that.reportHeaderMessages(sOriginalResourcePath, oResponse.messages, oResult,
+				sResourcePath);
 			return oResult;
 		});
 	};
@@ -2012,7 +2051,7 @@ sap.ui.define([
 				this.oModelInterface.isIgnoreETag()
 			);
 
-		return this.processOptimisticBatch(aRequests, sGroupId)
+		return !bHasChanges && this.processOptimisticBatch(aRequests, sGroupId)
 			|| this.sendRequest("POST", "$batch" + this.sQueryParams,
 				Object.assign(oBatchRequest.headers, mBatchHeaders,
 					bHasChanges ? undefined : {"sap-cancel-on-close" : "true"},
@@ -2354,6 +2393,8 @@ sap.ui.define([
 	 * @param {string} sOptimisticGroupId The group ID of the optimistic batch
 	 * @returns {boolean}
 	 *   Whether the actual batch requests and group ID matches the optimistic one
+	 *
+	 * @private
 	 */
 	_Requestor.matchesOptimisticBatch = function (aActualRequests, sActualGroupId,
 		aOptimisticRequests, sOptimisticGroupId) {
@@ -2441,17 +2482,19 @@ sap.ui.define([
 	 *   A map of query parameters as described in
 	 *   {@link sap.ui.model.odata.v4.lib._Helper.buildQuery}; used only to request the CSRF
 	 *   token
-	 * @param {string} [sODataVersion="4.0"]
-	 *   The version of the OData service. Supported values are "2.0" and "4.0".
+	 * @param {string} sODataVersion
+	 *   The version of the OData service. Supported values are "2.0", "4.0", and "4.01".
 	 * @param {boolean} [bWithCredentials]
 	 *   Whether the XHR should be called with <code>withCredentials</code>
 	 * @returns {object}
 	 *   A new <code>_Requestor</code> instance
+	 *
+	 * @public
 	 */
 	_Requestor.create = function (sServiceUrl, oModelInterface, mHeaders, mQueryParams,
 			sODataVersion, bWithCredentials) {
 		var oRequestor = new _Requestor(sServiceUrl, mHeaders, mQueryParams, oModelInterface,
-			bWithCredentials);
+			sODataVersion, bWithCredentials);
 
 		if (sODataVersion === "2.0") {
 			asV2Requestor(oRequestor);
@@ -2460,5 +2503,29 @@ sap.ui.define([
 		return oRequestor;
 	};
 
+	/**
+	 * A "reviver" function to be used by JSON.parse in order to transform 4.01 control information
+	 * back to 4.0 format by adding missing "odata." infixes and missing hashes for "@odata.type".
+	 *
+	 * @param {string} sProperty - The current property's name
+	 * @param {any} vPropertyValue - The current property's value
+	 * @returns {any|undefined}
+	 *   The current property's value or <code>undefined</code> in order to ignore delete it
+	 *
+	 * @private
+	 */
+	_Requestor.reviver = function (sProperty, vPropertyValue) {
+		if (sProperty.includes("@") && !sProperty.includes(".")) {
+			// control information w/o "odata."
+			if (sProperty.endsWith("@type") && !vPropertyValue.includes("#")) {
+				// "built-in primitive type value"
+				vPropertyValue = "#" + vPropertyValue;
+			}
+			this[sProperty.replace("@", "@odata.")] = vPropertyValue;
+			return undefined; // "delete this[sProperty]"
+		}
+		return vPropertyValue;
+	};
+
 	return _Requestor;
 }, /* bExport= */false);

package/src/sap/ui/model/odata/v4/lib/_V4MetadataConverter.js

@@ -14,14 +14,19 @@ sap.ui.define([
 	/**
 	 * Creates a converter for V4 metadata.
 	 *
+	 * @param {string} sODataVersion
+	 *   The version of the OData service. Supported values are "2.0" (in case an annotation file is
+	 *   converted), "4.0", and "4.01".
+	 *
 	 * @alias sap.ui.model.odata.v4.lib._V4MetadataConverter
 	 * @constructor
 	 * @extends sap.ui.model.odata.v4.lib._MetadataConverter
 	 */
-	function _V4MetadataConverter() {
+	function _V4MetadataConverter(sODataVersion) {
 		this.enumType = null; // the current EnumType
 		this.enumTypeMemberCounter = 0; // the current EnumType member value counter
 		this.navigationProperty = null; // the current NavigationProperty
+		this.odataVersion = sODataVersion;
 
 		_MetadataConverter.call(this);
 	}
@@ -33,7 +38,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.lib._MetadataConverter#finalize
 	 */
 	_V4MetadataConverter.prototype.finalize = function () {
-		if (this.result.$Version !== "4.0") {
+		if (this.result.$Version !== this.odataVersion && this.result.$Version !== "4.0") {
 			throw new Error(this.url + ": Unsupported OData version " + this.result.$Version);
 		}
 	};
@@ -250,7 +255,9 @@ sap.ui.define([
 			},
 			Precision : this.setNumber,
 			Scale : function (sValue) {
-				return sValue === "variable" ? sValue : that.setNumber(sValue);
+				return sValue === "floating" || sValue === "variable"
+					? sValue
+					: that.setNumber(sValue);
 			},
 			SRID : this.setValue,
 			Unicode : this.setIfFalse

package/src/sap/ui/model/odata/v4/ts.js

@@ -14,7 +14,7 @@
  */
 
 /**
- * An object representing a "14.5.11 Expression edm:NavigationPropertyPath". Its shape corresponds
+ * An object representing a "14.4.1.5 Expression edm:NavigationPropertyPath". Its shape corresponds
  * exactly to the shape of such an expression in the
  * {@link topic:87aac894a40640f89920d7b2a414499b OData V4 Metadata JSON Format} as returned by
  * {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject}.
@@ -29,7 +29,7 @@
  */
 
 /**
- * An object representing a "14.5.13 Expression edm:PropertyPath". Its shape corresponds exactly to
+ * An object representing a "14.4.1.6 Expression edm:PropertyPath". Its shape corresponds exactly to
  * the shape of such an expression in the
  * {@link topic:87aac894a40640f89920d7b2a414499b OData V4 Metadata JSON Format} as returned by
  * {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject}.

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/Forma
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/String.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.1
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/performance/Measurement.js

@@ -7,9 +7,15 @@
  * IMPORTANT: This is a private module, its API must not be used and is subject to change.
  * Code other than the OpenUI5 libraries must not introduce dependencies to this module.
  */
-sap.ui.define(['sap/base/Log', 'sap/base/util/now'
-], function(Log, now) {
-
+sap.ui.define([
+	'sap/base/Log',
+	'sap/base/util/now',
+	"sap/ui/performance/XHRInterceptor"
+], function(
+	Log,
+	now,
+	XHRInterceptor
+) {
 	"use strict";
 
 	/**
@@ -85,7 +91,6 @@ sap.ui.define(['sap/base/Log', 'sap/base/util/now'
 		}
 
 		var bActive = false,
-			fnXHR = XMLHttpRequest,
 			aRestrictedCategories = null,
 			aAverageMethods = [],
 			aOriginalMethods = [],
@@ -132,7 +137,7 @@ sap.ui.define(['sap/base/Log', 'sap/base/util/now'
 				return;
 			}
 			bActive = bOn;
-			if (bActive) {
+			if (bActive && !XHRInterceptor.isRegistered("MEASUREMENT", "open")) {
 
 				//activate method implementations once
 				for (var sName in mMethods) {
@@ -143,25 +148,14 @@ sap.ui.define(['sap/base/Log', 'sap/base/util/now'
 				fnStart = this.start;
 
 				// wrap and instrument XHR
-				/* eslint-disable-next-line no-global-assign */
-				XMLHttpRequest = function() {
-					var oXHR = new fnXHR(),
-						fnOpen = oXHR.open,
-						sMeasureId;
-
-					oXHR.open = function() {
-						sMeasureId = new URL(arguments[1], document.baseURI).href;
-						fnStart(sMeasureId, "Request for " + sMeasureId, "xmlhttprequest");
-						oXHR.addEventListener("loadend", fnEnd.bind(null, sMeasureId));
-
-						fnOpen.apply(this, arguments);
-					};
-
-					return oXHR;
-				};
-			} else {
-				/* eslint-disable-next-line no-global-assign */
-				XMLHttpRequest = fnXHR;
+				XHRInterceptor.register("MEASUREMENT", "open", function (sMethod, sUrl, bAsync) {
+					const sMeasureId = new URL(sUrl, document.baseURI).href;
+					fnStart(sMeasureId, "Request for " + sMeasureId, "xmlhttprequest");
+					this.addEventListener("loadend", fnEnd.bind(null, sMeasureId));
+
+				});
+			} else if (XHRInterceptor.isRegistered("MEASUREMENT", "open")) {
+				XHRInterceptor.unregister("MEASUREMENT", "open");
 			}
 
 			return bActive;

package/src/sap/ui/performance/trace/FESR.js

@@ -142,7 +142,7 @@ sap.ui.define([
 			formatInt(oInteraction.busyDuration, 4), // extension_1 - busy duration
 			formatInt(oFESRHandle.interactionType || 0, 4), // extension_2 - type of interaction: 0 = not implemented, 1 = app start, 2 = follow up step, 3 = unknown
 			format(CLIENT_DEVICE, 1), // extension_3 - client device
-			"", // extension_4
+			formatInt(oInteraction.legacyDuration, 10), // extension_4
 			format(formatInteractionStartTimestamp(oInteraction.start), 20), // extension_5 - interaction start time
 			format(oFESRHandle.appNameLong, 70, true) // application_name with 70 characters, trimmed from left
 		].join(",");
@@ -302,8 +302,9 @@ sap.ui.define([
 			oBeaconRequest = sUrl ? BeaconRequest.isSupported() && new BeaconRequest({url: sUrl}) : null;
 			sBeaconURL = sUrl;
 			bFesrActive = true;
-			Passport.setActive(true);
 			await Interaction.setActive(true);
+			// activate passport after Interaction is ready to make the XHRInterceptor work properly. The Interceptor needs a pending interaction to work.
+			Passport.setActive(true);
 			XHRInterceptor.register("PASSPORT_HEADER", "open", passportHeaderOverride);
 			if (!oBeaconRequest) {
 				XHRInterceptor.register("FESR", "open" , fesrHeaderOverride);