@microsoft/applicationinsights-dependencies-js 3.0.3-nightly3.2308-10 → 3.0.3-nightly3.2308-16
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,11 +1,11 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.2308-
|
|
2
|
+
* Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.2308-16
|
|
3
3
|
* Copyright (c) Microsoft and contributors. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
(function (global, factory) {
|
|
6
6
|
var undef = "undefined";
|
|
7
|
-
var nsKey, key, nm, theExports = {}, modName = "
|
|
8
|
-
var mods={}, modDetail=mods[modName]={}, ver="3.0.3-nightly3.2308-
|
|
7
|
+
var nsKey, key, nm, theExports = {}, modName = "es5_applicationinsights_dependencies_js_3_0_3_nightly3_2308_16", msMod="__ms$mod__";
|
|
8
|
+
var mods={}, modDetail=mods[modName]={}, ver="3.0.3-nightly3.2308-16";
|
|
9
9
|
var baseNs=global, nsKey="Microsoft", baseNs=baseNs[nsKey]=(baseNs[nsKey]||{});
|
|
10
10
|
// Versioned namespace "Microsoft.ApplicationInsights3"
|
|
11
11
|
var exportNs=baseNs, nsKey="ApplicationInsights3", exportNs=exportNs[nsKey]=(exportNs[nsKey]||{});
|
|
@@ -1383,7 +1383,7 @@ function newId(maxLength) {
|
|
|
1383
1383
|
return result;
|
|
1384
1384
|
}
|
|
1385
1385
|
|
|
1386
|
-
var version = '3.0.3-nightly3.2308-
|
|
1386
|
+
var version = '3.0.3-nightly3.2308-16';
|
|
1387
1387
|
var instanceName = "." + newId(6);
|
|
1388
1388
|
var _dataUid = 0;
|
|
1389
1389
|
function _canAcceptData(target) {
|
|
@@ -4088,7 +4088,7 @@ var ajaxRecord = /** @class */ (function () {
|
|
|
4088
4088
|
var _a;
|
|
4089
4089
|
var AJAX_MONITOR_PREFIX = "ai.ajxmn.";
|
|
4090
4090
|
var strDiagLog = "diagLog";
|
|
4091
|
-
var
|
|
4091
|
+
var AJAX_DATA_CONTAINER = "_ajaxData";
|
|
4092
4092
|
var STR_FETCH = "fetch";
|
|
4093
4093
|
var ERROR_HEADER = "Failed to monitor XMLHttpRequest";
|
|
4094
4094
|
var ERROR_PREFIX = ", monitoring data for this ajax call ";
|
|
@@ -4108,8 +4108,8 @@ function _supportsFetch() {
|
|
|
4108
4108
|
}
|
|
4109
4109
|
return _global[STR_FETCH];
|
|
4110
4110
|
}
|
|
4111
|
-
function _supportsAjaxMonitoring(ajaxMonitorInstance) {
|
|
4112
|
-
var _a;
|
|
4111
|
+
function _supportsAjaxMonitoring(ajaxMonitorInstance, ajaxDataId) {
|
|
4112
|
+
var _a, _b;
|
|
4113
4113
|
var result = false;
|
|
4114
4114
|
if (isXhrSupported()) {
|
|
4115
4115
|
var proto = XMLHttpRequest[strShimPrototype];
|
|
@@ -4125,24 +4125,63 @@ function _supportsAjaxMonitoring(ajaxMonitorInstance) {
|
|
|
4125
4125
|
if (result) {
|
|
4126
4126
|
try {
|
|
4127
4127
|
var xhr = new XMLHttpRequest();
|
|
4128
|
-
|
|
4128
|
+
var xhrData = {
|
|
4129
|
+
xh: [],
|
|
4130
|
+
i: (_a = {},
|
|
4131
|
+
_a[ajaxDataId] = {},
|
|
4132
|
+
_a)
|
|
4133
|
+
};
|
|
4134
|
+
xhr[AJAX_DATA_CONTAINER] = xhrData;
|
|
4129
4135
|
var theOpen = XMLHttpRequest[strShimPrototype].open;
|
|
4130
4136
|
XMLHttpRequest[strShimPrototype].open = theOpen;
|
|
4131
4137
|
}
|
|
4132
4138
|
catch (e) {
|
|
4133
4139
|
result = false;
|
|
4134
|
-
_throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (
|
|
4135
|
-
|
|
4136
|
-
|
|
4140
|
+
_throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (_b = {},
|
|
4141
|
+
_b[_DYN_EXCEPTION ] = dumpObj(e),
|
|
4142
|
+
_b));
|
|
4137
4143
|
}
|
|
4138
4144
|
}
|
|
4139
4145
|
return result;
|
|
4140
4146
|
}
|
|
4141
|
-
function
|
|
4147
|
+
var _getAjaxData = function (xhr, ajaxDataId) {
|
|
4148
|
+
if (xhr && ajaxDataId && xhr[AJAX_DATA_CONTAINER]) {
|
|
4149
|
+
return (xhr[AJAX_DATA_CONTAINER].i || {})[ajaxDataId];
|
|
4150
|
+
}
|
|
4151
|
+
return null;
|
|
4152
|
+
};
|
|
4153
|
+
var _addSharedXhrHeaders = function (xhr, name, value) {
|
|
4154
|
+
if (xhr) {
|
|
4155
|
+
var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
|
|
4156
|
+
if (headers) {
|
|
4157
|
+
headers.push({
|
|
4158
|
+
n: name,
|
|
4159
|
+
v: value
|
|
4160
|
+
});
|
|
4161
|
+
}
|
|
4162
|
+
}
|
|
4163
|
+
};
|
|
4164
|
+
var _isHeaderSet = function (xhr, name) {
|
|
4165
|
+
var isPresent = false;
|
|
4166
|
+
if (xhr) {
|
|
4167
|
+
var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
|
|
4168
|
+
if (headers) {
|
|
4169
|
+
arrForEach(headers, function (header) {
|
|
4170
|
+
if (header.n === name) {
|
|
4171
|
+
isPresent = true;
|
|
4172
|
+
return -1;
|
|
4173
|
+
}
|
|
4174
|
+
});
|
|
4175
|
+
}
|
|
4176
|
+
}
|
|
4177
|
+
return isPresent;
|
|
4178
|
+
};
|
|
4179
|
+
function _getFailedAjaxDiagnosticsMessage(xhr, ajaxDataId) {
|
|
4142
4180
|
var result = "";
|
|
4143
4181
|
try {
|
|
4144
|
-
|
|
4145
|
-
|
|
4182
|
+
var ajaxData = _getAjaxData(xhr, ajaxDataId);
|
|
4183
|
+
if (ajaxData && ajaxData[_DYN_REQUEST_URL ]) {
|
|
4184
|
+
result += "(url: '" + ajaxData[_DYN_REQUEST_URL ] + "')";
|
|
4146
4185
|
}
|
|
4147
4186
|
}
|
|
4148
4187
|
catch (e) {
|
|
@@ -4156,12 +4195,12 @@ function _throwInternalWarning(ajaxMonitorInstance, msgId, message, properties,
|
|
|
4156
4195
|
_throwInternal(ajaxMonitorInstance[strDiagLog](), 2 , msgId, message, properties, isUserAct);
|
|
4157
4196
|
}
|
|
4158
4197
|
function _createErrorCallbackFunc(ajaxMonitorInstance, internalMessage, message) {
|
|
4159
|
-
return function (
|
|
4198
|
+
return function (callDetails) {
|
|
4160
4199
|
var _a;
|
|
4161
4200
|
_throwInternalCritical(ajaxMonitorInstance, internalMessage, message, (_a = {
|
|
4162
|
-
ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(
|
|
4201
|
+
ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(callDetails[_DYN_INST ], ajaxMonitorInstance._ajaxDataId)
|
|
4163
4202
|
},
|
|
4164
|
-
_a[_DYN_EXCEPTION ] = dumpObj(
|
|
4203
|
+
_a[_DYN_EXCEPTION ] = dumpObj(callDetails.err),
|
|
4165
4204
|
_a));
|
|
4166
4205
|
};
|
|
4167
4206
|
}
|
|
@@ -4286,6 +4325,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4286
4325
|
var _excludeRequestFromAutoTrackingPatterns;
|
|
4287
4326
|
var _addRequestContext;
|
|
4288
4327
|
var _evtNamespace;
|
|
4328
|
+
var _ajaxDataId;
|
|
4289
4329
|
var _dependencyHandlerId;
|
|
4290
4330
|
var _dependencyListeners;
|
|
4291
4331
|
var _dependencyInitializers;
|
|
@@ -4355,17 +4395,27 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4355
4395
|
else if (xhr) {
|
|
4356
4396
|
if (correlationIdCanIncludeCorrelationHeader(_extensionConfig, ajaxData[_DYN_GET_ABSOLUTE_URL ](), currentWindowHost)) {
|
|
4357
4397
|
if (_isUsingAIHeaders) {
|
|
4358
|
-
|
|
4359
|
-
|
|
4360
|
-
|
|
4361
|
-
|
|
4398
|
+
if (!_isHeaderSet(xhr, RequestHeaders[3 ])) {
|
|
4399
|
+
var id = "|" + ajaxData[_DYN_TRACE_ID ] + "." + ajaxData[_DYN_SPAN_ID ];
|
|
4400
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[3 ], id);
|
|
4401
|
+
if (_enableRequestHeaderTracking) {
|
|
4402
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[3 ]] = id;
|
|
4403
|
+
}
|
|
4404
|
+
}
|
|
4405
|
+
else {
|
|
4406
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[3 ] + "] as it has already been set by another instance");
|
|
4362
4407
|
}
|
|
4363
4408
|
}
|
|
4364
4409
|
var appId = _appId || (_context && _context.appId());
|
|
4365
4410
|
if (appId) {
|
|
4366
|
-
|
|
4367
|
-
|
|
4368
|
-
|
|
4411
|
+
if (!_isHeaderSet(xhr, RequestHeaders[0 ])) {
|
|
4412
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[0 ], RequestHeaders[2 ] + appId);
|
|
4413
|
+
if (_enableRequestHeaderTracking) {
|
|
4414
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[0 ]] = RequestHeaders[2 ] + appId;
|
|
4415
|
+
}
|
|
4416
|
+
}
|
|
4417
|
+
else {
|
|
4418
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[0 ] + "] as it has already been set by another instance");
|
|
4369
4419
|
}
|
|
4370
4420
|
}
|
|
4371
4421
|
if (_isUsingW3CHeaders) {
|
|
@@ -4373,10 +4423,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4373
4423
|
if (isNullOrUndefined(traceFlags)) {
|
|
4374
4424
|
traceFlags = 0x01;
|
|
4375
4425
|
}
|
|
4376
|
-
|
|
4377
|
-
|
|
4378
|
-
|
|
4379
|
-
|
|
4426
|
+
if (!_isHeaderSet(xhr, RequestHeaders[4 ])) {
|
|
4427
|
+
var traceParent = formatTraceParent(createTraceParent(ajaxData[_DYN_TRACE_ID ], ajaxData[_DYN_SPAN_ID ], traceFlags));
|
|
4428
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[4 ], traceParent);
|
|
4429
|
+
if (_enableRequestHeaderTracking) {
|
|
4430
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[4 ]] = traceParent;
|
|
4431
|
+
}
|
|
4432
|
+
}
|
|
4433
|
+
else {
|
|
4434
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[4 ] + "] as it has already been set by another instance");
|
|
4380
4435
|
}
|
|
4381
4436
|
}
|
|
4382
4437
|
}
|
|
@@ -4434,6 +4489,8 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4434
4489
|
_dependencyHandlerId = 0;
|
|
4435
4490
|
_dependencyListeners = [];
|
|
4436
4491
|
_dependencyInitializers = [];
|
|
4492
|
+
_ajaxDataId = createUniqueNamespace("ajaxData");
|
|
4493
|
+
_self._ajaxDataId = _ajaxDataId;
|
|
4437
4494
|
_ignoreHeaders = null;
|
|
4438
4495
|
_maxAjaxPerfLookupAttempts = 1;
|
|
4439
4496
|
_ajaxPerfLookupDelay = 1;
|
|
@@ -4570,7 +4627,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4570
4627
|
_addHook(InstrumentProto(target, funcName, callbacks));
|
|
4571
4628
|
}
|
|
4572
4629
|
function _instrumentXhr() {
|
|
4573
|
-
if (!_supportsAjaxMonitoring(_self)) {
|
|
4630
|
+
if (!_supportsAjaxMonitoring(_self, _ajaxDataId)) {
|
|
4574
4631
|
return;
|
|
4575
4632
|
}
|
|
4576
4633
|
_self[_DYN__ADD_HOOK ](onConfigChange(_extensionConfig, function () {
|
|
@@ -4579,15 +4636,15 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4579
4636
|
if (!_disableAjaxTracking && !_xhrInitialized) {
|
|
4580
4637
|
_hookProto(XMLHttpRequest, "open", {
|
|
4581
4638
|
ns: _evtNamespace,
|
|
4582
|
-
req: function (
|
|
4639
|
+
req: function (callDetails, method, url, async) {
|
|
4583
4640
|
if (!_disableAjaxTracking) {
|
|
4584
|
-
var xhr =
|
|
4585
|
-
var ajaxData = xhr
|
|
4586
|
-
if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
|
|
4641
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4642
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4643
|
+
if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, ajaxData, true)) {
|
|
4587
4644
|
if (!ajaxData || !ajaxData.xhrMonitoringState[_DYN_OPEN_DONE ]) {
|
|
4588
|
-
_openHandler(xhr, method, url, async);
|
|
4645
|
+
ajaxData = _openHandler(xhr, method, url, async);
|
|
4589
4646
|
}
|
|
4590
|
-
_attachToOnReadyStateChange(xhr);
|
|
4647
|
+
_attachToOnReadyStateChange(xhr, ajaxData);
|
|
4591
4648
|
}
|
|
4592
4649
|
}
|
|
4593
4650
|
},
|
|
@@ -4595,11 +4652,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4595
4652
|
});
|
|
4596
4653
|
_hookProto(XMLHttpRequest, "send", {
|
|
4597
4654
|
ns: _evtNamespace,
|
|
4598
|
-
req: function (
|
|
4655
|
+
req: function (callDetails, context) {
|
|
4599
4656
|
if (!_disableAjaxTracking) {
|
|
4600
|
-
var xhr =
|
|
4601
|
-
var ajaxData = xhr
|
|
4602
|
-
if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
|
|
4657
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4658
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4659
|
+
if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
|
|
4603
4660
|
_createMarkId("xhr", ajaxData);
|
|
4604
4661
|
ajaxData[_DYN_REQUEST_SENT_TIME ] = dateTimeUtilsNow();
|
|
4605
4662
|
_self[_DYN_INCLUDE_CORRELATION_2 ](ajaxData, undefined, undefined, xhr);
|
|
@@ -4611,11 +4668,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4611
4668
|
});
|
|
4612
4669
|
_hookProto(XMLHttpRequest, "abort", {
|
|
4613
4670
|
ns: _evtNamespace,
|
|
4614
|
-
req: function (
|
|
4671
|
+
req: function (callDetails) {
|
|
4615
4672
|
if (!_disableAjaxTracking) {
|
|
4616
|
-
var xhr =
|
|
4617
|
-
var ajaxData = xhr
|
|
4618
|
-
if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
|
|
4673
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4674
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4675
|
+
if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
|
|
4619
4676
|
ajaxData[_DYN_ABORTED ] = 1;
|
|
4620
4677
|
ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ] = true;
|
|
4621
4678
|
}
|
|
@@ -4625,11 +4682,17 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4625
4682
|
});
|
|
4626
4683
|
_hookProto(XMLHttpRequest, "setRequestHeader", {
|
|
4627
4684
|
ns: _evtNamespace,
|
|
4628
|
-
req: function (
|
|
4629
|
-
if (!_disableAjaxTracking
|
|
4630
|
-
var xhr =
|
|
4631
|
-
|
|
4632
|
-
|
|
4685
|
+
req: function (callDetails, header, value) {
|
|
4686
|
+
if (!_disableAjaxTracking) {
|
|
4687
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4688
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4689
|
+
if (ajaxData && _isMonitoredXhrInstance(xhr, ajaxData)) {
|
|
4690
|
+
_addSharedXhrHeaders(xhr, header, value);
|
|
4691
|
+
if (_enableRequestHeaderTracking && _canIncludeHeaders(header)) {
|
|
4692
|
+
if (ajaxData) {
|
|
4693
|
+
ajaxData[_DYN_REQUEST_HEADERS ][header] = value;
|
|
4694
|
+
}
|
|
4695
|
+
}
|
|
4633
4696
|
}
|
|
4634
4697
|
}
|
|
4635
4698
|
},
|
|
@@ -4684,11 +4747,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4684
4747
|
}
|
|
4685
4748
|
return isDisabled;
|
|
4686
4749
|
}
|
|
4687
|
-
function _isMonitoredXhrInstance(xhr, excludeAjaxDataValidation) {
|
|
4750
|
+
function _isMonitoredXhrInstance(xhr, ajaxData, excludeAjaxDataValidation) {
|
|
4688
4751
|
var ajaxValidation = true;
|
|
4689
4752
|
var initialized = _xhrInitialized;
|
|
4690
4753
|
if (!isNullOrUndefined(xhr)) {
|
|
4691
|
-
ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(
|
|
4754
|
+
ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(ajaxData);
|
|
4692
4755
|
}
|
|
4693
4756
|
return initialized
|
|
4694
4757
|
&& ajaxValidation;
|
|
@@ -4708,7 +4771,9 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4708
4771
|
var distributedTraceCtx = _getDistributedTraceCtx();
|
|
4709
4772
|
var traceID = (distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_ID ]()) || generateW3CId();
|
|
4710
4773
|
var spanID = strSubstr(generateW3CId(), 0, 16);
|
|
4711
|
-
var
|
|
4774
|
+
var xhrRequestData = xhr[AJAX_DATA_CONTAINER] = (xhr[AJAX_DATA_CONTAINER] || { xh: [], i: {} });
|
|
4775
|
+
var ajaxDataCntr = xhrRequestData.i = (xhrRequestData.i || {});
|
|
4776
|
+
var ajaxData = ajaxDataCntr[_ajaxDataId] = (ajaxDataCntr[_ajaxDataId] || new ajaxRecord(traceID, spanID, _self[strDiagLog](), (_a = _self.core) === null || _a === void 0 ? void 0 : _a.getTraceCtx()));
|
|
4712
4777
|
ajaxData[_DYN_TRACE_FLAGS ] = distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_FLAGS ]();
|
|
4713
4778
|
ajaxData[_DYN_METHOD ] = method;
|
|
4714
4779
|
ajaxData[_DYN_REQUEST_URL ] = url;
|
|
@@ -4716,13 +4781,13 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4716
4781
|
ajaxData[_DYN_REQUEST_HEADERS ] = {};
|
|
4717
4782
|
ajaxData.async = async;
|
|
4718
4783
|
ajaxData[_DYN_ERROR_STATUS_TEXT ] = _enableAjaxErrorStatusText;
|
|
4719
|
-
|
|
4784
|
+
return ajaxData;
|
|
4720
4785
|
}
|
|
4721
|
-
function _attachToOnReadyStateChange(xhr) {
|
|
4722
|
-
|
|
4786
|
+
function _attachToOnReadyStateChange(xhr, ajaxData) {
|
|
4787
|
+
ajaxData.xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE13 ] = eventOn(xhr, "readystatechange", function () {
|
|
4723
4788
|
var _a;
|
|
4724
4789
|
try {
|
|
4725
|
-
if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
|
|
4790
|
+
if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr, ajaxData)) {
|
|
4726
4791
|
_onAjaxComplete(xhr);
|
|
4727
4792
|
}
|
|
4728
4793
|
}
|
|
@@ -4730,7 +4795,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4730
4795
|
var exceptionText = dumpObj(e);
|
|
4731
4796
|
if (!exceptionText || _indexOf(exceptionText[_DYN_TO_LOWER_CASE ](), "c00c023f") === -1) {
|
|
4732
4797
|
_throwInternalCritical(_self, 16 , ERROR_HEADER + " 'readystatechange' event handler" + ERROR_POSTFIX, (_a = {},
|
|
4733
|
-
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
|
|
4798
|
+
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
|
|
4734
4799
|
_a[_DYN_EXCEPTION ] = exceptionText,
|
|
4735
4800
|
_a));
|
|
4736
4801
|
}
|
|
@@ -4749,12 +4814,12 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4749
4814
|
return null;
|
|
4750
4815
|
}
|
|
4751
4816
|
function _onAjaxComplete(xhr) {
|
|
4752
|
-
var ajaxData = xhr
|
|
4817
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4753
4818
|
ajaxData[_DYN_RESPONSE_FINISHED_TI14 ] = dateTimeUtilsNow();
|
|
4754
4819
|
ajaxData[_DYN_STATUS ] = xhr[_DYN_STATUS ];
|
|
4755
4820
|
function _reportXhrError(e, failedProps) {
|
|
4756
4821
|
var errorProps = failedProps || {};
|
|
4757
|
-
errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr);
|
|
4822
|
+
errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId);
|
|
4758
4823
|
if (e) {
|
|
4759
4824
|
errorProps["exception"] = dumpObj(e);
|
|
4760
4825
|
}
|
|
@@ -4816,7 +4881,11 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4816
4881
|
}
|
|
4817
4882
|
finally {
|
|
4818
4883
|
try {
|
|
4819
|
-
xhr[
|
|
4884
|
+
var xhrRequestData = (xhr[AJAX_DATA_CONTAINER] || { i: {} });
|
|
4885
|
+
var ajaxDataCntr = (xhrRequestData.i || {});
|
|
4886
|
+
if (ajaxDataCntr[_ajaxDataId]) {
|
|
4887
|
+
ajaxDataCntr[_ajaxDataId] = null;
|
|
4888
|
+
}
|
|
4820
4889
|
}
|
|
4821
4890
|
catch (e) {
|
|
4822
4891
|
}
|
|
@@ -4839,7 +4908,7 @@ var AjaxMonitor = /** @class */ (function (_super) {
|
|
|
4839
4908
|
}
|
|
4840
4909
|
catch (e) {
|
|
4841
4910
|
_throwInternalWarning(_self, 18 , CORRELATION_HEADER_ERROR, (_a = {},
|
|
4842
|
-
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
|
|
4911
|
+
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
|
|
4843
4912
|
_a[_DYN_EXCEPTION ] = dumpObj(e),
|
|
4844
4913
|
_a));
|
|
4845
4914
|
}
|