.gitignore

@@ -21,6 +21,7 @@ Tests/FunctionalTests/TestApp/package-lock.json
 *.dat
 *.njsproj
 .vscode/
+.nyc_output
 
 # Ignore webstorm files
 .idea

AutoCollection/Statsbeat.ts

@@ -54,7 +54,7 @@ class Statsbeat {
         let statsbeatConnectionString = this._getConnectionString(config);
         this._statsbeatConfig = new Config(statsbeatConnectionString);
         this._statsbeatConfig.samplingPercentage = 100; // Do not sample
-        this._sender = new Sender(this._statsbeatConfig, null, null, null, null, true, this._shutdownStatsbeat);
+        this._sender = new Sender(this._statsbeatConfig, null, null, null, null, true, this._shutdownStatsbeat.bind(this));
     }
 
     public enable(isEnabled: boolean) {

AutoCollection/WebSnippet.ts

@@ -5,6 +5,9 @@ import zlib = require("zlib");
 import Logging = require("../Library/Logging");
 import TelemetryClient = require("../Library/TelemetryClient");
 import snippetInjectionHelper = require("../Library/SnippetInjectionHelper");
+import Statsbeat = require("./Statsbeat");
+import Constants = require("../Declarations/Constants");
+import ConnectionStringParser = require("../Library/ConnectionStringParser");
 
 class WebSnippet {
 
@@ -15,6 +18,8 @@ class WebSnippet {
     private static _aiDeprecatedUrl: string;
     private _isEnabled: boolean;
     private _isInitialized: boolean;
+    private _isIkeyValid: boolean = true;
+    private _statsbeat: Statsbeat;
 
 
     constructor(client: TelemetryClient) {
@@ -27,8 +32,17 @@ class WebSnippet {
         WebSnippet._aiUrl = "https://js.monitor.azure.com/scripts/b/ai";
         WebSnippet._aiDeprecatedUrl = "https://az416426.vo.msecnd.net/scripts/b/ai";
 
+        let clientSnippetConnectionString = client.config.webSnippetConnectionString;
+        let defaultIkey = client.config.instrumentationKey;
+        if (!!clientSnippetConnectionString) {
+            let clientSnippetIkey = this._getWebSnippetIkey(client.config.webSnippetConnectionString);
+            defaultIkey = clientSnippetIkey;
+        }
+
         //TODO: quick fix for bundle error, remove this when npm is published
-        WebSnippet._snippet = snippetInjectionHelper.webSnippet.replace("INSTRUMENTATION_KEY", client.config.instrumentationKey);
+        WebSnippet._snippet = snippetInjectionHelper.webSnippet.replace("INSTRUMENTATION_KEY", defaultIkey);
+        this._statsbeat = client.getStatsbeat();
+
 
         //TODO: replace the path with npm package exports
         //NOTE: should use the following part when npm is enabled
@@ -47,18 +61,38 @@ class WebSnippet {
 
     }
 
-    public enable(isEnabled: boolean) {
+    public enable(isEnabled: boolean, webSnippetConnectionString?: string ) {
         this._isEnabled = isEnabled;
-
-        if (this._isEnabled && !this._isInitialized) {
+        if (!!webSnippetConnectionString) {
+            let iKey = this._getWebSnippetIkey(webSnippetConnectionString);
+            WebSnippet._snippet = snippetInjectionHelper.webSnippet.replace("INSTRUMENTATION_KEY", iKey);
+        }
+        if (this._isEnabled && !this._isInitialized && this._isIkeyValid) {
+            if (this._statsbeat) {
+                this._statsbeat.addFeature(Constants.StatsbeatFeature.WEB_SNIPPET);
+            }
             this._initialize();
+        } else if (!this._isEnabled) {
+            if (this._statsbeat) {
+                this._statsbeat.removeFeature(Constants.StatsbeatFeature.WEB_SNIPPET);
+            }
         }
     }
 
     public isInitialized() {
         return this._isInitialized;
     }
 
+    private _getWebSnippetIkey(connectionString: string) {
+        const csCode = ConnectionStringParser.parse(connectionString);
+        const iKeyCode = csCode.instrumentationkey || "";
+        if (!ConnectionStringParser.isIkeyValid(iKeyCode)) {
+            this._isIkeyValid = false;
+            Logging.info("Invalid web snippet connection string, web snippet will not be injected.");
+        }
+        return iKeyCode;
+    }
+
     private _initialize() {
         this._isInitialized = true;
         const originalHttpServer = http.createServer;

Bootstrap/Default.ts

@@ -42,9 +42,9 @@ export function setStatusLogger(statusLogger: StatusLogger) {
 
 /**
  * Try to setup and start this app insights instance if attach is enabled.
- * @param setupString connection string
+ * @param aadTokenCredential Optional AAD credential
  */
-export function setupAndStart(setupString?: string, aadTokenCredential?: azureCore.TokenCredential): typeof types | null {
+export function setupAndStart(aadTokenCredential?: azureCore.TokenCredential): typeof types | null {
     // If app already contains SDK, skip agent attach
     if (!forceStart && Helpers.sdkAlreadyExists(_logger)) {
         _statusLogger.logStatus({
@@ -55,8 +55,7 @@ export function setupAndStart(setupString?: string, aadTokenCredential?: azureCo
         })
         return null;
     }
-
-    if (!setupString) {
+    if (!defaultConfig.instrumentationKey) {
         const message = "Application Insights wanted to be started, but no Connection String was provided";
         _logger.logError(message);
         _statusLogger.logStatus({
@@ -97,7 +96,7 @@ export function setupAndStart(setupString?: string, aadTokenCredential?: azureCo
         }
 
         // Instrument the SDK
-        _appInsights.setup(setupString).setSendLiveMetrics(true);
+        _appInsights.setup().setSendLiveMetrics(true);
         _appInsights.defaultClient.setAutoPopulateAzureProperties(true);
         _appInsights.defaultClient.addTelemetryProcessor(prefixInternalSdkVersion);
         _appInsights.defaultClient.addTelemetryProcessor(copyOverPrefixInternalSdkVersionToHeartBeatMetric);
@@ -114,7 +113,7 @@ export function setupAndStart(setupString?: string, aadTokenCredential?: azureCo
         }
 
         // Agent successfully instrumented the SDK
-        _logger.logMessage("Application Insights was started with setupString: " + setupString);
+        _logger.logMessage("Application Insights was started");
         _statusLogger.logStatus({
             ...StatusLogger.DEFAULT_STATUS,
             AgentInitializedSuccessfully: true

Declarations/Constants.ts

@@ -1,6 +1,6 @@
 import Contracts = require("./Contracts")
 
-export const APPLICATION_INSIGHTS_SDK_VERSION = "2.3.2";
+export const APPLICATION_INSIGHTS_SDK_VERSION = "2.3.3";
 export const DEFAULT_BREEZE_ENDPOINT = "https://dc.services.visualstudio.com";
 export const DEFAULT_LIVEMETRICS_ENDPOINT = "https://rt.services.visualstudio.com";
 export const DEFAULT_LIVEMETRICS_HOST = "rt.services.visualstudio.com";
@@ -160,6 +160,7 @@ export enum StatsbeatFeature {
     NONE = 0,
     DISK_RETRY = 1,
     AAD_HANDLING = 2,
+    WEB_SNIPPET = 4,
 }
 
 export enum StatsbeatInstrumentation {

Declarations/Interfaces.ts

@@ -138,7 +138,11 @@ export interface IBaseConfig {
      * Enable web snippet auto html injection, default to false
      */
      enableAutoWebSnippetInjection: boolean;
-
+    /**
+     * Application Insights resource connection string for web snippet
+     * Note: if no valid connection string is provided here, web snippet will use the connection string during initializing Nodejs SDK
+     */
+    webSnippetConnectionString?: string;
 }
 
 export interface IEnvironmentConfig {

Library/Config.ts

@@ -64,9 +64,8 @@ class Config implements IConfig {
     private _setCorrelationId: (v: string) => void;
     private _profileQueryEndpoint: string;
     private _instrumentationKey: string;
-
-
-
+    private _webSnippetConnectionString: string;
+
     constructor(setupString?: string) {
         // Load config values from env variables and JSON if available
         this._mergeConfig();
@@ -111,6 +110,7 @@ class Config implements IConfig {
         this.ignoreLegacyHeaders = this.ignoreLegacyHeaders || false;
         this.profileQueryEndpoint = csCode.ingestionendpoint || csEnv.ingestionendpoint || process.env[Config.ENV_profileQueryEndpoint] || this._endpointBase;
         this.quickPulseHost = this.quickPulseHost || csCode.liveendpoint || csEnv.liveendpoint || process.env[Config.ENV_quickPulseHost] || Constants.DEFAULT_LIVEMETRICS_HOST;
+        this.webSnippetConnectionString = this.webSnippetConnectionString || this._webSnippetConnectionString || "";
         // Parse quickPulseHost if it starts with http(s)://
         if (this.quickPulseHost.match(/^https?:\/\//)) {
             this.quickPulseHost = new url.URL(this.quickPulseHost).host;
@@ -139,6 +139,14 @@ class Config implements IConfig {
         return this._instrumentationKey;
     }
 
+    public set webSnippetConnectionString(connectionString: string) {
+        this._webSnippetConnectionString = connectionString;
+    }
+
+    public get webSnippetConnectionString(): string {
+        return this._webSnippetConnectionString;
+    }
+
     private _mergeConfig() {
         let jsonConfig = JsonConfig.getInstance();
         this._connectionString = jsonConfig.connectionString;
@@ -176,6 +184,7 @@ class Config implements IConfig {
         this.quickPulseHost = jsonConfig.quickPulseHost;
         this.samplingPercentage = jsonConfig.samplingPercentage;
         this.enableAutoWebSnippetInjection = jsonConfig.enableAutoWebSnippetInjection;
+        this.webSnippetConnectionString = jsonConfig.webSnippetConnectionString;
     }
 
     /**

Library/ConnectionStringParser.ts

@@ -40,6 +40,13 @@ class ConnectionStringParser {
 
         return result;
     }
+
+    public static isIkeyValid(iKey: string): boolean {
+        if (!iKey || iKey == "") return false;
+        const UUID_Regex = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$";
+        const regexp = new RegExp(UUID_Regex);
+        return regexp.test(iKey);
+    }
 }
 
 export = ConnectionStringParser;

Library/JsonConfig.ts

@@ -23,6 +23,7 @@ const ENV_noStatsbeat = "APPLICATION_INSIGHTS_NO_STATSBEAT";
 const ENV_noHttpAgentKeepAlive = "APPLICATION_INSIGHTS_NO_HTTP_AGENT_KEEP_ALIVE";
 const ENV_noPatchModules = "APPLICATION_INSIGHTS_NO_PATCH_MODULES";
 const ENV_webSnippetEnable = "APPLICATIONINSIGHTS_WEB_SNIPPET_ENABLED";
+const ENV_webSnippet_connectionString = "APPLICATIONINSIGHTS_WEB_SNIPPET_CONNECTION_STRING";
 
 export class JsonConfig implements IJsonConfig {
     private static _instance: JsonConfig;
@@ -65,7 +66,7 @@ export class JsonConfig implements IJsonConfig {
     public noHttpAgentKeepAlive: boolean;
     public quickPulseHost: string;
     public enableAutoWebSnippetInjection: boolean;
-
+    public webSnippetConnectionString: string;
 
     static getInstance() {
         if (!JsonConfig._instance) {
@@ -94,6 +95,7 @@ export class JsonConfig implements IJsonConfig {
         this.noHttpAgentKeepAlive = !!process.env[ENV_noHttpAgentKeepAlive];
         this.noPatchModules = process.env[ENV_noPatchModules] || "";
         this.enableAutoWebSnippetInjection = !!process.env[ENV_webSnippetEnable];
+        this.webSnippetConnectionString = process.env[ENV_webSnippet_connectionString] || "";
         this._loadJsonFile();
     }
 
@@ -148,6 +150,11 @@ export class JsonConfig implements IJsonConfig {
             if (jsonConfig.enableAutoWebSnippetInjection != undefined) {
                 this.enableAutoWebSnippetInjection = jsonConfig.enableAutoWebSnippetInjection;
             }
+
+            if (jsonConfig.webSnippetConnectionString != undefined) {
+                this.webSnippetConnectionString = jsonConfig.webSnippetConnectionString;
+            }
+
             this.endpointUrl = jsonConfig.endpointUrl;
             this.maxBatchSize = jsonConfig.maxBatchSize;
             this.maxBatchIntervalMs = jsonConfig.maxBatchIntervalMs;

Library/SnippetInjectionHelper.ts

@@ -131,3 +131,4 @@ export const isContentTypeHeaderHtml = (response: http.ServerResponse): boolean
     }
     return isHtml;
 }
+

README.md

@@ -268,9 +268,9 @@ separately from clients created with `new appInsights.TelemetryClient()`.
 | httpAgent                       | An http.Agent to use for SDK HTTP traffic (Optional, Default undefined)                                    |
 | httpsAgent                      | An https.Agent to use for SDK HTTPS traffic (Optional, Default undefined)
 | aadTokenCredential| Azure Credential instance to be used to authenticate the App. [AAD Identity Credential Classes](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/identity/identity#credential-classes)
-| enableAutoWebSnippetInjection(Preview)| Sets the state of automatic web snippet injection (disabled by default). If true, web snippet will be injected into valid node server http response automatically |                            |
+| enableAutoWebSnippetInjection(Preview)| Sets the state of automatic web snippet injection (disabled by default). If true, web snippet will be injected into valid node server http response automatically. If a connection string is provided here, e.g. `enableAutoWebSnippetInjection(true, "your-connection-string")`, auto snippet injection will use it instead of the default one (connection string used for SDK initialization) |                            |
 
-[Config.ts]: https://github.com/microsoft/ApplicationInsights-node.js/blob/develop/Library/Config.ts
+[Config.ts]: https://github.com/microsoft/ApplicationInsights-node.js/blob/develop/Library/Config.ts 
 
 All these properties except httpAgent, httpsAgent and aadTokenCredential could be configured using configuration file `applicationinsights.json` located under root folder of applicationinsights package installation folder, Ex: `node_modules/applicationinsights`. These configuration values will be applied to all TelemetryClients created in the SDK. 
 

Tests/AutoCollection/WebSnippet.tests.ts

@@ -5,15 +5,20 @@ import sinon = require("sinon");
 import AppInsights = require("../../applicationinsights");
 import WebSnippet = require("../../AutoCollection/WebSnippet");
 import SnippetInjectionHelper = require("../../Library/SnippetInjectionHelper");
-import TelemetryClient = require("../../Library/TelemetryClient");
 
 
 describe("AutoCollection/WebSnippet", () => {
+    var sandbox: sinon.SinonSandbox;
 
     afterEach(() => {
         AppInsights.dispose();
+        sandbox.restore();
     });
 
+    beforeEach(() =>{
+        sandbox = sinon.sandbox.create();
+    })
+
     describe("#init and #dispose()", () => {
         it("init should enable and dispose should stop injection", () => {
             var appInsights = AppInsights.setup("1aa11111-bbbb-1ccc-8ddd-eeeeffff3333").setWebSnippetInjection(true);
@@ -148,4 +153,41 @@ describe("AutoCollection/WebSnippet", () => {
         });
     });
 
+    describe("#web snippet replace correct connection string from config", () => {
+        it("injection should use correct connection string from config", () => {
+            var appInsights = AppInsights.setup("1aa11111-bbbb-1ccc-8ddd-eeeeffff3333").setWebSnippetInjection(true,"InstrumentationKey=1aa11111-bbbb-1ccc-8ddd-eeeeffff3330;IngestionEndpoint=https://centralus-0.in.applicationinsights.azure.com/");
+            let webSnippet = WebSnippet.INSTANCE;
+            webSnippet.enable(true, "InstrumentationKey=1aa11111-bbbb-1ccc-8ddd-eeeeffff3330;IngestionEndpoint=https://centralus-0.in.applicationinsights.azure.com/");
+            assert.equal(webSnippet["_isIkeyValid"], true,"ikey should be set to valid");
+            let _headers: any = {};
+            let response: http.ServerResponse = <any>{
+                setHeader: (header: string, value: string) => {
+                    _headers[header] = value;
+                },
+                getHeader: (header: string) => { return _headers[header]; },
+                removeHeader: (header: string) => { _headers[header] = undefined; }
+            };
+            response.setHeader("Content-Type", "text/html");
+            response.statusCode = 200;
+            let validHtml = "<html><head></head><body></body></html>";
+            assert.equal(webSnippet.ValidateInjection(response, validHtml), true); 
+            let newHtml = webSnippet.InjectWebSnippet(response, validHtml).toString();
+            assert.ok(newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.2.min.js") >= 0);
+            assert.ok(newHtml.indexOf("<html><head>") == 0);
+            assert.ok(newHtml.indexOf('instrumentationKey: "1aa11111-bbbb-1ccc-8ddd-eeeeffff3330"') >= 0);
+        });
+    });
+
+    describe("#web snippet enable should throw errors when ikey from config is not valid", () => {
+        it("injection should throw errors when ikey from config is not valid", () => {
+            var infoStub = sandbox.stub(console, "info");
+            var appInsights = AppInsights.setup("1aa11111-bbbb-1ccc-8ddd-eeeeffff3333").setWebSnippetInjection(true,"InstrumentationKey=1aa11111-bbbb-1ccc-8ddd-eeeeff;IngestionEndpoint=https://centralus-0.in.applicationinsights.azure.com/");
+            let webSnippet = WebSnippet.INSTANCE;
+            webSnippet.enable(true, "InstrumentationKey=1aa11111-bbbb-1ccc-8ddd-eeeeff;IngestionEndpoint=https://centralus-0.in.applicationinsights.azure.com/");
+            assert.equal(webSnippet["_isIkeyValid"], false,"ikey should be set to invalid");
+            assert.ok(infoStub.calledOn, "invalid key warning was raised");
+        });
+    });
+
+
 });

Tests/Bootstrap/Default.spec.ts

@@ -52,9 +52,9 @@ describe("#setupAndStart()", () => {
         // Test
         const Default = require("../../Bootstrap/Default") as typeof DefaultTypes;
         Default.setLogger(new DiagnosticLogger(logger));
-        const instance1 = Default.setupAndStart("1aa11111-bbbb-1ccc-8ddd-eeeeffff3333");
+        const instance1 = Default.setupAndStart();
         assert.ok(instance1.defaultClient);
-        const instance2 = Default.setupAndStart("1aa11111-bbbb-1ccc-8ddd-eeeeffff3333");
+        const instance2 = Default.setupAndStart();
         assert.deepEqual(instance1.defaultClient, instance2.defaultClient);
         assert.deepEqual(instance1.defaultClient["_telemetryProcessors"].length, 2)
         assert.deepEqual(instance2.defaultClient["_telemetryProcessors"].length, 2)
@@ -76,7 +76,7 @@ describe("#setupAndStart()", () => {
         // Test
         const Default = require("../../Bootstrap/Default") as typeof DefaultTypes;
         Default.setLogger(new DiagnosticLogger(logger));
-        const instance = Default.setupAndStart("1aa11111-bbbb-1ccc-8ddd-eeeeffff3333");
+        const instance = Default.setupAndStart();
         assert.deepEqual(instance, appInsights);
 
         // Cleanup
@@ -90,7 +90,7 @@ describe("#setupAndStart()", () => {
         assert.equal(logger.errorCount, 0);
     });
 
-    it("should not setup and start the SDK if no setupString is provided", () => {
+    it("should not setup and start the SDK if no connectionString is provided", () => {
         // Setup
         const logger = new LoggerSpy();
         const env = <{ [id: string]: string }>{};