Skip to content

Commit

Permalink
Add support for 3.* of log4net (#6075)
Browse files Browse the repository at this point in the history 
## Summary of changes

Adds support for v3 of `log4net`

## Reason for change

We only went to v2.

## Implementation details

Updated to v3 in places necessary.

## Test coverage

Updated sample app to use v3 and tests passed.

## Other details
<!-- Fixes #{issue} -->

<!-- ⚠️ Note: where possible, please obtain 2 approvals prior to
merging. Unless CODEOWNERS specifies otherwise, for external teams it is
typically best to have one review from a team member, and one review
from apm-dotnet. Trivial changes do not require 2 reviews. -->
  • Loading branch information
@bouwkast
bouwkast authored Oct 11, 2024
1 parent c8399df commit 10dbd01
Show file tree
Hide file tree
Showing 16 changed files with 190 additions and 20 deletions.
5 changes: 3 additions & 2 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,11 @@
"SampleProjectName": "LogsInjection.Log4Net",
"NugetPackageSearchName": "log4net",
"MinVersion": "1.0.0",
"MaxVersionExclusive": "3.0.0",
"MaxVersionExclusive": "4.0.0",
"SpecificVersions": [
"1.*.*",
"2.*.*"
"2.*.*",
"3.*.*"
],
"VersionConditions": [{
"MaxVersionExclusive": "2.0.6",
Expand Down
48 changes: 48 additions & 0 deletions tracer/build/PackageVersionsLatestMajors.g.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3156,48 +3156,96 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.ILogger.ExtendedLogger\LogsInjection.ILogger.ExtendedLogger.csproj">
<Properties>ApiVersion=8.9.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
48 changes: 48 additions & 0 deletions tracer/build/PackageVersionsLatestMinors.g.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17412,48 +17412,96 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj">
<Properties>ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Log4Net</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.ILogger.ExtendedLogger\LogsInjection.ILogger.ExtendedLogger.csproj">
<Properties>ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net462</TargetFramework>
Expand Down
Loading

0 comments on commit 10dbd01

Please sign in to comment.