.vscode/settings.json

@@ -6,5 +6,11 @@
         "**/*.d.ts": true,
         "out/": true
      },
-    "typescript.tsdk": "./node_modules/typescript/lib"
+   "typescript.tsdk": "./node_modules/typescript/lib",
+   "markdownlint.config": {
+      "MD028": false,
+      "MD025": {
+         "front_matter_title": ""
+      }
+   }
 }

AutoCollection/HeartBeat.ts

@@ -24,15 +24,15 @@ class HeartBeat {
         this._client = client;
     }
 
-    public enable(isEnabled: boolean, config?: Config) {
+    public enable(isEnabled: boolean) {
         this._isEnabled = isEnabled;
         if (this._isEnabled && !this._isInitialized) {
             this._isInitialized = true;
         }
 
         if (isEnabled) {
             if (!this._handle) {
-                this._handle = setInterval(() => this.trackHeartBeat(config, () => { }), this._collectionInterval);
+                this._handle = setInterval(() => this.trackHeartBeat(this._client.config, () => { }), this._collectionInterval);
                 this._handle.unref(); // Allow the app to terminate even while this loop is going on
             }
         } else {

AutoCollection/NativePerformance.ts

@@ -1,8 +1,8 @@
-import TelemetryClient= require("../Library/TelemetryClient");
+import TelemetryClient = require("../Library/TelemetryClient");
 import Constants = require("../Declarations/Constants");
-import Config = require("../Library/Config");
 import Context = require("../Library/Context");
-import Logging= require("../Library/Logging");
+import Logging = require("../Library/Logging");
+import { IBaseConfig } from "../Declarations/Interfaces";
 
 /**
  * Interface which defines which specific extended metrics should be disabled
@@ -110,12 +110,13 @@ export class AutoCollectNativePerformance {
      * @private
      * @static
      * @param {(boolean | IDisabledExtendedMetrics)} collectExtendedMetrics
+     * @param {(IBaseConfig)} customConfig
      * @returns {(boolean | IDisabledExtendedMetrics)}
      * @memberof AutoCollectNativePerformance
      */
-    public static parseEnabled(collectExtendedMetrics: boolean | IDisabledExtendedMetrics): { isEnabled: boolean, disabledMetrics: IDisabledExtendedMetrics } {
-        const disableAll = process.env[Config.ENV_nativeMetricsDisableAll];
-        const individualOptOuts = process.env[Config.ENV_nativeMetricsDisablers]
+    public static parseEnabled(collectExtendedMetrics: boolean | IDisabledExtendedMetrics, customConfig: IBaseConfig): { isEnabled: boolean, disabledMetrics: IDisabledExtendedMetrics } {
+        const disableAll = customConfig.disableAllExtendedMetrics;
+        const individualOptOuts = customConfig.extendedMetricDisablers;
 
         // case 1: disable all env var set, RETURN with isEnabled=false
         if (disableAll) {
@@ -134,19 +135,19 @@ export class AutoCollectNativePerformance {
 
             // case 2a: collectExtendedMetrics is an object, overwrite existing ones if they exist
             if (typeof collectExtendedMetrics === "object") {
-                return {isEnabled: true, disabledMetrics: {...collectExtendedMetrics, ...disabledMetrics}};
+                return { isEnabled: true, disabledMetrics: { ...collectExtendedMetrics, ...disabledMetrics } };
             }
 
             // case 2b: collectExtendedMetrics is a boolean, set disabledMetrics as is
-            return {isEnabled: collectExtendedMetrics, disabledMetrics};
+            return { isEnabled: collectExtendedMetrics, disabledMetrics };
         }
 
         // case 4: no env vars set, input arg is a boolean, RETURN with isEnabled=collectExtendedMetrics, disabledMetrics={}
         if (typeof collectExtendedMetrics === "boolean") {
             return { isEnabled: collectExtendedMetrics, disabledMetrics: {} };
         } else { // use else so we don't need to force typing on collectExtendedMetrics
             // case 5: no env vars set, input arg is object, RETURN with isEnabled=true, disabledMetrics=collectExtendedMetrics
-            return { isEnabled: true, disabledMetrics: collectExtendedMetrics};
+            return { isEnabled: true, disabledMetrics: collectExtendedMetrics };
         }
     }
 

AutoCollection/Statsbeat.ts

@@ -50,6 +50,7 @@ class Statsbeat {
         this._config = config;
         this._context = context || new Context();
         this._statsbeatConfig = new Config(Statsbeat.CONNECTION_STRING);
+        this._statsbeatConfig.samplingPercentage = 100; // Do not sample
         this._sender = new Sender(this._statsbeatConfig);
     }
 

AutoCollection/diagnostic-channel/initialization.ts

@@ -7,13 +7,14 @@ import * as DiagChannelPublishers from "diagnostic-channel-publishers";
 import * as DiagChannel from "diagnostic-channel";
 import { AsyncScopeManager } from "../AsyncHooksScopeManager";
 import Logging = require("../../Library/Logging");
+import { JsonConfig } from "../../Library/JsonConfig";
 
-export const IsInitialized = !process.env["APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL"];
+export const IsInitialized = !JsonConfig.getInstance().noDiagnosticChannel;
 const TAG = "DiagnosticChannel";
 
 if (IsInitialized) {
     const publishers: typeof DiagChannelPublishers = require("diagnostic-channel-publishers");
-    const individualOptOuts: string = process.env["APPLICATION_INSIGHTS_NO_PATCH_MODULES"] || "";
+    const individualOptOuts: string = JsonConfig.getInstance().noPatchModules;
     const unpatchedModules = individualOptOuts.split(",");
     const modules: {[key: string] : any} = {
         bunyan: publishers.bunyan,

Bootstrap/Default.ts

@@ -5,6 +5,7 @@ import * as Helpers from "./Helpers";
 import Constants = require("../Declarations/Constants");
 import { StatusLogger, StatusContract } from "./StatusLogger";
 import { DiagnosticLogger } from "./DiagnosticLogger";
+import { JsonConfig } from "../Library/JsonConfig";
 
 // Private configuration vars
 let _appInsights: typeof types | null;
@@ -13,7 +14,7 @@ let _logger: DiagnosticLogger = new DiagnosticLogger(console);
 let _statusLogger: StatusLogger = new StatusLogger(console);
 
 // Env var local constants
-const _setupString = process.env.APPLICATIONINSIGHTS_CONNECTION_STRING || process.env.APPINSIGHTS_INSTRUMENTATIONKEY;
+const _setupString = JsonConfig.getInstance().connectionString || process.env.APPINSIGHTS_INSTRUMENTATIONKEY;
 const forceStart = process.env.APPLICATIONINSIGHTS_FORCE_START === "true";
 
 // Other local constants

Declarations/Constants.ts

@@ -1,6 +1,6 @@
 import Contracts = require("./Contracts")
 
-export const APPLICATION_INSIGHTS_SDK_VERSION = "2.1.9";
+export const APPLICATION_INSIGHTS_SDK_VERSION = "2.2.0";
 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";
@@ -147,7 +147,7 @@ export const StatsbeatAttach = {
 
 export const StatsbeatCounter = {
     REQUEST_SUCCESS: "Request Success Count",
-    REQUEST_FAILURE: "Requests Failure Count",
+    REQUEST_FAILURE: "Request Failure Count",
     REQUEST_DURATION: "Request Duration",
     RETRY_COUNT: "Retry Count",
     THROTTLE_COUNT: "Throttle Count",

Declarations/Contracts/Generated/DataPoint.ts

@@ -1,51 +1,54 @@
 // THIS FILE WAS AUTOGENERATED
 import DataPointType = require('./DataPointType');
 "use strict";
-
-    /**
-     * Metric data single measurement.
-     */
-    class DataPoint
-    {
-
-        /**
-         * Name of the metric.
-         */
-        public name: string;
-
-        /**
-         * Metric type. Single measurement or the aggregated value.
-         */
-        public kind: DataPointType;
-
-        /**
-         * Single value for measurement. Sum of individual measurements for the aggregation.
-         */
-        public value: number;
-
-        /**
-         * Metric weight of the aggregated metric. Should not be set for a measurement.
-         */
-        public count: number;
-
-        /**
-         * Minimum value of the aggregated metric. Should not be set for a measurement.
-         */
-        public min: number;
-
-        /**
-         * Maximum value of the aggregated metric. Should not be set for a measurement.
-         */
-        public max: number;
-
-        /**
-         * Standard deviation of the aggregated metric. Should not be set for a measurement.
-         */
-        public stdDev: number;
-
-        constructor()
-        {
-            this.kind = DataPointType.Measurement;
-        }
+
+/**
+ * Metric data single measurement.
+ */
+class DataPoint {
+
+    /**
+     * Name of the metric.
+     */
+    public name: string;
+
+    /**
+     * Namespace of the metric.
+     */
+    public ns: string;
+
+    /**
+     * Metric type. Single measurement or the aggregated value.
+     */
+    public kind: DataPointType;
+
+    /**
+     * Single value for measurement. Sum of individual measurements for the aggregation.
+     */
+    public value: number;
+
+    /**
+     * Metric weight of the aggregated metric. Should not be set for a measurement.
+     */
+    public count: number;
+
+    /**
+     * Minimum value of the aggregated metric. Should not be set for a measurement.
+     */
+    public min: number;
+
+    /**
+     * Maximum value of the aggregated metric. Should not be set for a measurement.
+     */
+    public max: number;
+
+    /**
+     * Standard deviation of the aggregated metric. Should not be set for a measurement.
+     */
+    public stdDev: number;
+
+    constructor() {
+        this.kind = DataPointType.Measurement;
     }
+}
 export = DataPoint;

Declarations/Contracts/TelemetryTypes/MetricTelemetry.ts

@@ -15,6 +15,11 @@ export interface MetricTelemetry extends Telemetry {
      */
     value: number;
 
+    /**
+     * A string that identifies the metric namespace.
+     */
+    namespace?: string;
+
     /**
      * Type of metric being sent, e.g. Pre-agg metrics have kind=Aggregation
      */