Merge remote-tracking branch 'origin' into chrisnas/http_events

DataDog · Oct 14, 2024 · 250c0df · 250c0df
2 parents df4b85b + a721f7b
commit 250c0df
Show file tree

Hide file tree

Showing 181 changed files with 2,088 additions and 975 deletions.
diff --git 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
@@ -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>

diff --git 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
       <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>