[Infra] .NET 10 preparation #3100
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
github-actions
bot
added
infra
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #3100 +/- ##
==========================================
+ Coverage 65.28% 69.78% +4.50%
==========================================
Files 418 430 +12
Lines 15536 16617 +1081
==========================================
+ Hits 10142 11596 +1454
+ Misses 5394 5021 -373 Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull Request Overview
This PR prepares the codebase for .NET 10 compatibility by making several infrastructure improvements and fixes. The changes focus on conditional package references, test infrastructure enhancements, and correcting version comments in GitHub Actions.
- Conditionally reference System.Text.Json to avoid conflicts when the package is "in-box"
- Add support for maximum .NET version constraints in routing tests
- Fix spelling errors in test method names and comments
Reviewed Changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj | Added condition to System.Text.Json package reference |
| test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj | Added condition to System.Text.Json package reference |
| test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestCase.cs | Added MaximumDotnetVersion and ExpectedMetricRoute properties |
| test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTests.cs | Fixed comment typo and added metric route divergence support |
| test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.json | Added maximum version constraint to test case |
| test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.cs | Implemented maximum version filtering logic |
| test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs | Fixed spelling in test method name and activity tag |
| test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj | Added condition to System.Text.Json package reference |
| src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj | Fixed incorrect comment about target frameworks |
| global.json | Disabled pre-release SDK versions |
| .github/workflows/ossf-scorecard.yml | Updated CodeQL action version comment |
| .github/workflows/codeql-analysis.yml | Updated CodeQL action version comments |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
...lemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj
Outdated
Show resolved
Hide resolved
test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
Outdated
Show resolved
Hide resolved
test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj
Outdated
Show resolved
Hide resolved
it remove references to transitive dependencies. No more issues.
Kielek
reviewed
Sep 10, 2025
test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj
Outdated
Show resolved
Hide resolved
test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
Outdated
Show resolved
Hide resolved
I think there's already some of this in #2822 because some new changes in the SDK make them redundant, but maybe not all the possible places. |
Simplify condition for System.Text.Json reference.
Kielek
approved these changes
Sep 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Cherry-pick various changes from #2822 to prepare for .NET 10:
Merge requirement checklist
AppropriateCHANGELOG.mdfiles updated for non-trivial changesChanges in public API reviewed (if applicable)