.eslintignore

@@ -0,0 +1,3 @@
+**/*.js
+/out
+/Tests

.eslintrc

@@ -0,0 +1,41 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:security/recommended"
+    ],
+    "plugins": [
+        "security"
+    ],
+    "rules": {
+        "quotes": ["warn", "double"],                               // Enabled for auto fixing
+        "prefer-const": "off",
+        "prefer-spread": "off",
+        "no-var": "off",
+        "no-extra-boolean-cast": "off",
+        "prefer-rest-params": "off",
+        "no-case-declarations": "off",
+        "no-prototype-builtins": "off",
+        "no-useless-escape": "off",                                 // Suppressing Error -- need to Review Later
+        "no-trailing-spaces": [ "warn", { "skipBlankLines": true }],// Enabled for auto fixing
+        "no-const-assign": "error",
+        "comma-dangle": [ "error", "never" ],                       // Enabled for auto fixing
+        "security/detect-object-injection": "off",                  // Suppress Warning -- need to Review Later
+        "@typescript-eslint/ban-types": "off",
+        "@typescript-eslint/no-unused-vars": [ "warn", { "vars": "all", "args": "none", "argsIgnorePattern": "^_", "ignoreRestSiblings": true } ],
+        "@typescript-eslint/triple-slash-reference": "off",
+        "@typescript-eslint/no-inferrable-types": "off",
+        "@typescript-eslint/no-this-alias": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-empty-function": "off",
+        "@typescript-eslint/no-empty-interface": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/no-extra-semi": "error",                // Enabled for auto fixing
+        "@typescript-eslint/no-non-null-assertion": "error"
+    }
+}

.github/codeql/codeql-config.yml

@@ -0,0 +1,9 @@
+name: "CodeQL config"
+
+queries:
+  - uses: security-and-quality
+
+paths-ignore:
+  - '**/Tests/'
+  - '**/Schema/'
+  - '**/out/'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '17 15 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/node.js.yml

@@ -24,4 +24,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm run build --if-present
+    - run: if [[ ${{ matrix.node-version }} == 14 ]]; then npm run lint; fi;
     - run: npm test

.npmignore

@@ -7,6 +7,7 @@ obj
 *.sln
 *.njsproj
 .vscode/
+.github
 
 # Ignore test files
 Tests

.travis.yml

@@ -17,6 +17,8 @@ before_install:
   - npm uninstall applicationinsights-native-metrics --save-dev
   - if [ "$TRAVIS_EXTENDED_METRICS" = "true" ]; then npm install applicationinsights-native-metrics --save-optional || true; fi
 script:
+  - npm clean
+  # Build and test
   - npm test
   # Run funcs for LTS releases (currently 6, 8, 10) + current release (12)
   - if [ "$TRAVIS_NODE_VERSION" = "12" ]; then npm run functionaltest; fi

AutoCollection/AsyncHooksScopeManager.ts

@@ -1,5 +1,5 @@
 import { SpanContext } from "@opentelemetry/api";
-import { Span } from "@opentelemetry/tracing";
+import { Span } from "@opentelemetry/sdk-trace-base";
 
 import { CorrelationContextManager, CorrelationContext } from "./CorrelationContextManager"
 import { EventEmitter } from "events";
@@ -55,12 +55,20 @@ export class OpenTelemetryScopeManagerWrapper {
 
     private static _spanToContext(span: Span, parentSpanId?: string, name?: string): CorrelationContext {
         const spanContext = span.spanContext ? span.spanContext() : (<any>span).context(); // context is available in OT API <v0.19.0
-        const _parentId = parentSpanId ? `|${spanContext.traceId}.${parentSpanId}.` : spanContext.traceId;
         const context: SpanContext = {
             ...span.spanContext(),
             traceFlags: span.spanContext().traceFlags
         };
-        const correlationContext = CorrelationContextManager.spanToContextObject(context, _parentId, name)
+        let parentId = parentSpanId ? `|${spanContext.traceId}.${parentSpanId}.` : spanContext.traceId;
+        const aiContext = CorrelationContextManager.getCurrentContext();
+        if (aiContext) {
+            context.traceId = aiContext.operation.id;
+            // If parent is no available use current context
+            if (!parentSpanId) {
+                parentId = aiContext.operation.parentId;
+            }
+        }
+        const correlationContext = CorrelationContextManager.spanToContextObject(context, parentId, name)
         return correlationContext;
     }
 }

AutoCollection/Console.ts

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

AutoCollection/CorrelationContextManager.ts

@@ -11,6 +11,7 @@ import Traceparent = require("../Library/Traceparent");
 import Tracestate = require("../Library/Tracestate");
 import HttpRequestParser = require("./HttpRequestParser");
 import { SpanContext } from "@opentelemetry/api";
+import { Span } from "@opentelemetry/sdk-trace-base";
 
 export interface CustomProperties {
     /**
@@ -52,7 +53,7 @@ export class CorrelationContextManager {
     private static forceClsHooked: boolean = undefined; // true: use cls-hooked, false: use cls, undefined: choose based on node version
     private static session: cls.Namespace;
     private static cls: typeof cls;
-    private static CONTEXT_NAME = "ApplicationInsights-Context"
+    private static CONTEXT_NAME = "ApplicationInsights-Context";
 
     /**
      *  Provides the current Context.
@@ -93,7 +94,7 @@ export class CorrelationContextManager {
         return null;
     }
 
-    public static spanToContextObject(spanContext: SpanContext, parentId?: string, name?: string) {
+    public static spanToContextObject(spanContext: SpanContext, parentId?: string, name?: string): CorrelationContext {
         const traceContext = new Traceparent();
         traceContext.traceId = spanContext.traceId;
         traceContext.spanId = spanContext.spanId;
@@ -158,9 +159,9 @@ export class CorrelationContextManager {
 
             if (typeof this.cls === "undefined") {
                 if ((CorrelationContextManager.forceClsHooked === true) || (CorrelationContextManager.forceClsHooked === undefined && CorrelationContextManager.shouldUseClsHooked())) {
-                    this.cls = require('cls-hooked');
+                    this.cls = require("cls-hooked");
                 } else {
-                    this.cls = require('continuation-local-storage');
+                    this.cls = require("continuation-local-storage");
                 }
             }
 
@@ -174,45 +175,46 @@ export class CorrelationContextManager {
         this.enabled = true;
     }
 
-    public static startOperation(context: azureFunctionsTypes.Context | (http.IncomingMessage | azureFunctionsTypes.HttpRequest) | SpanContext, request?: azureFunctionsTypes.HttpRequest | string): CorrelationContext | null {
-        const traceContext = context && (context as azureFunctionsTypes.Context).traceContext || null;
-        const spanContext = context && (context as SpanContext).traceId
-            ? context as SpanContext
-            : null;
-        const headers = context && (context as http.IncomingMessage | azureFunctionsTypes.HttpRequest).headers;
+    /**
+     * Create new correlation context.
+     */
+    public static startOperation(
+        input: azureFunctionsTypes.Context | (http.IncomingMessage | azureFunctionsTypes.HttpRequest) | SpanContext | Span,
+        request?: azureFunctionsTypes.HttpRequest | string)
+        : CorrelationContext | null {
+        const traceContext = input && (input as azureFunctionsTypes.Context).traceContext || null;
+        const span = input && (input as Span).spanContext ? input as Span : null;
+        const spanContext = input && (input as SpanContext).traceId ? input as SpanContext : null;
+        const headers = input && (input as http.IncomingMessage | azureFunctionsTypes.HttpRequest).headers;
+
+        // OpenTelemetry Span
+        if (span) {
+            return this.spanToContextObject(span.spanContext(), span.parentSpanId, span.name);
+        }
 
+        // OpenTelemetry SpanContext
         if (spanContext) {
-            const traceparent = new Traceparent(`00-${spanContext.traceId}-${spanContext.spanId}-01`);
-            const tracestate = new Tracestate(spanContext.traceState ? spanContext.traceState.serialize() : null);
-            const correlationContext = CorrelationContextManager.generateContextObject(
-                spanContext.traceId,
-                `|${spanContext.traceId}.${spanContext.spanId}.`,
-                typeof request === "string" ? request : "",
-                undefined,
-                traceparent,
-                tracestate,
-            );
-            return correlationContext;
+            return this.spanToContextObject(spanContext, `|${spanContext.traceId}.${spanContext.spanId}.`, typeof request === "string" ? request : "");
         }
 
-        // AzFunction TraceContext available
+        // AzFunction TraceContext
         if (traceContext) {
             let traceparent = null;
             let tracestate = null;
-            if ( (request as azureFunctionsTypes.HttpRequest).headers ) {
-                if( (request as azureFunctionsTypes.HttpRequest).headers.traceparent ) {
+            if ((request as azureFunctionsTypes.HttpRequest).headers) {
+                if ((request as azureFunctionsTypes.HttpRequest).headers.traceparent) {
                     traceparent = new Traceparent((request as azureFunctionsTypes.HttpRequest).headers.traceparent);
-                } else if ( (request as azureFunctionsTypes.HttpRequest).headers["request-id"] ) {
+                } else if ((request as azureFunctionsTypes.HttpRequest).headers["request-id"]) {
                     traceparent = new Traceparent(null, (request as azureFunctionsTypes.HttpRequest).headers["request-id"]);
                 }
-                if( (request as azureFunctionsTypes.HttpRequest).headers.tracestate ) {
+                if ((request as azureFunctionsTypes.HttpRequest).headers.tracestate) {
                     tracestate = new Tracestate((request as azureFunctionsTypes.HttpRequest).headers.tracestate);
                 }
             }
-            if( !traceparent ) {
+            if (!traceparent) {
                 traceparent = new Traceparent(traceContext.traceparent);
             }
-            if( !tracestate ) {
+            if (!tracestate) {
                 tracestate = new Tracestate(traceContext.tracestate);
             }
             const parser = typeof request === "object"
@@ -226,7 +228,7 @@ export class CorrelationContextManager {
                     : parser.getOperationName({}),
                 parser && parser.getCorrelationContextHeader() || undefined,
                 traceparent,
-                tracestate,
+                tracestate
             );
 
             return correlationContext;
@@ -235,15 +237,15 @@ export class CorrelationContextManager {
         // No TraceContext available, parse as http.IncomingMessage
         if (headers) {
             const traceparent = new Traceparent(headers.traceparent ? headers.traceparent.toString() : null);
-            const tracestate = new Tracestate(headers.tracestate? headers.tracestate.toString() : null);
-            const parser = new HttpRequestParser(context as http.IncomingMessage | azureFunctionsTypes.HttpRequest);
+            const tracestate = new Tracestate(headers.tracestate ? headers.tracestate.toString() : null);
+            const parser = new HttpRequestParser(input as http.IncomingMessage | azureFunctionsTypes.HttpRequest);
             const correlationContext = CorrelationContextManager.generateContextObject(
                 traceparent.traceId,
                 traceparent.parentId,
                 parser.getOperationName({}),
                 parser.getCorrelationContextHeader(),
                 traceparent,
-                tracestate,
+                tracestate
             );
 
             return correlationContext;
@@ -266,7 +268,7 @@ export class CorrelationContextManager {
     public static reset() {
         if (CorrelationContextManager.hasEverEnabled) {
             CorrelationContextManager.session = null;
-            CorrelationContextManager.session = this.cls.createNamespace('AI-CLS-Session');
+            CorrelationContextManager.session = this.cls.createNamespace("AI-CLS-Session");
         }
     }
 
@@ -350,4 +352,4 @@ class CustomPropertiesImpl implements PrivateCustomProperties {
         }
         this.props.push({ key: prop, value: val });
     }
-}
+}

AutoCollection/Exceptions.ts

@@ -1,10 +1,6 @@
-import http = require("http");
-
 import Contracts = require("../Declarations/Contracts");
 import TelemetryClient = require("../Library/TelemetryClient");
-import Sender = require("../Library/Sender");
-import Queue = require("../Library/Channel");
-import Util = require("../Library/Util");
+
 
 class AutoCollectExceptions {
 
@@ -41,7 +37,6 @@ class AutoCollectExceptions {
     public enable(isEnabled: boolean) {
         if (isEnabled) {
             this._isInitialized = true;
-            var self = this;
             if (!this._exceptionListenerHandle) {
                 // For scenarios like Promise.reject(), an error won't be passed to the handle. Create a placeholder
                 // error for these scenarios.