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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/applicationinsights-dependencies-js",
-    "version": "3.0.0-beta.2302-01",
+    "version": "3.0.0-beta.2302-03",
     "description": "Microsoft Application Insights XHR dependencies plugin",
     "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme",
     "author": "Microsoft Application Insights Team",
@@ -26,15 +26,16 @@
         "ai-restore": "grunt deps-restore"
     },
     "devDependencies": {
+        "@nevware21/ts-async": "^0.1.0",
         "@microsoft/ai-test-framework": "0.0.1",
         "@microsoft/applicationinsights-rollup-plugin-uglify3-js": "1.0.0",
         "@microsoft/applicationinsights-rollup-es5": "1.0.0",
         "@microsoft/api-extractor": "^7.18.1",
-        "typescript": "^4.3.4",
+        "typescript": "^4.9.3",
         "tslib": "^2.0.0",
         "grunt": "^1.5.3",
         "grunt-cli": "^1.4.3",
-        "grunt-contrib-qunit": "^5.0.1",
+        "grunt-contrib-qunit": "^6.2.1",
         "@nevware21/grunt-ts-plugin": "^0.4.3",
         "@nevware21/grunt-eslint-ts": "^0.2.2",
         "globby": "^11.0.0",
@@ -53,9 +54,9 @@
     "dependencies": {
         "@microsoft/dynamicproto-js": "^1.1.7",
         "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/applicationinsights-core-js": "3.0.0-beta.2302-01",
-        "@microsoft/applicationinsights-common": "3.0.0-beta.2302-01",
-        "@nevware21/ts-utils": "^0.6.0"
+        "@microsoft/applicationinsights-core-js": "3.0.0-beta.2302-03",
+        "@microsoft/applicationinsights-common": "3.0.0-beta.2302-03",
+        "@nevware21/ts-utils": "^0.7.0"
     },
     "license": "MIT",
     "publishConfig": {

package/src/DependencyInitializer.ts

@@ -23,6 +23,11 @@ export interface IDependencyInitializerDetails {
      * The context that the application can assigned via the dependency listener(s)
      */
     context?: { [key: string]: any };
+
+    /**
+     * [Optional] A flag that indicates whether the client request was manually aborted by the `abort()`
+     */
+    aborted?: boolean;
 }
 
 /**

package/src/DependencyListener.ts

@@ -51,6 +51,13 @@ export interface IDependencyListenerDetails {
      * [Optional] Context that the application can assign that will also be passed to any dependency initializer
      */
     context?: { [key: string]: any };
+
+    /**
+     * [Optional] A flag that indicates whether the client request was manually aborted by the `abort()`,
+     * as listeners are called just before the request is sent it is unlikely that an application would have
+     * called `abort` before `send` this is also available in the dependency initializer.
+     */
+    aborted?: boolean;
 }
 
 /**

package/src/__DynamicConstants.ts

@@ -1,66 +1,67 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// @skip-file-minify
-
-// ##############################################################
-// AUTO GENERATED FILE: This file is Auto Generated during build.
-// ##############################################################
-
-// ###########################################################################################################################################
-// Note: DON'T Export these const from the package as we are still targeting IE this will export a mutable variables that someone could change
-// ###########################################################################################################################################
-
-export const _DYN_REQUEST_URL = "requestUrl";  // Count: 12
-export const _DYN_INST = "inst";  // Count: 5
-export const _DYN_LENGTH = "length";  // Count: 10
-export const _DYN_TRACE_ID = "traceID";  // Count: 9
-export const _DYN_SPAN_ID = "spanID";  // Count: 8
-export const _DYN_TRACE_FLAGS = "traceFlags";  // Count: 13
-export const _DYN_CONTEXT = "context";  // Count: 7
-export const _DYN_TRACE_ID0 = "traceId";  // Count: 5
-export const _DYN_SPAN_ID1 = "spanId";  // Count: 5
-export const _DYN__ADD_HOOK = "_addHook";  // Count: 4
-export const _DYN_CORE = "core";  // Count: 8
-export const _DYN_INCLUDE_CORRELATION_2 = "includeCorrelationHeaders";  // Count: 4
-export const _DYN_GET_ABSOLUTE_URL = "getAbsoluteUrl";  // Count: 3
-export const _DYN_HEADERS = "headers";  // Count: 6
-export const _DYN_REQUEST_HEADERS = "requestHeaders";  // Count: 13
-export const _DYN_SET_REQUEST_HEADER = "setRequestHeader";  // Count: 3
-export const _DYN_TRACK_DEPENDENCY_DAT3 = "trackDependencyDataInternal";  // Count: 2
-export const _DYN_START_TIME = "startTime";  // Count: 6
-export const _DYN_TO_LOWER_CASE = "toLowerCase";  // Count: 6
-export const _DYN_ENABLE_REQUEST_HEADE4 = "enableRequestHeaderTracking";  // Count: 3
-export const _DYN_ENABLE_AJAX_ERROR_ST5 = "enableAjaxErrorStatusText";  // Count: 2
-export const _DYN_ENABLE_AJAX_PERF_TRA6 = "enableAjaxPerfTracking";  // Count: 2
-export const _DYN_MAX_AJAX_CALLS_PER_V7 = "maxAjaxCallsPerView";  // Count: 2
-export const _DYN_EXCLUDE_REQUEST_FROM8 = "excludeRequestFromAutoTrackingPatterns";  // Count: 2
-export const _DYN_ADD_REQUEST_CONTEXT = "addRequestContext";  // Count: 2
-export const _DYN_DISABLE_AJAX_TRACKIN9 = "disableAjaxTracking";  // Count: 3
-export const _DYN_AJAX_PERF_LOOKUP_DEL10 = "ajaxPerfLookupDelay";  // Count: 2
-export const _DYN_DISABLE_FETCH_TRACKI11 = "disableFetchTracking";  // Count: 2
-export const _DYN_ENABLE_RESPONSE_HEAD12 = "enableResponseHeaderTracking";  // Count: 2
-export const _DYN_STATUS = "status";  // Count: 10
-export const _DYN_STATUS_TEXT = "statusText";  // Count: 8
-export const _DYN_HEADER_MAP = "headerMap";  // Count: 8
-export const _DYN_OPEN_DONE = "openDone";  // Count: 3
-export const _DYN_SEND_DONE = "sendDone";  // Count: 3
-export const _DYN_REQUEST_SENT_TIME = "requestSentTime";  // Count: 9
-export const _DYN_ABORT_DONE = "abortDone";  // Count: 3
-export const _DYN_GET_TRACE_ID = "getTraceId";  // Count: 3
-export const _DYN_GET_TRACE_FLAGS = "getTraceFlags";  // Count: 3
-export const _DYN_METHOD = "method";  // Count: 10
-export const _DYN_ERROR_STATUS_TEXT = "errorStatusText";  // Count: 3
-export const _DYN_STATE_CHANGE_ATTACHE13 = "stateChangeAttached";  // Count: 2
-export const _DYN_RESPONSE_TEXT = "responseText";  // Count: 5
-export const _DYN_RESPONSE_FINISHED_TI14 = "responseFinishedTime";  // Count: 7
-export const _DYN__CREATE_TRACK_ITEM = "CreateTrackItem";  // Count: 3
-export const _DYN_RESPONSE = "response";  // Count: 4
-export const _DYN_GET_ALL_RESPONSE_HEA15 = "getAllResponseHeaders";  // Count: 2
-export const _DYN_GET_PART_APROPS = "getPartAProps";  // Count: 3
-export const _DYN_PERF_MARK = "perfMark";  // Count: 4
-export const _DYN_NAME = "name";  // Count: 6
-export const _DYN_PERF_TIMING = "perfTiming";  // Count: 3
-export const _DYN_AJAX_DIAGNOSTICS_MES16 = "ajaxDiagnosticsMessage";  // Count: 3
-export const _DYN_CORRELATION_CONTEXT = "correlationContext";  // Count: 3
-export const _DYN_AJAX_TOTAL_DURATION = "ajaxTotalDuration";  // Count: 3
-export const _DYN_EVENT_TRACE_CTX = "eventTraceCtx";  // Count: 3
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// @skip-file-minify
+
+// ##############################################################
+// AUTO GENERATED FILE: This file is Auto Generated during build.
+// ##############################################################
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// Note: DON'T Export these const from the package as we are still targeting ES3 this will export a mutable variables that someone could change!!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+export const _DYN_REQUEST_URL = "requestUrl";  // Count: 12
+export const _DYN_INST = "inst";  // Count: 5
+export const _DYN_LENGTH = "length";  // Count: 10
+export const _DYN_TRACE_ID = "traceID";  // Count: 9
+export const _DYN_SPAN_ID = "spanID";  // Count: 8
+export const _DYN_TRACE_FLAGS = "traceFlags";  // Count: 13
+export const _DYN_CONTEXT = "context";  // Count: 7
+export const _DYN_ABORTED = "aborted";  // Count: 7
+export const _DYN_TRACE_ID0 = "traceId";  // Count: 5
+export const _DYN_SPAN_ID1 = "spanId";  // Count: 5
+export const _DYN__ADD_HOOK = "_addHook";  // Count: 4
+export const _DYN_CORE = "core";  // Count: 8
+export const _DYN_INCLUDE_CORRELATION_2 = "includeCorrelationHeaders";  // Count: 4
+export const _DYN_GET_ABSOLUTE_URL = "getAbsoluteUrl";  // Count: 3
+export const _DYN_HEADERS = "headers";  // Count: 6
+export const _DYN_REQUEST_HEADERS = "requestHeaders";  // Count: 13
+export const _DYN_SET_REQUEST_HEADER = "setRequestHeader";  // Count: 3
+export const _DYN_TRACK_DEPENDENCY_DAT3 = "trackDependencyDataInternal";  // Count: 2
+export const _DYN_START_TIME = "startTime";  // Count: 6
+export const _DYN_TO_LOWER_CASE = "toLowerCase";  // Count: 6
+export const _DYN_ENABLE_REQUEST_HEADE4 = "enableRequestHeaderTracking";  // Count: 3
+export const _DYN_ENABLE_AJAX_ERROR_ST5 = "enableAjaxErrorStatusText";  // Count: 2
+export const _DYN_ENABLE_AJAX_PERF_TRA6 = "enableAjaxPerfTracking";  // Count: 2
+export const _DYN_MAX_AJAX_CALLS_PER_V7 = "maxAjaxCallsPerView";  // Count: 2
+export const _DYN_EXCLUDE_REQUEST_FROM8 = "excludeRequestFromAutoTrackingPatterns";  // Count: 2
+export const _DYN_ADD_REQUEST_CONTEXT = "addRequestContext";  // Count: 2
+export const _DYN_DISABLE_AJAX_TRACKIN9 = "disableAjaxTracking";  // Count: 3
+export const _DYN_AJAX_PERF_LOOKUP_DEL10 = "ajaxPerfLookupDelay";  // Count: 2
+export const _DYN_DISABLE_FETCH_TRACKI11 = "disableFetchTracking";  // Count: 2
+export const _DYN_ENABLE_RESPONSE_HEAD12 = "enableResponseHeaderTracking";  // Count: 2
+export const _DYN_STATUS = "status";  // Count: 11
+export const _DYN_STATUS_TEXT = "statusText";  // Count: 9
+export const _DYN_HEADER_MAP = "headerMap";  // Count: 8
+export const _DYN_OPEN_DONE = "openDone";  // Count: 3
+export const _DYN_SEND_DONE = "sendDone";  // Count: 3
+export const _DYN_REQUEST_SENT_TIME = "requestSentTime";  // Count: 9
+export const _DYN_ABORT_DONE = "abortDone";  // Count: 3
+export const _DYN_GET_TRACE_ID = "getTraceId";  // Count: 3
+export const _DYN_GET_TRACE_FLAGS = "getTraceFlags";  // Count: 3
+export const _DYN_METHOD = "method";  // Count: 10
+export const _DYN_ERROR_STATUS_TEXT = "errorStatusText";  // Count: 3
+export const _DYN_STATE_CHANGE_ATTACHE13 = "stateChangeAttached";  // Count: 2
+export const _DYN_RESPONSE_TEXT = "responseText";  // Count: 6
+export const _DYN_RESPONSE_FINISHED_TI14 = "responseFinishedTime";  // Count: 7
+export const _DYN__CREATE_TRACK_ITEM = "CreateTrackItem";  // Count: 3
+export const _DYN_RESPONSE = "response";  // Count: 4
+export const _DYN_GET_ALL_RESPONSE_HEA15 = "getAllResponseHeaders";  // Count: 2
+export const _DYN_GET_PART_APROPS = "getPartAProps";  // Count: 3
+export const _DYN_PERF_MARK = "perfMark";  // Count: 4
+export const _DYN_NAME = "name";  // Count: 6
+export const _DYN_PERF_TIMING = "perfTiming";  // Count: 3
+export const _DYN_AJAX_DIAGNOSTICS_MES16 = "ajaxDiagnosticsMessage";  // Count: 3
+export const _DYN_CORRELATION_CONTEXT = "correlationContext";  // Count: 3
+export const _DYN_AJAX_TOTAL_DURATION = "ajaxTotalDuration";  // Count: 3
+export const _DYN_EVENT_TRACE_CTX = "eventTraceCtx";  // Count: 3

package/src/ajax.ts

@@ -1,31 +1,31 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import dynamicProto from "@microsoft/dynamicproto-js";
-import {
-    DisabledPropertyName, IConfig, ICorrelationConfig, IDependencyTelemetry, IRequestContext, ITelemetryContext, PropertiesPluginIdentifier,
-    RemoteDependencyData, RequestHeaders, correlationIdCanIncludeCorrelationHeader, correlationIdGetCorrelationContext,
-    createDistributedTraceContextFromTrace, createTelemetryItem, createTraceParent, dateTimeUtilsNow, eDistributedTracingModes,
-    eRequestHeaders, formatTraceParent, isInternalApplicationInsightsEndpoint
-} from "@microsoft/applicationinsights-common";
-import {
-    BaseTelemetryPlugin, IAppInsightsCore, IConfigDefaults, IConfiguration, ICustomProperties, IDistributedTraceContext,
-    IInstrumentCallDetails, IInstrumentHooksCallbacks, IPlugin, IProcessTelemetryContext, ITelemetryItem, ITelemetryPluginChain,
-    InstrumentFunc, InstrumentProto, _eInternalMessageId, _throwInternal, arrForEach, createProcessTelemetryContext, createUniqueNamespace,
-    dumpObj, eLoggingSeverity, eventOn, generateW3CId, getExceptionName, getGlobal, getIEVersion, getLocation, getPerformance, isFunction,
-    isNullOrUndefined, isString, isXhrSupported, mergeEvtNamespace, onConfigChange, strPrototype, strTrim
-} from "@microsoft/applicationinsights-core-js";
-import { objFreeze, scheduleTimeout, strIndexOf } from "@nevware21/ts-utils";
-import { DependencyInitializerFunction, IDependencyInitializerDetails, IDependencyInitializerHandler } from "./DependencyInitializer";
-import {
-    DependencyListenerFunction, IDependencyHandler, IDependencyListenerContainer, IDependencyListenerDetails, IDependencyListenerHandler
-} from "./DependencyListener";
-import { IAjaxRecordResponse, ajaxRecord } from "./ajaxRecord";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import dynamicProto from "@microsoft/dynamicproto-js";
+import {
+    DisabledPropertyName, IConfig, ICorrelationConfig, IDependencyTelemetry, IRequestContext, ITelemetryContext, PropertiesPluginIdentifier,
+    RemoteDependencyData, RequestHeaders, correlationIdCanIncludeCorrelationHeader, correlationIdGetCorrelationContext,
+    createDistributedTraceContextFromTrace, createTelemetryItem, createTraceParent, dateTimeUtilsNow, eDistributedTracingModes,
+    eRequestHeaders, formatTraceParent, isInternalApplicationInsightsEndpoint
+} from "@microsoft/applicationinsights-common";
+import {
+    BaseTelemetryPlugin, IAppInsightsCore, IConfigDefaults, IConfiguration, ICustomProperties, IDistributedTraceContext,
+    IInstrumentCallDetails, IInstrumentHooksCallbacks, IPlugin, IProcessTelemetryContext, ITelemetryItem, ITelemetryPluginChain,
+    InstrumentFunc, InstrumentProto, _eInternalMessageId, _throwInternal, arrForEach, createProcessTelemetryContext, createUniqueNamespace,
+    dumpObj, eLoggingSeverity, eventOn, generateW3CId, getExceptionName, getGlobal, getIEVersion, getLocation, getPerformance, isFunction,
+    isNullOrUndefined, isString, isXhrSupported, mergeEvtNamespace, onConfigChange, strPrototype, strTrim
+} from "@microsoft/applicationinsights-core-js";
+import { objFreeze, scheduleTimeout, strIndexOf } from "@nevware21/ts-utils";
+import { DependencyInitializerFunction, IDependencyInitializerDetails, IDependencyInitializerHandler } from "./DependencyInitializer";
+import {
+    DependencyListenerFunction, IDependencyHandler, IDependencyListenerContainer, IDependencyListenerDetails, IDependencyListenerHandler
+} from "./DependencyListener";
+import { IAjaxRecordResponse, ajaxRecord } from "./ajaxRecord";
+
 const AJAX_MONITOR_PREFIX = "ai.ajxmn.";
 const strDiagLog = "diagLog";
 const strAjaxData = "ajaxData";
-const strFetch = "fetch";
+const STR_FETCH = "fetch";
 
 const ERROR_HEADER = "Failed to monitor XMLHttpRequest";
 const ERROR_PREFIX = ", monitoring data for this ajax call ";
@@ -49,11 +49,11 @@ function _supportsFetch(): (input: RequestInfo, init?: RequestInit) => Promise<R
     if (!_global ||
             isNullOrUndefined((_global as any).Request) ||
             isNullOrUndefined((_global as any).Request[strPrototype]) ||
-            isNullOrUndefined(_global[strFetch])) {
+            isNullOrUndefined(_global[STR_FETCH])) {
         return null;
     }
 
-    return _global[strFetch];
+    return _global[STR_FETCH];
 }
 
 /**
@@ -198,7 +198,8 @@ function _processDependencyListeners(listeners: _IInternalDependencyHandler<Depe
             traceId: ajaxData.traceID,
             spanId: ajaxData.spanID,
             traceFlags: ajaxData.traceFlags,
-            context: ajaxData.context || {}
+            context: ajaxData.context || {},
+            aborted: !!ajaxData.aborted
         };
     
         _processDependencyContainer(core, listeners, details, "listener");
@@ -559,7 +560,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                     _enableResponseHeaderTracking = _extensionConfig.enableResponseHeaderTracking;
 
                     if (!_disableFetchTracking && !_fetchInitialized) {
-                        _addHook(InstrumentFunc(global, strFetch, {
+                        _addHook(InstrumentFunc(global, STR_FETCH, {
                             ns: _evtNamespace,
                             // Add request hook
                             req: (callDetails: IInstrumentCallDetails, input, init) => {
@@ -585,12 +586,12 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                                         callDetails.rslt = callDetails.rslt.then((response: any) => {
                                             _reportFetchMetrics(callDetails, (response||{}).status, input, response, fetchData, () => {
                                                 let ajaxResponse:IAjaxRecordResponse = {
-                                                    statusText: response.statusText,
+                                                    statusText: (response||{}).statusText,
                                                     headerMap: null,
                                                     correlationContext: _getFetchCorrelationContext(response)
                                                 };
         
-                                                if (_enableResponseHeaderTracking) {
+                                                if (_enableResponseHeaderTracking && response) {
                                                     const responseHeaderMap = {};
                                                     response.headers.forEach((value: string, name: string) => {     // @skip-minify
                                                         if (_canIncludeHeaders(name)) {
@@ -607,7 +608,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                                             return response;
                                         })
                                             .catch((reason: any) => {
-                                                _reportFetchMetrics(callDetails, 0, input, null, fetchData, null, { error: reason.message });
+                                                _reportFetchMetrics(callDetails, 0, input, null, fetchData, null, { error: reason.message || dumpObj(reason) });
                                                 throw reason;
                                             });
                                     }
@@ -626,7 +627,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                         // Note: Polyfill implementations that don't support the "polyfill" tag are not supported
                         // the workaround is to add a polyfill property to your fetch implementation before initializing
                         // App Insights
-                        _addHook(InstrumentFunc(global, strFetch, {
+                        _addHook(InstrumentFunc(global, STR_FETCH, {
                             ns: _evtNamespace,
                             req: (callDetails: IInstrumentCallDetails, input, init) => {
                                 // Just call so that we record any disabled URL
@@ -640,7 +641,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                 if (isPolyfill) {
                     // retag the instrumented fetch with the same polyfill settings this is mostly for testing
                     // But also supports multiple App Insights usages
-                    (global[strFetch] as any).polyfill = isPolyfill;
+                    (global[STR_FETCH] as any).polyfill = isPolyfill;
                 }
             }
 
@@ -1107,7 +1108,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
 
                 ajaxData.requestHeaders = requestHeaders;
 
-                _createMarkId("fetch", ajaxData);
+                _createMarkId(STR_FETCH, ajaxData);
 
                 return ajaxData;
             }
@@ -1153,7 +1154,7 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                 ajaxData.responseFinishedTime = dateTimeUtilsNow();
                 ajaxData.status = status;
 
-                _findPerfResourceEntry("fetch", ajaxData, () => {
+                _findPerfResourceEntry(STR_FETCH, ajaxData, () => {
                     const dependency = ajaxData.CreateTrackItem("Fetch", _enableRequestHeaderTracking, getResponse);
                     
                     let properties;
@@ -1219,7 +1220,8 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
                         item: dependency,
                         properties: properties,
                         sysProperties: systemProperties,
-                        context: ajaxData ? ajaxData.context : null
+                        context: ajaxData ? ajaxData.context : null,
+                        aborted: ajaxData ? !!ajaxData.aborted : false
                     };
                 
                     result = _processDependencyContainer(core, initializers, details, "initializer");
@@ -1284,4 +1286,4 @@ export class AjaxMonitor extends BaseTelemetryPlugin implements IDependenciesPlu
     protected trackDependencyDataInternal(dependency: IDependencyTelemetry, properties?: { [key: string]: any }, systemProperties?: { [key: string]: any }) {
         // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
     }
-}
+}

package/src/ajaxRecord.ts

@@ -1,15 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import dynamicProto from "@microsoft/dynamicproto-js";
-import {
-    Extensions, IDependencyTelemetry, dataSanitizeUrl, dateTimeUtilsDuration, msToTimeSpan, urlGetAbsoluteUrl, urlGetCompleteUrl
-} from "@microsoft/applicationinsights-common";
-import {
-    IDiagnosticLogger, IDistributedTraceContext, arrForEach, isNullOrUndefined, isNumber, isString, normalizeJsName, objForEachKey, objKeys
-} from "@microsoft/applicationinsights-core-js";
-import { STR_DURATION, STR_PROPERTIES } from "./InternalConstants";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import dynamicProto from "@microsoft/dynamicproto-js";
+import {
+    Extensions, IDependencyTelemetry, dataSanitizeUrl, dateTimeUtilsDuration, msToTimeSpan, urlGetAbsoluteUrl, urlGetCompleteUrl
+} from "@microsoft/applicationinsights-common";
+import {
+    IDiagnosticLogger, IDistributedTraceContext, arrForEach, isNullOrUndefined, isNumber, isString, normalizeJsName, objForEachKey, objKeys
+} from "@microsoft/applicationinsights-core-js";
+import { STR_DURATION, STR_PROPERTIES } from "./InternalConstants";
+
 export interface IAjaxRecordResponse {
     statusText: string,
     headerMap: Object,
@@ -240,7 +240,7 @@ export class ajaxRecord {
 
     public xhrMonitoringState: XHRMonitoringState;
 
-    // <summary>Determines whether or not JavaScript exception occured in xhr.onreadystatechange code. 1 if occured, otherwise 0.</summary>
+    // <summary>Determines whether or not JavaScript exception occurred in xhr.onreadystatechange code. 1 if occurred, otherwise 0.</summary>
     public clientFailure: number;
 
     /**
@@ -339,6 +339,11 @@ export class ajaxRecord {
                     [STR_PROPERTIES]: { HttpMethod: self.method }
                 } as IDependencyTelemetry;
 
+                let props = dependency[STR_PROPERTIES];
+                if (self.aborted) {
+                    props.aborted = true;
+                }
+
                 if (self.requestSentTime) {
                     // Set the correct dependency start time
                     dependency.startTime = new Date();
@@ -350,7 +355,6 @@ export class ajaxRecord {
         
                 if (enableRequestHeaderTracking) {
                     if (objKeys(self.requestHeaders).length > 0) {
-                        let props = dependency.properties = dependency.properties || {};
                         props.requestHeaders = self.requestHeaders;
                     }
                 }
@@ -367,19 +371,21 @@ export class ajaxRecord {
         
                         if (response.headerMap) {
                             if (objKeys(response.headerMap).length > 0) {
-                                let props = dependency.properties = dependency.properties || {};
                                 props.responseHeaders = response.headerMap;
                             }
                         }
         
-                        if (self.errorStatusText && self.status >= 400) {
-                            const responseType = response.type;
-                            let props = dependency.properties = dependency.properties || {};
-                            if (responseType === "" || responseType === "text") {
-                                props.responseText = response.responseText ? response.statusText + " - " + response[strResponseText] : response.statusText;
-                            }
-                            if (responseType === "json") {
-                                props.responseText = response.response ? response.statusText + " - " + JSON.stringify(response.response) : response.statusText;
+                        if (self.errorStatusText) {
+                            if (self.status >= 400) {
+                                const responseType = response.type;
+                                if (responseType === "" || responseType === "text") {
+                                    props.responseText = response.responseText ? response.statusText + " - " + response[strResponseText] : response.statusText;
+                                }
+                                if (responseType === "json") {
+                                    props.responseText = response.response ? response.statusText + " - " + JSON.stringify(response.response) : response.statusText;
+                                }
+                            } else if (self.status === 0) {
+                                props.responseText = response.statusText || "";
                             }
                         }
                     }
@@ -428,4 +434,4 @@ export class ajaxRecord {
         // @DynamicProtoStub -- DO NOT add any code as this will be removed during packaging
         return null;
     }
-}
+}

package/src/ajaxUtils.ts

@@ -1,8 +1,8 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import { isNullOrUndefined } from "@microsoft/applicationinsights-core-js";
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { isNullOrUndefined } from "@microsoft/applicationinsights-core-js";
+
 export class stringUtils {
     public static GetLength(strObject: any) {
         let res = 0;
@@ -20,4 +20,4 @@ export class stringUtils {
 
         return res;
     }
-}
+}

package/types/DependencyInitializer.d.ts

@@ -23,6 +23,10 @@ export interface IDependencyInitializerDetails {
     context?: {
         [key: string]: any;
     };
+    /**
+     * [Optional] A flag that indicates whether the client request was manually aborted by the `abort()`
+     */
+    aborted?: boolean;
 }
 /**
  * The initializer function that will be called, if it returns false the event will be dropped and not reported

package/types/DependencyListener.d.ts

@@ -42,6 +42,12 @@ export interface IDependencyListenerDetails {
     context?: {
         [key: string]: any;
     };
+    /**
+     * [Optional] A flag that indicates whether the client request was manually aborted by the `abort()`,
+     * as listeners are called just before the request is sent it is unlikely that an application would have
+     * called `abort` before `send` this is also available in the dependency initializer.
+     */
+    aborted?: boolean;
 }
 /**
  * The function that will get called when the ajax request is about to occur.

package/types/__DynamicConstants.d.ts

@@ -5,6 +5,7 @@ export declare const _DYN_TRACE_ID = "traceID";
 export declare const _DYN_SPAN_ID = "spanID";
 export declare const _DYN_TRACE_FLAGS = "traceFlags";
 export declare const _DYN_CONTEXT = "context";
+export declare const _DYN_ABORTED = "aborted";
 export declare const _DYN_TRACE_ID0 = "traceId";
 export declare const _DYN_SPAN_ID1 = "spanId";
 export declare const _DYN__ADD_HOOK = "_addHook";