[Infra] .NET 10 preparation

Cherry-pick various changes from open-telemetry#2822:

- Fix incorrect version comment on CodeQL actions.
- Explicitly disable use of pre-release .NET SDK versions.
- Fix incorrect comment.
- Make System.Text.Json package reference conditional to avoid explicit dependency when the package in "in-box".
- Fix typo in test name.
- Add support for a maximum version for routing test cases.
- Allow the metric path for routing test cases to diverge from the activity path.

Author: martincostello

.github/workflows/codeql-analysis.yml

@@ -41,13 +41,13 @@ jobs:
           show-progress: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.29.5
+        uses: github/codeql-action/init@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
         with:
           build-mode: none
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.29.5
+        uses: github/codeql-action/analyze@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
         with:
           category: '/language:${{ matrix.language }}'
 

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.29.5
+        uses: github/codeql-action/upload-sarif@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
         with:
           sarif_file: results.sarif

global.json

@@ -1,6 +1,7 @@
 {
   "sdk": {
     "rollForward": "latestFeature",
+    "allowPrerelease": false,
     "version": "9.0.304"
   }
 }

src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj

@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Note: Only include LinuxTracepoints-Net files for net8.0+ targets -->
+    <!-- Note: Only include LinuxTracepoints-Net files for netfx targets -->
     <Compile Remove="External\LinuxTracepoints-Net\**" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
   </ItemGroup>
 

test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPkgVer)" />
     <PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
-    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonLatestNet8OutOfBandPkgVer)" />
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonLatestNet8OutOfBandPkgVer)" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
   </ItemGroup>
 
   <ItemGroup>

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs

@@ -1214,7 +1214,7 @@ void ConfigureTestServices(IServiceCollection services)
 
     // note: this is always passing on Net9 or lower, because AddAspNetCoreInstrumentation only adds the subscription in Net10 or higher.
     [Fact]
-    public async Task RazorComponentsActivitesCanBeDisabled()
+    public async Task RazorComponentsActivitiesCanBeDisabled()
     {
         var exportedItems = new List<Activity>();
         void ConfigureTestServices(IServiceCollection services)
@@ -1239,7 +1239,7 @@ void ConfigureTestServices(IServiceCollection services)
             {
                 activity.Start();
                 activity.SetTag("aspnetcore.components.type", "BasicTests");
-                activity.SetTag("aspnetcore.components.method", "BlazorActivitesCanBeDisabled");
+                activity.SetTag("aspnetcore.components.method", "BlazorActivitiesCanBeDisabled");
                 activity.Stop();
             }
 

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.cs

@@ -27,10 +27,12 @@ public static IEnumerable<object[]> GetTestCases()
     private static List<object[]> GetArgumentsFromTestCaseObject(IEnumerable<TestCase> input)
     {
         var result = new List<object[]>();
+        var dotnetVersion = Environment.Version.Major;
 
         foreach (var testCase in input)
         {
-            if (testCase.MinimumDotnetVersion.HasValue && Environment.Version.Major < testCase.MinimumDotnetVersion.Value)
+            if ((testCase.MinimumDotnetVersion.HasValue && dotnetVersion < testCase.MinimumDotnetVersion.Value) ||
+                (testCase.MaximumDotnetVersion.HasValue && dotnetVersion > testCase.MaximumDotnetVersion.Value))
             {
                 continue;
             }

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.json

@@ -128,6 +128,7 @@
   {
     "name": "Root path",
     "testApplicationScenario": "RazorPages",
+    "maximumDotnetVersion": 9,
     "httpMethod": "GET",
     "path": "/",
     "expectedStatusCode": 200,

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTests.cs

@@ -74,11 +74,13 @@ public async Task TestHttpRoute(TestCase testCase)
         Assert.Equal(testCase.HttpMethod, activityHttpMethod);
         Assert.Equal(testCase.HttpMethod, metricHttpMethod);
 
-        // TODO: The CurrentHttpRoute property will go away. It They only serve to capture status quo.
+        // TODO: The CurrentHttpRoute property will go away. They only serve to capture status quo.
         // If CurrentHttpRoute is null, then that means we already conform to the correct behavior.
         var expectedHttpRoute = testCase.CurrentHttpRoute ?? testCase.ExpectedHttpRoute;
         Assert.Equal(expectedHttpRoute, activityHttpRoute);
-        Assert.Equal(expectedHttpRoute, metricHttpRoute);
+
+        var expectedMetricRoute = testCase.ExpectedMetricRoute ?? expectedHttpRoute;
+        Assert.Equal(expectedMetricRoute, metricHttpRoute);
 
         // Activity.DisplayName should be a combination of http.method + http.route attributes, see:
         // https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-spans.md#name

test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestCase.cs

@@ -11,6 +11,8 @@ public class TestCase
 
     public int? MinimumDotnetVersion { get; set; }
 
+    public int? MaximumDotnetVersion { get; set; }
+
     public TestApplicationScenario TestApplicationScenario { get; set; }
 
     public string? HttpMethod { get; set; }
@@ -23,6 +25,8 @@ public class TestCase
 
     public string? CurrentHttpRoute { get; set; }
 
+    public string? ExpectedMetricRoute { get; set; }
+
     public override string ToString()
     {
         // This is used by Visual Studio's test runner to identify the test case.