Repository navigation
fix(log4net): send event properties as log attributes on log4net 3.x #5559
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
d0fb17f
fix(log4net): send event properties as log attributes on log4net 3.x
jamescrosswell 0ded8b5
fix: add the new test project to the generated NoMobile solution
jamescrosswell a813647
chore: trim bug-specific commentary from the log4net 3.x test project
jamescrosswell bd94d96
chore: drop the remaining comment from the log4net properties loop
jamescrosswell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
41 changes: 41 additions & 0 deletions
41
test/Sentry.Log4Net.V3.Tests/Sentry.Log4Net.V3.Tests.csproj
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>$(LatestTfm)</TargetFrameworks> | ||
| <!-- These tests fail on Mono --> | ||
| <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net48</TargetFrameworks> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| The appender tests from Sentry.Log4Net.Tests, run against log4net 3.x instead of 2.x. | ||
|
|
||
| Sentry.Log4Net keeps its 2.0.12 floor, so this covers what users on log4net 3.x actually get: the | ||
| 2.x-compiled appender loaded against the 3.x assembly. log4net 3.x added IDictionary<string, object?> | ||
| to PropertiesDictionary, which changes what its non-generic IEnumerable yields - a runtime-only | ||
| difference that no amount of building against 2.x can catch. See #5557. | ||
|
|
||
| Source is linked rather than duplicated so the two majors can never drift apart. The Verify-based | ||
| tests are deliberately not linked: their snapshots are keyed off the original file paths, and running | ||
| them from two projects would have both writing the same files. | ||
| --> | ||
|
jamescrosswell marked this conversation as resolved.
Outdated
|
||
| <ItemGroup> | ||
| <Compile Include="..\Sentry.Log4Net.Tests\SentryAppenderTests.cs" Link="SentryAppenderTests.cs" /> | ||
| <Compile Include="..\Sentry.Log4Net.Tests\SentryAppenderTests.Structured.cs" Link="SentryAppenderTests.Structured.cs"> | ||
| <DependentUpon>SentryAppenderTests.cs</DependentUpon> | ||
| </Compile> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="log4net" Version="3.4.0" /> | ||
| <ProjectReference Include="..\..\src\Sentry.Log4Net\Sentry.Log4Net.csproj" /> | ||
| <ProjectReference Include="..\Sentry.Testing\Sentry.Testing.csproj" /> | ||
|
|
||
| <Using Include="log4net" /> | ||
| <Using Include="log4net.Core" /> | ||
| <Using Include="log4net.Appender" /> | ||
| <Using Include="log4net.Layout" /> | ||
| <Using Include="log4net.Repository.Hierarchy" /> | ||
| <Using Include="Sentry.Log4Net" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.