@microsoft/applicationinsights-dependencies-js 3.0.0-beta.2302-01 → 3.0.0-beta.2302-02

package/browser/applicationinsights-dependencies-js.integrity.json

@@ -1,25 +1,25 @@
 {
     "name": "applicationinsights-dependencies-js",
-    "version": "3.0.0-beta.2302-01",
+    "version": "3.0.0-beta.2302-02",
     "ext": {
         "@js": {
             "file": "applicationinsights-dependencies-js.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-QBqTVnjgIn1JcdTGLs18opQUp30vCW5BxXlwrWUdMTE= sha384-Yd8gwI1TKmv5spjT7eZo3zOAd/qDfTHe3nGAzuAfKrcOv0XLYEDCqF39Ekr493GL sha512-9PYY0br7MqwnPTG4gBNhzEOT2NnU1j9YAtR1fieEZaNDq05kiMGJc7ePD4OCk2pMOP0GBvWdyh929/zfBJSooQ==",
+            "integrity": "sha256-clKhCzJoc86HK+Sr4VnIBSmTtO1bcHc5BJIboHHn/S4= sha384-flW+CZXj+Z8p0+iTkhLMlIvfr8wMZg+nS3WAYv2I1nlkA7YWfzRQNK/tdZUy88ri sha512-k+gxKs5DIGrAKhR7G2HFCpuWzUgyJo0EsD2y+lLE+n060U44qHiexNhTOEyaEL1PGMshZHHIdsOIikt+l88slg==",
             "hashes": {
-                "sha256": "QBqTVnjgIn1JcdTGLs18opQUp30vCW5BxXlwrWUdMTE=",
-                "sha384": "Yd8gwI1TKmv5spjT7eZo3zOAd/qDfTHe3nGAzuAfKrcOv0XLYEDCqF39Ekr493GL",
-                "sha512": "9PYY0br7MqwnPTG4gBNhzEOT2NnU1j9YAtR1fieEZaNDq05kiMGJc7ePD4OCk2pMOP0GBvWdyh929/zfBJSooQ=="
+                "sha256": "clKhCzJoc86HK+Sr4VnIBSmTtO1bcHc5BJIboHHn/S4=",
+                "sha384": "flW+CZXj+Z8p0+iTkhLMlIvfr8wMZg+nS3WAYv2I1nlkA7YWfzRQNK/tdZUy88ri",
+                "sha512": "k+gxKs5DIGrAKhR7G2HFCpuWzUgyJo0EsD2y+lLE+n060U44qHiexNhTOEyaEL1PGMshZHHIdsOIikt+l88slg=="
             }
         },
         "@min.js": {
             "file": "applicationinsights-dependencies-js.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-tANT4Ay+BPtQ/ChdZkc2zkVwaYHy5qYbjghsV2RDxZM= sha384-e+44ZrOCgho5e0/3ueVR5kARA7Bsk1yYe70Bdcc2EnsT84AZH2pSgBvRiO+xx+xT sha512-1UQMaP46HLVi8oPmkpRauBzMJsTy0lBHyGoDuu0ecOIK25oLbriyLGVu99cxdq6wz6vXRMUBkcgXcQp7PJnsuw==",
+            "integrity": "sha256-A8z7jelPnZ7DkN71qYv7bRAtCn4QoFZnwUQnPA+6q+U= sha384-Zc8UJQ6wuiaS+YmithZA+7EYNPTX5X2Siirqm37aSS/aN8fknDkTux3ippGws4wu sha512-z8GJcR4z2FOwrmhgh724Vch/pgEVQW9oERi/Yj8NEytoGroQQZYMFlfRnh502ByfRyZQRYU7d0jYWsZ2e6Qytg==",
             "hashes": {
-                "sha256": "tANT4Ay+BPtQ/ChdZkc2zkVwaYHy5qYbjghsV2RDxZM=",
-                "sha384": "e+44ZrOCgho5e0/3ueVR5kARA7Bsk1yYe70Bdcc2EnsT84AZH2pSgBvRiO+xx+xT",
-                "sha512": "1UQMaP46HLVi8oPmkpRauBzMJsTy0lBHyGoDuu0ecOIK25oLbriyLGVu99cxdq6wz6vXRMUBkcgXcQp7PJnsuw=="
+                "sha256": "A8z7jelPnZ7DkN71qYv7bRAtCn4QoFZnwUQnPA+6q+U=",
+                "sha384": "Zc8UJQ6wuiaS+YmithZA+7EYNPTX5X2Siirqm37aSS/aN8fknDkTux3ippGws4wu",
+                "sha512": "z8GJcR4z2FOwrmhgh724Vch/pgEVQW9oERi/Yj8NEytoGroQQZYMFlfRnh502ByfRyZQRYU7d0jYWsZ2e6Qytg=="
             }
         }
     }

package/browser/applicationinsights-dependencies-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Dependencies Plugin, 3.0.0-beta.2302-01
+ * Application Insights JavaScript SDK - Dependencies Plugin, 3.0.0-beta.2302-02
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -881,6 +881,44 @@
     var TRIM = "trim";
     var strTrim = StrProto[TRIM] ? _unwrapFunction(TRIM) : polyStrTrim;
 
+    function _createTimerHandler(startTimer, refreshFn, cancelFn) {
+        var ref = true;
+        var timerId = startTimer ? refreshFn(null) : null;
+        function _unref() {
+            ref = false;
+            timerId && timerId["unref"] && timerId["unref"]();
+            return timer;
+        }
+        function _ref() {
+            ref = true;
+            timerId && timerId["ref"] && timerId["ref"]();
+            return timer;
+        }
+        function _hasRef() {
+            if (timerId && timerId["hasRef"]) {
+                return timerId["hasRef"]();
+            }
+            return ref;
+        }
+        var timer = {
+            cancel: function () {
+                timerId && cancelFn(timerId);
+                timerId = null;
+            },
+            refresh: function () {
+                timerId = refreshFn(timerId);
+                if (!ref) {
+                    _unref();
+                }
+                return timer;
+            },
+            hasRef: _hasRef,
+            ref: _ref,
+            unref: _unref
+        };
+        return timer;
+    }
+
     function _extractArgs(args, startAt) {
         var theArgs = [];
         for (var lp = startAt; lp < args[LENGTH]; lp++) {
@@ -889,22 +927,26 @@
         return theArgs;
     }
 
-    function _scheduleTimeoutWith(self, setTimeoutFn, clearTimeoutFn, theArgs) {
-        var timeoutId = setTimeoutFn.apply(self, theArgs);
-        return {
-            cancel: function () {
-                timeoutId && clearTimeoutFn.call(self, timeoutId);
-                timeoutId = null;
-            },
-            refresh: function () {
-                timeoutId && clearTimeoutFn.call(self, timeoutId);
-                timeoutId = setTimeoutFn.apply(self, theArgs);
-                return this;
+    function _createTimeoutWith(self, startTimer, overrideFn, theArgs) {
+        var isArr = isArray(overrideFn);
+        var len = isArr ? overrideFn.length : 0;
+        var setFn = (len > 0 ? overrideFn[0] : (!isArr ? overrideFn : UNDEF_VALUE)) || setTimeout;
+        var clearFn = (len > 1 ? overrideFn[1] : UNDEF_VALUE) || clearTimeout;
+        return _createTimerHandler(startTimer, function (timerId) {
+            if (timerId) {
+                if (timerId.refresh) {
+                    timerId.refresh();
+                    return timerId;
+                }
+                clearFn.call(self, timerId);
             }
-        };
+            return setFn.apply(self, theArgs);
+        }, function (timerId) {
+            clearFn.call(self, timerId);
+        });
     }
     function scheduleTimeout(callback, timeout) {
-        return _scheduleTimeoutWith(this, setTimeout, clearTimeout, _extractArgs(arguments, 0));
+        return _createTimeoutWith(this, true, UNDEF_VALUE, _extractArgs(arguments, 0));
     }
 
     var createValueMap = createTypeMap;
@@ -1218,7 +1260,7 @@
     }
 
     var _objDefineProperty = ObjDefineProperty;
-    var version = "3.0.0-beta.2302-01";
+    var version = "3.0.0-beta.2302-02";
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function _createAccessor(target, prop, value) {
@@ -3486,6 +3528,7 @@
     var _DYN_SPAN_ID = "spanID";
     var _DYN_TRACE_FLAGS = "traceFlags";
     var _DYN_CONTEXT = "context";
+    var _DYN_ABORTED = "aborted";
     var _DYN_TRACE_ID0 = "traceId";
     var _DYN_SPAN_ID1 = "spanId";
     var _DYN__ADD_HOOK = "_addHook";
@@ -3659,7 +3702,7 @@
             self.responseReceivingDuration = null;
             self.callbackDuration = null;
             self[_DYN_AJAX_TOTAL_DURATION ] = null;
-            self.aborted = 0;
+            self[_DYN_ABORTED ] = 0;
             self.pageUrl = null;
             self[_DYN_REQUEST_URL ] = null;
             self.requestSize = 0;
@@ -3711,6 +3754,10 @@
                         _a.method = self[_DYN_METHOD ],
                         _a[STR_PROPERTIES] = { HttpMethod: self[_DYN_METHOD ] },
                         _a);
+                    var props = dependency[STR_PROPERTIES];
+                    if (self[_DYN_ABORTED ]) {
+                        props[_DYN_ABORTED ] = true;
+                    }
                     if (self[_DYN_REQUEST_SENT_TIME ]) {
                         dependency[_DYN_START_TIME ] = new Date();
                         dependency[_DYN_START_TIME ].setTime(self[_DYN_REQUEST_SENT_TIME ]);
@@ -3718,7 +3765,6 @@
                     _populatePerfData(self, dependency);
                     if (enableRequestHeaderTracking) {
                         if (objKeys(self.requestHeaders)[_DYN_LENGTH ] > 0) {
-                            var props = dependency[STR_PROPERTIES ] = dependency[STR_PROPERTIES ] || {};
                             props[_DYN_REQUEST_HEADERS ] = self[_DYN_REQUEST_HEADERS ];
                         }
                     }
@@ -3731,18 +3777,21 @@
                             }
                             if (response[_DYN_HEADER_MAP ]) {
                                 if (objKeys(response.headerMap)[_DYN_LENGTH ] > 0) {
-                                    var props = dependency[STR_PROPERTIES ] = dependency[STR_PROPERTIES ] || {};
                                     props.responseHeaders = response[_DYN_HEADER_MAP ];
                                 }
                             }
-                            if (self.errorStatusText && self[_DYN_STATUS ] >= 400) {
-                                var responseType = response.type;
-                                var props = dependency[STR_PROPERTIES ] = dependency[STR_PROPERTIES ] || {};
-                                if (responseType === "" || responseType === "text") {
-                                    props.responseText = response.responseText ? response[_DYN_STATUS_TEXT ] + " - " + response[strResponseText] : response[_DYN_STATUS_TEXT ];
+                            if (self[_DYN_ERROR_STATUS_TEXT ]) {
+                                if (self[_DYN_STATUS ] >= 400) {
+                                    var responseType = response.type;
+                                    if (responseType === "" || responseType === "text") {
+                                        props.responseText = response.responseText ? response[_DYN_STATUS_TEXT ] + " - " + response[strResponseText] : response[_DYN_STATUS_TEXT ];
+                                    }
+                                    if (responseType === "json") {
+                                        props.responseText = response.response ? response[_DYN_STATUS_TEXT ] + " - " + JSON.stringify(response[_DYN_RESPONSE ]) : response[_DYN_STATUS_TEXT ];
+                                    }
                                 }
-                                if (responseType === "json") {
-                                    props.responseText = response.response ? response[_DYN_STATUS_TEXT ] + " - " + JSON.stringify(response[_DYN_RESPONSE ]) : response[_DYN_STATUS_TEXT ];
+                                else if (self[_DYN_STATUS ] === 0) {
+                                    props.responseText = response[_DYN_STATUS_TEXT ] || "";
                                 }
                             }
                         }
@@ -3775,7 +3824,7 @@
     var AJAX_MONITOR_PREFIX = "ai.ajxmn.";
     var strDiagLog = "diagLog";
     var strAjaxData = "ajaxData";
-    var strFetch = "fetch";
+    var STR_FETCH = "fetch";
     var ERROR_HEADER = "Failed to monitor XMLHttpRequest";
     var ERROR_PREFIX = ", monitoring data for this ajax call ";
     var ERROR_POSTFIX = ERROR_PREFIX + "may be incorrect.";
@@ -3789,10 +3838,10 @@
         if (!_global ||
             isNullOrUndefined(_global.Request) ||
             isNullOrUndefined(_global.Request[strShimPrototype]) ||
-            isNullOrUndefined(_global[strFetch])) {
+            isNullOrUndefined(_global[STR_FETCH])) {
             return null;
         }
-        return _global[strFetch];
+        return _global[STR_FETCH];
     }
     function _supportsAjaxMonitoring(ajaxMonitorInstance) {
         var result = false;
@@ -3898,6 +3947,7 @@
                 _a.spanId = ajaxData[_DYN_SPAN_ID ],
                 _a.traceFlags = ajaxData[_DYN_TRACE_FLAGS ],
                 _a.context = ajaxData[_DYN_CONTEXT ] || {},
+                _a.aborted = !!ajaxData[_DYN_ABORTED ],
                 _a);
             _processDependencyContainer(core, listeners, details, "listener");
             ajaxData[_DYN_TRACE_ID ] = details[_DYN_TRACE_ID0 ];
@@ -4181,7 +4231,7 @@
                         _disableFetchTracking = !!_extensionConfig[_DYN_DISABLE_FETCH_TRACKI11 ];
                         _enableResponseHeaderTracking = _extensionConfig[_DYN_ENABLE_RESPONSE_HEAD12 ];
                         if (!_disableFetchTracking && !_fetchInitialized) {
-                            _addHook(InstrumentFunc(global, strFetch, {
+                            _addHook(InstrumentFunc(global, STR_FETCH, {
                                 ns: _evtNamespace,
                                 req: function (callDetails, input, init) {
                                     var fetchData;
@@ -4205,12 +4255,12 @@
                                                 _reportFetchMetrics(callDetails, (response || {})[_DYN_STATUS ], input, response, fetchData_1, function () {
                                                     var _a;
                                                     var ajaxResponse = (_a = {
-                                                            statusText: response[_DYN_STATUS_TEXT ]
+                                                            statusText: (response || {})[_DYN_STATUS_TEXT ]
                                                         },
                                                         _a[_DYN_HEADER_MAP ] = null,
                                                         _a[_DYN_CORRELATION_CONTEXT ] = _getFetchCorrelationContext(response),
                                                         _a);
-                                                    if (_enableResponseHeaderTracking) {
+                                                    if (_enableResponseHeaderTracking && response) {
                                                         var responseHeaderMap_1 = {};
                                                         response.headers.forEach(function (value, name) {
                                                             if (_canIncludeHeaders(name)) {
@@ -4224,7 +4274,7 @@
                                                 return response;
                                             })
                                                 .catch(function (reason) {
-                                                _reportFetchMetrics(callDetails, 0, input, null, fetchData_1, null, { error: reason.message });
+                                                _reportFetchMetrics(callDetails, 0, input, null, fetchData_1, null, { error: reason.message || dumpObj(reason) });
                                                 throw reason;
                                             });
                                         }
@@ -4235,7 +4285,7 @@
                             _fetchInitialized = true;
                         }
                         else if (isPolyfill && !_polyfillInitialized) {
-                            _addHook(InstrumentFunc(global, strFetch, {
+                            _addHook(InstrumentFunc(global, STR_FETCH, {
                                 ns: _evtNamespace,
                                 req: function (callDetails, input, init) {
                                     _isDisabledRequest(null, input, init);
@@ -4245,7 +4295,7 @@
                         }
                     }));
                     if (isPolyfill) {
-                        global[strFetch].polyfill = isPolyfill;
+                        global[STR_FETCH].polyfill = isPolyfill;
                     }
                 }
                 function _hookProto(target, funcName, callbacks) {
@@ -4298,7 +4348,7 @@
                                         var xhr = args[_DYN_INST ];
                                         var ajaxData = xhr[strAjaxData];
                                         if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
-                                            ajaxData.aborted = 1;
+                                            ajaxData[_DYN_ABORTED ] = 1;
                                             ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ] = true;
                                         }
                                     }
@@ -4624,7 +4674,7 @@
                         });
                     }
                     ajaxData[_DYN_REQUEST_HEADERS ] = requestHeaders;
-                    _createMarkId("fetch", ajaxData);
+                    _createMarkId(STR_FETCH, ajaxData);
                     return ajaxData;
                 }
                 function _getFailedFetchDiagnosticsMessage(input) {
@@ -4658,7 +4708,7 @@
                     }
                     ajaxData[_DYN_RESPONSE_FINISHED_TI14 ] = dateTimeUtilsNow();
                     ajaxData[_DYN_STATUS ] = status;
-                    _findPerfResourceEntry("fetch", ajaxData, function () {
+                    _findPerfResourceEntry(STR_FETCH, ajaxData, function () {
                         var dependency = ajaxData[_DYN__CREATE_TRACK_ITEM ]("Fetch", _enableRequestHeaderTracking, getResponse);
                         var properties;
                         try {
@@ -4711,6 +4761,7 @@
                             _a[STR_PROPERTIES ] = properties,
                             _a.sysProperties = systemProperties,
                             _a.context = ajaxData ? ajaxData[_DYN_CONTEXT ] : null,
+                            _a.aborted = ajaxData ? !!ajaxData[_DYN_ABORTED ] : false,
                             _a);
                         result = _processDependencyContainer(core, initializers, details, "initializer");
                     }