diff --git a/tracer/build/PackageVersionsGeneratorDefinitions.json b/tracer/build/PackageVersionsGeneratorDefinitions.json
index f30ebb47b87a..2422b2b5a663 100644
--- a/tracer/build/PackageVersionsGeneratorDefinitions.json
+++ b/tracer/build/PackageVersionsGeneratorDefinitions.json
@@ -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",
diff --git a/tracer/build/PackageVersionsLatestMajors.g.props b/tracer/build/PackageVersionsLatestMajors.g.props
index 46af2e03c382..1df1ca860e74 100644
--- a/tracer/build/PackageVersionsLatestMajors.g.props
+++ b/tracer/build/PackageVersionsLatestMajors.g.props
@@ -3156,48 +3156,96 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net462
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp2.1
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp2.1
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp3.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp3.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp3.1
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp3.1
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net5.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net5.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net6.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net6.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net7.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net7.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net8.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net8.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=8.9.1;RestoreRecursive=false;BuildProjectReferences=false
net462
diff --git a/tracer/build/PackageVersionsLatestMinors.g.props b/tracer/build/PackageVersionsLatestMinors.g.props
index 7bbc0bf2f5fd..b01a6dc8c606 100644
--- a/tracer/build/PackageVersionsLatestMinors.g.props
+++ b/tracer/build/PackageVersionsLatestMinors.g.props
@@ -17412,48 +17412,96 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net462
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp2.1
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp2.1
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp3.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp3.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp3.1
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp3.1
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net5.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net5.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net6.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net6.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net7.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net7.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net8.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net8.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=8.0.0;RestoreRecursive=false;BuildProjectReferences=false
net462
diff --git a/tracer/build/PackageVersionsLatestSpecific.g.props b/tracer/build/PackageVersionsLatestSpecific.g.props
index 8e5ddf55c5bf..d6d4652f03bc 100644
--- a/tracer/build/PackageVersionsLatestSpecific.g.props
+++ b/tracer/build/PackageVersionsLatestSpecific.g.props
@@ -4506,48 +4506,96 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net462
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp2.1
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp2.1
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp3.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp3.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
netcoreapp3.1
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ netcoreapp3.1
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net5.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net5.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net6.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net6.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net7.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net7.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=2.0.17;RestoreRecursive=false;BuildProjectReferences=false
net8.0
None
LogsInjection.Log4Net
+
+ ApiVersion=3.0.0;RestoreRecursive=false;BuildProjectReferences=false
+ net8.0
+ None
+ LogsInjection.Log4Net
+
ApiVersion=8.9.1;RestoreRecursive=false;BuildProjectReferences=false
net462
diff --git a/tracer/build/supported_versions.json b/tracer/build/supported_versions.json
index f88890ea7e74..3afed7909015 100644
--- a/tracer/build/supported_versions.json
+++ b/tracer/build/supported_versions.json
@@ -761,16 +761,16 @@
"integrationName": "Log4Net",
"assemblyName": "log4net",
"minAssemblyVersionInclusive": "1.0.0",
- "maxAssemblyVersionInclusive": "2.65535.65535",
+ "maxAssemblyVersionInclusive": "3.65535.65535",
"packages": [
{
"name": "log4net",
"minVersionAvailableInclusive": "1.2.10",
"minVersionSupportedInclusive": "1.2.10",
"minVersionTestedInclusive": "1.2.11",
- "maxVersionSupportedInclusive": "2.0.17",
- "maxVersionAvailableInclusive": "3.0.1",
- "maxVersionTestedInclusive": "2.0.17"
+ "maxVersionSupportedInclusive": "3.0.0",
+ "maxVersionAvailableInclusive": "3.0.0",
+ "maxVersionTestedInclusive": "3.0.0"
}
]
},
diff --git a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
index 287b213db1c6..de4ddbfe922e 100644
--- a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
+++ b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
@@ -100,8 +100,8 @@
-
-
+
+
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/DirectSubmission/AppenderCollectionIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/DirectSubmission/AppenderCollectionIntegration.cs
index 5a3e8d0ba18e..efc5f476eb9f 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/DirectSubmission/AppenderCollectionIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/DirectSubmission/AppenderCollectionIntegration.cs
@@ -1,4 +1,4 @@
-//
+//
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
//
@@ -22,7 +22,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSu
ReturnTypeName = "log4net.Appender.IAppender[]",
ParameterTypeNames = new string[0],
MinimumVersion = "2.0.0",
- MaximumVersion = "2.*.*",
+ MaximumVersion = "3.*.*",
IntegrationName = nameof(IntegrationId.Log4Net))]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/LogsInjection/AppenderAttachedImplIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/LogsInjection/AppenderAttachedImplIntegration.cs
index 6b4d8f2c04a2..7359e2101109 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/LogsInjection/AppenderAttachedImplIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/Log4Net/LogsInjection/AppenderAttachedImplIntegration.cs
@@ -19,7 +19,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net
ReturnTypeName = ClrNames.Int32,
ParameterTypeNames = new[] { "log4net.Core.LoggingEvent" },
MinimumVersion = "1.0.0",
- MaximumVersion = "2.*.*",
+ MaximumVersion = "3.*.*",
IntegrationName = "Log4Net")]
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
index 3503dc627f97..17e7520f63e0 100644
--- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
@@ -358,9 +358,9 @@ static InstrumentationDefinitions()
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka.Producer`2+TypedDeliveryHandlerShim_Action"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(".ctor"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Void", "System.String", "!0", "!1", "System.Action`1[Confluent.Kafka.DeliveryReport`2[!0,!1]]"), 5, 1, 4, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Kafka.KafkaProduceSyncDeliveryHandlerIntegration"), 0, 1),
// Log4Net
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 1, 0, 0, 1, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionLegacyIntegration"), 0, 1),
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
// MongoDb
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core.WireProtocol.CommandUsingCommandMessageWireProtocol`1"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Execute"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!0", "MongoDB.Driver.Core.Connections.IConnection", "System.Threading.CancellationToken"), 3, 2, 2, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.MongoDb.IWireProtocol_Generic_Execute_Integration"), 0, 1),
diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
index fd94b1c317b8..87fb058e6165 100644
--- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
@@ -383,9 +383,9 @@ static InstrumentationDefinitions()
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka.Producer`2+TypedDeliveryHandlerShim_Action"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(".ctor"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Void", "System.String", "!0", "!1", "System.Action`1[Confluent.Kafka.DeliveryReport`2[!0,!1]]"), 5, 1, 4, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Kafka.KafkaProduceSyncDeliveryHandlerIntegration"), 0, 1),
// Log4Net
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 1, 0, 0, 1, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionLegacyIntegration"), 0, 1),
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
// MongoDb
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core.WireProtocol.CommandUsingCommandMessageWireProtocol`1"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Execute"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!0", "MongoDB.Driver.Core.Connections.IConnection", "System.Threading.CancellationToken"), 3, 2, 2, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.MongoDb.IWireProtocol_Generic_Execute_Integration"), 0, 1),
diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
index 50bec2f96cca..afa5fe473e05 100644
--- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
@@ -379,9 +379,9 @@ static InstrumentationDefinitions()
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka.Producer`2+TypedDeliveryHandlerShim_Action"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(".ctor"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Void", "System.String", "!0", "!1", "System.Action`1[Confluent.Kafka.DeliveryReport`2[!0,!1]]"), 5, 1, 4, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Kafka.KafkaProduceSyncDeliveryHandlerIntegration"), 0, 1),
// Log4Net
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 1, 0, 0, 1, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionLegacyIntegration"), 0, 1),
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
// MongoDb
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core.WireProtocol.CommandUsingCommandMessageWireProtocol`1"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Execute"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!0", "MongoDB.Driver.Core.Connections.IConnection", "System.Threading.CancellationToken"), 3, 2, 2, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.MongoDb.IWireProtocol_Generic_Execute_Integration"), 0, 1),
diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
index 50bec2f96cca..afa5fe473e05 100644
--- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
@@ -379,9 +379,9 @@ static InstrumentationDefinitions()
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Confluent.Kafka.Producer`2+TypedDeliveryHandlerShim_Action"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(".ctor"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Void", "System.String", "!0", "!1", "System.Action`1[Confluent.Kafka.DeliveryReport`2[!0,!1]]"), 5, 1, 4, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Kafka.KafkaProduceSyncDeliveryHandlerIntegration"), 0, 1),
// Log4Net
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 2, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionIntegration"), 0, 1),
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Appender.AppenderCollection"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("ToArray"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("log4net.Appender.IAppender[]"), 1, 1, 0, 0, 1, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.Log4Net.DirectSubmission.AppenderCollectionLegacyIntegration"), 0, 1),
- new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
+ new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("log4net.Util.AppenderAttachedImpl"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("AppendLoopOnAppenders"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Int32", "log4net.Core.LoggingEvent"), 2, 1, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.Log4Net.AppenderAttachedImplIntegration"), 0, 1),
// MongoDb
new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("MongoDB.Driver.Core.WireProtocol.CommandUsingCommandMessageWireProtocol`1"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Execute"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("!0", "MongoDB.Driver.Core.Connections.IConnection", "System.Threading.CancellationToken"), 3, 2, 2, 0, 2, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.MongoDb.IWireProtocol_Generic_Execute_Integration"), 0, 1),
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
index bd820d273aac..f339fc34adbb 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
@@ -1379,27 +1379,35 @@ public class PackageVersionsLatestMajors
#if NET462
new object[] { "1.2.11" },
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP2_1
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP3_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP3_1
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET5_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET6_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET7_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET8_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#endif
};
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs
index b6da8fe16a8d..cb2fd53ecabe 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs
@@ -3755,27 +3755,35 @@ public class PackageVersionsLatestMinors
#if NET462
new object[] { "1.2.11" },
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP2_1
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP3_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP3_1
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET5_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET6_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET7_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET8_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#endif
};
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs
index 95deab602fee..2f80dec4b725 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs
@@ -1604,27 +1604,35 @@ public class PackageVersionsLatestSpecific
#if NET462
new object[] { "1.2.11" },
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP2_1
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP3_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NETCOREAPP3_1
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET5_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET6_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET7_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#if NET8_0
new object[] { "2.0.17" },
+ new object[] { "3.0.0" },
#endif
#endif
};
diff --git a/tracer/test/test-applications/integrations/LogsInjection.Log4Net/LogsInjection.Log4Net.csproj b/tracer/test/test-applications/integrations/LogsInjection.Log4Net/LogsInjection.Log4Net.csproj
index cfb59c36610d..7cf492b87052 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.Log4Net/LogsInjection.Log4Net.csproj
+++ b/tracer/test/test-applications/integrations/LogsInjection.Log4Net/LogsInjection.Log4Net.csproj
@@ -2,7 +2,7 @@
1.2.11
- 2.0.12
+ 3.0.0
$(DefineConstants);LOG4NET_2_0_5
@@ -30,6 +30,7 @@
+
Always