[Beta] Clean Up Shim Files & Fix Check for Extended Metrics Env Var (#…

…1300)

* Clean up shim files and fix env var setting for extended metrics.

* Continue cleanup of extended metrics.

* Remove native metrics dead code and remove depdendency.

package.json

@@ -54,7 +54,6 @@
     "@types/sinon": "^10.0.12",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
-    "applicationinsights-native-metrics": "0.0.8",
     "eslint": "^8.0.0",
     "eslint-plugin-node": "^11.1.0",
     "mocha": "^10.0.0",
@@ -87,13 +86,5 @@
     "@opentelemetry/semantic-conventions": "^1.20.0",
     "diagnostic-channel": "1.1.1",
     "diagnostic-channel-publishers": "1.0.7"
-  },
-  "peerDependencies": {
-    "applicationinsights-native-metrics": "*"
-  },
-  "peerDependenciesMeta": {
-    "applicationinsights-native-metrics": {
-      "optional": true
-    }
   }
 }

src/metrics/performanceCounters.ts

@@ -60,9 +60,9 @@ export class PerformanceCounterMetrics {
     }[];
 
     /**
-     * Initializes a new instance of the NativeMetrics class.
+     * Creates performance counter instruments.
      * @param options - Distro configuration.
-     * @param config - Native Metrics extra configuration.
+     * @param config - Application Insights configuration.
      */
     constructor(config: ApplicationInsightsConfig, options?: { collectionInterval: number }) {
         this._internalConfig = config;

src/shared/configuration/config.ts

@@ -10,12 +10,11 @@ import {
     envDetectorSync,
 } from "@opentelemetry/resources";
 import { JsonConfig } from "./jsonConfig";
-import { AzureMonitorOpenTelemetryOptions, ExtendedMetricType, OTLPExporterConfig, InstrumentationOptions } from "../../types";
+import { AzureMonitorOpenTelemetryOptions, OTLPExporterConfig, InstrumentationOptions } from "../../types";
 
 
 export class ApplicationInsightsConfig {
     public enableAutoCollectExceptions: boolean;
-    public extendedMetrics: { [type: string]: boolean };
     /** OTLP Trace Exporter Configuration */
     public otlpTraceExporterConfig: OTLPExporterConfig;
     /** OTLP Metric Exporter Configuration */
@@ -57,10 +56,6 @@ export class ApplicationInsightsConfig {
         this.otlpMetricExporterConfig = {};
         this.otlpTraceExporterConfig = {};
         this.enableAutoCollectPerformance = true;
-        this.extendedMetrics = {};
-        this.extendedMetrics[ExtendedMetricType.gc] = false;
-        this.extendedMetrics[ExtendedMetricType.heap] = false;
-        this.extendedMetrics[ExtendedMetricType.loop] = false;
         this.enableAutoCollectExceptions = true;
         this.enableAutoCollectPerformance = true;
 
@@ -142,11 +137,6 @@ export class ApplicationInsightsConfig {
                 jsonConfig.otlpLogExporterConfig
             );
 
-            this.extendedMetrics = Object.assign(
-                this.extendedMetrics,
-                jsonConfig.extendedMetrics
-            );
-
             this.samplingRatio =
                 jsonConfig.samplingRatio !== undefined ? jsonConfig.samplingRatio : this.samplingRatio;
 

src/shared/configuration/jsonConfig.ts

@@ -14,7 +14,6 @@ const ENV_CONTENT = "APPLICATIONINSIGHTS_CONFIGURATION_CONTENT";
 export class JsonConfig {
     private static _instance: JsonConfig;
     public enableAutoCollectExceptions: boolean;
-    public extendedMetrics: { [type: string]: boolean };
     /** OTLP Trace Exporter Configuration */
     public otlpTraceExporterConfig?: OTLPExporterConfig;
     /** OTLP Metric Exporter Configuration */
@@ -75,7 +74,6 @@ export class JsonConfig {
         try {
             const jsonConfig: AzureMonitorOpenTelemetryOptions = JSON.parse(jsonString);
             this.enableAutoCollectExceptions = jsonConfig.enableAutoCollectExceptions;
-            this.extendedMetrics = jsonConfig.extendedMetrics;
             this.otlpLogExporterConfig = jsonConfig.otlpLogExporterConfig;
             this.otlpMetricExporterConfig = jsonConfig.otlpMetricExporterConfig;
             this.otlpTraceExporterConfig = jsonConfig.otlpTraceExporterConfig;