Merge branch 'main' into dependabot/nuget/BASE/Test/Microsoft.Applica…

…tionInsights.Test/Microsoft.ApplicationInsights.Tests/Azure.Identity-1.10.2
microsoft · Feb 13, 2024 · a1ddb75 · a1ddb75
2 parents 9365609 + bde1239
commit a1ddb75
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -34,7 +34,7 @@ jobs:
             6.0.x
             7.0.x
 
-    - uses: nuget/setup-nuget@v1
+    - uses: nuget/setup-nuget@v2
       with:
         nuget-version: 'latest'
 

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6.0.1
+      - uses: actions/stale@v9.0.0
         id: stale
         with:
           stale-issue-message: 'This issue is stale because it has been open 300 days with no activity. Remove stale label or this will be closed in 7 days. Commenting will instruct the bot to automatically remove the label.'

diff --git a/.props/_GlobalStaticVersion.props b/.props/_GlobalStaticVersion.props
@@ -13,7 +13,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>22</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta4</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
+    <PreReleaseMilestone></PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
     <PreReleaseMilestone Condition="'$(Redfield)' == 'True'">redfield</PreReleaseMilestone>
     <PreReleaseMilestone Condition="'$(NightlyBuild)' == 'True'">nightly</PreReleaseMilestone> <!-- Overwrite this property for nightly builds from the DEVELOP branch. -->
     <!--

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## VNext
 
+## Version 2.22.0
+- no changes since beta.
 
 ## Version 2.22.0-beta4
 - [Added support to read diagnostics config from the path defined in environment variable.](https://github.com/microsoft/ApplicationInsights-dotnet/pull/2769)

diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj
@@ -29,7 +29,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
     <PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsNetFramework)' == 'True'">

diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs b/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs
@@ -81,7 +81,7 @@ public class DependencyTrackingTelemetryModule : ITelemetryModule, IDisposable
         public ICollection<string> ExcludeComponentCorrelationHttpHeadersOnDomains { get; } = new SanitizedHostList();
 
         /// <summary>
-        /// Gets the list of diagnostic sources and activities to exclude from collection.
+        /// Gets the list of diagnostic sources and activities to include from collection.
         /// </summary>
         public ICollection<string> IncludeDiagnosticSourceActivities { get; } = new List<string>();
 

diff --git a/WEB/Src/WindowsServer/WindowsServer/ApplicationInsights.config.install.xdt b/WEB/Src/WindowsServer/WindowsServer/ApplicationInsights.config.install.xdt
@@ -9,7 +9,7 @@
     <Add xdt:Transform="InsertIfMissing" xdt:Locator="Match(Type)" Type="Microsoft.ApplicationInsights.WindowsServer.AppServicesHeartbeatTelemetryModule, Microsoft.AI.WindowsServer" />
     <Add xdt:Transform="InsertIfMissing" xdt:Locator="Match(Type)" Type="Microsoft.ApplicationInsights.WindowsServer.AzureInstanceMetadataTelemetryModule, Microsoft.AI.WindowsServer">
       <!--
-      Remove individual fields collected here by adding them to the ApplicationInsighs.HeartbeatProvider 
+      Remove individual fields collected here by adding them to the ApplicationInsights.HeartbeatProvider 
       with the following syntax:
 
       <Add Type="Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing.DiagnosticsTelemetryModule, Microsoft.ApplicationInsights">
@@ -42,4 +42,4 @@
     <Add Type="Microsoft.ApplicationInsights.WindowsServer.FirstChanceExceptionStatisticsTelemetryModule, Microsoft.AI.WindowsServer">--></Add>
   </TelemetryModules>
 
-</ApplicationInsights>
+</ApplicationInsights>
diff --git a/examples/.NET Config File/2.10.0_ApplicationInsights.config b/examples/.NET Config File/2.10.0_ApplicationInsights.config
@@ -61,7 +61,7 @@
 		<Add Type="Microsoft.ApplicationInsights.WindowsServer.AppServicesHeartbeatTelemetryModule, Microsoft.AI.WindowsServer"/>
 		<Add Type="Microsoft.ApplicationInsights.WindowsServer.AzureInstanceMetadataTelemetryModule, Microsoft.AI.WindowsServer">
 			<!--
-      Remove individual fields collected here by adding them to the ApplicationInsighs.HeartbeatProvider 
+      Remove individual fields collected here by adding them to the ApplicationInsights.HeartbeatProvider 
       with the following syntax:
       
       <Add Type="Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing.DiagnosticsTelemetryModule, Microsoft.ApplicationInsights">
@@ -138,4 +138,4 @@
     
     Note: If not present, please add <InstrumentationKey>Your Key</InstrumentationKey> to the top of this file.
   -->
-</ApplicationInsights>
+</ApplicationInsights>
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ jobs: @@
 .0.x
 .0.x
-        - uses: nuget/setup-nuget@v1
+        - uses: nuget/setup-nuget@v2
           with:
             nuget-version: 'latest'
@@ Expand Down @@