Fix up Redis trimming annotations #1420
Merged
Conversation
This file contains 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
open-telemetry#1415 had an issue in it due to how the DynamicDependency attribute is written. 1. Referring to a nested type with `+` isn't correct in DynamicDependency attributes. You need to just use a normal `.`. The current code is producing a warning when using the .NET 8.0 SDK to publish for AOT. "warning IL2036: OpenTelemetry.Instrumentation.StackExchangeRedis.Implementation.RedisProfilerEntryToActivityConverter.<.cctor>g__GetCommandAndKey|5_3(PropertyFetcher`1<String>,Object,String&): Unresolved type 'StackExchange.Redis.RedisDatabase+ScriptEvalMessage' in 'DynamicDependencyAttribute'." This wasn't caught in our CI because we use the .NET 7.0 SDK to publish, which doesn't catch this bug. 2. The "CommandAndKey" property isn't on the nested ScriptEvalMessage type, but instead a virtual on the base Message class. The fix here is to use the base Message class in the DynamicDependency. I've verified this works with a .NET 8.0 SDK.
Codecov Report
@@ Coverage Diff @@
## main #1420 +/- ##
==========================================
- Coverage 73.91% 71.37% -2.55%
==========================================
Files 267 5 -262
Lines 9615 269 -9346
==========================================
- Hits 7107 192 -6915
+ Misses 2508 77 -2431
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
maybe add a unit test to cover this case? |
Do we have unit tests that actually publish the trimmed/AOT'd app and run it? This bug would have been caught if we used the .NET 8.0 SDK in the verify-aot-compat leg instead of the 7.0 SDK. Do you know when that will happen? After 8.0 RTM ships? |
utpilla
approved these changes
Nov 1, 2023
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.
#1415 had an issue in it due to how the DynamicDependency attribute is written.
+isn't correct in DynamicDependency attributes. You need to just use a normal.. The current code is producing a warning when using the .NET 8.0 SDK to publish for AOT. "warning IL2036: OpenTelemetry.Instrumentation.StackExchangeRedis.Implementation.RedisProfilerEntryToActivityConverter.<.cctor>g__GetCommandAndKey|5_3(PropertyFetcher`1,Object,String&): Unresolved type 'StackExchange.Redis.RedisDatabase+ScriptEvalMessage' in 'DynamicDependencyAttribute'."This wasn't caught in our CI because we use the .NET 7.0 SDK to publish, which doesn't catch this bug.
The fix here is to use the base Message class in the DynamicDependency. I've verified this works with a .NET 8.0 SDK.
cc @Yun-Ting @utpilla @vitek-karas