Merge branch 'main' into add-aiconnectionstring-to-nlog-targets

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,9 +16,3 @@ The PR will trigger build, unit tests, and functional tests automatically. Pleas
 
 ### Notes for authors:
 - FxCop and other analyzers will fail the build. To see these errors yourself, compile localy using the Release configuration.
-
-### Notes for reviewers:
-
-- We support [comment build triggers](https://docs.microsoft.com/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#comment-triggers)
-  - `/AzurePipelines run` will queue all builds
-  - `/AzurePipelines run <pipeline-name>` will queue a specific build

.github/workflows/build-and-test-BASE.yml

@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.1.0
       with:
         dotnet-version: |
             3.1.x

.github/workflows/build-and-test-LOGGING.yml

@@ -30,7 +30,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.1.0
       with:
         dotnet-version: |
             3.1.x

.github/workflows/build-and-test-NETCORE.yml

@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.1.0
       with:
         dotnet-version: |
             3.1.x

.github/workflows/build-and-test-WEB.yml

@@ -30,7 +30,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.1.0
       with:
         dotnet-version: |
             3.1.x

.github/workflows/nightly.yml

@@ -27,7 +27,7 @@ jobs:
         ref: ${{ matrix.branch }}
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.1.0
       with:
         dotnet-version: |
             3.1.x

.github/workflows/redfield-sanity-check.yml

@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.1.0
       with:
         dotnet-version: |
             3.1.x

.github/workflows/sanity.yml

@@ -32,7 +32,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.1.0
       with:
         dotnet-version: |
             3.1.x

.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>beta2</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
+    <PreReleaseMilestone>beta3</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. -->
     <!--

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/OperationCorrelationTelemetryInitializerTests.cs

@@ -285,6 +285,7 @@ public void InitializeWithActivityWinsOverCallContext()
             currentActivity.Stop();
         }
 
+        [Ignore("ProactiveSamplingDecision is removed and won't work")]
         [TestMethod]
         public void InitializeWithActivityRecorded()
         {
@@ -299,6 +300,7 @@ public void InitializeWithActivityRecorded()
             currentActivity.Stop();
         }
 
+        [Ignore("ProactiveSamplingDecision is removed and won't work")]
         [TestMethod]
         public void InitializeWithActivityRecordedOperationIdSet()
         {

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/StartOperationActivityTests.cs

@@ -467,7 +467,7 @@ private void ValidateTelemetry<T>(T telemetry, Activity activity, bool isW3C = t
                 Assert.IsFalse(telemetry.Properties.ContainsKey("tracestate"));
             }
 
-            Assert.AreEqual(activity.Recorded ? SamplingDecision.SampledIn : SamplingDecision.None, (telemetry as ISupportAdvancedSampling).ProactiveSamplingDecision);
+            Assert.AreEqual(SamplingDecision.None, (telemetry as ISupportAdvancedSampling).ProactiveSamplingDecision);
         }
     }
 }

BASE/src/Microsoft.ApplicationInsights/Extensibility/OperationCorrelationTelemetryInitializer.cs

@@ -46,15 +46,6 @@ telemetryItem is OperationTelemetry &&
                         telemetryProp.Properties.Add(TracestatePropertyKey, currentActivity.TraceStateString);
                     }
 
-                    // update proactive sampling decision if Activity is recorded
-                    // sampling processor may change the decision
-                    if (currentActivity.Recorded &&
-                        telemetryItem is ISupportAdvancedSampling supportSamplingTelemetry &&
-                        supportSamplingTelemetry.ProactiveSamplingDecision == SamplingDecision.None)
-                    {
-                        supportSamplingTelemetry.ProactiveSamplingDecision = SamplingDecision.SampledIn;
-                    }
-
                     if (string.IsNullOrEmpty(itemOperationContext.Id))
                     {
                         if (currentActivity.IdFormat == ActivityIdFormat.W3C)

BASE/src/Microsoft.ApplicationInsights/Metrics/MetricManager.cs

@@ -8,8 +8,8 @@
     using Microsoft.ApplicationInsights.Metrics.Extensibility;
 
     /// <summary>A metric manager coordinates metrics aggregation at a specific scope.
-    /// It keeps track of the known metrics and is ultimataly respnsibe for correctly
-    /// initializeing metric data time series.
+    /// It keeps track of the known metrics and is ultimately responsibe for correctly
+    /// initializing metric data time series.
     /// Note that a metric manager deals with zero dimensional time series.
     /// Metric objects are multidimensional collections of such series and the manager 
     /// merely holds a collection of such containers for its scope.</summary>