Merge branch 'main' into feat/shim_configuration_edit_azmonitoroptions

Author: JacksonWeber

.github/workflows/stale.yml

@@ -0,0 +1,31 @@
+name: 'Stale issue handler'
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 7 * * *'
+
+permissions:
+  actions: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        id: stale
+        with:
+          stale-issue-message: 'This Issue will be closed in 30 days. Please remove the "Stale" label or comment to avoid closure with no action.'
+          stale-pr-message: 'This PR will be closed in 30 days. Please remove the "Stale" label or comment to avoid closure with no action.'
+          operations-per-run: 200
+          days-before-stale: 300
+          days-before-close: 30
+          stale-issue-label: 'stale'
+          stale-pr-label: 'stale'
+          close-issue-label: 'closed'
+          close-pr-label: 'closed'
+          exempt-issue-labels: 'bug,enhancement,documentation,waiting,keep'
+          exempt-pr-labels: 'waiting,keep'
+          exempt-all-milestones: true
+          exempt-all-assignees: true

package-lock.json

@@ -3,7 +3,7 @@
   "author": "Microsoft Application Insights Team",
   "license": "MIT",
   "bugs": "https://github.com/microsoft/ApplicationInsights-node.js/issues",
-  "version": "3.5.0",
+  "version": "3.7.0",
   "description": "Microsoft Application Insights module for Node.js",
   "repository": {
     "type": "git",
@@ -68,23 +68,23 @@
     "@azure/core-rest-pipeline": "^1.9.2",
     "@azure/functions": "^4.6.0",
     "@azure/functions-old": "npm:@azure/[email protected]",
-    "@azure/identity": "^4.2.1",
-    "@azure/monitor-opentelemetry": "^1.8.1",
-    "@azure/monitor-opentelemetry-exporter": "^1.0.0-beta.28",
-    "@azure/opentelemetry-instrumentation-azure-sdk": "^1.0.0-beta.5",
+    "@azure/identity": "^4.6.0",
+    "@azure/monitor-opentelemetry": "^1.11.0",
+    "@azure/monitor-opentelemetry-exporter": "^1.0.0-beta.31",
+    "@azure/opentelemetry-instrumentation-azure-sdk": "^1.0.0-beta.7",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/api-logs": "^0.57.1",
-    "@opentelemetry/core": "^1.26.0",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.57.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.57.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.57.1",
-    "@opentelemetry/otlp-exporter-base": "^0.57.1",
+    "@opentelemetry/api-logs": "^0.57.2",
+    "@opentelemetry/core": "^1.30.1",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.57.2",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.57.2",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
+    "@opentelemetry/otlp-exporter-base": "^0.57.2",
     "@opentelemetry/resources": "^1.30.1",
-    "@opentelemetry/sdk-logs": "^0.57.1",
+    "@opentelemetry/sdk-logs": "^0.57.2",
     "@opentelemetry/sdk-metrics": "^1.30.1",
     "@opentelemetry/sdk-trace-base": "^1.30.1",
     "@opentelemetry/sdk-trace-node": "^1.30.1",
-    "@opentelemetry/semantic-conventions": "^1.28.0",
+    "@opentelemetry/semantic-conventions": "^1.30.0",
     "diagnostic-channel": "1.1.1",
     "diagnostic-channel-publishers": "1.0.8"
   }

package.json

@@ -3,14 +3,14 @@
 
 import { IDiagnosticLog } from "../types";
 import { BaseDiagnosticLogger } from "./baseDiagnosticLogger";
-import { EtwWritter } from "./writers/etwWritter";
+import { EtwWriter } from "./writers/etwWriter";
 
 
 export class EtwDiagnosticLogger extends BaseDiagnosticLogger {
 
     constructor(instrumentationKey: string) {
         super(instrumentationKey);
-        this._agentLogger = new EtwWritter();
+        this._agentLogger = new EtwWriter();
     }
 
     public logMessage(diagnosticLog: IDiagnosticLog) {

src/agent/diagnostics/etwDiagnosticLogger.ts

@@ -6,7 +6,7 @@ import * as path from 'path';
 import { Util } from "../../../shared/util";
 import { IAgentLogger } from "../../types";
 
-export class EtwWritter implements IAgentLogger {
+export class EtwWriter implements IAgentLogger {
     private _etwModule: any;
 
     constructor() {

…/agent/diagnostics/writers/etwWritter.ts …c/agent/diagnostics/writers/etwWriter.tssrc/agent/diagnostics/writers/etwWritter.ts renamed to src/agent/diagnostics/writers/etwWriter.ts src/agent/diagnostics/writers/etwWritter.ts renamed to src/agent/diagnostics/writers/etwWriter.ts

@@ -16,13 +16,11 @@ import { AutoCollectExceptions } from "./logs/exceptions";
 import { AZURE_MONITOR_STATSBEAT_FEATURES, AzureMonitorOpenTelemetryOptions } from "./types";
 import { ApplicationInsightsConfig } from "./shared/configuration/config";
 import { LogApi } from "./shim/logsApi";
-import { PerformanceCounterMetrics } from "./metrics/performanceCounters";
-import { AzureMonitorSpanProcessor } from "./traces/spanProcessor";
 import { StatsbeatFeature, StatsbeatInstrumentation } from "./shim/types";
+import { RequestSpanProcessor } from "./traces/requestProcessor";
 
 let autoCollectLogs: AutoCollectLogs;
 let exceptions: AutoCollectExceptions;
-let perfCounters: PerformanceCounterMetrics;
 
 /**
  * Initialize Azure Monitor
@@ -34,24 +32,15 @@ export function useAzureMonitor(options?: AzureMonitorOpenTelemetryOptions) {
         instrumentation: StatsbeatInstrumentation.NONE,
         feature: StatsbeatFeature.SHIM
     });
+    // Allows for full filtering of dependency/request spans
+    options.spanProcessors = [new RequestSpanProcessor(options.enableAutoCollectDependencies, options.enableAutoCollectRequests)];
     distroUseAzureMonitor(options);
     const internalConfig = new ApplicationInsightsConfig(options);
     const logApi = new LogApi(logs.getLogger("ApplicationInsightsLogger"));
     autoCollectLogs = new AutoCollectLogs();
     if (internalConfig.enableAutoCollectExceptions) {
         exceptions = new AutoCollectExceptions(logApi);
     }
-    if (internalConfig.enableAutoCollectPerformance) {
-        try {
-            perfCounters = new PerformanceCounterMetrics(internalConfig);
-            // Add SpanProcessor to calculate Request Metrics
-            if (typeof (trace.getTracerProvider() as BasicTracerProvider).addSpanProcessor === "function") {
-                (trace.getTracerProvider() as BasicTracerProvider).addSpanProcessor(new AzureMonitorSpanProcessor(perfCounters));
-            }
-        } catch (err) {
-            diag.error("Failed to initialize PerformanceCounterMetrics: ", err);
-        }
-    }
     autoCollectLogs.enable(internalConfig.instrumentationOptions);
     _addOtlpExporters(internalConfig);
 }
@@ -63,7 +52,6 @@ export async function shutdownAzureMonitor() {
     await distroShutdownAzureMonitor();
     autoCollectLogs.shutdown();
     exceptions?.shutdown();
-    perfCounters?.shutdown();
 }
 
 /**