Merge remote-tracking branch 'origin/master' into MSNev/beta

.github/codeql/codeql-config.yml

@@ -8,4 +8,3 @@ paths-ignore:
   - '**/Tests/'
   - '**/dist-history/'
   - '**/rollup.config.js'
-  - '/extensions/applicationinsights-angularplugin-js/'

.github/workflows/ci.yml

@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master, beta ]
+    branches: [ master, beta, Release2.7 ]
   pull_request:
-    branches: [ master, beta ]
+    branches: [ master, beta, Release2.7 ]
 
 jobs:
   build:

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, beta ]
+    branches: [ master, beta, Release2.7 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master, beta ]
+    branches: [ master, beta, Release2.7 ]
   schedule:
     - cron: '17 15 * * 2'
 

.gitignore

@@ -261,3 +261,4 @@ aicore.tests.js*
 aicore.tests.d.ts
 ai.tests.d.ts
 /.vs
+/index.html

AISKU/README.md

@@ -27,6 +27,8 @@ Refer to [our GitHub page](https://github.com/microsoft/applicationinsights-js)
 | Version | Full Size | Raw Minified | GZip Size 
 |---------|-----------|--------------|-------------
 | <nightly>  | [![full size size](https://img.badgesize.io/https://js.monitor.azure.com/nightly/ai.2-nightly.js.svg?label=full%20size&color=blue)](https://img.badgesize.io/https://js.monitor.azure.com/nightly/ai.2-nightly.js.svg?label=full%20size&color=blue)| ![minified size size](https://img.badgesize.io/https://js.monitor.azure.com/nightly/ai.2-nightly.min.js.svg?label=minified%20size&color=darkorchid) | ![gzip size](https://img.badgesize.io/https://js.monitor.azure.com/nightly/ai.2-nightly.min.js.svg?compression=gzip&softmax=30000&max=35000)
+| 2.8.1:  | [![full size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.1.js.svg?label=full%20size&color=blue)](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.1.js.svg?label=full%20size&color=blue)| ![minified size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.1.min.js.svg?label=minified%20size&color=darkorchid) | ![gzip size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.1.min.js.svg?compression=gzip&softmax=30000&max=35000)
+| 2.8.0:  | [![full size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.0.js.svg?label=full%20size&color=blue)](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.0.js.svg?label=full%20size&color=blue)| ![minified size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.0.min.js.svg?label=minified%20size&color=darkorchid) | ![gzip size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.8.0.min.js.svg?compression=gzip&softmax=30000&max=35000)
 | 2.7.4:  | [![full size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.4.js.svg?label=full%20size&color=blue)](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.4.js.svg?label=full%20size&color=blue)| ![minified size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.4.min.js.svg?label=minified%20size&color=darkorchid) | ![gzip size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.4.min.js.svg?compression=gzip&softmax=30000&max=35000)
 | 2.7.3:  | [![full size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.3.js.svg?label=full%20size&color=blue)](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.3.js.svg?label=full%20size&color=blue)| ![minified size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.3.min.js.svg?label=minified%20size&color=darkorchid) | ![gzip size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.3.min.js.svg?compression=gzip&softmax=30000&max=35000)
 | 2.7.2:  | [![full size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.2.js.svg?label=full%20size&color=blue)](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.2.js.svg?label=full%20size&color=blue)| ![minified size size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.2.min.js.svg?label=minified%20size&color=darkorchid) | ![gzip size](https://img.badgesize.io/https://js.monitor.azure.com/scripts/b/ai.2.7.2.min.js.svg?compression=gzip&softmax=30000&max=35000)

AISKU/Tests/Perf/src/AISKUPerf.Tests.ts

@@ -123,7 +123,6 @@ function addSnippetLoadingTimeEvent(AISKUPerfTest: any, endtime: number): void {
     createPerfEvent(AISKUPerfTest, "SDKInit", duration, true, `AppInsightsInit-Init: Script LoadingTime: ${duration} ms added`);
 }
 
-
 export class AISKUPerf extends AITestClass {
     public AISKUPerfTest: AppInsightsInitPerfTestClass;
     public perfMgr: any;
@@ -137,7 +136,6 @@ export class AISKUPerf extends AITestClass {
     public testInitialize() {
         try {
            this.AISKUPerfTest = new AppInsightsInitPerfTestClass();
-           this.AISKUPerfTest.loadScriptOnInit = () => {return this._loadScriptOnInit();}
            Assert.ok(window["oneDS"], "oneDS exists");
            Assert.ok(window["Microsoft"]?.ApplicationInsights?.PerfMarkMeasureManager, "perfMgr exists");
            Assert.ok(window["Microsoft"]?.ApplicationInsights?.doPerf, "doPerf exists");
@@ -167,6 +165,7 @@ export class AISKUPerf extends AITestClass {
         this.testCaseAsync({
             name: "AppInsights AISKU perf Test",
             stepDelay: 10000,
+            assertNoHooks: false,
             steps: [() => {
                 Assert.ok(window["appInsightsInitPerftest"], "global appInsightsInitPerftest exists");
                 Assert.ok(window["oneDS"], "oneDS exists");
@@ -199,16 +198,27 @@ export class AISKUPerf extends AITestClass {
         });
     }
 
-    protected _loadScriptOnInit(): void {
+    protected _loadScriptOnInit(theModule: any): void {
         var snippetLoadingEndTime = performance.now();
         this._addMemoryPerfEvent(this.initialMemoryUsage);
         Assert.ok(true,"AppInsights script loaded");
 
-        addSnippetLoadingTimeEvent(this.AISKUPerfTest,snippetLoadingEndTime);
+        addSnippetLoadingTimeEvent(this.AISKUPerfTest, snippetLoadingEndTime);
 
         let appInsights = window["appInsights"];
         this.appInsights = appInsights;
 
+        this.onDone(() => {
+            if (appInsights && appInsights.unload && appInsights.core && appInsights.core.isInitialized()) {
+                Assert.ok(true, "Unloading...");
+                appInsights.unload(false);
+            } else {
+                Assert.ok(true, "Unload not supported...");
+            }
+
+            appInsights = null;
+            this.appInsights = null;
+        });
         try {
             let notificationManager = this.appInsights.core["_notificationManager"] ||this.appInsights.core?.getNotifyMgr();
             if (notificationManager) {
@@ -230,29 +240,31 @@ export class AISKUPerf extends AITestClass {
     }
 
     protected _loadSnippet():void {
-        this.initialMemoryUsage = performance["memory"]?.usedJSHeapSize;
-        var tag = document.createElement("script");
-        tag.innerText = this.getSnippet();
-        this.AISKUPerfTest.snippetStartTime = performance.now();
-        document.getElementsByTagName("head")[0].appendChild(tag);
-    }
-
-    public getSnippet(): string {
-        return `
-            loadSdkUsingRequire({
-                src: "https://js.monitor.azure.com/scripts/b/ai.${this.AISKUPerfTest.version}.min.js?${this.AISKUPerfTest.testPostfix}",
-                onInit: function (appInsights) {
-                    console.log("snippet loaded");
-                    appInsightsInitPerftest.loadScriptOnInit();
-                },
-                cfg: { 
-                    instrumentationKey: "key",
-                    enablePerfMgr: true,
-                    maxBatchSizeInBytes: 1000000,
-                    maxBatchInterval: 30000000,
-                    extensionConfig: {}
-                }
-            });`;
+        let self = this;
+        self.initialMemoryUsage = performance["memory"]?.usedJSHeapSize;
+        window["loadSdkUsingRequire"]({
+            src: self.getScriptSrc(),
+            onInit: function (theInstance) {
+                console.log("snippet loaded");
+                self._loadScriptOnInit(theInstance);
+
+                self.onDone(() => {
+                    if (theInstance && theInstance.unload && theInstance.core && theInstance.core.isInitialized()) {
+                        Assert.ok(true, "Unloading from onInit...");
+                        theInstance.unload(false);
+                    } else {
+                        Assert.ok(true, "Unload not supported in onInit...");
+                    }
+                });
+            },
+            cfg: { 
+                instrumentationKey: "key",
+                enablePerfMgr: true,
+                maxBatchSizeInBytes: 1000000,
+                maxBatchInterval: 30000000,
+                extensionConfig: {}
+            }            
+        });
     }
 
     public addPerfEvents() {
@@ -277,8 +289,14 @@ export class AISKUPerf extends AITestClass {
     }
 
     public getScriptSrc(): string {
-        return `https://js.monitor.azure.com/scripts/b/ai.${this.AISKUPerfTest.version}.min.js?${this.AISKUPerfTest.testPostfix}`;
-    }
+        let baseUrl = "https://js.monitor.azure.com/scripts/b/ai.";
+
+        if (this.AISKUPerfTest.version.indexOf("nightly") !== -1) {
+            baseUrl = "https://js.monitor.azure.com/nightly/ai.";
+        }
+
+        return baseUrl + `${this.AISKUPerfTest.version}.min.js?${this.AISKUPerfTest.testPostfix}`;
+    }    
 
     private _addMemoryPerfEvent(initialMemoryUsage: number, metric?: string): void {
         let curMemory = performance["memory"]?.usedJSHeapSize;

AISKU/Tests/Perf/src/AISKUPerf.ts

@@ -19,7 +19,7 @@ export class AppInsightsInitPerfTestClass {
          * should update version after new release
          * version with doperf(): after 2.5.6
          * */
-        var defaultVer = "2.7.4";
+        var defaultVer = "2.8.1";
         this.version = ver? ver:this._getQueryParameterVersion(defaultVer); 
         this.perfEventsBuffer = [];
         this.perfEventWaitBuffer = [];

AISKU/Tests/PerfTests.html

@@ -55,7 +55,9 @@
             };
 
             if (snippetCfg.onInit) {
-                appInsights.queue.push(snippetCfg.onInit);
+                appInsights.queue.push(function() {
+                    snippetCfg.onInit(appInsights);
+                });
             }
 
             window["appInsights"] = appInsights;

AISKU/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/applicationinsights-web",
-    "version": "2.7.4",
+    "version": "2.8.1",
     "description": "Microsoft Application Insights JavaScript SDK - Web",
     "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme",
     "author": "Microsoft Application Insights Team",
@@ -64,14 +64,14 @@
         "tslib": "*"
     },
     "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.4",
+        "@microsoft/dynamicproto-js": "^1.1.5",
         "@microsoft/applicationinsights-shims": "2.0.1",
-        "@microsoft/applicationinsights-analytics-js": "2.7.4",
-        "@microsoft/applicationinsights-channel-js": "2.7.4",
-        "@microsoft/applicationinsights-common": "2.7.4",
-        "@microsoft/applicationinsights-core-js": "2.7.4",
-        "@microsoft/applicationinsights-dependencies-js": "2.7.4",
-        "@microsoft/applicationinsights-properties-js": "2.7.4"
+        "@microsoft/applicationinsights-analytics-js": "2.8.1",
+        "@microsoft/applicationinsights-channel-js": "2.8.1",
+        "@microsoft/applicationinsights-common": "2.8.1",
+        "@microsoft/applicationinsights-core-js": "2.8.1",
+        "@microsoft/applicationinsights-dependencies-js": "2.8.1",
+        "@microsoft/applicationinsights-properties-js": "2.8.1"
     },
     "license": "MIT"
 }

AISKU/src/ApplicationInsightsDeprecated.ts

@@ -5,7 +5,7 @@ import {
     IEventTelemetry, IEnvelope, ProcessLegacy
 } from "@microsoft/applicationinsights-common";
 import { Snippet, Initialization as ApplicationInsights } from "./Initialization";
-import { ITelemetryItem, IDiagnosticLogger, IConfiguration, proxyAssign, throwError, ICookieMgr } from "@microsoft/applicationinsights-core-js";
+import { ITelemetryItem, IDiagnosticLogger, IConfiguration, proxyAssign, throwError, ICookieMgr, arrIndexOf } from "@microsoft/applicationinsights-core-js";
 
 // This is an exclude list of properties that should not be updated during initialization
 // They include a combination of private and internal property names
@@ -187,7 +187,7 @@ export class AppInsightsDeprecated implements IAppInsightsDeprecated {
         // Note: This must be called before loadAppInsights is called
         proxyAssign(snippet, this, (name: string) => {
             // Not excluding names prefixed with "_" as we need to proxy some functions like _onError
-            return name && _ignoreUpdateSnippetProperties.indexOf(name) === -1;
+            return name && arrIndexOf(_ignoreUpdateSnippetProperties, name) === -1;
         });
     }
 

AISKU/src/Initialization.ts

@@ -3,20 +3,20 @@
 
 import dynamicProto from "@microsoft/dynamicproto-js";
 import {
-    IConfiguration, AppInsightsCore, IAppInsightsCore, LoggingSeverity, _InternalMessageId, ITelemetryItem, ICustomProperties,
+    IConfiguration, AppInsightsCore, IAppInsightsCore, eLoggingSeverity, _eInternalMessageId, ITelemetryItem, ICustomProperties,
     IChannelControls, hasWindow, hasDocument, isReactNative, doPerf, IDiagnosticLogger, INotificationManager, objForEachKey, proxyAssign, proxyFunctions,
     arrForEach, isString, isFunction, isNullOrUndefined, isArray, throwError, ICookieMgr, addPageUnloadEventListener, addPageHideEventListener,
     createUniqueNamespace, ITelemetryPlugin, IPlugin, ILoadedPlugin, UnloadHandler, removePageUnloadEventListener, removePageHideEventListener,
-    ITelemetryInitializerHandler, ITelemetryUnloadState, mergeEvtNamespace
+    ITelemetryInitializerHandler, ITelemetryUnloadState, mergeEvtNamespace, _throwInternal, arrIndexOf
 } from "@microsoft/applicationinsights-core-js";
 import { AnalyticsPlugin, ApplicationInsights } from "@microsoft/applicationinsights-analytics-js";
 import { Sender } from "@microsoft/applicationinsights-channel-js";
 import { PropertiesPlugin } from "@microsoft/applicationinsights-properties-js";
 import { AjaxPlugin as DependenciesPlugin, IDependenciesPlugin } from "@microsoft/applicationinsights-dependencies-js";
 import {
     IUtil, Util, ICorrelationIdHelper, CorrelationIdHelper, IUrlHelper, UrlHelper, IDateTimeUtils, DateTimeUtils, ConnectionStringParser, FieldType,
-    IRequestHeaders, RequestHeaders, DisabledPropertyName, ProcessLegacy, SampleRate, HttpMethod, DEFAULT_BREEZE_ENDPOINT, AIData, AIBase,
-    Envelope, Event, Exception, Metric, PageView, PageViewData, RemoteDependencyData, IEventTelemetry,
+    IRequestHeaders, RequestHeaders, DisabledPropertyName, ProcessLegacy, SampleRate, HttpMethod, DEFAULT_BREEZE_ENDPOINT,
+    Envelope, Event, Exception, Metric, PageView, RemoteDependencyData, IEventTelemetry,
     ITraceTelemetry, IMetricTelemetry, IDependencyTelemetry, IExceptionTelemetry, IAutoExceptionTelemetry,
     IPageViewTelemetry, IPageViewPerformanceTelemetry, Trace, PageViewPerformance, Data, SeverityLevel,
     IConfig, ConfigurationManager, ContextTagKeys, IDataSanitizer, DataSanitizer, TelemetryItemCreator, IAppInsights, CtxTagKeys, Extensions,
@@ -124,14 +124,11 @@ export const Telemetry = {
     SampleRate,
     HttpMethod,
     DEFAULT_BREEZE_ENDPOINT,
-    AIData,
-    AIBase,
     Envelope,
     Event,
     Exception,
     Metric,
     PageView,
-    PageViewData,
     RemoteDependencyData,
     Trace,
     PageViewPerformance,
@@ -238,7 +235,7 @@ export class Initialization implements IApplicationInsights {
                             if (isString(field) &&
                                     !isFunction(value) &&
                                     field && field[0] !== "_" &&                                // Don't copy "internal" values
-                                    _ignoreUpdateSnippetProperties.indexOf(field) === -1) {
+                                    arrIndexOf(_ignoreUpdateSnippetProperties, field) === -1) {
                                 snippet[field as string] = value;
                             }
                         });
@@ -280,7 +277,7 @@ export class Initialization implements IApplicationInsights {
                 // Note: This must be called before loadAppInsights is called
                 proxyAssign(snippet, _self, (name: string) => {
                     // Not excluding names prefixed with "_" as we need to proxy some functions like _onError
-                    return name && _ignoreUpdateSnippetProperties.indexOf(name) === -1;
+                    return name && arrIndexOf(_ignoreUpdateSnippetProperties, name) === -1;
                 });
             };
 
@@ -306,8 +303,8 @@ export class Initialization implements IApplicationInsights {
 
                     // need from core
                     // Microsoft.ApplicationInsights._InternalLogging.throwInternal(
-                    //     LoggingSeverity.WARNING,
-                    //     _InternalMessageId.FailedToSendQueuedTelemetry,
+                    //     eLoggingSeverity.WARNING,
+                    //     _eInternalMessageId.FailedToSendQueuedTelemetry,
                     //     "Failed to send queued telemetry",
                     //     properties);
                 }
@@ -362,9 +359,9 @@ export class Initialization implements IApplicationInsights {
                         // A reactNative app may not have a window and therefore the beforeunload/pagehide events -- so don't
                         // log the failure in this case
                         if (!added && !isReactNative()) {
-                            appInsightsInstance.appInsights.core.logger.throwInternal(
-                                LoggingSeverity.CRITICAL,
-                                _InternalMessageId.FailedToAddHandlerForOnBeforeUnload,
+                            _throwInternal(appInsightsInstance.appInsights.core.logger,
+                                eLoggingSeverity.CRITICAL,
+                                _eInternalMessageId.FailedToAddHandlerForOnBeforeUnload,
                                 "Could not add handler for beforeunload and pagehide");
                         }
                     }

AISKU/src/applicationinsights-web.ts

@@ -14,7 +14,9 @@ export {
     AppInsightsCore,
     IAppInsightsCore,
     LoggingSeverity,
+    eLoggingSeverity,
     _InternalMessageId,
+    _eInternalMessageId,
     ITelemetryItem,
     ITelemetryPlugin,
     IPerfEvent,
@@ -49,6 +51,7 @@ export {
     IEventTelemetry,
     IAppInsights,
     SeverityLevel,
+    eSeverityLevel,
     Event,
     Exception,
     Metric,

AISKULight/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/applicationinsights-web-basic",
-    "version": "2.7.4",
+    "version": "2.8.1",
     "description": "Microsoft Application Insights Javascript SDK core and channel",
     "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme",
     "author": "Microsoft Application Insights Team",
@@ -49,11 +49,11 @@
         "tslib": "*"
     },
     "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.4",
+        "@microsoft/dynamicproto-js": "^1.1.5",
         "@microsoft/applicationinsights-shims": "2.0.1",
-        "@microsoft/applicationinsights-common": "2.7.4",
-        "@microsoft/applicationinsights-channel-js": "2.7.4",
-        "@microsoft/applicationinsights-core-js": "2.7.4"
+        "@microsoft/applicationinsights-common": "2.8.1",
+        "@microsoft/applicationinsights-channel-js": "2.8.1",
+        "@microsoft/applicationinsights-core-js": "2.8.1"
     },
     "license": "MIT"
 }

AISKULight/src/index.ts

@@ -192,6 +192,7 @@ export {
 } from "@microsoft/applicationinsights-core-js";
 export {
     SeverityLevel,
+    eSeverityLevel,
     IPageViewTelemetry,
     IDependencyTelemetry,
     IAutoExceptionTelemetry,