AutoCollection/HttpRequestParser.ts

@@ -172,13 +172,14 @@ class HttpRequestParser extends RequestParser {
         var pathName = requestUrl.pathname;
         var search = requestUrl.search;
 
+        var protocol = (encrypted || request.headers["x-forwarded-proto"] == "https") ? "https" : "http";
+
         var absoluteUrl = url.format({
-            protocol: encrypted ? "https" : "http",
+            protocol: protocol,
             host: request.headers.host,
             pathname: pathName,
             search: search
         });
-
         return absoluteUrl;
     }
 

AutoCollection/PreAggregatedMetrics.ts

@@ -229,7 +229,7 @@ class AutoCollectPreAggregatedMetrics {
                 value: intervalExceptions,
                 count: intervalExceptions,
                 aggregationInterval: elapsedMs,
-                metricType: Constants.MetricId.DEPENDENCIES_DURATION,
+                metricType: Constants.MetricId.EXCEPTIONS_COUNT,
             });
 
             // Set last counters
@@ -249,7 +249,7 @@ class AutoCollectPreAggregatedMetrics {
                 value: intervalTraces,
                 count: intervalTraces,
                 aggregationInterval: elapsedMs,
-                metricType: Constants.MetricId.DEPENDENCIES_DURATION,
+                metricType: Constants.MetricId.TRACES_COUNT,
             });
 
             // Set last counters

Bootstrap/DiagnosticLogger.ts

@@ -20,7 +20,7 @@ export class DiagnosticLogger {
             siteName: process.env.WEBSITE_SITE_NAME,
             ikey: process.env.APPINSIGHTS_INSTRUMENTATIONKEY,
             extensionVersion: process.env.ApplicationInsightsAgent_EXTENSION_VERSION,
-            sdkVersion: "2.0.0",
+            sdkVersion: "2.1.0",
             subscriptionId: process.env.WEBSITE_OWNER_NAME ? process.env.WEBSITE_OWNER_NAME.split("+")[0] : null,
         }
     }

Declarations/Contracts/Constants.ts

@@ -44,7 +44,6 @@ export function domainSupportsProperties(domain: Domain): domain is ISupportProp
  * @type ConnectionStringKey
  */
 export interface ConnectionString {
-    authorization?: string;
     instrumentationkey?: string;
     ingestionendpoint?: string;
     liveendpoint?: string;
@@ -55,4 +54,4 @@ export interface ConnectionString {
     // type ConnectionString = { [key in ConnectionStringKey]?: string }
 }
 
-export type ConnectionStringKey = "authorization" | "instrumentationkey" | "ingestionendpoint" | "liveendpoint" | "location" | "endpointsuffix";
+export type ConnectionStringKey = "instrumentationkey" | "ingestionendpoint" | "liveendpoint" | "location"| "endpointsuffix";

Library/Config.ts

@@ -1,3 +1,5 @@
+import azureCore = require("@azure/core-http");
+
 import CorrelationIdManager = require('./CorrelationIdManager');
 import ConnectionStringParser = require('./ConnectionStringParser');
 import Logging = require('./Logging');
@@ -73,11 +75,11 @@ class Config {
 
         this.instrumentationKey = csCode.instrumentationkey || iKeyCode /* === instrumentationKey */ || csEnv.instrumentationkey || Config._getInstrumentationKey();
         // validate ikey. If fails throw a warning
-        if(!Config._validateInstrumentationKey(this.instrumentationKey)) {
+        if (!Config._validateInstrumentationKey(this.instrumentationKey)) {
             Logging.warn("An invalid instrumentation key was provided. There may be resulting telemetry loss", this.instrumentationKey);
         }
 
-        this.endpointUrl = `${csCode.ingestionendpoint || csEnv.ingestionendpoint || this.endpointBase}/v2/track`;
+        this.endpointUrl = `${csCode.ingestionendpoint || csEnv.ingestionendpoint || this.endpointBase}/v2.1/track`;
         this.maxBatchSize = 250;
         this.maxBatchIntervalMs = 15000;
         this.disableAppInsights = false;
@@ -152,10 +154,10 @@ class Config {
     * Third section has 4 characters
     * Fourth section has 4 characters
     * Fifth section has 12 characters                  
-    */    
-    private static _validateInstrumentationKey(iKey:string): boolean {
+    */
+    private static _validateInstrumentationKey(iKey: string): boolean {
         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); 
+        const regexp = new RegExp(UUID_Regex);
         return regexp.test(iKey);
     }
 }

Library/QuickPulseSender.ts

@@ -1,4 +1,5 @@
 import https = require("https");
+
 import Config = require("./Config");
 import AutoCollectHttpDependencies = require("../AutoCollection/HttpDependencies");
 import Logging = require("./Logging");
@@ -50,21 +51,21 @@ class QuickPulseSender {
         this._submitData(envelope, redirectedHostEndpoint, done, "ping", pingHeaders);
     }
 
-    public post(envelope: Contracts.EnvelopeQuickPulse,
+    public async post(envelope: Contracts.EnvelopeQuickPulse,
         redirectedHostEndpoint: string,
         done: (shouldPOST?: boolean, res?: http.IncomingMessage, redirectedHost?: string, pollingIntervalHint?: number) => void,
-    ): void {
+    ): Promise<void> {
 
         // Important: When POSTing data, envelope must be an array
-        this._submitData([envelope], redirectedHostEndpoint, done, "post");
+        await this._submitData([envelope], redirectedHostEndpoint, done, "post");
     }
 
-    private _submitData(envelope: Contracts.EnvelopeQuickPulse | Contracts.EnvelopeQuickPulse[],
+    private async _submitData(envelope: Contracts.EnvelopeQuickPulse | Contracts.EnvelopeQuickPulse[],
         redirectedHostEndpoint: string,
         done: (shouldPOST?: boolean, res?: http.IncomingMessage, redirectedHost?: string, pollingIntervalHint?: number) => void,
         postOrPing: "post" | "ping",
         additionalHeaders?: { name: string, value: string }[]
-    ): void {
+    ): Promise<void> {
 
         const payload = JSON.stringify(envelope);
         var options = {
@@ -92,33 +93,42 @@ class QuickPulseSender {
         }
 
         const req = https.request(options, (res: http.IncomingMessage) => {
-            const shouldPOSTData = res.headers[QuickPulseConfig.subscribed] === "true";
-            const redirectHeader = res.headers[QuickPulseConfig.endpointRedirect] ? res.headers[QuickPulseConfig.endpointRedirect].toString() : null;
-            const pollingIntervalHint = res.headers[QuickPulseConfig.pollingIntervalHint] ? parseInt(res.headers[QuickPulseConfig.pollingIntervalHint].toString()) : null;
-            this._consecutiveErrors = 0;
-            done(shouldPOSTData, res, redirectHeader, pollingIntervalHint);
-        });
-        req.on("error", (error: Error) => {
-            // Unable to contact qps endpoint.
-            // Do nothing for now.
-            this._consecutiveErrors++;
-
-            // LOG every error, but WARN instead when X number of consecutive errors occur
-            let notice = `Transient error connecting to the Live Metrics endpoint. This packet will not appear in your Live Metrics Stream. Error:`;
-            if (this._consecutiveErrors % QuickPulseSender.MAX_QPS_FAILURES_BEFORE_WARN === 0) {
-                notice = `Live Metrics endpoint could not be reached ${this._consecutiveErrors} consecutive times. Most recent error:`;
-                Logging.warn(QuickPulseSender.TAG, notice, error);
-            } else {
-                // Potentially transient error, do not change the ping/post state yet.
-                Logging.info(QuickPulseSender.TAG, notice, error);
+            if (res.statusCode == 200) {
+                const shouldPOSTData = res.headers[QuickPulseConfig.subscribed] === "true";
+                const redirectHeader = res.headers[QuickPulseConfig.endpointRedirect] ? res.headers[QuickPulseConfig.endpointRedirect].toString() : null;
+                const pollingIntervalHint = res.headers[QuickPulseConfig.pollingIntervalHint] ? parseInt(res.headers[QuickPulseConfig.pollingIntervalHint].toString()) : null;
+                this._consecutiveErrors = 0;
+                done(shouldPOSTData, res, redirectHeader, pollingIntervalHint);
+            }
+            else {
+                this._onError("StatusCode:" + res.statusCode + " StatusMessage:" + res.statusMessage);
+                done();
             }
+        });
 
+        req.on("error", (error: Error) => {
+            this._onError(error);
             done();
         });
 
         req.write(payload);
         req.end();
     }
+
+    private _onError(error: Error | string) {
+        // Unable to contact qps endpoint.
+        // Do nothing for now.
+        this._consecutiveErrors++;
+        // LOG every error, but WARN instead when X number of consecutive errors occur
+        let notice = `Transient error connecting to the Live Metrics endpoint. This packet will not appear in your Live Metrics Stream. Error:`;
+        if (this._consecutiveErrors % QuickPulseSender.MAX_QPS_FAILURES_BEFORE_WARN === 0) {
+            notice = `Live Metrics endpoint could not be reached ${this._consecutiveErrors} consecutive times. Most recent error:`;
+            Logging.warn(QuickPulseSender.TAG, notice, error);
+        } else {
+            // Potentially transient error, do not change the ping/post state yet.
+            Logging.info(QuickPulseSender.TAG, notice, error);
+        }
+    }
 }
 
 export = QuickPulseSender;

Library/QuickPulseStateManager.ts

@@ -26,14 +26,14 @@ class QuickPulseStateManager {
     private _lastSuccessTime: number = Date.now();
     private _lastSendSucceeded: boolean = true;
     private _handle: NodeJS.Timer;
-    private _metrics: {[name: string]: Contracts.MetricQuickPulse} = {};
+    private _metrics: { [name: string]: Contracts.MetricQuickPulse } = {};
     private _documents: Contracts.DocumentQuickPulse[] = [];
-    private _collectors: {enable: (enable: boolean) => void}[] = [];
+    private _collectors: { enable: (enable: boolean) => void }[] = [];
     private _redirectedHost: string = null;
     private _pollingIntervalHint: number = -1;
 
-    constructor(iKey?: string, context?: Context) {
-        this.config = new Config(iKey);
+    constructor(config: Config, context?: Context) {
+        this.config = config;
         this.context = context || new Context();
         this._sender = new QuickPulseSender(this.config);
         this._isEnabled = false;
@@ -95,13 +95,13 @@ class QuickPulseStateManager {
      * @param telemetry
      */
     private _addMetric(telemetry: Contracts.MetricTelemetry) {
-        const {value} = telemetry;
+        const { value } = telemetry;
         const count = telemetry.count || 1;
 
         let name = Constants.PerformanceToQuickPulseCounter[telemetry.name];
         if (name) {
             if (this._metrics[name]) {
-                this._metrics[name].Value = (this._metrics[name].Value*this._metrics[name].Weight + value*count) / (this._metrics[name].Weight + count);
+                this._metrics[name].Value = (this._metrics[name].Value * this._metrics[name].Weight + value * count) / (this._metrics[name].Weight + count);
                 this._metrics[name].Weight += count;
             } else {
                 this._metrics[name] = QuickPulseEnvelopeFactory.createQuickPulseMetric(telemetry);
@@ -117,7 +117,7 @@ class QuickPulseStateManager {
         this._documents.length = 0;
     }
 
-    private _goQuickPulse(): void {
+    private async _goQuickPulse(): Promise<void> {
         // Create envelope from Documents and Metrics
         const metrics = Object.keys(this._metrics).map(k => this._metrics[k]);
         const envelope = QuickPulseEnvelopeFactory.createQuickPulseEnvelope(metrics, this._documents.slice(), this.config, this.context);
@@ -127,7 +127,7 @@ class QuickPulseStateManager {
 
         // Send it to QuickPulseService, if collecting
         if (this._isCollectingData) {
-            this._post(envelope);
+            await this._post(envelope);
         } else {
             this._ping(envelope);
         }
@@ -151,15 +151,15 @@ class QuickPulseStateManager {
         this._sender.ping(envelope, this._redirectedHost, this._quickPulseDone.bind(this));
     }
 
-    private _post(envelope: Contracts.EnvelopeQuickPulse): void {
-        this._sender.post(envelope, this._redirectedHost, this._quickPulseDone.bind(this));
+    private async _post(envelope: Contracts.EnvelopeQuickPulse): Promise<void> {
+        await this._sender.post(envelope, this._redirectedHost, this._quickPulseDone.bind(this));
     }
 
     /**
      * Change the current QPS send state. (shouldPOST == undefined) --> error, but do not change the state yet.
      */
-    private _quickPulseDone(shouldPOST?: boolean, res?: http.IncomingMessage, 
-            redirectedHost?: string, pollingIntervalHint?: number): void {
+    private _quickPulseDone(shouldPOST?: boolean, res?: http.IncomingMessage,
+        redirectedHost?: string, pollingIntervalHint?: number): void {
         if (shouldPOST != undefined) {
             if (this._isCollectingData !== shouldPOST) {
                 Logging.info("Live Metrics sending data", shouldPOST);

Library/Sender.ts

@@ -93,7 +93,7 @@ class Sender {
         }
         if (this._enableDiskRetryMode) {
             // Starts file cleanup task
-            if(!this._fileCleanupTimer){
+            if (!this._fileCleanupTimer) {
                 this._fileCleanupTimer = setTimeout(() => { this._fileCleanupTask(); }, Sender.CLEANUP_TIMEOUT);
                 this._fileCleanupTimer.unref();
             }
@@ -105,7 +105,7 @@ class Sender {
         }
     }
 
-    public send(envelopes: Contracts.EnvelopeTelemetry[], callback?: (v: string) => void) {
+    public async send(envelopes: Contracts.EnvelopeTelemetry[], callback?: (v: string) => void) {
         if (envelopes) {
             var endpointUrl = this._redirectedHost || this._config.endpointUrl;
 
@@ -119,7 +119,6 @@ class Sender {
             };
 
             let batch: string = "";
-
             envelopes.forEach(envelope => {
                 var payload: string = this._stringify(envelope);
                 if (typeof payload !== "string") {
@@ -261,6 +260,7 @@ class Sender {
     private _isRetriable(statusCode: number) {
         return (
             statusCode === 206 || // Retriable
+            statusCode === 308 || // Permanent Redirect
             statusCode === 408 || // Timeout
             statusCode === 429 || // Throttle
             statusCode === 439 || // Quota

Library/TelemetryClient.ts

@@ -1,5 +1,6 @@
 import url = require("url");
 import os = require("os");
+import azureCore = require("@azure/core-http");
 
 import Config = require("./Config");
 import Context = require("./Context");
@@ -13,7 +14,7 @@ import Logging = require("./Logging");
 import FlushOptions = require("./FlushOptions");
 import EnvelopeFactory = require("./EnvelopeFactory");
 import QuickPulseStateManager = require("./QuickPulseStateManager");
-import {Tags} from "../Declarations/Contracts";
+import { Tags } from "../Declarations/Contracts";
 
 /**
  * Application Insights telemetry client provides interface to track telemetry items, register telemetry initializers and
@@ -38,7 +39,6 @@ class TelemetryClient {
         this.config = config;
         this.context = new Context();
         this.commonProperties = {};
-
         var sender = new Sender(this.config);
         this.channel = new Channel(() => config.disableAppInsights, () => config.maxBatchSize, () => config.maxBatchIntervalMs, sender);
     }

Library/Util.ts

@@ -13,6 +13,8 @@ import { HttpRequest } from "../Library/Functions";
 class Util {
     public static MAX_PROPERTY_LENGTH = 8192;
     public static tlsRestrictedAgent: https.Agent = new https.Agent(<any>{
+        keepAlive: true,
+        maxSockets: 25,
         secureOptions: constants.SSL_OP_NO_SSLv2 | constants.SSL_OP_NO_SSLv3 |
             constants.SSL_OP_NO_TLSv1 | constants.SSL_OP_NO_TLSv1_1
     });