.github/workflows/node.js.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [8, 10, 12, 14, 15, 16, 17]
+        node-version: [8, 10, 12, 14, 16, 17, 18]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [10, 12, 14, 16]
+        node-version: [12, 14, 16, 18]
 
     steps:
     - uses: actions/checkout@v2

.vscode/settings.json

@@ -3,7 +3,6 @@
      "files.exclude": {
         "**/*.js": { "when": "$(basename).ts"},
         "**/*.js.map": true,
-        "**/*.d.ts": true,
         "out/": true
      },
    "typescript.tsdk": "./node_modules/typescript/lib",

AutoCollection/AzureFunctionsHook.ts

@@ -0,0 +1,116 @@
+import { Context, HttpRequest } from "../Library/Functions";
+import Logging = require("../Library/Logging");
+import TelemetryClient = require("../Library/TelemetryClient");
+import { CorrelationContext, CorrelationContextManager } from "./CorrelationContextManager";
+
+
+/** Node.js Azure Functions handle incoming HTTP requests before Application Insights SDK is available,
+ * this code generate incoming request telemetry and generate correlation context to be used 
+ * by outgoing requests and other telemetry, we rely on hooks provided by Azure Functions
+*/
+export class AzureFunctionsHook {
+    private _client: TelemetryClient;
+    private _functionsCoreModule: any;
+    private _autoGenerateIncomingRequests: boolean;
+    private _preInvocationHook: any;
+
+    constructor(client: TelemetryClient) {
+        this._client = client;
+        this._autoGenerateIncomingRequests = false;
+        try {
+            this._functionsCoreModule = require('@azure/functions-core');
+        }
+        catch (error) {
+            Logging.info("AzureFunctionsHook failed to load, not running in Azure Functions");
+            return;
+        }
+        this._addPreInvocationHook();
+    }
+
+    public enable(isEnabled: boolean) {
+        this._autoGenerateIncomingRequests = isEnabled;
+    }
+
+    public dispose() {
+        this.enable(false);
+        this._removePreInvocationHook();
+        this._functionsCoreModule = undefined;
+    }
+
+    private _addPreInvocationHook() {
+        if (!this._preInvocationHook) {
+            this._preInvocationHook = this._functionsCoreModule.registerHook('preInvocation', async (preInvocationContext: any) => {
+                const originalCallback = preInvocationContext.functionCallback;
+                preInvocationContext.functionCallback = async (ctx: Context, request: HttpRequest) => {
+                    this._propagateContext(ctx, request, originalCallback);
+                };
+            });
+        }
+    }
+
+    private async _propagateContext(ctx: Context, request: HttpRequest, originalCallback: any) {
+        // Update context to use Azure Functions one
+        let extractedContext: CorrelationContext = null;
+        try {
+            // Start an AI Correlation Context using the provided Function context
+            extractedContext = CorrelationContextManager.startOperation(ctx, request);
+            extractedContext.customProperties.setProperty("InvocationId", ctx.invocationId);
+            if (ctx.traceContext.attributes) {
+                extractedContext.customProperties.setProperty("ProcessId", ctx.traceContext.attributes["ProcessId"]);
+                extractedContext.customProperties.setProperty("LogLevel", ctx.traceContext.attributes["LogLevel"]);
+                extractedContext.customProperties.setProperty("Category", ctx.traceContext.attributes["Category"]);
+                extractedContext.customProperties.setProperty("HostInstanceId", ctx.traceContext.attributes["HostInstanceId"]);
+                extractedContext.customProperties.setProperty("AzFuncLiveLogsSessionId", ctx.traceContext.attributes["#AzFuncLiveLogsSessionId"]);
+            }
+        }
+        catch (err) {
+            Logging.warn("Failed to propagate context in Azure Functions", err);
+            originalCallback(ctx, request);
+            return;
+        }
+        if (!extractedContext) {
+            // Correlation Context could be disabled causing this to be null
+            Logging.warn("Failed to create context in Azure Functions");
+            originalCallback(ctx, request);
+            return;
+        }
+
+        CorrelationContextManager.wrapCallback(async () => {
+            const startTime = Date.now(); // Start trackRequest timer
+            originalCallback(ctx, request);
+            try {
+                if (this._autoGenerateIncomingRequests) {
+                    let statusCode = 200; //Default
+                    if (ctx.res) {
+                        if (ctx.res.statusCode) {
+                            statusCode = ctx.res.statusCode;
+                        }
+                        else if (ctx.res.status) {
+                            statusCode = ctx.res.status;
+                        }
+                    }
+                    this._client.trackRequest({
+                        name: request.method + " " + request.url,
+                        resultCode: statusCode,
+                        success: statusCode == 200,
+                        url: request.url,
+                        time: new Date(startTime),
+                        duration: Date.now() - startTime,
+                        id: extractedContext.operation?.parentId,
+                    });
+                    this._client.flush();
+                }
+            }
+            catch (err) {
+                Logging.warn("Error creating automatic incoming request in Azure Functions", err);
+            }
+        }, extractedContext)();
+    }
+
+    private _removePreInvocationHook() {
+        if (this._preInvocationHook) {
+            this._preInvocationHook.dispose();
+            this._preInvocationHook = undefined;
+        }
+    }
+}

AutoCollection/CorrelationContextManager.ts

@@ -1,6 +1,5 @@
 import events = require("events");
 import Logging = require("../Library/Logging");
-
 import * as DiagChannel from "./diagnostic-channel/initialization";
 import * as azureFunctionsTypes from "../Library/Functions";
 

AutoCollection/HttpRequestParser.ts

@@ -11,6 +11,7 @@ import Tracestate = require("../Library/Tracestate");
 import Traceparent = require("../Library/Traceparent");
 import { HttpRequest } from "../Library/Functions";
 
+
 /**
  * Helper class to read data from the request/response objects and convert them into the telemetry contract
  */
@@ -145,7 +146,7 @@ class HttpRequestParser extends RequestParser {
     }
 
     public getOperationName(tags: { [key: string]: string }) {
-        if(tags[HttpRequestParser.keys.operationName]){
+        if (tags[HttpRequestParser.keys.operationName]) {
             return tags[HttpRequestParser.keys.operationName];
         }
         let pathName = "";
@@ -202,7 +203,7 @@ class HttpRequestParser extends RequestParser {
         }
         catch (ex) {
             // Ignore errors
-         }
+        }
         var absoluteUrl = url.format({
             protocol: protocol,
             host: request.headers.host,

AutoCollection/Statsbeat.ts

@@ -250,10 +250,11 @@ class Statsbeat {
 
     private _trackRequestDuration(commonProperties: {}) {
         for (let i = 0; i < this._networkStatsbeatCollection.length; i++) {
-            var currentCounter = this._networkStatsbeatCollection[i];
+            let currentCounter = this._networkStatsbeatCollection[i];
             currentCounter.time = +new Date;
-            var intervalRequests = (currentCounter.totalRequestCount - currentCounter.lastRequestCount) || 0;
-            var averageRequestExecutionTime = ((currentCounter.intervalRequestExecutionTime - currentCounter.lastIntervalRequestExecutionTime) / intervalRequests) || 0;
+            let intervalRequests = (currentCounter.totalRequestCount - currentCounter.lastRequestCount) || 0;
+            let totalRequestExecutionTime = currentCounter.intervalRequestExecutionTime - currentCounter.lastIntervalRequestExecutionTime;
+            let averageRequestExecutionTime = totalRequestExecutionTime > 0 ? (totalRequestExecutionTime / intervalRequests) || 0 : 0;
             currentCounter.lastIntervalRequestExecutionTime = currentCounter.intervalRequestExecutionTime; // reset
             if (intervalRequests > 0) {
                 // Add extra properties
@@ -284,6 +285,7 @@ class Statsbeat {
             if (res != null && res.length > 1) {
                 shortHost = res[1];
             }
+            shortHost = shortHost.replace(".in.applicationinsights.azure.com", "");
         }
         catch (error) {
             // Ignore error
@@ -435,7 +437,9 @@ class Statsbeat {
             "norwaywest",
             "swedencentral",
             "switzerlandnorth",
-            "switzerlandwest"
+            "switzerlandwest",
+            "uksouth",
+            "ukwest"
         ];
         for (let i = 0; i < euEndpoints.length; i++) {
             if (currentEndpoint.indexOf(euEndpoints[i]) > -1) {

Bootstrap/Default.ts

@@ -1,4 +1,4 @@
-import azureCore = require("@azure/core-http");
+import * as azureCoreAuth from "@azure/core-auth";
 
 import * as types from "../applicationinsights";
 import * as Helpers from "./Helpers";
@@ -10,7 +10,7 @@ import { DiagnosticLog, DiagnosticMessageId } from "./DataModel";
 
 // Private configuration vars
 let _appInsights: typeof types | null;
-let _prefix = "ad_"; // App Services, Default
+let _prefix = "ud_"; // Unknown, Default
 
 export const defaultConfig = new Config(); // Will read env variables, expose for Agent initialization
 const _instrumentationKey = defaultConfig.instrumentationKey;
@@ -31,7 +31,7 @@ export function setLogger(logger: DiagnosticLogger) {
 
 /**
  * Sets the string which is prefixed to the existing sdkVersion, e.g. `ad_`, `alr_`
- * @param prefix string prefix, including underscore. Defaults to `ad_`
+ * @param prefix string prefix, including underscore. Defaults to `ud_`
  */
 export function setUsagePrefix(prefix: string) {
     _prefix = prefix;
@@ -45,7 +45,7 @@ export function setStatusLogger(statusLogger: StatusLogger) {
  * Try to setup and start this app insights instance if attach is enabled.
  * @param aadTokenCredential Optional AAD credential
  */
-export function setupAndStart(aadTokenCredential?: azureCore.TokenCredential): typeof types | null {
+export function setupAndStart(aadTokenCredential?: azureCoreAuth.TokenCredential, isAzureFunction?: boolean): typeof types | null {
     // If app already contains SDK, skip agent attach
     if (!forceStart && Helpers.sdkAlreadyExists(_logger)) {
         _statusLogger.logStatus({
@@ -115,7 +115,31 @@ export function setupAndStart(aadTokenCredential?: azureCore.TokenCredential): t
         }
 
         // Instrument the SDK
-        _appInsights.setup().setSendLiveMetrics(true);
+        // Azure Functions
+        if (isAzureFunction) {
+            _appInsights.setup().setSendLiveMetrics(false)
+                .setAutoCollectPerformance(false)
+                .setAutoCollectPreAggregatedMetrics(false)
+                .setAutoCollectIncomingRequestAzureFunctions(false)
+                .setAutoCollectRequests(true)
+                .setAutoCollectDependencies(true)
+                .setAutoCollectExceptions(true)
+                .setAutoCollectHeartbeat(true)
+                .setUseDiskRetryCaching(true);
+        }
+        // App Services
+        else {
+            _appInsights.setup().setSendLiveMetrics(true)
+                .setAutoCollectPerformance(true)
+                .setAutoCollectPreAggregatedMetrics(true)
+                .setAutoCollectIncomingRequestAzureFunctions(false)
+                .setAutoCollectRequests(true)
+                .setAutoCollectDependencies(true)
+                .setAutoCollectExceptions(true)
+                .setAutoCollectHeartbeat(true)
+                .setUseDiskRetryCaching(true);
+        }
+
         _appInsights.defaultClient.setAutoPopulateAzureProperties(true);
         _appInsights.defaultClient.addTelemetryProcessor(prefixInternalSdkVersion);
         _appInsights.defaultClient.addTelemetryProcessor(copyOverPrefixInternalSdkVersionToHeartBeatMetric);

Declarations/Constants.ts

@@ -1,6 +1,6 @@
 import Contracts = require("./Contracts")
 
-export const APPLICATION_INSIGHTS_SDK_VERSION = "2.3.6";
+export const APPLICATION_INSIGHTS_SDK_VERSION = "2.4.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";

Declarations/Interfaces.ts

@@ -1,6 +1,6 @@
 import http = require("http");
 import https = require("https");
-import azureCore = require("@azure/core-http");
+import * as azureCoreAuth from "@azure/core-auth";
 import { DistributedTracingModes } from "../applicationinsights";
 import { IDisabledExtendedMetrics } from "../AutoCollection/NativePerformance";
 
@@ -138,7 +138,7 @@ export interface IBaseConfig {
      * @deprecated, please use enableWebInstrumentation instead
      * Enable web snippet auto html injection, default to false, this config is NOT exposed in documentation after version 2.3.5
      */
-     enableAutoWebSnippetInjection?: boolean;
+    enableAutoWebSnippetInjection?: boolean;
     /**
      * @deprecated, Please use webInstrumentationConnectionString instead
      * Application Insights resource connection string for web snippet, this config is NOT exposed in documentation after version 2.3.5
@@ -149,10 +149,14 @@ export interface IBaseConfig {
      * Enable web instrumentation and automatic monitoring, default to false
      */
     enableWebInstrumentation: boolean;
-     /**
-     * Application Insights resource connection string for web instrumentation and automatic monitoring
-     * Note: if no VALID connection string is provided here, web instrumentation will use the connection string during initializing Nodejs SDK
-     */
+    /**
+    * Enable automatic incoming request tracking when running in Azure Functions
+    */
+    enableAutoCollectIncomingRequestAzureFunctions: boolean;
+    /**
+    * Application Insights resource connection string for web instrumentation and automatic monitoring
+    * Note: if no VALID connection string is provided here, web instrumentation will use the connection string during initializing Nodejs SDK
+    */
     webInstrumentationConnectionString?: string;
     /**
      * Application Insights web Instrumentation config
@@ -163,12 +167,12 @@ export interface IBaseConfig {
      * see more Application Insights web Instrumentation config details at: https://github.com/microsoft/ApplicationInsights-JS#configuration
      */
     webInstrumentationConfig?: IWebInstrumentationConfig[];
-     /**
-     * Application Insights web Instrumentation CDN url
-     * NOTE: this config can be changed from env variable: APPLICATIONINSIGHTS_WEB_INSTRUMENTATION_SOURCE or Json Config: webInstrumentationSrc
-     * If no resouce is provided here, default CDN endpoint: https://js.monitor.azure.com/scripts/b/ai will be used
-     * see more details at: https://github.com/microsoft/ApplicationInsights-JS
-     */
+    /**
+    * Application Insights web Instrumentation CDN url
+    * NOTE: this config can be changed from env variable: APPLICATIONINSIGHTS_WEB_INSTRUMENTATION_SOURCE or Json Config: webInstrumentationSrc
+    * If no resouce is provided here, default CDN endpoint: https://js.monitor.azure.com/scripts/b/ai will be used
+    * see more details at: https://github.com/microsoft/ApplicationInsights-JS
+    */
     webInstrumentationSrc?: string;
 }
 
@@ -178,9 +182,9 @@ export interface IWebInstrumentationConfig {
      * see more Application Insights web Instrumentation config details at: https://github.com/microsoft/ApplicationInsights-JS#configuration
      */
     name: string;
-     /**
-     * value provided to replace the default config value above
-     */
+    /**
+    * value provided to replace the default config value above
+    */
     value: string | boolean | number;
 }
 
@@ -216,5 +220,5 @@ export interface IConfig extends IBaseConfig {
     /** An https.Agent to use for SDK HTTPS traffic (Optional, Default undefined) */
     httpsAgent: https.Agent;
     /** AAD TokenCredential to use to authenticate the app */
-    aadTokenCredential?: azureCore.TokenCredential;
+    aadTokenCredential?: azureCoreAuth.TokenCredential;
 }