From e7611df4d506e44e6029f57c3772653c267a250a Mon Sep 17 00:00:00 2001
From: Nev Wylie <54870357+MSNev@users.noreply.github.com>
Date: Thu, 6 Apr 2023 12:40:11 -0700
Subject: [PATCH] [BUG] SDK LOAD Failure reporting not working #2027

---
 AISKU/Tests/Manual/HelloWorld.html            |  96 +++--
 .../Unit/src/SnippetInitialization.Tests.ts   |  18 +-
 .../src/{testSnippet.ts => testSnippetV5.ts}  |   0
 AISKU/Tests/Unit/src/testSnippetV6.ts         | 337 ++++++++++++++++++
 AISKU/snippet/README.md                       |   8 +-
 AISKU/snippet/snippet.js                      |   9 +-
 AISKU/snippet/snippet.min.js                  |   4 +-
 README.md                                     |   6 +-
 common/Tests/Framework/src/AITestClass.ts     |  11 +-
 common/config/rush/npm-shrinkwrap.json        |  70 ++--
 .../README.md                                 |   4 +-
 gruntfile.js                                  |  31 +-
 .../Tests/Unit/src/SnippetTests.ts            |  43 +++
 .../Tests/Unit/src/snippet.tests.ts           |   5 +
 .../Tests/UnitTests.html                      |  43 +++
 .../Tests/tsconfig.json                       |  19 +
 .../build/applicationinsights-web-snippet.ts  |  13 +
 .../build/web-snippet-cs.ts                   |   1 +
 .../build/web-snippet.ts                      |   1 +
 .../package.json                              |   5 +-
 .../src/applicationinsights-web-snippet.ts    |  14 +-
 .../src/web-snippet-cs.ts                     |   1 +
 .../src/web-snippet.ts                        |   1 +
 .../tsconfig.json                             |   4 +-
 tools/config/package.json                     |   2 +-
 25 files changed, 657 insertions(+), 89 deletions(-)
 rename AISKU/Tests/Unit/src/{testSnippet.ts => testSnippetV5.ts} (100%)
 create mode 100644 AISKU/Tests/Unit/src/testSnippetV6.ts
 create mode 100644 tools/applicationinsights-web-snippet/Tests/Unit/src/SnippetTests.ts
 create mode 100644 tools/applicationinsights-web-snippet/Tests/Unit/src/snippet.tests.ts
 create mode 100644 tools/applicationinsights-web-snippet/Tests/UnitTests.html
 create mode 100644 tools/applicationinsights-web-snippet/Tests/tsconfig.json
 create mode 100644 tools/applicationinsights-web-snippet/build/applicationinsights-web-snippet.ts
 create mode 100644 tools/applicationinsights-web-snippet/build/web-snippet-cs.ts
 create mode 100644 tools/applicationinsights-web-snippet/build/web-snippet.ts
 create mode 100644 tools/applicationinsights-web-snippet/src/web-snippet-cs.ts
 create mode 100644 tools/applicationinsights-web-snippet/src/web-snippet.ts

diff --git a/AISKU/Tests/Manual/HelloWorld.html b/AISKU/Tests/Manual/HelloWorld.html
index 85109bb4b..67e9fd49f 100644
--- a/AISKU/Tests/Manual/HelloWorld.html
+++ b/AISKU/Tests/Manual/HelloWorld.html
@@ -50,6 +50,60 @@ <h1 class="display-4">Welcome</h1>
 <script src="http://localhost:9001/AISKU/browser/ai.2.js"></script>
 <!-- <script src="https://js.monitor.azure.com/scripts/b/ai.2.7.4.js" crossorigin="anonymous"></script> -->
 <!-- <script src="https://js.monitor.azure.com/scripts/b/ai.2.8.0.js" crossorigin="anonymous"></script> -->
+<!-- <script>
+    // Snippet v5
+    var enableDebug = true;
+    var instrumentationKey = "2bd72339-a683-4cce-8ed7-b1b0e8700000";
+
+    !function(T,l,y){var S=T.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w="crossOrigin",N="POST",e="appInsightsSDK",t=y.name||"appInsights";(y.name||T[e])&&(T[e]=t);var n=T[t]||function(d){var g=!1,f=!1,m={initialize:!0,queue:[],sv:"5",version:2,config:d};function v(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(m.sv||m.version),{time:function(){var e=new Date;function t(e){var t=""+e;return 1===t.length&&(t="0"+t),t}return e.getUTCFullYear()+"-"+t(1+e.getUTCMonth())+"-"+t(e.getUTCDate())+"T"+t(e.getUTCHours())+":"+t(e.getUTCMinutes())+":"+t(e.getUTCSeconds())+"."+((e.getUTCMilliseconds()/1e3).toFixed(3)+"").slice(2,5)+"Z"}(),iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}}}var h=d.url||y.src;if(h){function a(e){var t,n,a,i,r,o,s,c,u,p,l;g=!0,m.queue=[],f||(f=!0,t=h,s=function(){var e={},t=d.connectionString;if(t)for(var n=t.split(";"),a=0;a<n.length;a++){var i=n[a].split("=");2===i.length&&(e[i[0][b]()]=i[1])}if(!e[C]){var r=e.endpointsuffix,o=r?e.location:null;e[C]="https://"+(o?o+".":"")+"dc."+(r||"services.visualstudio.com")}return e}(),c=s[D]||d[D]||"",u=s[C],p=u?u+"/v2/track":d.endpointUrl,(l=[]).push((n="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",a=t,i=p,(o=(r=v(c,"Exception")).data).baseType="ExceptionData",o.baseData.exceptions=[{typeName:"SDKLoadFailed",message:n.replace(/\./g,"-"),hasFullStack:!1,stack:n+"\nSnippet failed to load ["+a+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+i,parsedStack:[]}],r)),l.push(function(e,t,n,a){var i=v(c,"Message"),r=i.data;r.baseType="MessageData";var o=r.baseData;return o.message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+n+")").replace(/\"/g,"")+'"',o.properties={endpoint:a},i}(0,0,t,p)),function(e,t){if(JSON){var n=T.fetch;if(n&&!y.useXhr)n(t,{method:N,body:JSON.stringify(e),mode:"cors"});else if(XMLHttpRequest){var a=new XMLHttpRequest;a.open(N,t),a.setRequestHeader("Content-type","application/json"),a.send(JSON.stringify(e))}}}(l,p))}function i(e,t){f||setTimeout(function(){!t&&m.core||a()},500)}var e=function(){var n=l.createElement(k);n.src=h;var e=y[w];return!e&&""!==e||"undefined"==n[w]||(n[w]=e),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},n}();y.ld<0?l.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){l.getElementsByTagName(k)[0].parentNode.appendChild(e)},y.ld||0)}try{m.cookie=l.cookie}catch(p){}function t(e){for(;e.length;)!function(t){m[t]=function(){var e=arguments;g||m.queue.push(function(){m[t].apply(m,e)})}}(e.pop())}var n="track",r="TrackPage",o="TrackEvent";t([n+"Event",n+"PageView",n+"Exception",n+"Trace",n+"DependencyData",n+"Metric",n+"PageViewPerformance","start"+r,"stop"+r,"start"+o,"stop"+o,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),m.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4};var s=(d.extensionConfig||{}).ApplicationInsightsAnalytics||{};if(!0!==d[I]&&!0!==s[I]){var c="onerror";t(["_"+c]);var u=T[c];T[c]=function(e,t,n,a,i){var r=u&&u(e,t,n,a,i);return!0!==r&&m["_"+c]({message:e,url:t,lineNumber:n,columnNumber:a,error:i}),r},d.autoExceptionInstrumented=!0}return m}(y.cfg);function a(){y.onInit&&y.onInit(n)}(T[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
+    src: "http://localhost:9001/AISKU/browser/ai.2x.js", // The SDK URL Source
+    // name: "appInsights", // Global SDK Instance name defaults to "appInsights" when not supplied
+    // ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,
+    // useXhr: 1, // Use XHR instead of fetch to report failures (if available),
+    // crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
+    // onInit: null, // Once the application insights instance has loaded and initialized this callback function will be called with 1 argument -- the sdk instance (DO NOT ADD anything to the sdk.queue -- As they won't get called)
+    cfg: { // Application Insights Configuration
+        connectionString: "InstrumentationKey=" + instrumentationKey + ";IngestionEndpoint=http://localhost:9001",
+        //extensions: [reactPlugin],
+        enableDebug: true,
+        loggingLevelConsole: enableDebug ? 2 : 0,
+        loggingLevelTelemetry: enableDebug ? 2 : 1,
+        autoTrackPageVisitTime: true,
+        enableAutoRouteTracking: true,
+        enableDebugExceptions: enableDebug,
+        enableUnhandledPromiseRejectionTracking: true,
+        enableCorsCorrelation: false,
+        enableRequestHeaderTracking: true,
+        enableResponseHeaderTracking: true
+    }});
+</script> -->
+<script>
+    // Snippet v5
+    var enableDebug = true;
+    var instrumentationKey = "2bd72339-a683-4cce-8ed7-b1b0e8700000";
+
+    !function(v,y,T){var S=v.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w=(D[b](),"crossOrigin"),N="POST",e="appInsightsSDK",t=T.name||"appInsights",n=((T.name||v[e])&&(v[e]=t),v[t]||function(l){var u=!1,d=!1,g={initialize:!0,queue:[],sv:"6",version:2,config:l};function m(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(g.sv||g.version),{time:(a=new Date).getUTCFullYear()+"-"+i(1+a.getUTCMonth())+"-"+i(a.getUTCDate())+"T"+i(a.getUTCHours())+":"+i(a.getUTCMinutes())+":"+i(a.getUTCSeconds())+"."+(a.getUTCMilliseconds()/1e3).toFixed(3).slice(2,5)+"Z",iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}};function i(e){e=""+e;return 1===e.length?"0"+e:e}}var e,n,f=l.url||T.src;function a(e){var t,n,a,i,o,s,r,c,p;u=!0,g.queue=[],d||(d=!0,i=f,r=(c=function(){var e,t={},n=l.connectionString;if(n)for(var a=n.split(";"),i=0;i<a.length;i++){var o=a[i].split("=");2===o.length&&(t[o[0][b]()]=o[1])}return t[C]||(t[C]="https://"+((e=(n=t.endpointsuffix)?t.location:null)?e+".":"")+"dc."+(n||"services.visualstudio.com")),t}()).instrumentationkey||l[D]||"",c=(c=c[C])?c+"/v2/track":l.endpointUrl,(p=[]).push((t="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",n=i,o=c,(s=(a=m(r,"Exception")).data).baseType="ExceptionData",s.baseData.exceptions=[{typeName:"SDKLoadFailed",message:t.replace(/\./g,"-"),hasFullStack:!1,stack:t+"\nSnippet failed to load ["+n+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+o,parsedStack:[]}],a)),p.push((s=i,t=c,(o=(n=m(r,"Message")).data).baseType="MessageData",(a=o.baseData).message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+s+")").replace(/\"/g,"")+'"',a.properties={endpoint:t},n)),i=p,r=c,JSON&&((o=v.fetch)&&!T.useXhr?o(r,{method:N,body:JSON.stringify(i),mode:"cors"}):XMLHttpRequest&&((s=new XMLHttpRequest).open(N,r),s.setRequestHeader("Content-type","application/json"),s.send(JSON.stringify(i)))))}function i(e,t){d||setTimeout(function(){!t&&g.core||a()},500)}f&&((n=y.createElement(k)).src=f,!(o=T[w])&&""!==o||"undefined"==n[w]||(n[w]=o),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},e=n,T.ld<0?y.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){y.getElementsByTagName(k)[0].parentNode.appendChild(e)},T.ld||0));try{g.cookie=y.cookie}catch(h){}function t(e){for(;e.length;)!function(t){g[t]=function(){var e=arguments;u||g.queue.push(function(){g[t].apply(g,e)})}}(e.pop())}var s,r,o="track",c="TrackPage",p="TrackEvent",o=(t([o+"Event",o+"PageView",o+"Exception",o+"Trace",o+"DependencyData",o+"Metric",o+"PageViewPerformance","start"+c,"stop"+c,"start"+p,"stop"+p,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),g.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4},(l.extensionConfig||{}).ApplicationInsightsAnalytics||{});return!0!==l[I]&&!0!==o[I]&&(t(["_"+(s="onerror")]),r=v[s],v[s]=function(e,t,n,a,i){var o=r&&r(e,t,n,a,i);return!0!==o&&g["_"+s]({message:e,url:t,lineNumber:n,columnNumber:a,error:i,evt:v.event}),o},l.autoExceptionInstrumented=!0),g}(T.cfg));function a(){T.onInit&&T.onInit(n)}(v[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
+        src: "http://localhost:9001/AISKU/browser/ai.2x.js", // The SDK URL Source
+    // name: "appInsights", // Global SDK Instance name defaults to "appInsights" when not supplied
+    // ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,
+    // useXhr: 1, // Use XHR instead of fetch to report failures (if available),
+    // crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
+    // onInit: null, // Once the application insights instance has loaded and initialized this callback function will be called with 1 argument -- the sdk instance (DO NOT ADD anything to the sdk.queue -- As they won't get called)
+    cfg: { // Application Insights Configuration
+        connectionString: "InstrumentationKey=" + instrumentationKey + ";IngestionEndpoint=http://localhost:9001",
+        //extensions: [reactPlugin],
+        enableDebug: true,
+        loggingLevelConsole: enableDebug ? 2 : 0,
+        loggingLevelTelemetry: enableDebug ? 2 : 1,
+        autoTrackPageVisitTime: true,
+        enableAutoRouteTracking: true,
+        enableDebugExceptions: enableDebug,
+        enableUnhandledPromiseRejectionTracking: true,
+        enableCorsCorrelation: false,
+        enableRequestHeaderTracking: true,
+        enableResponseHeaderTracking: true
+    }});
+</script>
 <script>
 
     //var sdkInstance="appInsightsSDK";window[sdkInstance]="appInsights";var aiName=window[sdkInstance],aisdk=window[aiName]||function(e){function n(e){t[e]=function(){var n=arguments;t.queue.push(function(){t[e].apply(t,n)})}}var t={config:e};t.initialize=!0;var i=document,a=window;setTimeout(function(){var n=i.createElement("script");n.src=e.url||"https://az416426.vo.msecnd.net/scripts/b/ai.2.min.js",i.getElementsByTagName("script")[0].parentNode.appendChild(n)});try{t.cookie=i.cookie}catch(e){}t.queue=[],t.version=2;for(var r=["Event","PageView","Exception","Trace","DependencyData","Metric","PageViewPerformance"];r.length;)n("track"+r.pop());n("startTrackPage"),n("stopTrackPage");var s="Track"+r[0];if(n("start"+s),n("stop"+s),n("addTelemetryInitializer"),n("setAuthenticatedUserContext"),n("clearAuthenticatedUserContext"),n("flush"),t.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4},!(!0===e.disableExceptionTracking||e.extensionConfig&&e.extensionConfig.ApplicationInsightsAnalytics&&!0===e.extensionConfig.ApplicationInsightsAnalytics.disableExceptionTracking)){n("_"+(r="onerror"));var o=a[r];a[r]=function(e,n,i,a,s){var c=o&&o(e,n,i,a,s);return!0!==c&&t["_"+r]({message:e,url:n,lineNumber:i,columnNumber:a,error:s}),c},e.autoExceptionInstrumented=!0}return t}(
@@ -77,28 +131,28 @@ <h1 class="display-4">Welcome</h1>
     //     }, 100);
     // }
 
-    var enableDebug = true;
-    var instrumentationKey = "2bd72339-a683-4cce-8ed7-b1b0e8700000";
-    var appInsights = new Microsoft.ApplicationInsights.ApplicationInsights({
-        config: {
-            instrumentationKey: instrumentationKey,
-            endpointUrl: "http://localhost:9001/v2/track",
-            //extensions: [reactPlugin],
-            enableDebug: true,
-            loggingLevelConsole: enableDebug ? 2 : 0,
-            loggingLevelTelemetry: enableDebug ? 2 : 1,
-            autoTrackPageVisitTime: true,
-            enableAutoRouteTracking: true,
-            enableDebugExceptions: enableDebug,
-            enableUnhandledPromiseRejectionTracking: true,
-            enableCorsCorrelation: false,
-            enableRequestHeaderTracking: true,
-            enableResponseHeaderTracking: true
-        }
-    });    
+    // var enableDebug = true;
+    // var instrumentationKey = "2bd72339-a683-4cce-8ed7-b1b0e8700000";
+    // var appInsights = new Microsoft.ApplicationInsights.ApplicationInsights({
+    //     config: {
+    //         instrumentationKey: instrumentationKey,
+    //         endpointUrl: "http://localhost:9001/v2/track",
+    //         //extensions: [reactPlugin],
+    //         enableDebug: true,
+    //         loggingLevelConsole: enableDebug ? 2 : 0,
+    //         loggingLevelTelemetry: enableDebug ? 2 : 1,
+    //         autoTrackPageVisitTime: true,
+    //         enableAutoRouteTracking: true,
+    //         enableDebugExceptions: enableDebug,
+    //         enableUnhandledPromiseRejectionTracking: true,
+    //         enableCorsCorrelation: false,
+    //         enableRequestHeaderTracking: true,
+    //         enableResponseHeaderTracking: true
+    //     }
+    // });    
 
-    appInsights.loadAppInsights();
-    appInsights.trackPageView();    
+    // appInsights.loadAppInsights();
+    // appInsights.trackPageView();    
 
     //$.ajax({
     //    url: "https://www.mocky.io/v2/5185415ba171ea3a00704eed",
diff --git a/AISKU/Tests/Unit/src/SnippetInitialization.Tests.ts b/AISKU/Tests/Unit/src/SnippetInitialization.Tests.ts
index 1f46352ac..9e2d4a0e5 100644
--- a/AISKU/Tests/Unit/src/SnippetInitialization.Tests.ts
+++ b/AISKU/Tests/Unit/src/SnippetInitialization.Tests.ts
@@ -4,7 +4,8 @@ import { IApplicationInsights, Snippet } from "../../../src/Initialization";
 import { Sender } from "@microsoft/applicationinsights-channel-js";
 import { SinonSpy } from "sinon";
 import { AITestClass, Assert, PollingAssert } from "@microsoft/ai-test-framework";
-import { createSnippetV5 } from "./testSnippet";
+import { createSnippetV5 } from "./testSnippetV5";
+import { createSnippetV6 } from "./testSnippetV6";
 import { dumpObj, hasOwnProperty, isNotNullOrUndefined, ITelemetryItem, objForEachKey } from "@microsoft/applicationinsights-core-js";
 import { ContextTagKeys, DistributedTracingModes, IConfig, IDependencyTelemetry, RequestHeaders, Util } from "@microsoft/applicationinsights-common";
 import { getGlobal } from "@microsoft/applicationinsights-shims";
@@ -140,7 +141,8 @@ export class SnippetInitializationTests extends AITestClass {
 
     // Add any new snippet configurations to this map
     private _theSnippets = {
-        "v5": createSnippetV5
+        "v5": createSnippetV5,
+        "v6": createSnippetV6
     };
     
     public testInitialize() {
@@ -148,7 +150,9 @@ export class SnippetInitializationTests extends AITestClass {
 
         try {
             this.useFakeServer = true;
+            this.useFakeFetch = true;
             this.fakeServerAutoRespond = true;
+            this.fakeFetchAutoRespond = true;
             this.isFetchPolyfill = fetch && fetch["polyfill"];
 
             console.log("* testInitialize()");
@@ -197,7 +201,7 @@ export class SnippetInitializationTests extends AITestClass {
                 test: () => {
                     let theSnippet:any = null;
                     let exception: Error = null;
-                    this.useFakeServer = false;
+                    //this.useFakeServer = false;
                     try {
                         let snippet:Snippet = snippetCreator(getSnippetConfigWrongConnectionString(this.sessionPrefix));
                         // Call the initialization
@@ -213,7 +217,7 @@ export class SnippetInitializationTests extends AITestClass {
                 test: () => {
                     let theSnippet:any = null;
                     let exception: Error = null;
-                    this.useFakeServer = false;
+                    //this.useFakeServer = false;
                     try {
                         let snippet:Snippet = snippetCreator(getSnippetConfigNotSetConnectionString(this.sessionPrefix));
                         // Call the initialization
@@ -637,7 +641,7 @@ export class SnippetInitializationTests extends AITestClass {
         if (global && global.fetch && !this.isEmulatingEs3) {
             this.testCaseAsync({
                 name: "DependenciesPlugin: auto collection of outgoing fetch requests " + (this.isFetchPolyfill ? " using polyfill " : ""),
-                stepDelay: 5000,
+                stepDelay: 2000,
                 steps: [
                     () => {
                         let theSnippet = this._initializeSnippet(snippetCreator(getSnippetConfig(this.sessionPrefix)));
@@ -967,7 +971,7 @@ export class SnippetInitializationTests extends AITestClass {
 
     private _initializeSnippet(snippet: Snippet): IApplicationInsights {
         try {
-            this.useFakeServer = false;
+            //this.useFakeServer = false;
 
             // Call the initialization
             ((ApplicationInsightsContainer.getAppInsights(snippet, snippet.version)) as IApplicationInsights);
@@ -1049,5 +1053,5 @@ export class SnippetInitializationTests extends AITestClass {
         } else {
             return false;
         }
-    }, "sender succeeded", 30, 1000))];
+    }, "sender succeeded", 30, 500))];
 }
\ No newline at end of file
diff --git a/AISKU/Tests/Unit/src/testSnippet.ts b/AISKU/Tests/Unit/src/testSnippetV5.ts
similarity index 100%
rename from AISKU/Tests/Unit/src/testSnippet.ts
rename to AISKU/Tests/Unit/src/testSnippetV5.ts
diff --git a/AISKU/Tests/Unit/src/testSnippetV6.ts b/AISKU/Tests/Unit/src/testSnippetV6.ts
new file mode 100644
index 000000000..5ca2e1b96
--- /dev/null
+++ b/AISKU/Tests/Unit/src/testSnippetV6.ts
@@ -0,0 +1,337 @@
+
+
+/**
+ * DO NOT FIX BUGS WITH THE OBJECT RETURNED BY THIS HELPER
+ * -------------------------------------------------------
+ * YOU *SHOULD* CREATE A NEW VERSION FOR EACH SNIPPET VERSION UNLESS CHANGES ARE MINIMAL
+ * -------------------------------------------------------
+ * This is a helper that returns an object that is the same as the v6 snippet, if there is
+ * an issue with the tests because of the object this returns there is probably a bug during 
+ * initialization.
+ */
+export function createSnippetV6(snipConfig) {
+    let win = window;
+    let doc = document;
+
+    var locn = win.location;
+    var helpLink = "https://go.microsoft.com/fwlink/?linkid=2128109";
+    var scriptText = "script";
+    var strInstrumentationKey = "instrumentationKey";
+    var strIngestionendpoint = "ingestionendpoint";
+    var strDisableExceptionTracking = "disableExceptionTracking";
+    var strAiDevice = "ai.device.";
+    var strAiOperationName = "ai.operation.name";
+    var strAiSdkVersion = "ai.internal.sdkVersion";
+    var strToLowerCase = "toLowerCase";
+    var strConStringIKey = strInstrumentationKey[strToLowerCase]();
+    var strEmpty = "";
+    var strUndefined = "undefined";
+    var strCrossOrigin = "crossOrigin";
+
+    var strPostMethod = "POST";
+    var sdkInstanceName = "appInsightsSDK";         // required for Initialization to find the current instance
+    var aiName = snipConfig.name || "appInsights";  // provide non default instance name through snipConfig name value
+    if (snipConfig.name || win[sdkInstanceName]) {
+        // Only set if supplied or another name is defined to avoid polluting the global namespace
+        win[sdkInstanceName] = aiName;
+    }
+    var aiSdk = win[aiName] || (function (aiConfig) {
+        var loadFailed = false;
+        var handled = false;
+        var appInsights: any = {
+            initialize: true,   // initialize sdk on download
+            queue: [],
+            sv: "6",            // Track the actual snippet version for reporting.
+            version: 2.0,       // initialization version, if this is not 2.0 the previous scripts fail to initialize
+            config: aiConfig
+        };
+        function _parseConnectionString() {
+            var fields: any = {};
+            var connectionString = aiConfig.connectionString;
+            if (connectionString) {
+                var kvPairs = connectionString.split(";");
+                for (var lp = 0; lp < kvPairs.length; lp++) {
+                    var kvParts = kvPairs[lp].split("=");
+    
+                    if (kvParts.length === 2) { // only save fields with valid formats
+                        fields[kvParts[0][strToLowerCase]()] = kvParts[1];
+                    }
+                }
+            }
+
+            // apply the default endpoints
+            if (!fields[strIngestionendpoint]) {
+                // use endpoint suffix where overrides are not provided
+                var endpointSuffix = fields.endpointsuffix;
+                // Only fetch the location if a suffix was supplied
+                var fLocation = endpointSuffix ? fields.location : null;
+                fields[strIngestionendpoint] = "https://" + (fLocation ? fLocation + "." : strEmpty) + "dc." + (endpointSuffix || "services.visualstudio.com");
+            }
+
+            return fields;
+        }
+
+        function _sendEvents(evts, endpointUrl) {
+            if (JSON) {
+                var sender = win.fetch;
+                if (sender && !snipConfig.useXhr) {
+                    sender(endpointUrl, { method:strPostMethod, body: JSON.stringify(evts), mode:"cors"});
+                } else if (XMLHttpRequest) {
+                    // IE doesn't support fetch and private clouds may only be using IE
+                    var xhr = new XMLHttpRequest();
+                    xhr.open(strPostMethod, endpointUrl);
+                    xhr.setRequestHeader("Content-type", "application/json");
+                    xhr.send(JSON.stringify(evts));
+                }
+            }
+        }
+
+        function _reportFailure(targetSrc) {
+            var conString = _parseConnectionString();
+            var iKey = conString[strConStringIKey] || aiConfig[strInstrumentationKey] || strEmpty;
+            var ingest = conString[strIngestionendpoint];
+            var endpointUrl = ingest ? ingest + "/v2/track" : aiConfig.endpointUrl; // only add /v2/track when from connectionstring
+
+            var message = "SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)";
+            var evts = [];
+            evts.push(_createException(iKey, message, targetSrc, endpointUrl));
+            evts.push(_createInternal(iKey, message, targetSrc, endpointUrl));
+
+            _sendEvents(evts, endpointUrl);
+        }
+
+        // Gets the time as an ISO date format, using a function as IE7/8 doesn't support toISOString
+        function _getTime() {
+            var date = new Date();
+            function pad(num) {
+                var r = strEmpty + num;
+                if (r.length === 1) {
+                    r = "0" + r;
+                }
+
+                return r;
+            }
+
+            return date.getUTCFullYear()
+                + "-" + pad(date.getUTCMonth() + 1)
+                + "-" + pad(date.getUTCDate())
+                + "T" + pad(date.getUTCHours())
+                + ":" + pad(date.getUTCMinutes())
+                + ":" + pad(date.getUTCSeconds())
+                + "." + String((date.getUTCMilliseconds() / 1000).toFixed(3)).slice(2, 5)
+                + "Z";            
+        }
+
+        function _createEnvelope(iKey, theType): any {
+            var tags = {};
+            var type = "Browser";
+            tags[strAiDevice + "id"] = type[strToLowerCase]();
+            tags[strAiDevice + "type"] = type;
+            tags[strAiOperationName] = locn && locn.pathname || "_unknown_";
+            tags[strAiSdkVersion] = "javascript:snippet_" + (appInsights.sv || appInsights.version);
+
+            return {
+                time: _getTime(),
+                iKey: iKey,
+                name: "Microsoft.ApplicationInsights." + iKey.replace(/-/g, strEmpty) + "." + theType,
+                sampleRate: 100,
+                tags: tags,
+                data: {
+                    baseData: {
+                        ver: 2
+                    }
+                }
+            };
+        }
+
+        function _createInternal(iKey, message, targetSrc, endpointUrl) {
+            var envelope = _createEnvelope(iKey, "Message");
+            var data = envelope.data;
+            data.baseType = "MessageData";
+            var baseData = data.baseData;
+            baseData.message = "AI (Internal): 99 message:\"" + (message + " (" + targetSrc + ")").replace(/\"/g, strEmpty) + "\"";
+            baseData.properties = {
+                endpoint: endpointUrl
+            };
+
+            return envelope;
+        }
+
+        function _createException(iKey, message, targetSrc, endpointUrl) {
+            var envelope = _createEnvelope(iKey, "Exception");
+            var data = envelope.data;
+            data.baseType = "ExceptionData";
+            data.baseData.exceptions = [{
+                typeName: "SDKLoadFailed",
+                message: message.replace(/\./g, "-"),  // Replacing '.' characters as it causes the portal to hide the start of the message in the summary
+                hasFullStack: false,
+                stack: message + "\nSnippet failed to load [" + targetSrc + "] -- Telemetry is disabled\nHelp Link: " + helpLink + "\nHost: " + (locn && locn.pathname || "_unknown_") + "\nEndpoint: " + endpointUrl,
+                parsedStack: []
+            }];
+
+            return envelope;
+        }
+    
+        //     Commented out as we don't want to load from the CDN
+        // -------------------------------------------------------------
+        // Assigning these to local variables allows them to be minified to save space:
+        // var targetSrc = aiConfig.url || snipConfig.src;
+        // if (targetSrc) {
+        //     function _handleError(evt) {
+        //         loadFailed = true;
+        //         appInsights.queue = []; // Clear the queue
+        //         if (!handled) {
+        //             handled = true;
+        //             _reportFailure(targetSrc);
+        //         }
+        //     }
+
+        //     function _handleLoad(evt, isAbort) {
+        //         if (!handled) {
+        //             // IE10, Opera calls loaded before the script is processed.
+        //             // so delaying to give the script a chance to be processed
+        //             setTimeout(function() {
+        //                 if (isAbort || !appInsights.core) {
+        //                     _handleError();
+        //                 }
+        //             }, 500);
+        //         }
+        //     }
+
+        //     function _createScript() {
+        //         var scriptElement = doc.createElement(scriptText);
+        //         scriptElement.src = targetSrc;
+
+        //         // Allocate Cross origin only if defined and available
+        //         var crossOrigin = snipConfig[strCrossOrigin];
+        //         if ((crossOrigin || crossOrigin === "") && scriptElement[strCrossOrigin] != strUndefined) {
+        //             scriptElement[strCrossOrigin] = crossOrigin;
+        //         }
+            
+        //         scriptElement.onload = _handleLoad;
+        //         scriptElement.onerror = _handleError;
+
+        //         // Some browsers support onload while others onreadystatechange and others both
+        //         scriptElement.onreadystatechange = function (evt, isAbort) {
+        //             if (scriptElement.readyState === "loaded" || scriptElement.readyState === "complete") {
+        //                 _handleLoad(evt, isAbort);
+        //             }
+        //         };                
+
+        //         return scriptElement;
+        //     }
+
+        //     var theScript = _createScript();
+        //     if (snipConfig.ld < 0) {
+        //         // if user wants to append tag to document head, blocking page load
+        //         var headNode = doc.getElementsByTagName("head")[0];
+        //         headNode.appendChild(theScript);
+        //     } else {
+        //         setTimeout(function () {
+        //             // Attempts to place the script tag in the same location as the first script on the page
+        //             doc.getElementsByTagName(scriptText)[0].parentNode.appendChild(theScript);
+        //         }, snipConfig.ld || 0);
+        //     }
+        // }
+    
+        // capture initial cookie
+        try {
+            appInsights.cookie = doc.cookie;
+        } catch (e) { }
+    
+        function _createMethods(methods) {
+            while (methods.length) {
+                (function (name) {
+                    // Define a temporary method that queues-up a the real method call
+                    appInsights[name] = function () {
+                        // Capture the original arguments passed to the method
+                        var originalArguments = arguments;
+                        if (!loadFailed) { // If we have detected that the main script failed to load then stop queuing events that will never be processed
+                            // Queue-up a call to the real method
+                            appInsights.queue.push(function () {
+                                // Invoke the real method with the captured original arguments
+                                appInsights[name].apply(appInsights, originalArguments);
+                            });
+                        }
+                    };
+                })(methods.pop());
+            }
+        }
+
+        var track = "track";
+        var trackPage = "TrackPage";
+        var trackEvent = "TrackEvent";
+        _createMethods([track + "Event", 
+            track + "PageView", 
+            track + "Exception", 
+            track + "Trace", 
+            track + "DependencyData", 
+            track + "Metric", 
+            track + "PageViewPerformance",
+            "start" + trackPage, 
+            "stop" + trackPage,
+            "start" + trackEvent, 
+            "stop" + trackEvent,
+            "addTelemetryInitializer", 
+            "setAuthenticatedUserContext", 
+            "clearAuthenticatedUserContext", 
+            "flush"]);
+    
+        // expose SeverityLevel enum
+        appInsights['SeverityLevel'] = {
+            Verbose : 0,
+            Information : 1,
+            Warning : 2,
+            Error : 3,
+            Critical : 4
+        };
+    
+        // Collect global errors
+        // Note: ApplicationInsightsAnalytics is the extension string identifier for
+        //  AppAnalytics. It is defined in ApplicationInsights.ts:ApplicationInsights.identifer
+        var analyticsCfg = ((aiConfig.extensionConfig || {}).ApplicationInsightsAnalytics ||{});
+        if (!(aiConfig[strDisableExceptionTracking] === true || analyticsCfg[strDisableExceptionTracking] === true)) {
+            var method = "onerror";
+            _createMethods(["_" + method]);
+            var originalOnError = win[method];
+            win[method] = function(message, url, lineNumber, columnNumber, error) {
+                var handled = originalOnError && originalOnError(message, url, lineNumber, columnNumber, error);
+                if (handled !== true) {
+                    appInsights["_" + method]({
+                        message: message,
+                        url: url,
+                        lineNumber: lineNumber,
+                        columnNumber: columnNumber,
+                        error: error,
+                        evt: win.event
+                    });
+                }
+    
+                return handled;
+            };
+            aiConfig.autoExceptionInstrumented = true;
+        }
+    
+        return appInsights;
+    })(snipConfig.cfg);
+
+    // global instance must be set in this order to mitigate issues in ie8 and lower
+    // win[aiName] = aiSdk;
+    
+    function _onInit() {
+        if (snipConfig.onInit) {
+            snipConfig.onInit(aiSdk);
+        }
+    }
+
+    // if somebody calls the snippet twice, don't report page view again
+    if (aiSdk.queue && aiSdk.queue.length === 0) {
+        aiSdk.queue.push(_onInit);
+        // aiSdk.trackPageView({});
+    } else {
+        // Already loaded so just call the onInit
+        _onInit();
+    }
+
+    return aiSdk;
+}
\ No newline at end of file
diff --git a/AISKU/snippet/README.md b/AISKU/snippet/README.md
index 54c4745aa..163b65bdb 100644
--- a/AISKU/snippet/README.md
+++ b/AISKU/snippet/README.md
@@ -36,15 +36,15 @@ Due to security concerns, you can't directly add the script that's described in
 
 - Snippet for SPO (Sharepoint online) modern UX scenario: 
 ```js
-`!function(T,l,y){var S=T.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w="crossOrigin",N="POST",e="appInsightsSDK",t=y.name||"appInsights";(y.name||T[e])&&(T[e]=t);var n=T[t]||function(d){var g=!1,f=!1,m={initialize:!0,queue:[],sv:"5",version:2,config:d};function v(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(m.sv||m.version),{time:function(){var e=new Date;function t(e){var t=""+e;return 1===t.length&&(t="0"+t),t}return e.getUTCFullYear()+"-"+t(1+e.getUTCMonth())+"-"+t(e.getUTCDate())+"T"+t(e.getUTCHours())+":"+t(e.getUTCMinutes())+":"+t(e.getUTCSeconds())+"."+((e.getUTCMilliseconds()/1e3).toFixed(3)+"").slice(2,5)+"Z"}(),iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}}}var h=d.url||y.src;if(h){function a(e){var t,n,a,i,r,o,s,c,u,p,l;g=!0,m.queue=[],f||(f=!0,t=h,s=function(){var e={},t=d.connectionString;if(t)for(var n=t.split(";"),a=0;a<n.length;a++){var i=n[a].split("=");2===i.length&&(e[i[0][b]()]=i[1])}if(!e[C]){var r=e.endpointsuffix,o=r?e.location:null;e[C]="https://"+(o?o+".":"")+"dc."+(r||"services.visualstudio.com")}return e}(),c=s[D]||d[D]||"",u=s[C],p=u?u+"/v2/track":d.endpointUrl,(l=[]).push((n="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",a=t,i=p,(o=(r=v(c,"Exception")).data).baseType="ExceptionData",o.baseData.exceptions=[{typeName:"SDKLoadFailed",message:n.replace(/\./g,"-"),hasFullStack:!1,stack:n+"\nSnippet failed to load ["+a+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+i,parsedStack:[]}],r)),l.push(function(e,t,n,a){var i=v(c,"Message"),r=i.data;r.baseType="MessageData";var o=r.baseData;return o.message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+n+")").replace(/\"/g,"")+'"',o.properties={endpoint:a},i}(0,0,t,p)),function(e,t){if(JSON){var n=T.fetch;if(n&&!y.useXhr)n(t,{method:N,body:JSON.stringify(e),mode:"cors"});else if(XMLHttpRequest){var a=new XMLHttpRequest;a.open(N,t),a.setRequestHeader("Content-type","application/json"),a.send(JSON.stringify(e))}}}(l,p))}function i(e,t){f||setTimeout(function(){!t&&m.core||a()},500)}var e=function(){var n=l.createElement(k);n.src=h;var e=y[w];return!e&&""!==e||"undefined"==n[w]||(n[w]=e),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},n}();y.ld<0?l.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){l.getElementsByTagName(k)[0].parentNode.appendChild(e)},y.ld||0)}try{m.cookie=l.cookie}catch(p){}function t(e){for(;e.length;)!function(t){m[t]=function(){var e=arguments;g||m.queue.push(function(){m[t].apply(m,e)})}}(e.pop())}var n="track",r="TrackPage",o="TrackEvent";t([n+"Event",n+"PageView",n+"Exception",n+"Trace",n+"DependencyData",n+"Metric",n+"PageViewPerformance","start"+r,"stop"+r,"start"+o,"stop"+o,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),m.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4};var s=(d.extensionConfig||{}).ApplicationInsightsAnalytics||{};if(!0!==d[I]&&!0!==s[I]){var c="onerror";t(["_"+c]);var u=T[c];T[c]=function(e,t,n,a,i){var r=u&&u(e,t,n,a,i);return!0!==r&&m["_"+c]({message:e,url:t,lineNumber:n,columnNumber:a,error:i}),r},d.autoExceptionInstrumented=!0}return m}(y.cfg);function a(){y.onInit&&y.onInit(n)}(T[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
-    src: "https://js.monitor.azure.com/scripts/b/ai.2.min.js", // The SDK URL Source
+`!function(v,y,T){var S=v.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w=(D[b](),"crossOrigin"),N="POST",e="appInsightsSDK",t=T.name||"appInsights",n=((T.name||v[e])&&(v[e]=t),v[t]||function(l){var u=!1,d=!1,g={initialize:!0,queue:[],sv:"6",version:2,config:l};function m(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(g.sv||g.version),{time:(a=new Date).getUTCFullYear()+"-"+i(1+a.getUTCMonth())+"-"+i(a.getUTCDate())+"T"+i(a.getUTCHours())+":"+i(a.getUTCMinutes())+":"+i(a.getUTCSeconds())+"."+(a.getUTCMilliseconds()/1e3).toFixed(3).slice(2,5)+"Z",iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}};function i(e){e=""+e;return 1===e.length?"0"+e:e}}var e,n,f=l.url||T.src;function a(e){var t,n,a,i,o,s,r,c,p;u=!0,g.queue=[],d||(d=!0,i=f,r=(c=function(){var e,t={},n=l.connectionString;if(n)for(var a=n.split(";"),i=0;i<a.length;i++){var o=a[i].split("=");2===o.length&&(t[o[0][b]()]=o[1])}return t[C]||(t[C]="https://"+((e=(n=t.endpointsuffix)?t.location:null)?e+".":"")+"dc."+(n||"services.visualstudio.com")),t}()).instrumentationkey||l[D]||"",c=(c=c[C])?c+"/v2/track":l.endpointUrl,(p=[]).push((t="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",n=i,o=c,(s=(a=m(r,"Exception")).data).baseType="ExceptionData",s.baseData.exceptions=[{typeName:"SDKLoadFailed",message:t.replace(/\./g,"-"),hasFullStack:!1,stack:t+"\nSnippet failed to load ["+n+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+o,parsedStack:[]}],a)),p.push((s=i,t=c,(o=(n=m(r,"Message")).data).baseType="MessageData",(a=o.baseData).message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+s+")").replace(/\"/g,"")+'"',a.properties={endpoint:t},n)),i=p,r=c,JSON&&((o=v.fetch)&&!T.useXhr?o(r,{method:N,body:JSON.stringify(i),mode:"cors"}):XMLHttpRequest&&((s=new XMLHttpRequest).open(N,r),s.setRequestHeader("Content-type","application/json"),s.send(JSON.stringify(i)))))}function i(e,t){d||setTimeout(function(){!t&&g.core||a()},500)}f&&((n=y.createElement(k)).src=f,!(o=T[w])&&""!==o||"undefined"==n[w]||(n[w]=o),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},e=n,T.ld<0?y.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){y.getElementsByTagName(k)[0].parentNode.appendChild(e)},T.ld||0));try{g.cookie=y.cookie}catch(h){}function t(e){for(;e.length;)!function(t){g[t]=function(){var e=arguments;u||g.queue.push(function(){g[t].apply(g,e)})}}(e.pop())}var s,r,o="track",c="TrackPage",p="TrackEvent",o=(t([o+"Event",o+"PageView",o+"Exception",o+"Trace",o+"DependencyData",o+"Metric",o+"PageViewPerformance","start"+c,"stop"+c,"start"+p,"stop"+p,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),g.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4},(l.extensionConfig||{}).ApplicationInsightsAnalytics||{});return!0!==l[I]&&!0!==o[I]&&(t(["_"+(s="onerror")]),r=v[s],v[s]=function(e,t,n,a,i){var o=r&&r(e,t,n,a,i);return!0!==o&&g["_"+s]({message:e,url:t,lineNumber:n,columnNumber:a,error:i,evt:v.event}),o},l.autoExceptionInstrumented=!0),g}(T.cfg));function a(){T.onInit&&T.onInit(n)}(v[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
+    src: "https://js.monitor.azure.com/scripts/b/ai.2.gbl.min.js", // The SDK URL Source
     // name: "appInsights", // Global SDK Instance name defaults to "appInsights" when not supplied
     // ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,
     // useXhr: 1, // Use XHR instead of fetch to report failures (if available),
-    // crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
+    crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
     // onInit: null, // Once the application insights instance has loaded and initialized this callback function will be called with 1 argument -- the sdk instance (DO NOT ADD anything to the sdk.queue -- As they won't get called)
     cfg: { // Application Insights Configuration
-            instrumentationKey: "` + this.properties.instrumentationKey + `"
+        connectionString: "InstrumentationKey=` + this.properties.instrumentationKey + `"
     }
 });`
 ```
diff --git a/AISKU/snippet/snippet.js b/AISKU/snippet/snippet.js
index be4cf8d4f..c7ed984f5 100644
--- a/AISKU/snippet/snippet.js
+++ b/AISKU/snippet/snippet.js
@@ -9,6 +9,7 @@
     var strAiOperationName = "ai.operation.name";
     var strAiSdkVersion = "ai.internal.sdkVersion";
     var strToLowerCase = "toLowerCase";
+    var strConStringIKey = strInstrumentationKey[strToLowerCase]();
     var strEmpty = "";
     var strUndefined = "undefined";
     var strCrossOrigin = "crossOrigin";
@@ -26,7 +27,7 @@
         var appInsights = {
             initialize: true,   // initialize sdk on download
             queue: [],
-            sv: "5",            // Track the actual snippet version for reporting.
+            sv: "6",            // Track the actual snippet version for reporting.
             version: 2.0,       // initialization version, if this is not 2.0 the previous scripts fail to initialize
             config: aiConfig
         };
@@ -73,7 +74,7 @@
 
         function _reportFailure(targetSrc) {
             var conString = _parseConnectionString();
-            var iKey = conString[strInstrumentationKey] || aiConfig[strInstrumentationKey] || strEmpty;
+            var iKey = conString[strConStringIKey] || aiConfig[strInstrumentationKey] || strEmpty;
             var ingest = conString[strIngestionendpoint];
             var endpointUrl = ingest ? ingest + "/v2/track" : aiConfig.endpointUrl; // only add /v2/track when from connectionstring
 
@@ -320,9 +321,9 @@
     // name: "appInsights", // Global SDK Instance name defaults to "appInsights" when not supplied
     // ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,
     // useXhr: 1, // Use XHR instead of fetch to report failures (if available),
-    // crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
+    crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
     // onInit: null, // Once the application insights instance has loaded and initialized this callback function will be called with 1 argument -- the sdk instance (DO NOT ADD anything to the sdk.queue -- As they won't get called)
     cfg: { // Application Insights Configuration
-        instrumentationKey: "INSTRUMENTATION_KEY"
+        connectionString: "YOUR_CONNECTION_STRING"
     }
 });
diff --git a/AISKU/snippet/snippet.min.js b/AISKU/snippet/snippet.min.js
index 94d52569c..24f882c86 100644
--- a/AISKU/snippet/snippet.min.js
+++ b/AISKU/snippet/snippet.min.js
@@ -1,4 +1,4 @@
-!function(T,l,y){var S=T.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w="crossOrigin",N="POST",e="appInsightsSDK",t=y.name||"appInsights";(y.name||T[e])&&(T[e]=t);var n=T[t]||function(d){var g=!1,f=!1,m={initialize:!0,queue:[],sv:"5",version:2,config:d};function v(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(m.sv||m.version),{time:function(){var e=new Date;function t(e){var t=""+e;return 1===t.length&&(t="0"+t),t}return e.getUTCFullYear()+"-"+t(1+e.getUTCMonth())+"-"+t(e.getUTCDate())+"T"+t(e.getUTCHours())+":"+t(e.getUTCMinutes())+":"+t(e.getUTCSeconds())+"."+((e.getUTCMilliseconds()/1e3).toFixed(3)+"").slice(2,5)+"Z"}(),iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}}}var h=d.url||y.src;if(h){function a(e){var t,n,a,i,r,o,s,c,u,p,l;g=!0,m.queue=[],f||(f=!0,t=h,s=function(){var e={},t=d.connectionString;if(t)for(var n=t.split(";"),a=0;a<n.length;a++){var i=n[a].split("=");2===i.length&&(e[i[0][b]()]=i[1])}if(!e[C]){var r=e.endpointsuffix,o=r?e.location:null;e[C]="https://"+(o?o+".":"")+"dc."+(r||"services.visualstudio.com")}return e}(),c=s[D]||d[D]||"",u=s[C],p=u?u+"/v2/track":d.endpointUrl,(l=[]).push((n="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",a=t,i=p,(o=(r=v(c,"Exception")).data).baseType="ExceptionData",o.baseData.exceptions=[{typeName:"SDKLoadFailed",message:n.replace(/\./g,"-"),hasFullStack:!1,stack:n+"\nSnippet failed to load ["+a+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+i,parsedStack:[]}],r)),l.push(function(e,t,n,a){var i=v(c,"Message"),r=i.data;r.baseType="MessageData";var o=r.baseData;return o.message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+n+")").replace(/\"/g,"")+'"',o.properties={endpoint:a},i}(0,0,t,p)),function(e,t){if(JSON){var n=T.fetch;if(n&&!y.useXhr)n(t,{method:N,body:JSON.stringify(e),mode:"cors"});else if(XMLHttpRequest){var a=new XMLHttpRequest;a.open(N,t),a.setRequestHeader("Content-type","application/json"),a.send(JSON.stringify(e))}}}(l,p))}function i(e,t){f||setTimeout(function(){!t&&m.core||a()},500)}var e=function(){var n=l.createElement(k);n.src=h;var e=y[w];return!e&&""!==e||"undefined"==n[w]||(n[w]=e),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},n}();y.ld<0?l.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){l.getElementsByTagName(k)[0].parentNode.appendChild(e)},y.ld||0)}try{m.cookie=l.cookie}catch(p){}function t(e){for(;e.length;)!function(t){m[t]=function(){var e=arguments;g||m.queue.push(function(){m[t].apply(m,e)})}}(e.pop())}var n="track",r="TrackPage",o="TrackEvent";t([n+"Event",n+"PageView",n+"Exception",n+"Trace",n+"DependencyData",n+"Metric",n+"PageViewPerformance","start"+r,"stop"+r,"start"+o,"stop"+o,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),m.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4};var s=(d.extensionConfig||{}).ApplicationInsightsAnalytics||{};if(!0!==d[I]&&!0!==s[I]){var c="onerror";t(["_"+c]);var u=T[c];T[c]=function(e,t,n,a,i){var r=u&&u(e,t,n,a,i);return!0!==r&&m["_"+c]({message:e,url:t,lineNumber:n,columnNumber:a,error:i}),r},d.autoExceptionInstrumented=!0}return m}(y.cfg);function a(){y.onInit&&y.onInit(n)}(T[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
+!function(v,y,T){var S=v.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w=(D[b](),"crossOrigin"),N="POST",e="appInsightsSDK",t=T.name||"appInsights",n=((T.name||v[e])&&(v[e]=t),v[t]||function(l){var u=!1,d=!1,g={initialize:!0,queue:[],sv:"6",version:2,config:l};function m(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(g.sv||g.version),{time:(a=new Date).getUTCFullYear()+"-"+i(1+a.getUTCMonth())+"-"+i(a.getUTCDate())+"T"+i(a.getUTCHours())+":"+i(a.getUTCMinutes())+":"+i(a.getUTCSeconds())+"."+(a.getUTCMilliseconds()/1e3).toFixed(3).slice(2,5)+"Z",iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}};function i(e){e=""+e;return 1===e.length?"0"+e:e}}var e,n,f=l.url||T.src;function a(e){var t,n,a,i,o,s,r,c,p;u=!0,g.queue=[],d||(d=!0,i=f,r=(c=function(){var e,t={},n=l.connectionString;if(n)for(var a=n.split(";"),i=0;i<a.length;i++){var o=a[i].split("=");2===o.length&&(t[o[0][b]()]=o[1])}return t[C]||(t[C]="https://"+((e=(n=t.endpointsuffix)?t.location:null)?e+".":"")+"dc."+(n||"services.visualstudio.com")),t}()).instrumentationkey||l[D]||"",c=(c=c[C])?c+"/v2/track":l.endpointUrl,(p=[]).push((t="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",n=i,o=c,(s=(a=m(r,"Exception")).data).baseType="ExceptionData",s.baseData.exceptions=[{typeName:"SDKLoadFailed",message:t.replace(/\./g,"-"),hasFullStack:!1,stack:t+"\nSnippet failed to load ["+n+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+o,parsedStack:[]}],a)),p.push((s=i,t=c,(o=(n=m(r,"Message")).data).baseType="MessageData",(a=o.baseData).message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+s+")").replace(/\"/g,"")+'"',a.properties={endpoint:t},n)),i=p,r=c,JSON&&((o=v.fetch)&&!T.useXhr?o(r,{method:N,body:JSON.stringify(i),mode:"cors"}):XMLHttpRequest&&((s=new XMLHttpRequest).open(N,r),s.setRequestHeader("Content-type","application/json"),s.send(JSON.stringify(i)))))}function i(e,t){d||setTimeout(function(){!t&&g.core||a()},500)}f&&((n=y.createElement(k)).src=f,!(o=T[w])&&""!==o||"undefined"==n[w]||(n[w]=o),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},e=n,T.ld<0?y.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){y.getElementsByTagName(k)[0].parentNode.appendChild(e)},T.ld||0));try{g.cookie=y.cookie}catch(h){}function t(e){for(;e.length;)!function(t){g[t]=function(){var e=arguments;u||g.queue.push(function(){g[t].apply(g,e)})}}(e.pop())}var s,r,o="track",c="TrackPage",p="TrackEvent",o=(t([o+"Event",o+"PageView",o+"Exception",o+"Trace",o+"DependencyData",o+"Metric",o+"PageViewPerformance","start"+c,"stop"+c,"start"+p,"stop"+p,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),g.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4},(l.extensionConfig||{}).ApplicationInsightsAnalytics||{});return!0!==l[I]&&!0!==o[I]&&(t(["_"+(s="onerror")]),r=v[s],v[s]=function(e,t,n,a,i){var o=r&&r(e,t,n,a,i);return!0!==o&&g["_"+s]({message:e,url:t,lineNumber:n,columnNumber:a,error:i,evt:v.event}),o},l.autoExceptionInstrumented=!0),g}(T.cfg));function a(){T.onInit&&T.onInit(n)}(v[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
 src: "https://js.monitor.azure.com/scripts/b/ai.2.min.js", // The SDK URL Source
 // name: "appInsights", // Global SDK Instance name defaults to "appInsights" when not supplied
 // ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,
@@ -6,5 +6,5 @@ src: "https://js.monitor.azure.com/scripts/b/ai.2.min.js", // The SDK URL Source
 // crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
 // onInit: null, // Once the application insights instance has loaded and initialized this callback function will be called with 1 argument -- the sdk instance (DO NOT ADD anything to the sdk.queue -- As they won't get called)
 cfg: { // Application Insights Configuration
-    instrumentationKey: "INSTRUMENTATION_KEY"
+    connectionString: "YOUR_CONNECTION_STRING"
 }});
\ No newline at end of file
diff --git a/README.md b/README.md
index 2bb3598cc..fd186d4b1 100644
--- a/README.md
+++ b/README.md
@@ -73,9 +73,11 @@ appInsights.trackPageView(); // Manually call trackPageView to establish the cur
 
 If your app does not use NPM, you can directly instrument your webpages with Application Insights by pasting this snippet at the top of each your pages. Preferably, it should be the first script in your `<head>` section so that it can monitor any potential issues with all of your dependencies.
 
+The current version of the snippet is version 6, the version is identified by the "sv:" in the script.
+
 ```html
 <script type="text/javascript">
-!function(T,l,y){var S=T.location,k="script",D="connectionString",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w="crossOrigin",N="POST",e="appInsightsSDK",t=y.name||"appInsights";(y.name||T[e])&&(T[e]=t);var n=T[t]||function(d){var g=!1,f=!1,m={initialize:!0,queue:[],sv:"5",version:2,config:d};function v(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(m.sv||m.version),{time:function(){var e=new Date;function t(e){var t=""+e;return 1===t.length&&(t="0"+t),t}return e.getUTCFullYear()+"-"+t(1+e.getUTCMonth())+"-"+t(e.getUTCDate())+"T"+t(e.getUTCHours())+":"+t(e.getUTCMinutes())+":"+t(e.getUTCSeconds())+"."+((e.getUTCMilliseconds()/1e3).toFixed(3)+"").slice(2,5)+"Z"}(),iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}}}var h=d.url||y.src;if(h){function a(e){var t,n,a,i,r,o,s,c,u,p,l;g=!0,m.queue=[],f||(f=!0,t=h,s=function(){var e={},t=d.connectionString;if(t)for(var n=t.split(";"),a=0;a<n.length;a++){var i=n[a].split("=");2===i.length&&(e[i[0][b]()]=i[1])}if(!e[C]){var r=e.endpointsuffix,o=r?e.location:null;e[C]="https://"+(o?o+".":"")+"dc."+(r||"services.visualstudio.com")}return e}(),c=s[D]||d[D]||"",u=s[C],p=u?u+"/v2/track":d.endpointUrl,(l=[]).push((n="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",a=t,i=p,(o=(r=v(c,"Exception")).data).baseType="ExceptionData",o.baseData.exceptions=[{typeName:"SDKLoadFailed",message:n.replace(/\./g,"-"),hasFullStack:!1,stack:n+"\nSnippet failed to load ["+a+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+i,parsedStack:[]}],r)),l.push(function(e,t,n,a){var i=v(c,"Message"),r=i.data;r.baseType="MessageData";var o=r.baseData;return o.message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+n+")").replace(/\"/g,"")+'"',o.properties={endpoint:a},i}(0,0,t,p)),function(e,t){if(JSON){var n=T.fetch;if(n&&!y.useXhr)n(t,{method:N,body:JSON.stringify(e),mode:"cors"});else if(XMLHttpRequest){var a=new XMLHttpRequest;a.open(N,t),a.setRequestHeader("Content-type","application/json"),a.send(JSON.stringify(e))}}}(l,p))}function i(e,t){f||setTimeout(function(){!t&&m.core||a()},500)}var e=function(){var n=l.createElement(k);n.src=h;var e=y[w];return!e&&""!==e||"undefined"==n[w]||(n[w]=e),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},n}();y.ld<0?l.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){l.getElementsByTagName(k)[0].parentNode.appendChild(e)},y.ld||0)}try{m.cookie=l.cookie}catch(p){}function t(e){for(;e.length;)!function(t){m[t]=function(){var e=arguments;g||m.queue.push(function(){m[t].apply(m,e)})}}(e.pop())}var n="track",r="TrackPage",o="TrackEvent";t([n+"Event",n+"PageView",n+"Exception",n+"Trace",n+"DependencyData",n+"Metric",n+"PageViewPerformance","start"+r,"stop"+r,"start"+o,"stop"+o,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),m.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4};var s=(d.extensionConfig||{}).ApplicationInsightsAnalytics||{};if(!0!==d[I]&&!0!==s[I]){var c="onerror";t(["_"+c]);var u=T[c];T[c]=function(e,t,n,a,i){var r=u&&u(e,t,n,a,i);return!0!==r&&m["_"+c]({message:e,url:t,lineNumber:n,columnNumber:a,error:i}),r},d.autoExceptionInstrumented=!0}return m}(y.cfg);function a(){y.onInit&&y.onInit(n)}(T[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
+!function(v,y,T){var S=v.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w=(D[b](),"crossOrigin"),N="POST",e="appInsightsSDK",t=T.name||"appInsights",n=((T.name||v[e])&&(v[e]=t),v[t]||function(l){var u=!1,d=!1,g={initialize:!0,queue:[],sv:"6",version:2,config:l};function m(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(g.sv||g.version),{time:(a=new Date).getUTCFullYear()+"-"+i(1+a.getUTCMonth())+"-"+i(a.getUTCDate())+"T"+i(a.getUTCHours())+":"+i(a.getUTCMinutes())+":"+i(a.getUTCSeconds())+"."+(a.getUTCMilliseconds()/1e3).toFixed(3).slice(2,5)+"Z",iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}};function i(e){e=""+e;return 1===e.length?"0"+e:e}}var e,n,f=l.url||T.src;function a(e){var t,n,a,i,o,s,r,c,p;u=!0,g.queue=[],d||(d=!0,i=f,r=(c=function(){var e,t={},n=l.connectionString;if(n)for(var a=n.split(";"),i=0;i<a.length;i++){var o=a[i].split("=");2===o.length&&(t[o[0][b]()]=o[1])}return t[C]||(t[C]="https://"+((e=(n=t.endpointsuffix)?t.location:null)?e+".":"")+"dc."+(n||"services.visualstudio.com")),t}()).instrumentationkey||l[D]||"",c=(c=c[C])?c+"/v2/track":l.endpointUrl,(p=[]).push((t="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",n=i,o=c,(s=(a=m(r,"Exception")).data).baseType="ExceptionData",s.baseData.exceptions=[{typeName:"SDKLoadFailed",message:t.replace(/\./g,"-"),hasFullStack:!1,stack:t+"\nSnippet failed to load ["+n+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+o,parsedStack:[]}],a)),p.push((s=i,t=c,(o=(n=m(r,"Message")).data).baseType="MessageData",(a=o.baseData).message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+s+")").replace(/\"/g,"")+'"',a.properties={endpoint:t},n)),i=p,r=c,JSON&&((o=v.fetch)&&!T.useXhr?o(r,{method:N,body:JSON.stringify(i),mode:"cors"}):XMLHttpRequest&&((s=new XMLHttpRequest).open(N,r),s.setRequestHeader("Content-type","application/json"),s.send(JSON.stringify(i)))))}function i(e,t){d||setTimeout(function(){!t&&g.core||a()},500)}f&&((n=y.createElement(k)).src=f,!(o=T[w])&&""!==o||"undefined"==n[w]||(n[w]=o),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},e=n,T.ld<0?y.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){y.getElementsByTagName(k)[0].parentNode.appendChild(e)},T.ld||0));try{g.cookie=y.cookie}catch(h){}function t(e){for(;e.length;)!function(t){g[t]=function(){var e=arguments;u||g.queue.push(function(){g[t].apply(g,e)})}}(e.pop())}var s,r,o="track",c="TrackPage",p="TrackEvent",o=(t([o+"Event",o+"PageView",o+"Exception",o+"Trace",o+"DependencyData",o+"Metric",o+"PageViewPerformance","start"+c,"stop"+c,"start"+p,"stop"+p,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),g.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4},(l.extensionConfig||{}).ApplicationInsightsAnalytics||{});return!0!==l[I]&&!0!==o[I]&&(t(["_"+(s="onerror")]),r=v[s],v[s]=function(e,t,n,a,i){var o=r&&r(e,t,n,a,i);return!0!==o&&g["_"+s]({message:e,url:t,lineNumber:n,columnNumber:a,error:i,evt:v.event}),o},l.autoExceptionInstrumented=!0),g}(T.cfg));function a(){T.onInit&&T.onInit(n)}(v[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
 src: "https://js.monitor.azure.com/scripts/b/ai.2.min.js", // The SDK URL Source
 // name: "appInsights", // Global SDK Instance name defaults to "appInsights" when not supplied
 // ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,
@@ -124,7 +126,7 @@ The available configuration options are: -
 | ld | number in ms *[optional]* | Defines the load delay to wait before attempting to load the SDK. Default value is 0ms and any negative value will immediately add a script tag to the &lt;head&gt; region of the page, which will then block the page load event until to script is loaded (or fails).
 | useXhr | boolean *[optional]* | This setting is used only for reporting SDK load failures. Reporting will first attempt to use fetch() if available and then fallback to XHR, setting this value to true just bypasses the fetch check. Use of this value is only be required if your application is being used in an environment where fetch would fail to send the failure events.
 | crossOrigin | string *[optional]* | By including this setting, the script tag added to download the SDK will include the crossOrigin attribute with this string value. When not defined (the default) no crossOrigin attribute is added. Recommended values are not defined (the default); ""; or "anonymous" (For all valid values see [HTML attribute: crossorigin](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin) documentation)
-| onInit | function(aiSdk) { ... } *[optional]* | This callback function which is called after the main SDK script has been successfully loaded and initialized from the CDN (based on the src value), it is passed a reference to the sdk instance that it is being called for and it is also called _before_ the first initial page view. If the SDK has already been loaded and initialized this callback will still be called. NOTE: As this callback is called during the processing of the sdk.queue array you CANNOT add any additional items to the queue as they will be ignored and dropped. (Added as part of snippet version 5 -- the sv:"5" value within the snippet script)
+| onInit | function(aiSdk) { ... } *[optional]* | This callback function which is called after the main SDK script has been successfully loaded and initialized from the CDN (based on the src value), it is passed a reference to the sdk instance that it is being called for and it is also called _before_ the first initial page view. If the SDK has already been loaded and initialized this callback will still be called. NOTE: As this callback is called during the processing of the sdk.queue array you CANNOT add any additional items to the queue as they will be ignored and dropped. (Added as part of snippet version 5 -- the sv:"#" value within the snippet script, the current version is 6)
 | cfg | object **[required]** | The configuration passed to the Application Insights SDK during initialization.
 
 #### Example using the snippet onInit callback
diff --git a/common/Tests/Framework/src/AITestClass.ts b/common/Tests/Framework/src/AITestClass.ts
index 0a1b86f1c..631bd44fe 100644
--- a/common/Tests/Framework/src/AITestClass.ts
+++ b/common/Tests/Framework/src/AITestClass.ts
@@ -1126,7 +1126,16 @@ export class AITestClass {
                 if (autoRespond && xhr && xhr.url && xhr.method) {
                     AITestClass.orgSetTimeout && AITestClass.orgSetTimeout(() => {
                         if (AITestClass.currentTestInfo && xhr && _self._xhrRequests && _self._xhrRequests.indexOf(xhr) !== -1) {
-                            xhr.respond(200, {}, "");
+                            var theResponse: any;
+                            if (xhr.url.endsWith("/v2/track")) {
+                                theResponse = {
+                                    itemsReceived: 1,
+                                    itemsAccepted: 1,
+                                    errors: [],
+                                    appId: "00000000-0000-0000-0000-000000000000"
+                                };
+                            }
+                            xhr.respond(200, {}, (theResponse && JSON.stringify(theResponse)) || "");
                         }
                     }, 5);
                 }
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
index 8f32c4acf..aac9a7d4e 100644
--- a/common/config/rush/npm-shrinkwrap.json
+++ b/common/config/rush/npm-shrinkwrap.json
@@ -958,13 +958,14 @@
     "node_modules/@rush-temp/applicationinsights-web-snippet": {
       "version": "0.0.0",
       "resolved": "file:projects/applicationinsights-web-snippet.tgz",
-      "integrity": "sha512-KfpibUBvopMng15NNtuEfvmUiS7ArCSmqIwZPpjk0A12E+ztMS32GtnABX/OsPKgFnjBFwsqsMhOMQWa2yRMlQ==",
+      "integrity": "sha512-0GDMATdX3idkMr6d815JDlWCO7hTh8bs4HeB/an0ejH+ZlwsU+MOH48siy94vs1fr3K7ZOFzmTsHJlE/SjYpag==",
       "dependencies": {
         "@nevware21/grunt-eslint-ts": "^0.2.2",
         "@nevware21/grunt-ts-plugin": "^0.4.3",
         "@rollup/plugin-commonjs": "^18.0.0",
         "@rollup/plugin-node-resolve": "^11.2.1",
         "@rollup/plugin-replace": "^2.3.3",
+        "@types/qunit": "^2.19.3",
         "grunt": "^1.5.3",
         "grunt-cli": "^1.4.3",
         "grunt-contrib-qunit": "^6.2.1",
@@ -1186,9 +1187,9 @@
       "integrity": "sha512-EocRiD2JRWrOaA0dnyyLX083DIo1p3OSBBiGODcHaMzOFhteXtvRRp0kKsiYYqynnBSMqnqRI92iE32axdoXZw=="
     },
     "node_modules/@types/react": {
-      "version": "16.14.37",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.37.tgz",
-      "integrity": "sha512-Jy/9txct4JC2nQsJNACeFczzIQ2Bh7s1PZpbYMs9jbj/jREWxEH0qGFYYZb7dq7H1sU0AAzHAPevtxBHGk6N6Q==",
+      "version": "16.14.38",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.38.tgz",
+      "integrity": "sha512-PbEjuhwkdH6IB5Sak6BFAqpVMHY/wJxa0EG3bKkr0vWA2hSDIq3iEMhHyqjXrDFMqRzkiQkdyNXOnoELrh/9aQ==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -1810,9 +1811,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001473",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz",
-      "integrity": "sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==",
+      "version": "1.0.30001474",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz",
+      "integrity": "sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==",
       "funding": [
         {
           "type": "opencollective",
@@ -2172,9 +2173,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.348",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.348.tgz",
-      "integrity": "sha512-gM7TdwuG3amns/1rlgxMbeeyNoBFPa+4Uu0c7FeROWh4qWmvSOnvcslKmWy51ggLKZ2n/F/4i2HJ+PVNxH9uCQ=="
+      "version": "1.4.355",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.355.tgz",
+      "integrity": "sha512-056hxzEE4l667YeOccgjhRr5fTiwZ6EIJ4FpzGps4k3YcS8iAhiaBYUBrv5E2LDQJsussscv9EEUwAYKnv+ZKg=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -4509,9 +4510,9 @@
       }
     },
     "node_modules/readdir-glob": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
-      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
       "dependencies": {
         "minimatch": "^5.1.0"
       }
@@ -4556,11 +4557,11 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -6242,13 +6243,14 @@
     },
     "@rush-temp/applicationinsights-web-snippet": {
       "version": "file:projects\\applicationinsights-web-snippet.tgz",
-      "integrity": "sha512-KfpibUBvopMng15NNtuEfvmUiS7ArCSmqIwZPpjk0A12E+ztMS32GtnABX/OsPKgFnjBFwsqsMhOMQWa2yRMlQ==",
+      "integrity": "sha512-0GDMATdX3idkMr6d815JDlWCO7hTh8bs4HeB/an0ejH+ZlwsU+MOH48siy94vs1fr3K7ZOFzmTsHJlE/SjYpag==",
       "requires": {
         "@nevware21/grunt-eslint-ts": "^0.2.2",
         "@nevware21/grunt-ts-plugin": "^0.4.3",
         "@rollup/plugin-commonjs": "^18.0.0",
         "@rollup/plugin-node-resolve": "^11.2.1",
         "@rollup/plugin-replace": "^2.3.3",
+        "@types/qunit": "^2.19.3",
         "grunt": "^1.5.3",
         "grunt-cli": "^1.4.3",
         "grunt-contrib-qunit": "^6.2.1",
@@ -6453,9 +6455,9 @@
       "integrity": "sha512-EocRiD2JRWrOaA0dnyyLX083DIo1p3OSBBiGODcHaMzOFhteXtvRRp0kKsiYYqynnBSMqnqRI92iE32axdoXZw=="
     },
     "@types/react": {
-      "version": "16.14.37",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.37.tgz",
-      "integrity": "sha512-Jy/9txct4JC2nQsJNACeFczzIQ2Bh7s1PZpbYMs9jbj/jREWxEH0qGFYYZb7dq7H1sU0AAzHAPevtxBHGk6N6Q==",
+      "version": "16.14.38",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.38.tgz",
+      "integrity": "sha512-PbEjuhwkdH6IB5Sak6BFAqpVMHY/wJxa0EG3bKkr0vWA2hSDIq3iEMhHyqjXrDFMqRzkiQkdyNXOnoELrh/9aQ==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -6874,9 +6876,9 @@
       "peer": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001473",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz",
-      "integrity": "sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg=="
+      "version": "1.0.30001474",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz",
+      "integrity": "sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q=="
     },
     "chalk": {
       "version": "4.1.2",
@@ -7136,9 +7138,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.348",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.348.tgz",
-      "integrity": "sha512-gM7TdwuG3amns/1rlgxMbeeyNoBFPa+4Uu0c7FeROWh4qWmvSOnvcslKmWy51ggLKZ2n/F/4i2HJ+PVNxH9uCQ=="
+      "version": "1.4.355",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.355.tgz",
+      "integrity": "sha512-056hxzEE4l667YeOccgjhRr5fTiwZ6EIJ4FpzGps4k3YcS8iAhiaBYUBrv5E2LDQJsussscv9EEUwAYKnv+ZKg=="
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -8918,9 +8920,9 @@
       }
     },
     "readdir-glob": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
-      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
       "requires": {
         "minimatch": "^5.1.0"
       },
@@ -8958,11 +8960,11 @@
       "peer": true
     },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
diff --git a/extensions/applicationinsights-debugplugin-js/README.md b/extensions/applicationinsights-debugplugin-js/README.md
index 05bc568e6..55c0acdb6 100644
--- a/extensions/applicationinsights-debugplugin-js/README.md
+++ b/extensions/applicationinsights-debugplugin-js/README.md
@@ -165,7 +165,7 @@ const toTrack = [
 const debugPluginInstance = new DebugPlugin();
 const appInsights = new ApplicationInsights({
     config: {
-        instrumentationKey: 'YOUR_INSTRUMENTATION_KEY_GOES_HERE',
+        connectionString: 'InstrumentationKey=YOUR_INSTRUMENTATION_KEY_GOES_HERE',
         extensions: [debugPluginInstance],
         extensionConfig: {
             [DebugPlugin.identifier]: {
@@ -187,7 +187,7 @@ appInsights.trackPageView(); // Manually call trackPageView to establish the cur
 <!-- Snippet code removed for brevity -- copy from main readme --!> {
 src: "https://js.monitor.azure.com/scripts/b/ai.2.min.js", // The SDK URL Source
 cfg: { // Application Insights Configuration
-    instrumentationKey: "INSTRUMENTATION_KEY",
+    connectionString: "InstrumentationKey=INSTRUMENTATION_KEY",
     extensions: [new Microsoft.ApplicationInsights.DebugPlugin()],
         extensionConfig: {
             ["DebugPlugin"]: {
diff --git a/gruntfile.js b/gruntfile.js
index 8f2fb718f..8fc2acf40 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -27,8 +27,16 @@ module.exports = function (grunt) {
  
      }
  
-     function generateNewSnippet() {
+     function generateNewSnippet(connString) {
          var snippetBuffer = grunt.file.read("./AISKU/snippet/snippet.min.js");
+         if (connString) {
+            snippetBuffer = snippetBuffer.replace(/^\s*instrumentationKey:\s*\".*\"/gm, "    connectionString: \"YOUR_CONNECTION_STRING\"");
+            snippetBuffer = snippetBuffer.replace(/^\s*connectionString:\s*\".*\"/gm, "    connectionString: \"YOUR_CONNECTION_STRING\"");
+         } else {
+            snippetBuffer = snippetBuffer.replace(/^\s*instrumentationKey:\s*\".*\"/gm, "    connectionString: \"InstrumentationKey=INSTRUMENTATION_KEY\"");
+            snippetBuffer = snippetBuffer.replace(/^\s*connectionString:\s*\".*\"/gm, "    connectionString: \"InstrumentationKey=INSTRUMENTATION_KEY\"");
+         }
+
          var snippetStr = _encodeStr(snippetBuffer.toString());
          var expectedStr = "##replaceSnippet##";
          var srcPath = "./tools/applicationinsights-web-snippet/src";
@@ -36,8 +44,8 @@ module.exports = function (grunt) {
              files: [{
                  expand: true,
                  cwd: srcPath,
-                 dest: "./tools/applicationinsights-web-snippet/dest",
-                 src: 'applicationinsights-web-snippet.ts'
+                 dest: "./tools/applicationinsights-web-snippet/build",
+                 src: `web-snippet${connString ? "-cs" : ""}.ts`
              }],
              options: {
                  replacements: [{
@@ -498,7 +506,7 @@ module.exports = function (grunt) {
                                          path: "./tools/applicationinsights-web-snippet",
                                          cfg: {
                                              src: [
-                                                 "./tools/applicationinsights-web-snippet/dest/*.ts"
+                                                 "./tools/applicationinsights-web-snippet/build/*.ts"
                                              ]
                                          }
                                      },
@@ -654,10 +662,16 @@ module.exports = function (grunt) {
                  }
              },
              'string-replace': {
-                 'generate-snippet': generateNewSnippet()
+                 'generate-snippet-ikey': generateNewSnippet(false),
+                 'generate-snippet-connString': generateNewSnippet(true)
              },
              copy: {
-                 config: {
+                "web-snippet": {
+                    files: [
+                        { src: "./tools/applicationinsights-web-snippet/src/applicationinsights-web-snippet.ts", dest: `./tools/applicationinsights-web-snippet/build/applicationinsights-web-snippet.ts` },
+                    ]
+                },
+                config: {
                      files: [
                          { src: "./tools/config/config.json", dest: `./tools/config/browser/ai.config${configVer}.cfg.json` },
                          { src: "./tools/config/config.json", dest: `./tools/config/browser/ai.config${configMajorVer}.cfg.json`}
@@ -757,8 +771,9 @@ module.exports = function (grunt) {
          grunt.registerTask("chromedebugextension-min", minTasks("chrome-debug-extension"));
          grunt.registerTask("chromedebugextension-restore", restoreTasks("chrome-debug-extension"));
  
-         grunt.registerTask("websnippetReplace", ["string-replace:generate-snippet"]);
+         grunt.registerTask("websnippetReplace", ["copy:web-snippet", "string-replace:generate-snippet-ikey", "string-replace:generate-snippet-connString"]);
          grunt.registerTask("websnippet", tsBuildActions("applicationinsights-web-snippet"));
+         grunt.registerTask("websnippettests", tsTestActions("applicationinsights-web-snippet"));
  
          grunt.registerTask("clickanalytics", tsBuildActions("clickanalytics"));
          grunt.registerTask("clickanalytics-min", minTasks("clickanalytics"));
@@ -772,6 +787,8 @@ module.exports = function (grunt) {
          grunt.registerTask("tst-framework", tsBuildActions("tst-framework"));
          grunt.registerTask("serve", ["connect:server:keepalive"]);
 
+         grunt.registerTask("copy-config", ["copy:config"]);
+
          grunt.registerTask("example-aisku", tsBuildActions("example-aisku"));
          grunt.registerTask("example-dependency", tsBuildActions("example-dependency"));
      } catch (e) {
diff --git a/tools/applicationinsights-web-snippet/Tests/Unit/src/SnippetTests.ts b/tools/applicationinsights-web-snippet/Tests/Unit/src/SnippetTests.ts
new file mode 100644
index 000000000..f64c1aa9f
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/Tests/Unit/src/SnippetTests.ts
@@ -0,0 +1,43 @@
+import { AITestClass } from "@microsoft/ai-test-framework";
+import { webSnippetVersion, webSnippet, webSnippetCs } from "../../../build/applicationinsights-web-snippet";
+
+export class SnippetTests extends AITestClass {
+
+    private _global: any = null;
+
+    public testInitialize() {
+    }
+
+    public registerTests() {
+        this.testCase({
+            name: "Check snippet version",
+            test: () => {
+                QUnit.assert.equal("6", webSnippetVersion());
+            }
+        });
+
+        this.testCase({
+            name: "Check contains INSTRUMENTATION_KEY",
+            test: () => {
+                let theSnippet = webSnippet;
+
+                QUnit.assert.notEqual(-1, theSnippet.indexOf("INSTRUMENTATION_KEY"), "The Snippet contains INSTRUMENTATION_KEY");
+                QUnit.assert.notEqual(-1, theSnippet.indexOf("\"InstrumentationKey=INSTRUMENTATION_KEY\""), "The Snippet contains \"InstrumentationKey=INSTRUMENTATION_KEY\"");
+                QUnit.assert.equal(-1, theSnippet.indexOf("YOUR_CONNECTION_STRING"), "The Snippet contains YOUR_CONNECTION_STRING");
+                QUnit.assert.equal(-1, theSnippet.indexOf("\"YOUR_CONNECTION_STRING\""), "The Snippet contains \"YOUR_CONNECTION_STRING\"");
+            }
+        });
+
+        this.testCase({
+            name: "Check contains YOUR_CONNECTION_STRING",
+            test: () => {
+                let theSnippet = webSnippetCs;
+
+                QUnit.assert.notEqual(-1, theSnippet.indexOf("YOUR_CONNECTION_STRING"), "The Snippet contains YOUR_CONNECTION_STRING");
+                QUnit.assert.notEqual(-1, theSnippet.indexOf("\"YOUR_CONNECTION_STRING\""), "The Snippet contains \"YOUR_CONNECTION_STRING\"");
+                QUnit.assert.equal(-1, theSnippet.indexOf("INSTRUMENTATION_KEY"), "The Snippet contains INSTRUMENTATION_KEY");
+                QUnit.assert.equal(-1, theSnippet.indexOf("\"InstrumentationKey=INSTRUMENTATION_KEY\""), "The Snippet contains \"InstrumentationKey=INSTRUMENTATION_KEY\"");
+            }
+        });
+    }
+}
diff --git a/tools/applicationinsights-web-snippet/Tests/Unit/src/snippet.tests.ts b/tools/applicationinsights-web-snippet/Tests/Unit/src/snippet.tests.ts
new file mode 100644
index 000000000..aa854d906
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/Tests/Unit/src/snippet.tests.ts
@@ -0,0 +1,5 @@
+import { SnippetTests } from "./SnippetTests";
+
+export function runTests() {
+    new SnippetTests().registerTests();
+}
diff --git a/tools/applicationinsights-web-snippet/Tests/UnitTests.html b/tools/applicationinsights-web-snippet/Tests/UnitTests.html
new file mode 100644
index 000000000..db1f3edab
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/Tests/UnitTests.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="Cache-control" content="no-Cache" />
+    <title>Tests for Shims</title>
+    <link rel="stylesheet" href="../../../common/Tests/External/qunit-2.9.3.css">
+    <script src="../../../common/Tests/External/sinon-2.3.8.js"></script>
+    <script src="../../../common/Tests/External/require-2.3.6.js"></script>
+    <script src="../../../common/Tests/Selenium/ModuleLoader.js"></script>
+
+    <script>
+        var modules = new ModuleLoader({
+            baseUrl: '../',
+            paths: {
+                qunit: "../../common/Tests/External/qunit-2.9.3",
+                "whatwg-fetch": "../../common/Tests/External/whatwg-fetch.3.6.2"
+            }
+        });
+
+        modules.add("qunit");
+
+        modules.add("@microsoft/ai-test-framework");
+
+        var testModule = modules.add("Tests/Unit/src/snippet.tests", "./Unit/dist/applicationinsights-web-snippet.tests.js")
+        testModule.run = function (tests) {
+            console && console.log("Starting tests");
+            QUnit.start();
+            tests.runTests();
+        };
+
+        modules.run();
+    </script>
+</head>
+
+<body>
+    <div id="qunit"></div>
+    <div id="qunit-fixture"></div>
+    <div id="error-message"></div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/tools/applicationinsights-web-snippet/Tests/tsconfig.json b/tools/applicationinsights-web-snippet/Tests/tsconfig.json
new file mode 100644
index 000000000..5fd1d6fcf
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/Tests/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "sourceMap": true,
+        "inlineSources": true,
+        "noImplicitAny": false,
+        "module": "amd",
+        "moduleResolution": "node",
+        "target": "es5",
+        "alwaysStrict": true,
+        "declaration": true,
+        "importHelpers": false,
+        "noEmitHelpers": false,
+        "skipLibCheck": true
+    },
+    "files": [],
+    "exclude": [
+        "**/*.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tools/applicationinsights-web-snippet/build/applicationinsights-web-snippet.ts b/tools/applicationinsights-web-snippet/build/applicationinsights-web-snippet.ts
new file mode 100644
index 000000000..5c4fd7ba3
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/build/applicationinsights-web-snippet.ts
@@ -0,0 +1,13 @@
+import { webSnippet } from "./web-snippet";
+import { webSnippetCs } from "./web-snippet-cs"
+
+function webSnippetVersion() {
+    let parse = /sv:\"([^\"]+)\"/.exec(webSnippet);
+    if (parse) {
+        return parse[1];
+    }
+
+    return "";
+}
+
+export { webSnippet, webSnippetCs, webSnippetVersion }
\ No newline at end of file
diff --git a/tools/applicationinsights-web-snippet/build/web-snippet-cs.ts b/tools/applicationinsights-web-snippet/build/web-snippet-cs.ts
new file mode 100644
index 000000000..cbeff7c6d
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/build/web-snippet-cs.ts
@@ -0,0 +1 @@
+export const webSnippetCs = "!function(v,y,T){var S=v.location,k=\"script\",D=\"instrumentationKey\",C=\"ingestionendpoint\",I=\"disableExceptionTracking\",E=\"ai.device.\",b=\"toLowerCase\",w=(D[b](),\"crossOrigin\"),N=\"POST\",e=\"appInsightsSDK\",t=T.name||\"appInsights\",n=((T.name||v[e])&&(v[e]=t),v[t]||function(l){var u=!1,d=!1,g={initialize:!0,queue:[],sv:\"6\",version:2,config:l};function m(e,t){var n={},a=\"Browser\";return n[E+\"id\"]=a[b](),n[E+\"type\"]=a,n[\"ai.operation.name\"]=S&&S.pathname||\"_unknown_\",n[\"ai.internal.sdkVersion\"]=\"javascript:snippet_\"+(g.sv||g.version),{time:(a=new Date).getUTCFullYear()+\"-\"+i(1+a.getUTCMonth())+\"-\"+i(a.getUTCDate())+\"T\"+i(a.getUTCHours())+\":\"+i(a.getUTCMinutes())+\":\"+i(a.getUTCSeconds())+\".\"+(a.getUTCMilliseconds()/1e3).toFixed(3).slice(2,5)+\"Z\",iKey:e,name:\"Microsoft.ApplicationInsights.\"+e.replace(/-/g,\"\")+\".\"+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}};function i(e){e=\"\"+e;return 1===e.length?\"0\"+e:e}}var e,n,f=l.url||T.src;function a(e){var t,n,a,i,o,s,r,c,p;u=!0,g.queue=[],d||(d=!0,i=f,r=(c=function(){var e,t={},n=l.connectionString;if(n)for(var a=n.split(\";\"),i=0;i<a.length;i++){var o=a[i].split(\"=\");2===o.length&&(t[o[0][b]()]=o[1])}return t[C]||(t[C]=\"https://\"+((e=(n=t.endpointsuffix)?t.location:null)?e+\".\":\"\")+\"dc.\"+(n||\"services.visualstudio.com\")),t}()).instrumentationkey||l[D]||\"\",c=(c=c[C])?c+\"/v2/track\":l.endpointUrl,(p=[]).push((t=\"SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)\",n=i,o=c,(s=(a=m(r,\"Exception\")).data).baseType=\"ExceptionData\",s.baseData.exceptions=[{typeName:\"SDKLoadFailed\",message:t.replace(/\\./g,\"-\"),hasFullStack:!1,stack:t+\"\\nSnippet failed to load [\"+n+\"] -- Telemetry is disabled\\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\\nHost: \"+(S&&S.pathname||\"_unknown_\")+\"\\nEndpoint: \"+o,parsedStack:[]}],a)),p.push((s=i,t=c,(o=(n=m(r,\"Message\")).data).baseType=\"MessageData\",(a=o.baseData).message=\'AI (Internal): 99 message:\"\'+(\"SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) (\"+s+\")\").replace(/\\\"/g,\"\")+\'\"\',a.properties={endpoint:t},n)),i=p,r=c,JSON&&((o=v.fetch)&&!T.useXhr?o(r,{method:N,body:JSON.stringify(i),mode:\"cors\"}):XMLHttpRequest&&((s=new XMLHttpRequest).open(N,r),s.setRequestHeader(\"Content-type\",\"application/json\"),s.send(JSON.stringify(i)))))}function i(e,t){d||setTimeout(function(){!t&&g.core||a()},500)}f&&((n=y.createElement(k)).src=f,!(o=T[w])&&\"\"!==o||\"undefined\"==n[w]||(n[w]=o),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){\"loaded\"!==n.readyState&&\"complete\"!==n.readyState||i(0,t)},e=n,T.ld<0?y.getElementsByTagName(\"head\")[0].appendChild(e):setTimeout(function(){y.getElementsByTagName(k)[0].parentNode.appendChild(e)},T.ld||0));try{g.cookie=y.cookie}catch(h){}function t(e){for(;e.length;)!function(t){g[t]=function(){var e=arguments;u||g.queue.push(function(){g[t].apply(g,e)})}}(e.pop())}var s,r,o=\"track\",c=\"TrackPage\",p=\"TrackEvent\",o=(t([o+\"Event\",o+\"PageView\",o+\"Exception\",o+\"Trace\",o+\"DependencyData\",o+\"Metric\",o+\"PageViewPerformance\",\"start\"+c,\"stop\"+c,\"start\"+p,\"stop\"+p,\"addTelemetryInitializer\",\"setAuthenticatedUserContext\",\"clearAuthenticatedUserContext\",\"flush\"]),g.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4},(l.extensionConfig||{}).ApplicationInsightsAnalytics||{});return!0!==l[I]&&!0!==o[I]&&(t([\"_\"+(s=\"onerror\")]),r=v[s],v[s]=function(e,t,n,a,i){var o=r&&r(e,t,n,a,i);return!0!==o&&g[\"_\"+s]({message:e,url:t,lineNumber:n,columnNumber:a,error:i,evt:v.event}),o},l.autoExceptionInstrumented=!0),g}(T.cfg));function a(){T.onInit&&T.onInit(n)}(v[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{\r\nsrc: \"https://js.monitor.azure.com/scripts/b/ai.2.min.js\", // The SDK URL Source\r\n// name: \"appInsights\", // Global SDK Instance name defaults to \"appInsights\" when not supplied\r\n// ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,\r\n// useXhr: 1, // Use XHR instead of fetch to report failures (if available),\r\n// crossOrigin: \"anonymous\", // When supplied this will add the provided value as the cross origin attribute on the script tag\r\n// onInit: null, // Once the application insights instance has loaded and initialized this callback function will be called with 1 argument -- the sdk instance (DO NOT ADD anything to the sdk.queue -- As they won\'t get called)\r\ncfg: { // Application Insights Configuration\r    connectionString: \"YOUR_CONNECTION_STRING\"\r\n}});";
diff --git a/tools/applicationinsights-web-snippet/build/web-snippet.ts b/tools/applicationinsights-web-snippet/build/web-snippet.ts
new file mode 100644
index 000000000..5c6d4526a
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/build/web-snippet.ts
@@ -0,0 +1 @@
+export const webSnippet = "!function(v,y,T){var S=v.location,k=\"script\",D=\"instrumentationKey\",C=\"ingestionendpoint\",I=\"disableExceptionTracking\",E=\"ai.device.\",b=\"toLowerCase\",w=(D[b](),\"crossOrigin\"),N=\"POST\",e=\"appInsightsSDK\",t=T.name||\"appInsights\",n=((T.name||v[e])&&(v[e]=t),v[t]||function(l){var u=!1,d=!1,g={initialize:!0,queue:[],sv:\"6\",version:2,config:l};function m(e,t){var n={},a=\"Browser\";return n[E+\"id\"]=a[b](),n[E+\"type\"]=a,n[\"ai.operation.name\"]=S&&S.pathname||\"_unknown_\",n[\"ai.internal.sdkVersion\"]=\"javascript:snippet_\"+(g.sv||g.version),{time:(a=new Date).getUTCFullYear()+\"-\"+i(1+a.getUTCMonth())+\"-\"+i(a.getUTCDate())+\"T\"+i(a.getUTCHours())+\":\"+i(a.getUTCMinutes())+\":\"+i(a.getUTCSeconds())+\".\"+(a.getUTCMilliseconds()/1e3).toFixed(3).slice(2,5)+\"Z\",iKey:e,name:\"Microsoft.ApplicationInsights.\"+e.replace(/-/g,\"\")+\".\"+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}};function i(e){e=\"\"+e;return 1===e.length?\"0\"+e:e}}var e,n,f=l.url||T.src;function a(e){var t,n,a,i,o,s,r,c,p;u=!0,g.queue=[],d||(d=!0,i=f,r=(c=function(){var e,t={},n=l.connectionString;if(n)for(var a=n.split(\";\"),i=0;i<a.length;i++){var o=a[i].split(\"=\");2===o.length&&(t[o[0][b]()]=o[1])}return t[C]||(t[C]=\"https://\"+((e=(n=t.endpointsuffix)?t.location:null)?e+\".\":\"\")+\"dc.\"+(n||\"services.visualstudio.com\")),t}()).instrumentationkey||l[D]||\"\",c=(c=c[C])?c+\"/v2/track\":l.endpointUrl,(p=[]).push((t=\"SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)\",n=i,o=c,(s=(a=m(r,\"Exception\")).data).baseType=\"ExceptionData\",s.baseData.exceptions=[{typeName:\"SDKLoadFailed\",message:t.replace(/\\./g,\"-\"),hasFullStack:!1,stack:t+\"\\nSnippet failed to load [\"+n+\"] -- Telemetry is disabled\\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\\nHost: \"+(S&&S.pathname||\"_unknown_\")+\"\\nEndpoint: \"+o,parsedStack:[]}],a)),p.push((s=i,t=c,(o=(n=m(r,\"Message\")).data).baseType=\"MessageData\",(a=o.baseData).message=\'AI (Internal): 99 message:\"\'+(\"SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) (\"+s+\")\").replace(/\\\"/g,\"\")+\'\"\',a.properties={endpoint:t},n)),i=p,r=c,JSON&&((o=v.fetch)&&!T.useXhr?o(r,{method:N,body:JSON.stringify(i),mode:\"cors\"}):XMLHttpRequest&&((s=new XMLHttpRequest).open(N,r),s.setRequestHeader(\"Content-type\",\"application/json\"),s.send(JSON.stringify(i)))))}function i(e,t){d||setTimeout(function(){!t&&g.core||a()},500)}f&&((n=y.createElement(k)).src=f,!(o=T[w])&&\"\"!==o||\"undefined\"==n[w]||(n[w]=o),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){\"loaded\"!==n.readyState&&\"complete\"!==n.readyState||i(0,t)},e=n,T.ld<0?y.getElementsByTagName(\"head\")[0].appendChild(e):setTimeout(function(){y.getElementsByTagName(k)[0].parentNode.appendChild(e)},T.ld||0));try{g.cookie=y.cookie}catch(h){}function t(e){for(;e.length;)!function(t){g[t]=function(){var e=arguments;u||g.queue.push(function(){g[t].apply(g,e)})}}(e.pop())}var s,r,o=\"track\",c=\"TrackPage\",p=\"TrackEvent\",o=(t([o+\"Event\",o+\"PageView\",o+\"Exception\",o+\"Trace\",o+\"DependencyData\",o+\"Metric\",o+\"PageViewPerformance\",\"start\"+c,\"stop\"+c,\"start\"+p,\"stop\"+p,\"addTelemetryInitializer\",\"setAuthenticatedUserContext\",\"clearAuthenticatedUserContext\",\"flush\"]),g.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4},(l.extensionConfig||{}).ApplicationInsightsAnalytics||{});return!0!==l[I]&&!0!==o[I]&&(t([\"_\"+(s=\"onerror\")]),r=v[s],v[s]=function(e,t,n,a,i){var o=r&&r(e,t,n,a,i);return!0!==o&&g[\"_\"+s]({message:e,url:t,lineNumber:n,columnNumber:a,error:i,evt:v.event}),o},l.autoExceptionInstrumented=!0),g}(T.cfg));function a(){T.onInit&&T.onInit(n)}(v[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{\r\nsrc: \"https://js.monitor.azure.com/scripts/b/ai.2.min.js\", // The SDK URL Source\r\n// name: \"appInsights\", // Global SDK Instance name defaults to \"appInsights\" when not supplied\r\n// ld: 0, // Defines the load delay (in ms) before attempting to load the sdk. -1 = block page load and add to head. (default) = 0ms load after timeout,\r\n// useXhr: 1, // Use XHR instead of fetch to report failures (if available),\r\n// crossOrigin: \"anonymous\", // When supplied this will add the provided value as the cross origin attribute on the script tag\r\n// onInit: null, // Once the application insights instance has loaded and initialized this callback function will be called with 1 argument -- the sdk instance (DO NOT ADD anything to the sdk.queue -- As they won\'t get called)\r\ncfg: { // Application Insights Configuration\r    connectionString: \"InstrumentationKey=INSTRUMENTATION_KEY\"\r\n}});";
diff --git a/tools/applicationinsights-web-snippet/package.json b/tools/applicationinsights-web-snippet/package.json
index 0265788cb..24d5ddc88 100644
--- a/tools/applicationinsights-web-snippet/package.json
+++ b/tools/applicationinsights-web-snippet/package.json
@@ -16,12 +16,15 @@
     "build:esm": "grunt websnippet",
     "build:browser": "rollup -c",
     "rebuild": "npm run build",
-    "test": "",
+    "test": "grunt websnippettests",
     "lint": "tslint -p tsconfig.json",
     "npm-pack": "npm pack"
+
   },
   "license": "MIT",
   "devDependencies": {
+    "@types/qunit": "^2.19.3",
+    "@microsoft/ai-test-framework": "0.0.1",
     "@microsoft/applicationinsights-rollup-plugin-uglify3-js": "1.0.0",
     "@microsoft/applicationinsights-rollup-es3": "1.1.3",
     "typescript": "^4.9.3",
diff --git a/tools/applicationinsights-web-snippet/src/applicationinsights-web-snippet.ts b/tools/applicationinsights-web-snippet/src/applicationinsights-web-snippet.ts
index 844dacb50..5c4fd7ba3 100644
--- a/tools/applicationinsights-web-snippet/src/applicationinsights-web-snippet.ts
+++ b/tools/applicationinsights-web-snippet/src/applicationinsights-web-snippet.ts
@@ -1 +1,13 @@
-export const webSnippet = "##replaceSnippet##";
+import { webSnippet } from "./web-snippet";
+import { webSnippetCs } from "./web-snippet-cs"
+
+function webSnippetVersion() {
+    let parse = /sv:\"([^\"]+)\"/.exec(webSnippet);
+    if (parse) {
+        return parse[1];
+    }
+
+    return "";
+}
+
+export { webSnippet, webSnippetCs, webSnippetVersion }
\ No newline at end of file
diff --git a/tools/applicationinsights-web-snippet/src/web-snippet-cs.ts b/tools/applicationinsights-web-snippet/src/web-snippet-cs.ts
new file mode 100644
index 000000000..fe78d79a1
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/src/web-snippet-cs.ts
@@ -0,0 +1 @@
+export const webSnippetCs = "##replaceSnippet##";
diff --git a/tools/applicationinsights-web-snippet/src/web-snippet.ts b/tools/applicationinsights-web-snippet/src/web-snippet.ts
new file mode 100644
index 000000000..844dacb50
--- /dev/null
+++ b/tools/applicationinsights-web-snippet/src/web-snippet.ts
@@ -0,0 +1 @@
+export const webSnippet = "##replaceSnippet##";
diff --git a/tools/applicationinsights-web-snippet/tsconfig.json b/tools/applicationinsights-web-snippet/tsconfig.json
index b56c88f33..3b4c3c383 100644
--- a/tools/applicationinsights-web-snippet/tsconfig.json
+++ b/tools/applicationinsights-web-snippet/tsconfig.json
@@ -15,10 +15,10 @@
     "declaration": true,
     "declarationDir": "tools/applicationinsights-web-snippet/types",
     "outDir": "./out",
-    "rootDir": "./tools/applicationinsights-web-snippet/dest"
+    "rootDir": "./tools/applicationinsights-web-snippet/build"
   },
   "include": [
-    "./dest/*.ts"
+    "./build/*.ts"
   ],
   "exclude": [
     "node_modules"
diff --git a/tools/config/package.json b/tools/config/package.json
index ded84f977..c6742f9e7 100644
--- a/tools/config/package.json
+++ b/tools/config/package.json
@@ -10,7 +10,7 @@
     },
     "scripts": {
         "build": "npm run build:browser",
-        "build:browser": "grunt copy",
+        "build:browser": "grunt copy-config",
         "rebuild": "npm run build",
         "test": ""
     },