@microsoft/applicationinsights-dependencies-js 3.0.3-nightly3.2308-11 → 3.0.3-nightly3.2309-01
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/browser/es5/applicationinsights-dependencies-js.cjs.js +127 -58
- package/browser/es5/applicationinsights-dependencies-js.cjs.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.cjs.min.js +2 -2
- package/browser/es5/applicationinsights-dependencies-js.cjs.min.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.gbl.js +129 -60
- package/browser/es5/applicationinsights-dependencies-js.gbl.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.gbl.min.js +2 -2
- package/browser/es5/applicationinsights-dependencies-js.gbl.min.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.integrity.json +25 -25
- package/browser/es5/applicationinsights-dependencies-js.js +129 -60
- package/browser/es5/applicationinsights-dependencies-js.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.min.js +2 -2
- package/browser/es5/applicationinsights-dependencies-js.min.js.map +1 -1
- package/dist/es5/applicationinsights-dependencies-js.js +127 -58
- package/dist/es5/applicationinsights-dependencies-js.js.map +1 -1
- package/dist/es5/applicationinsights-dependencies-js.min.js +2 -2
- package/dist/es5/applicationinsights-dependencies-js.min.js.map +1 -1
- package/dist-es5/DependencyInitializer.js +1 -1
- package/dist-es5/DependencyListener.js +1 -1
- package/dist-es5/InternalConstants.js +1 -1
- package/dist-es5/__DynamicConstants.js +1 -1
- package/dist-es5/ajax.js +139 -58
- package/dist-es5/ajax.js.map +1 -1
- package/dist-es5/ajaxRecord.js +1 -1
- package/dist-es5/ajaxUtils.js +1 -1
- package/dist-es5/applicationinsights-dependencies-js.js +1 -1
- package/package.json +3 -3
- package/types/applicationinsights-dependencies-js.d.ts +18 -2
- package/types/applicationinsights-dependencies-js.namespaced.d.ts +18 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.
|
|
2
|
+
* Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.2309-01
|
|
3
3
|
* Copyright (c) Microsoft and contributors. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
'use strict';
|
|
@@ -1362,7 +1362,7 @@ function newId(maxLength) {
|
|
|
1362
1362
|
return result;
|
|
1363
1363
|
}
|
|
1364
1364
|
|
|
1365
|
-
var version = '3.0.3-nightly3.
|
|
1365
|
+
var version = '3.0.3-nightly3.2309-01';
|
|
1366
1366
|
var instanceName = "." + newId(6);
|
|
1367
1367
|
var _dataUid = 0;
|
|
1368
1368
|
function _canAcceptData(target) {
|
|
@@ -4067,7 +4067,7 @@ var ajaxRecord = /** @class */ (function () {
|
|
|
4067
4067
|
var _a;
|
|
4068
4068
|
var AJAX_MONITOR_PREFIX = "ai.ajxmn.";
|
|
4069
4069
|
var strDiagLog = "diagLog";
|
|
4070
|
-
var
|
|
4070
|
+
var AJAX_DATA_CONTAINER = "_ajaxData";
|
|
4071
4071
|
var STR_FETCH = "fetch";
|
|
4072
4072
|
var ERROR_HEADER = "Failed to monitor XMLHttpRequest";
|
|
4073
4073
|
var ERROR_PREFIX = ", monitoring data for this ajax call ";
|
|
@@ -4087,8 +4087,8 @@ function _supportsFetch() {
|
|
|
4087
4087
|
}
|
|
4088
4088
|
return _global[STR_FETCH];
|
|
4089
4089
|
}
|
|
4090
|
-
function _supportsAjaxMonitoring(ajaxMonitorInstance) {
|
|
4091
|
-
var _a;
|
|
4090
|
+
function _supportsAjaxMonitoring(ajaxMonitorInstance, ajaxDataId) {
|
|
4091
|
+
var _a, _b;
|
|
4092
4092
|
var result = false;
|
|
4093
4093
|
if (isXhrSupported()) {
|
|
4094
4094
|
var proto = XMLHttpRequest[strShimPrototype];
|
|
@@ -4104,24 +4104,63 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance) {
|
|
|
4104
4104
|
if (result) {
|
|
4105
4105
|
try {
|
|
4106
4106
|
var xhr = new XMLHttpRequest();
|
|
4107
|
-
|
|
4107
|
+
var xhrData = {
|
|
4108
|
+
xh: [],
|
|
4109
|
+
i: (_a = {},
|
|
4110
|
+
_a[ajaxDataId] = {},
|
|
4111
|
+
_a)
|
|
4112
|
+
};
|
|
4113
|
+
xhr[AJAX_DATA_CONTAINER] = xhrData;
|
|
4108
4114
|
var theOpen = XMLHttpRequest[strShimPrototype].open;
|
|
4109
4115
|
XMLHttpRequest[strShimPrototype].open = theOpen;
|
|
4110
4116
|
}
|
|
4111
4117
|
catch (e) {
|
|
4112
4118
|
result = false;
|
|
4113
|
-
_throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (
|
|
4114
|
-
|
|
4115
|
-
|
|
4119
|
+
_throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (_b = {},
|
|
4120
|
+
_b[_DYN_EXCEPTION ] = dumpObj(e),
|
|
4121
|
+
_b));
|
|
4116
4122
|
}
|
|
4117
4123
|
}
|
|
4118
4124
|
return result;
|
|
4119
4125
|
}
|
|
4120
|
-
function
|
|
4126
|
+
var _getAjaxData = function (xhr, ajaxDataId) {
|
|
4127
|
+
if (xhr && ajaxDataId && xhr[AJAX_DATA_CONTAINER]) {
|
|
4128
|
+
return (xhr[AJAX_DATA_CONTAINER].i || {})[ajaxDataId];
|
|
4129
|
+
}
|
|
4130
|
+
return null;
|
|
4131
|
+
};
|
|
4132
|
+
var _addSharedXhrHeaders = function (xhr, name, value) {
|
|
4133
|
+
if (xhr) {
|
|
4134
|
+
var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
|
|
4135
|
+
if (headers) {
|
|
4136
|
+
headers.push({
|
|
4137
|
+
n: name,
|
|
4138
|
+
v: value
|
|
4139
|
+
});
|
|
4140
|
+
}
|
|
4141
|
+
}
|
|
4142
|
+
};
|
|
4143
|
+
var _isHeaderSet = function (xhr, name) {
|
|
4144
|
+
var isPresent = false;
|
|
4145
|
+
if (xhr) {
|
|
4146
|
+
var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
|
|
4147
|
+
if (headers) {
|
|
4148
|
+
arrForEach(headers, function (header) {
|
|
4149
|
+
if (header.n === name) {
|
|
4150
|
+
isPresent = true;
|
|
4151
|
+
return -1;
|
|
4152
|
+
}
|
|
4153
|
+
});
|
|
4154
|
+
}
|
|
4155
|
+
}
|
|
4156
|
+
return isPresent;
|
|
4157
|
+
};
|
|
4158
|
+
function _getFailedAjaxDiagnosticsMessage(xhr, ajaxDataId) {
|
|
4121
4159
|
var result = "";
|
|
4122
4160
|
try {
|
|
4123
|
-
|
|
4124
|
-
|
|
4161
|
+
var ajaxData = _getAjaxData(xhr, ajaxDataId);
|
|
4162
|
+
if (ajaxData && ajaxData[_DYN_REQUEST_URL ]) {
|
|
4163
|
+
result += "(url: '" + ajaxData[_DYN_REQUEST_URL ] + "')";
|
|
4125
4164
|
}
|
|
4126
4165
|
}
|
|
4127
4166
|
catch (e) {
|
|
@@ -4135,12 +4174,12 @@ function _throwInternalWarning(ajaxMonitorInstance, msgId, message, properties,
|
|
|
4135
4174
|
_throwInternal(ajaxMonitorInstance[strDiagLog](), 2 , msgId, message, properties, isUserAct);
|
|
4136
4175
|
}
|
|
4137
4176
|
function _createErrorCallbackFunc(ajaxMonitorInstance, internalMessage, message) {
|
|
4138
|
-
return function (
|
|
4177
|
+
return function (callDetails) {
|
|
4139
4178
|
var _a;
|
|
4140
4179
|
_throwInternalCritical(ajaxMonitorInstance, internalMessage, message, (_a = {
|
|
4141
|
-
ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(
|
|
4180
|
+
ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(callDetails[_DYN_INST ], ajaxMonitorInstance._ajaxDataId)
|
|
4142
4181
|
},
|
|
4143
|
-
_a[_DYN_EXCEPTION ] = dumpObj(
|
|
4182
|
+
_a[_DYN_EXCEPTION ] = dumpObj(callDetails.err),
|
|
4144
4183
|
_a));
|
|
4145
4184
|
};
|
|
4146
4185
|
}
|
|
@@ -4265,6 +4304,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4265
4304
|
var _excludeRequestFromAutoTrackingPatterns;
|
|
4266
4305
|
var _addRequestContext;
|
|
4267
4306
|
var _evtNamespace;
|
|
4307
|
+
var _ajaxDataId;
|
|
4268
4308
|
var _dependencyHandlerId;
|
|
4269
4309
|
var _dependencyListeners;
|
|
4270
4310
|
var _dependencyInitializers;
|
|
@@ -4334,17 +4374,27 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4334
4374
|
else if (xhr) {
|
|
4335
4375
|
if (correlationIdCanIncludeCorrelationHeader(_extensionConfig, ajaxData[_DYN_GET_ABSOLUTE_URL ](), currentWindowHost)) {
|
|
4336
4376
|
if (_isUsingAIHeaders) {
|
|
4337
|
-
|
|
4338
|
-
|
|
4339
|
-
|
|
4340
|
-
|
|
4377
|
+
if (!_isHeaderSet(xhr, RequestHeaders[3 ])) {
|
|
4378
|
+
var id = "|" + ajaxData[_DYN_TRACE_ID ] + "." + ajaxData[_DYN_SPAN_ID ];
|
|
4379
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[3 ], id);
|
|
4380
|
+
if (_enableRequestHeaderTracking) {
|
|
4381
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[3 ]] = id;
|
|
4382
|
+
}
|
|
4383
|
+
}
|
|
4384
|
+
else {
|
|
4385
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[3 ] + "] as it has already been set by another instance");
|
|
4341
4386
|
}
|
|
4342
4387
|
}
|
|
4343
4388
|
var appId = _appId || (_context && _context.appId());
|
|
4344
4389
|
if (appId) {
|
|
4345
|
-
|
|
4346
|
-
|
|
4347
|
-
|
|
4390
|
+
if (!_isHeaderSet(xhr, RequestHeaders[0 ])) {
|
|
4391
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[0 ], RequestHeaders[2 ] + appId);
|
|
4392
|
+
if (_enableRequestHeaderTracking) {
|
|
4393
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[0 ]] = RequestHeaders[2 ] + appId;
|
|
4394
|
+
}
|
|
4395
|
+
}
|
|
4396
|
+
else {
|
|
4397
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[0 ] + "] as it has already been set by another instance");
|
|
4348
4398
|
}
|
|
4349
4399
|
}
|
|
4350
4400
|
if (_isUsingW3CHeaders) {
|
|
@@ -4352,10 +4402,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4352
4402
|
if (isNullOrUndefined(traceFlags)) {
|
|
4353
4403
|
traceFlags = 0x01;
|
|
4354
4404
|
}
|
|
4355
|
-
|
|
4356
|
-
|
|
4357
|
-
|
|
4358
|
-
|
|
4405
|
+
if (!_isHeaderSet(xhr, RequestHeaders[4 ])) {
|
|
4406
|
+
var traceParent = formatTraceParent(createTraceParent(ajaxData[_DYN_TRACE_ID ], ajaxData[_DYN_SPAN_ID ], traceFlags));
|
|
4407
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[4 ], traceParent);
|
|
4408
|
+
if (_enableRequestHeaderTracking) {
|
|
4409
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[4 ]] = traceParent;
|
|
4410
|
+
}
|
|
4411
|
+
}
|
|
4412
|
+
else {
|
|
4413
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[4 ] + "] as it has already been set by another instance");
|
|
4359
4414
|
}
|
|
4360
4415
|
}
|
|
4361
4416
|
}
|
|
@@ -4413,6 +4468,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4413
4468
|
_dependencyHandlerId = 0;
|
|
4414
4469
|
_dependencyListeners = [];
|
|
4415
4470
|
_dependencyInitializers = [];
|
|
4471
|
+
_ajaxDataId = createUniqueNamespace("ajaxData");
|
|
4472
|
+
_self._ajaxDataId = _ajaxDataId;
|
|
4416
4473
|
_ignoreHeaders = null;
|
|
4417
4474
|
_maxAjaxPerfLookupAttempts = 1;
|
|
4418
4475
|
_ajaxPerfLookupDelay = 1;
|
|
@@ -4549,7 +4606,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4549
4606
|
_addHook(InstrumentProto(target, funcName, callbacks));
|
|
4550
4607
|
}
|
|
4551
4608
|
function _instrumentXhr() {
|
|
4552
|
-
if (!_supportsAjaxMonitoring(_self)) {
|
|
4609
|
+
if (!_supportsAjaxMonitoring(_self, _ajaxDataId)) {
|
|
4553
4610
|
return;
|
|
4554
4611
|
}
|
|
4555
4612
|
_self[_DYN__ADD_HOOK ](onConfigChange(_extensionConfig, function () {
|
|
@@ -4558,15 +4615,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4558
4615
|
if (!_disableAjaxTracking && !_xhrInitialized) {
|
|
4559
4616
|
_hookProto(XMLHttpRequest, "open", {
|
|
4560
4617
|
ns: _evtNamespace,
|
|
4561
|
-
req: function (
|
|
4618
|
+
req: function (callDetails, method, url, async) {
|
|
4562
4619
|
if (!_disableAjaxTracking) {
|
|
4563
|
-
var xhr =
|
|
4564
|
-
var ajaxData = xhr
|
|
4565
|
-
if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
|
|
4620
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4621
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4622
|
+
if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, ajaxData, true)) {
|
|
4566
4623
|
if (!ajaxData || !ajaxData.xhrMonitoringState[_DYN_OPEN_DONE ]) {
|
|
4567
|
-
_openHandler(xhr, method, url, async);
|
|
4624
|
+
ajaxData = _openHandler(xhr, method, url, async);
|
|
4568
4625
|
}
|
|
4569
|
-
_attachToOnReadyStateChange(xhr);
|
|
4626
|
+
_attachToOnReadyStateChange(xhr, ajaxData);
|
|
4570
4627
|
}
|
|
4571
4628
|
}
|
|
4572
4629
|
},
|
|
@@ -4574,11 +4631,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4574
4631
|
});
|
|
4575
4632
|
_hookProto(XMLHttpRequest, "send", {
|
|
4576
4633
|
ns: _evtNamespace,
|
|
4577
|
-
req: function (
|
|
4634
|
+
req: function (callDetails, context) {
|
|
4578
4635
|
if (!_disableAjaxTracking) {
|
|
4579
|
-
var xhr =
|
|
4580
|
-
var ajaxData = xhr
|
|
4581
|
-
if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
|
|
4636
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4637
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4638
|
+
if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
|
|
4582
4639
|
_createMarkId("xhr", ajaxData);
|
|
4583
4640
|
ajaxData[_DYN_REQUEST_SENT_TIME ] = dateTimeUtilsNow();
|
|
4584
4641
|
_self[_DYN_INCLUDE_CORRELATION_2 ](ajaxData, undefined, undefined, xhr);
|
|
@@ -4590,11 +4647,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4590
4647
|
});
|
|
4591
4648
|
_hookProto(XMLHttpRequest, "abort", {
|
|
4592
4649
|
ns: _evtNamespace,
|
|
4593
|
-
req: function (
|
|
4650
|
+
req: function (callDetails) {
|
|
4594
4651
|
if (!_disableAjaxTracking) {
|
|
4595
|
-
var xhr =
|
|
4596
|
-
var ajaxData = xhr
|
|
4597
|
-
if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
|
|
4652
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4653
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4654
|
+
if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
|
|
4598
4655
|
ajaxData[_DYN_ABORTED ] = 1;
|
|
4599
4656
|
ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ] = true;
|
|
4600
4657
|
}
|
|
@@ -4604,11 +4661,17 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4604
4661
|
});
|
|
4605
4662
|
_hookProto(XMLHttpRequest, "setRequestHeader", {
|
|
4606
4663
|
ns: _evtNamespace,
|
|
4607
|
-
req: function (
|
|
4608
|
-
if (!_disableAjaxTracking
|
|
4609
|
-
var xhr =
|
|
4610
|
-
|
|
4611
|
-
|
|
4664
|
+
req: function (callDetails, header, value) {
|
|
4665
|
+
if (!_disableAjaxTracking) {
|
|
4666
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4667
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4668
|
+
if (ajaxData && _isMonitoredXhrInstance(xhr, ajaxData)) {
|
|
4669
|
+
_addSharedXhrHeaders(xhr, header, value);
|
|
4670
|
+
if (_enableRequestHeaderTracking && _canIncludeHeaders(header)) {
|
|
4671
|
+
if (ajaxData) {
|
|
4672
|
+
ajaxData[_DYN_REQUEST_HEADERS ][header] = value;
|
|
4673
|
+
}
|
|
4674
|
+
}
|
|
4612
4675
|
}
|
|
4613
4676
|
}
|
|
4614
4677
|
},
|
|
@@ -4663,11 +4726,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4663
4726
|
}
|
|
4664
4727
|
return isDisabled;
|
|
4665
4728
|
}
|
|
4666
|
-
function _isMonitoredXhrInstance(xhr, excludeAjaxDataValidation) {
|
|
4729
|
+
function _isMonitoredXhrInstance(xhr, ajaxData, excludeAjaxDataValidation) {
|
|
4667
4730
|
var ajaxValidation = true;
|
|
4668
4731
|
var initialized = _xhrInitialized;
|
|
4669
4732
|
if (!isNullOrUndefined(xhr)) {
|
|
4670
|
-
ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(
|
|
4733
|
+
ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(ajaxData);
|
|
4671
4734
|
}
|
|
4672
4735
|
return initialized
|
|
4673
4736
|
&& ajaxValidation;
|
|
@@ -4687,7 +4750,9 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4687
4750
|
var distributedTraceCtx = _getDistributedTraceCtx();
|
|
4688
4751
|
var traceID = (distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_ID ]()) || generateW3CId();
|
|
4689
4752
|
var spanID = strSubstr(generateW3CId(), 0, 16);
|
|
4690
|
-
var
|
|
4753
|
+
var xhrRequestData = xhr[AJAX_DATA_CONTAINER] = (xhr[AJAX_DATA_CONTAINER] || { xh: [], i: {} });
|
|
4754
|
+
var ajaxDataCntr = xhrRequestData.i = (xhrRequestData.i || {});
|
|
4755
|
+
var ajaxData = ajaxDataCntr[_ajaxDataId] = (ajaxDataCntr[_ajaxDataId] || new ajaxRecord(traceID, spanID, _self[strDiagLog](), (_a = _self.core) === null || _a === void 0 ? void 0 : _a.getTraceCtx()));
|
|
4691
4756
|
ajaxData[_DYN_TRACE_FLAGS ] = distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_FLAGS ]();
|
|
4692
4757
|
ajaxData[_DYN_METHOD ] = method;
|
|
4693
4758
|
ajaxData[_DYN_REQUEST_URL ] = url;
|
|
@@ -4695,13 +4760,13 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4695
4760
|
ajaxData[_DYN_REQUEST_HEADERS ] = {};
|
|
4696
4761
|
ajaxData.async = async;
|
|
4697
4762
|
ajaxData[_DYN_ERROR_STATUS_TEXT ] = _enableAjaxErrorStatusText;
|
|
4698
|
-
|
|
4763
|
+
return ajaxData;
|
|
4699
4764
|
}
|
|
4700
|
-
function _attachToOnReadyStateChange(xhr) {
|
|
4701
|
-
|
|
4765
|
+
function _attachToOnReadyStateChange(xhr, ajaxData) {
|
|
4766
|
+
ajaxData.xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE13 ] = eventOn(xhr, "readystatechange", function () {
|
|
4702
4767
|
var _a;
|
|
4703
4768
|
try {
|
|
4704
|
-
if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
|
|
4769
|
+
if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr, ajaxData)) {
|
|
4705
4770
|
_onAjaxComplete(xhr);
|
|
4706
4771
|
}
|
|
4707
4772
|
}
|
|
@@ -4709,7 +4774,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4709
4774
|
var exceptionText = dumpObj(e);
|
|
4710
4775
|
if (!exceptionText || _indexOf(exceptionText[_DYN_TO_LOWER_CASE ](), "c00c023f") === -1) {
|
|
4711
4776
|
_throwInternalCritical(_self, 16 , ERROR_HEADER + " 'readystatechange' event handler" + ERROR_POSTFIX, (_a = {},
|
|
4712
|
-
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
|
|
4777
|
+
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
|
|
4713
4778
|
_a[_DYN_EXCEPTION ] = exceptionText,
|
|
4714
4779
|
_a));
|
|
4715
4780
|
}
|
|
@@ -4728,12 +4793,12 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4728
4793
|
return null;
|
|
4729
4794
|
}
|
|
4730
4795
|
function _onAjaxComplete(xhr) {
|
|
4731
|
-
var ajaxData = xhr
|
|
4796
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4732
4797
|
ajaxData[_DYN_RESPONSE_FINISHED_TI14 ] = dateTimeUtilsNow();
|
|
4733
4798
|
ajaxData[_DYN_STATUS ] = xhr[_DYN_STATUS ];
|
|
4734
4799
|
function _reportXhrError(e, failedProps) {
|
|
4735
4800
|
var errorProps = failedProps || {};
|
|
4736
|
-
errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr);
|
|
4801
|
+
errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId);
|
|
4737
4802
|
if (e) {
|
|
4738
4803
|
errorProps["exception"] = dumpObj(e);
|
|
4739
4804
|
}
|
|
@@ -4795,7 +4860,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4795
4860
|
}
|
|
4796
4861
|
finally {
|
|
4797
4862
|
try {
|
|
4798
|
-
xhr[
|
|
4863
|
+
var xhrRequestData = (xhr[AJAX_DATA_CONTAINER] || { i: {} });
|
|
4864
|
+
var ajaxDataCntr = (xhrRequestData.i || {});
|
|
4865
|
+
if (ajaxDataCntr[_ajaxDataId]) {
|
|
4866
|
+
ajaxDataCntr[_ajaxDataId] = null;
|
|
4867
|
+
}
|
|
4799
4868
|
}
|
|
4800
4869
|
catch (e) {
|
|
4801
4870
|
}
|
|
@@ -4818,7 +4887,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4818
4887
|
}
|
|
4819
4888
|
catch (e) {
|
|
4820
4889
|
_throwInternalWarning(_self, 18 , CORRELATION_HEADER_ERROR, (_a = {},
|
|
4821
|
-
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
|
|
4890
|
+
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
|
|
4822
4891
|
_a[_DYN_EXCEPTION ] = dumpObj(e),
|
|
4823
4892
|
_a));
|
|
4824
4893
|
}
|