diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml
index 72f093030bcf..86031fe12e01 100644
--- a/.azure-pipelines/ultimate-pipeline.yml
+++ b/.azure-pipelines/ultimate-pipeline.yml
@@ -111,6 +111,7 @@ variables:
   relativeArtifacts: /tracer/src/bin/artifacts
   monitoringHome: $(System.DefaultWorkingDirectory)/shared/bin/monitoring-home
   artifacts: $(System.DefaultWorkingDirectory)/tracer/src/bin/artifacts
+  outputDir: $(System.DefaultWorkingDirectory)/artifacts
   symbols: $(System.DefaultWorkingDirectory)/tracer/bin/symbols
   relativeRunnerTool: tracer/src/bin/runnerTool
   relativeRunnerStandalone: tracer/src/bin/runnerStandalone
@@ -171,7 +172,7 @@ variables:
   DD_COLLECTOR_CPU_USAGE: true
   # If we're doing an SSI run, set the indicator, the rest need to be set in the stage
   IS_SSI_RUN: $[ or(eq(variables['Build.CronSchedule.DisplayName'], 'Daily SSI Run'), eq(variables['force_ssi_run'], 'true')) ]
-  ToolVersion: 3.8.0
+  ToolVersion: 3.9.0
 
 # Declare the datadog agent as a resource to be used as a pipeline service
 resources:
@@ -1359,7 +1360,7 @@ stages:
 
 - stage: unit_tests_windows
   condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
-  dependsOn: [build_windows_tracer, merge_commit_id]
+  dependsOn: [build_windows_tracer, merge_commit_id, generate_variables]
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
@@ -1373,6 +1374,8 @@ stages:
 
     - job: managed
       timeoutInMinutes: 60 #default value
+      strategy:
+        matrix: $[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_windows_matrix'] ]
       steps:
       - template: steps/clone-repo.yml
         parameters:
@@ -1381,7 +1384,7 @@ stages:
       - template: steps/install-dotnet.yml
       - template: steps/restore-working-directory.yml
 
-      - script: tracer\build.cmd BuildAndRunManagedUnitTests --code-coverage-enabled $(CodeCoverageEnabled)
+      - script: tracer\build.cmd BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
         displayName: Build and Test
         env:
           DD_LOGGER_DD_API_KEY: $(ddApiKey)
@@ -1400,7 +1403,7 @@ stages:
 
 - stage: unit_tests_macos
   condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
-  dependsOn: [build_macos, merge_commit_id]
+  dependsOn: [build_macos, merge_commit_id, generate_variables]
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
@@ -1410,6 +1413,9 @@ stages:
       jobs: [managed]
 
   - job: managed
+    strategy:
+      matrix:
+        $[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_macos_matrix'] ]
     timeoutInMinutes: 90
     pool:
       vmImage: macos-13
@@ -1430,7 +1436,7 @@ stages:
           artifact: build-macos-native_tracer
           path: $(monitoringHome)
 
-      - script: ./tracer/build.sh BuildAndRunManagedUnitTests --code-coverage-enabled $(CodeCoverageEnabled)
+      - script: ./tracer/build.sh BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
         displayName: Build and Test
         retryCountOnTaskFailure: 1
         env:
@@ -1450,7 +1456,7 @@ stages:
 
 - stage: unit_tests_linux
   condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
-  dependsOn: [build_linux_tracer, build_linux_profiler, merge_commit_id]
+  dependsOn: [build_linux_tracer, build_linux_profiler, merge_commit_id, generate_variables]
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
@@ -1463,12 +1469,7 @@ stages:
     timeoutInMinutes: 60 #default value
     strategy:
       matrix:
-        x64:
-          baseImage: debian
-          artifactSuffix: linux-x64
-        alpine:
-          baseImage: alpine
-          artifactSuffix: linux-musl-x64
+        $[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_linux_x64_matrix'] ]
     pool:
       name: azure-linux-scale-set
 
@@ -1486,7 +1487,7 @@ stages:
       parameters:
         build: true
         baseImage: $(baseImage)
-        command: "BuildAndRunManagedUnitTests --code-coverage-enabled $(CodeCoverageEnabled)"
+        command: "BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)"
         apiKey: $(DD_LOGGER_DD_API_KEY)
 
     - publish: artifacts/build_data
@@ -1503,7 +1504,7 @@ stages:
 
 - stage: unit_tests_arm64
   condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
-  dependsOn: [build_arm64_tracer, merge_commit_id]
+  dependsOn: [build_arm64_tracer, merge_commit_id, generate_variables]
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
@@ -1514,14 +1515,10 @@ stages:
 
     - job: test
       timeoutInMinutes: 60 #default value
+
       strategy:
         matrix:
-          arm64:
-            baseImage: debian
-            artifactSuffix: linux-arm64
-          alpine:
-            baseImage: alpine
-            artifactSuffix: linux-musl-arm64
+          $[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_linux_arm64_matrix'] ]
       pool:
         name: aws-arm64-auto-scaling
       workspace:
@@ -1539,7 +1536,7 @@ stages:
           parameters:
             build: true
             baseImage: $(baseImage)
-            command: "BuildAndRunManagedUnitTests"
+            command: "BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)"
             apiKey: $(DD_LOGGER_DD_API_KEY)
 
         - publish: artifacts/build_data
@@ -1554,9 +1551,209 @@ stages:
             testResultsFiles: artifacts/build_data/results/**/*.trx
           condition: succeededOrFailed()
 
+- stage: build_samples
+  dependsOn: [merge_commit_id]
+  variables:
+    targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
+    targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
+  jobs:
+    - template: steps/update-github-status-jobs.yml
+      parameters:
+        jobs: [standalone, multi_version, merge]
+
+    - job: standalone
+      timeoutInMinutes: 60 #default value
+      pool:
+        name: azure-windows-scale-set-3
+      steps:
+        - template: steps/clone-repo.yml
+          parameters:
+            targetShaId: $(targetShaId)
+            targetBranch: $(targetBranch)
+        - template: steps/install-latest-dotnet-sdk.yml
+
+        - script: tracer\build.cmd CreateRequiredDirectories CompileSamples
+          displayName: Build sample projects
+          retryCountOnTaskFailure: 1
+
+        - publish: $(outputDir)/bin
+          displayName: Upload artifact samples (bin only)
+          artifact: samples-bin-standalone
+
+        - publish: artifacts/build_data
+          displayName: Uploading logs
+          artifact: _$(System.StageName)_$(Agent.JobName)_logs_$(System.JobAttempt)
+          condition: failed()
+          continueOnError: true
+
+    - job: multi_version
+      timeoutInMinutes: 60 #default value
+      strategy:
+        # TODO: we could move this generation to the generate_variables stage but it would delay this starting, so just hardcode it for now
+        matrix:
+          net462:
+            framework: net462
+          netcoreapp2.1:
+            framework: netcoreapp2.1
+          netcoreapp3.0:
+            framework: netcoreapp3.0
+          netcoreapp3.1:
+            framework: netcoreapp3.1
+          net5.0:
+            framework: net5.0
+          net6.0:
+            framework: net6.0
+          net7.0:
+            framework: net7.0
+          net8.0:
+            framework: net8.0
+          net9.0:
+            framework: net9.0
+      pool:
+        name: azure-windows-scale-set-3
+      steps:
+        - template: steps/clone-repo.yml
+          parameters:
+            targetShaId: $(targetShaId)
+            targetBranch: $(targetBranch)
+        - template: steps/install-latest-dotnet-sdk.yml
+
+        - script: tracer\build.cmd CreateRequiredDirectories CompileSamples -Framework $(framework) -TestAllPackageVersions
+          displayName: Build sample projects
+          retryCountOnTaskFailure: 1
+
+        - publish: $(outputDir)/publish
+          displayName: Upload artifact samples (bin only)
+          artifact: samples-multi-version-$(framework)
+
+        - publish: artifacts/build_data
+          displayName: Uploading logs
+          artifact: _$(System.StageName)_$(Agent.JobName)_logs_$(System.JobAttempt)
+          condition: failed()
+          continueOnError: true
+
+    - job: merge
+      dependsOn: [ standalone, multi_version ]
+      timeoutInMinutes: 60 #default value
+      pool:
+        name: azure-windows-scale-set-3
+      steps:
+        - checkout: none
+        - powershell: |
+            mkdir $(Build.ArtifactStagingDirectory)/bin
+            mkdir $(Build.ArtifactStagingDirectory)/publish
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-bin-standalone
+            path: $(Build.ArtifactStagingDirectory)/bin
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-net462
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-netcoreapp2.1
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-netcoreapp3.0
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-netcoreapp3.1
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-net5.0
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-net6.0
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-net7.0
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-net8.0
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples-multi-version-net9.0
+            path: $(Build.ArtifactStagingDirectory)/publish
+          retryCountOnTaskFailure: 5
+
+        - publish: $(Build.ArtifactStagingDirectory)
+          displayName: Upload artifact samples
+          artifact: samples
+
+# This is just to test that we _can_ build the solution on macos
+# It's not used by other stages, and just ensures we don't break the macos build
+- stage: build_samples_macos
+  dependsOn: [merge_commit_id]
+  variables:
+    targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
+    targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
+  jobs:
+    - template: steps/update-github-status-jobs.yml
+      parameters:
+        jobs: [macos]
+
+    - job: macos
+      timeoutInMinutes: 60 #default value
+      pool:
+        vmImage: macos-13
+      steps:
+        - template: steps/clone-repo.yml
+          parameters:
+            targetShaId: $(targetShaId)
+            targetBranch: $(targetBranch)
+        - template: steps/install-latest-dotnet-sdk.yml
+
+        - script: ./tracer/build.sh CreateRequiredDirectories CompileSamples
+          displayName: Build sample projects
+          retryCountOnTaskFailure: 1
+
+        - publish: artifacts/build_data
+          displayName: Uploading logs
+          artifact: _$(System.StageName)_$(Agent.JobName)_logs_$(System.JobAttempt)
+          condition: failed()
+          continueOnError: true
+
+
 - stage: integration_tests_windows
   condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
-  dependsOn: [build_windows_tracer, generate_variables, merge_commit_id]
+  dependsOn: [build_windows_tracer, generate_variables, merge_commit_id, build_samples]
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
@@ -1581,6 +1778,12 @@ stages:
       parameters:
         includeX86: true
     - template: steps/restore-working-directory.yml
+    - task: DownloadPipelineArtifact@2
+      displayName: Download samples
+      inputs:
+        artifact: samples
+        path: $(outputDir)
+      retryCountOnTaskFailure: 5
 
 # Cosmos is _way_ to flaky at the moment. Try enabling again at a later time
 #    - powershell: |
@@ -1598,7 +1801,7 @@ stages:
       displayName: 'Initialize LocalDB'
       workingDirectory: $(Build.Repository.LocalPath)
 
-    - script: tracer\build.cmd BuildAndRunWindowsIntegrationTests BuildAndRunWindowsRegressionTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
+    - script: tracer\build.cmd CompileTrimmingSamples BuildWindowsIntegrationTests BuildWindowsRegressionTests RunWindowsIntegrationTests RunWindowsRegressionTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
       displayName: Run integration tests
       env:
         DD_LOGGER_DD_API_KEY: $(ddApiKey)
@@ -1835,6 +2038,12 @@ stages:
         targetShaId: $(targetShaId)
         targetBranch: $(targetBranch)
     - template: steps/install-dotnet-sdks.yml
+    # This is a hack because otherwise Azure Functions _always_ tries to use the one from program files otherwise
+    - script: |
+        cd /D %PROGRAMFILES%/dotnet
+        rename dotnet.exe dotnet.exe.bak
+        where dotnet
+      displayName: 'Rename default dotnet.exe'
     - template: steps/restore-working-directory.yml
         
     - template: steps/install-msi.yml
@@ -2112,7 +2321,7 @@ stages:
 
 - stage: integration_tests_linux
   condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
-  dependsOn: [package_linux, generate_variables, merge_commit_id]
+  dependsOn: [package_linux, generate_variables, merge_commit_id, build_samples]
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
@@ -2142,6 +2351,12 @@ stages:
     - template: steps/restore-working-directory.yml
       parameters:
         artifact: build-$(artifactSuffix)-working-directory
+    - task: DownloadPipelineArtifact@2
+      displayName: Download samples
+      inputs:
+        artifact: samples
+        path: $(outputDir)
+      retryCountOnTaskFailure: 5
 
     # when we build samples separately, we could run this step and the docker-compose one below in //
     # (currently the docker-compose step relies on serverless samples)
@@ -2149,7 +2364,7 @@ stages:
       parameters:
         build: true
         baseImage: $(baseImage)
-        command: "BuildLinuxIntegrationTests --framework $(publishTargetFramework) --IncludeTestsRequiringDocker false --Filter $(IntegrationTestFilter) --SampleName $(IntegrationTestSampleName)"
+        command: "BuildLinuxIntegrationTests CompileTrimmingSamples --framework $(publishTargetFramework) --IncludeTestsRequiringDocker false --Filter $(IntegrationTestFilter) --SampleName $(IntegrationTestSampleName)"
         apikey: $(DD_LOGGER_DD_API_KEY)
 
     - task: DownloadPipelineArtifact@2
@@ -2223,6 +2438,12 @@ stages:
     - template: steps/restore-working-directory.yml
       parameters:
         artifact: build-$(artifactSuffix)-working-directory
+    - task: DownloadPipelineArtifact@2
+      displayName: Download samples
+      inputs:
+        artifact: samples
+        path: $(outputDir)
+      retryCountOnTaskFailure: 5
 
     # when we build samples separately, we could run this step and the docker-compose one below in //
     # (currently the docker-compose step relies on serverless samples)
@@ -2230,7 +2451,7 @@ stages:
       parameters:
         build: true
         baseImage: $(baseImage)
-        command: "BuildLinuxIntegrationTests --framework $(publishTargetFramework) --IncludeTestsRequiringDocker true --Filter $(IntegrationTestFilter) --SampleName $(IntegrationTestSampleName)"
+        command: "BuildLinuxIntegrationTests CompileTrimmingSamples --framework $(publishTargetFramework) --IncludeTestsRequiringDocker true --Filter $(IntegrationTestFilter) --SampleName $(IntegrationTestSampleName)"
         apiKey: $(DD_LOGGER_DD_API_KEY)
 
     - task: DownloadPipelineArtifact@2
@@ -2340,6 +2561,12 @@ stages:
       inputs:
         artifact: linux-monitoring-home-$(artifactSuffix)
         path: $(monitoringHome)
+    - task: DownloadPipelineArtifact@2
+      displayName: Download samples
+      inputs:
+        artifact: samples
+        path: $(outputDir)
+      retryCountOnTaskFailure: 5
 
     - template: steps/run-in-docker.yml
       parameters:
@@ -2912,7 +3139,7 @@ stages:
 
 - stage: integration_tests_arm64
   condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
-  dependsOn: [package_arm64, generate_variables, merge_commit_id]
+  dependsOn: [package_arm64, generate_variables, merge_commit_id, build_samples]
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
@@ -2943,11 +3170,18 @@ stages:
           parameters:
             artifact: build-$(artifactSuffix)-working-directory
 
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples
+            path: $(outputDir)
+          retryCountOnTaskFailure: 5
+
         - template: steps/run-in-docker.yml
           parameters:
             build: true
             baseImage: $(baseImage)
-            command: "BuildLinuxIntegrationTests --framework $(publishTargetFramework) --IncludeTestsRequiringDocker false --Filter $(IntegrationTestFilter) --SampleName $(IntegrationTestSampleName)"
+            command: "BuildLinuxIntegrationTests CompileTrimmingSamples --framework $(publishTargetFramework) --IncludeTestsRequiringDocker false --Filter $(IntegrationTestFilter) --SampleName $(IntegrationTestSampleName)"
             apiKey: $(DD_LOGGER_DD_API_KEY)
 
         - task: DownloadPipelineArtifact@2
@@ -3013,6 +3247,12 @@ stages:
         - template: steps/restore-working-directory.yml
           parameters:
             artifact: build-$(artifactSuffix)-working-directory
+        - task: DownloadPipelineArtifact@2
+          displayName: Download samples
+          inputs:
+            artifact: samples
+            path: $(outputDir)
+          retryCountOnTaskFailure: 5
 
         - template: steps/run-in-docker.yml
           parameters:
@@ -5039,107 +5279,163 @@ stages:
   variables:
     targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
     targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
+    scenarioGroups: "appsec"
+    additionalScenarios: '[\"PARAMETRIC\", \"REMOTE_CONFIG_SCENARIOS\", \"TELEMETRY_SCENARIOS\", \"DEFAULT\", \"INTEGRATIONS\", \"INTEGRATIONS_AWS\", \"CROSSED_TRACING_LIBRARIES\", \"DEBUGGER_SCENARIOS\", \"+S PROFILING +S TRACE_PROPAGATION_STYLE_W3C +S LIBRARY_CONF_CUSTOM_HEADER_TAGS\"]'
   jobs:
-  - template: steps/update-github-status-jobs.yml
-    parameters:
-      jobs: [test]
+    - template: steps/update-github-status-jobs.yml
+      parameters:
+        jobs: [compute_scenarios, tests]
+        
+    - job: compute_scenarios
+      timeoutInMinutes: 60
+      displayName: Compute system-tests scenarios
+      pool:
+          vmImage: ubuntu-latest
+          
+      steps:
+        - checkout: none
+          
+        - task: UsePythonVersion@0
+          inputs:
+            versionSpec: '3.12'
+          displayName: Install python 3.12
 
-  - job: test
-    timeoutInMinutes: 60
-    pool:
-      vmImage: ubuntu-latest
+        - script: git clone --depth 1 https://github.com/DataDog/system-tests.git
+          displayName: Get system tests repo
+          
+        - script: |
+            ./build.sh -i runner
+          displayName: Install runner
+          workingDirectory: system-tests
+          
+        - script: |
+            set -e
+            
+            source venv/bin/activate
+            PYTHONPATH=. python utils/scripts/compute-workflow-parameters.py dotnet -g $(scenarioGroups) > out.txt
+
+            endtoend_scenarios=$(grep 'endtoend_scenarios' out.txt | sed 's/.*=//g')
+            graphql_scenarios=$(grep 'graphql_scenarios' out.txt | sed 's/.*=//g')
+            parametric_scenarios=$(grep 'parametric_scenarios' out.txt | sed 's/.*=//g')
+            endtoend_weblogs=$(grep 'endtoend_weblogs' out.txt | sed 's/.*=//g')
+
+            echo "Found scenarios: $endtoend_scenarios"
+            echo "Found graphql scenarios: $graphql_scenarios"
+            echo "Found parametric scenarios: $parametric_scenarios"
+            echo "Found weblogs: $endtoend_weblogs"
+            echo "Additional manual scenarios: $(additionalScenarios)"
+            
+            # Write the weblogs to a file (for later use to generate the docker images)
+            python -c "import json; variants = json.loads('$endtoend_weblogs'); print('\n'.join(variants))" > /tmp/weblogs_list.txt
+        
+            # Inline python script to cross the data into a json
+            echo "import json" > cross.py
+            echo "script_scenarios = json.loads('$endtoend_scenarios')" >> cross.py
+            echo "script_graphql_scenarios = json.loads('$graphql_scenarios')" >> cross.py
+            echo "script_parametric_scenarios = json.loads('$parametric_scenarios')" >> cross.py
+            echo "script_weblogs   = json.loads('$endtoend_weblogs')" >> cross.py
+            echo "extra_scenarios  = json.loads('$(additionalScenarios)')" >> cross.py
+            echo 'combined_scenarios = script_scenarios + script_graphql_scenarios + script_parametric_scenarios + extra_scenarios' >> cross.py
+            echo 'matrix_items = {}' >> cross.py
+            echo 'for s in combined_scenarios:' >> cross.py
+            echo '    for w in script_weblogs:' >> cross.py
+            echo '        matrix_items[s + " (" + w + ")"] = {"SCENARIO": s, "WEBLOG_VARIANT": w}' >> cross.py
+            echo 'print(json.dumps(matrix_items))' >> cross.py
+            
+            python cross.py > matrix.json
+            
+            echo "##vso[task.setvariable variable=matrixJson;isOutput=true]$(cat matrix.json)"
+            echo "Json: $(cat matrix.json)"
+          displayName: Generate scenarios matrix JSON
+          name: create_matrix
+          workingDirectory: system-tests
+          
+        - task: DownloadPipelineArtifact@2
+          displayName: Download linux-packages
+          condition: eq( variables['System.JobAttempt'], 1 )
+          inputs:
+            artifact: linux-packages-linux-x64
+            patterns: '**/*tar.gz'
+            path: $(Build.ArtifactStagingDirectory)
 
-    strategy:
-      matrix:
-        parametric_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: PARAMETRIC
-        parametric_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: PARAMETRIC
-        appsec_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: APPSEC_SCENARIOS
-        appsec_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: APPSEC_SCENARIOS
-        rcm_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: REMOTE_CONFIG_SCENARIOS
-        rcm_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: REMOTE_CONFIG_SCENARIOS
-        telemetry_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: TELEMETRY_SCENARIOS
-        telemetry_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: TELEMETRY_SCENARIOS
-        default_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: DEFAULT
-        default_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: DEFAULT
-        integrations_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: INTEGRATIONS
-        integrations_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: INTEGRATIONS
-        integrations_aws_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: INTEGRATIONS_AWS
-        integrations_aws_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: INTEGRATIONS_AWS
-        crossed_tracing_libraries_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: CROSSED_TRACING_LIBRARIES
-        crossed_tracing_libraries_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: CROSSED_TRACING_LIBRARIES
-        # All the other scenarios that aren't in a secenario group
-        remainder_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: "+S TRACE_PROPAGATION_STYLE_W3C +S PROFILING +S LIBRARY_CONF_CUSTOM_HEADERS_SHORT +S LIBRARY_CONF_CUSTOM_HEADERS_LONG"
-        remainder_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: "+S TRACE_PROPAGATION_STYLE_W3C +S PROFILING +S LIBRARY_CONF_CUSTOM_HEADERS_SHORT +S LIBRARY_CONF_CUSTOM_HEADERS_LONG"
-        debugger_poc:
-          WEBLOG_VARIANT: "poc"
-          SCENARIO: DEBUGGER_SCENARIOS
-        debugger_uds:
-          WEBLOG_VARIANT: "uds"
-          SCENARIO: DEBUGGER_SCENARIOS
+        - script: |
+            PACKAGE_NAME=$(basename $(Build.ArtifactStagingDirectory)/datadog-dotnet-apm-*.tar.gz)
+            echo Moving $PACKAGE_NAME to system-tests/binaries
+            mv $(Build.ArtifactStagingDirectory)/$PACKAGE_NAME system-tests/binaries/
+          displayName: Move dotnet binary to system test folder
+          condition: eq( variables['System.JobAttempt'], 1 )
+        
+        - script: |
+            set -e
+            cd system-tests
+            mkdir -p ../docker-images
+        
+            while read w; do
+              echo "------------------------------------"
+              echo "Building images for variant: $w"
+              echo "------------------------------------"
+              # Build the images. For example:
+              ./build.sh dotnet --weblog-variant $w
+            
+              # Save weblog variant image
+              docker save system_tests/weblog:latest -o ../docker-images/$w.tar
+            done < /tmp/weblogs_list.txt
+            
+            # Save agent image
+            docker save system_tests/agent:latest -o ../docker-images/agent.tar
 
-    steps:
+          displayName: Build weblogs and agent & save Docker images
+          condition: eq( variables['System.JobAttempt'], 1 )
+        
+        - task: PublishPipelineArtifact@1
+          displayName: Publish Docker images artifact
+          condition: eq( variables['System.JobAttempt'], 1 )
+          inputs:
+            path: 'docker-images'
+            artifactName: 'system-test-docker-images'
+
+    - job: tests
+      displayName: ""
+      timeoutInMinutes: 60
+      pool:
+          vmImage: ubuntu-latest
+      dependsOn: compute_scenarios
+     
+      strategy:
+        matrix: $[ dependencies.compute_scenarios.outputs['create_matrix.matrixJson'] ]
+
+      steps:
       - checkout: none
 
       - task: UsePythonVersion@0
         inputs:
-            versionSpec: '3.12'
+          versionSpec: '3.12'
         displayName: Install python 3.12
 
       - script: git clone --depth 1 https://github.com/DataDog/system-tests.git
         displayName: Get system tests repo
-
+        
       - task: DownloadPipelineArtifact@2
-        displayName: Download linux-packages
+        displayName: Download Docker images
         inputs:
-          artifact: linux-packages-linux-x64
-          patterns: '**/*tar.gz'
-          path: $(Build.ArtifactStagingDirectory)
+          artifact: system-test-docker-images
+          path: $(Build.SourcesDirectory)
 
       - script: |
-          PACKAGE_NAME=$(basename $(Build.ArtifactStagingDirectory)/datadog-dotnet-apm-*.tar.gz)
-          echo Moving $PACKAGE_NAME to system-tests/binaries
-          mv $(Build.ArtifactStagingDirectory)/$PACKAGE_NAME system-tests/binaries/
-        displayName: Move dotnet binary to system test folder
+          echo "Loading images for variant: $(WEBLOG_VARIANT)"
+          docker load -i "$(Build.SourcesDirectory)/$(WEBLOG_VARIANT).tar"
+          
+          echo "Loading agent image"
+          docker load -i "$(Build.SourcesDirectory)/agent.tar"
+          
+          echo "Available Docker images after loading:"
+          docker images
+        displayName: Docker load the correct variant
 
-      - script: ./build.sh dotnet
+      - script: |
+              ./build.sh -i runner
+        displayName: Install runner
         workingDirectory: system-tests
-        displayName: Build images
 
       - script: ./run.sh $(SCENARIO)
         workingDirectory: system-tests
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4126800cfce3..58165d55408a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,6 +12,20 @@ updates:
       - dependency-name: "MessagePack" # Locked at a version that supports our net452 build target
       - dependency-name: "*" # Ignore patches for all integrations
         update-types: ["version-update:semver-patch"]
+
+  # Azure functions explicit testing - we can't include these with our "normal" process checks
+  # Because they aren't compatible with the dotnet msbuild approach we're using
+  - package-ecosystem: "nuget"
+    directory: "/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+      - "area:dependabot"
+    ignore:
+      - dependency-name: "*" # Ignore patches for all integrations
+        update-types: ["version-update:semver-patch"]
+
   # Src libraries
   - package-ecosystem: "nuget"
     directory: "/tracer/src/Datadog.Trace"
diff --git a/.github/workflows/override_version_bump_pr_checks.yml b/.github/workflows/override_version_bump_pr_checks.yml
index 98954bb10f69..39a67d785832 100644
--- a/.github/workflows/override_version_bump_pr_checks.yml
+++ b/.github/workflows/override_version_bump_pr_checks.yml
@@ -21,7 +21,7 @@ jobs:
           set -o pipefail
 
           # These checks won't run automatically on the version bump PR, so need to force this
-          contexts=("code_freeze" "verify_source_generators" "verify_app_trimming_descriptor_generator")
+          contexts=("code_freeze" "verify_source_generators" "verify_app_trimming_descriptor_generator", "verify_solution_changes_are_persisted")
 
           sha="${{ github.sha }}"
           targetUrl="https://github.com/DataDog/dd-trace-dotnet/actions/workflows/override_version_bump_pr_checks.yml"
diff --git a/.github/workflows/verify_solution_changes_are_persisted.yml b/.github/workflows/verify_solution_changes_are_persisted.yml
new file mode 100644
index 000000000000..0a4ca74576f2
--- /dev/null
+++ b/.github/workflows/verify_solution_changes_are_persisted.yml
@@ -0,0 +1,36 @@
+name: Verify Sample solution changes have been persisted
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  verify_solution_changes_are_persisted:
+    runs-on: windows-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Support longpaths
+        run: git config --system core.longpaths true
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '9.0.100'
+
+      - name: "Regenerating Solutions"
+        run: .\tracer\build.ps1 RegenerateSolutions
+
+      - name: "Verify no changes in generated solutions"
+        run: |
+          git diff --quiet
+          if ($LASTEXITCODE -eq 1) {
+            git diff
+            Write-Error "Found changes in generated solutions. Did you add a new sample? Regenerate the build solution locally by running the target 'RegenerateSolutions', and ensure the changed files are committed to git."
+            Exit 1
+          } else {
+            echo "No changes found to generated files"
+          }
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7cda54eafd9..ed61e590751f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,7 +126,9 @@ onboarding_tests_installer:
 onboarding_tests_k8s_injection:
   parallel:
     matrix:
-      - WEBLOG_VARIANT: dd-lib-dotnet-init-test-app
+      - WEBLOG_VARIANT: [dd-lib-dotnet-init-test-app]
+        SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE]
+        K8S_CLUSTER_VERSION: ['7.56.2','7.57.0','7.59.0']
 
 deploy_to_reliability_env:
   rules:
diff --git a/Datadog.Trace.Samples.g.sln b/Datadog.Trace.Samples.g.sln
new file mode 100644
index 000000000000..0fe817afc722
--- /dev/null
+++ b/Datadog.Trace.Samples.g.sln
@@ -0,0 +1,1220 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FEBCE7DC-9FD1-48A6-B911-71ABB240A030}"
+	ProjectSection(SolutionItems) = preProject
+		.dockerignore = .dockerignore
+		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		tracer\Datadog.Trace.proj = tracer\Datadog.Trace.proj
+		Datadog.Trace.snk = Datadog.Trace.snk
+		tracer\Directory.Build.props = tracer\Directory.Build.props
+		docker-compose.yml = docker-compose.yml
+		tracer\GlobalSuppressions.cs = tracer\GlobalSuppressions.cs
+		LICENSE = LICENSE
+		LICENSE-3rdparty.csv = LICENSE-3rdparty.csv
+		docs\README.md = docs\README.md
+		tracer\stylecop.json = tracer\stylecop.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9E5F0022-0A50-40BF-AC6A-C3078585ECAB}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\src\Directory.Build.props = tracer\src\Directory.Build.props
+		tracer\src\GlobalSuppressions.cs = tracer\src\GlobalSuppressions.cs
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8CEC2042-F11C-49F5-A674-2355793B600A}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\test\Directory.Build.props = tracer\test\Directory.Build.props
+		tracer\test\GlobalSuppressions.cs = tracer\test\GlobalSuppressions.cs
+		tracer\test\test.settings = tracer\test\test.settings
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-applications", "test-applications", "{9518425A-36A5-4B8F-B0B8-6137DB88441D}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\test\test-applications\Directory.Build.props = tracer\test\test-applications\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "regression", "regression", "{498A300E-D036-49B7-A43D-821D1CAF11A5}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependency-libs", "dependency-libs", "{EFE48691-1FBA-41D5-9BFD-676771973F0C}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\test\test-applications\regression\dependency-libs\Directory.Build.props = tracer\test\test-applications\regression\dependency-libs\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integrations", "integrations", "{BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet", "aspnet", "{AFA0AB23-64F0-4AC1-9050-6CE8FE06F580}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\test\test-applications\aspnet\Directory.Build.props = tracer\test\test-applications\aspnet\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependency-libs", "dependency-libs", "{8683D82A-2BBE-4199-9C36-C59F48804F90}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\test\test-applications\integrations\dependency-libs\Directory.Build.props = tracer\test\test-applications\integrations\dependency-libs\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A0C5FBBB-CFB2-4FB9-B8F0-55676E9DCF06}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\build\PackageVersionsGeneratorDefinitions.json = tracer\build\PackageVersionsGeneratorDefinitions.json
+		tracer\build\supported_versions.json = tracer\build\supported_versions.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "artifacts", "artifacts", "{CC53E5C5-9D3E-4AD9-A9CA-D2190463EB5B}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\build\artifacts\after-install.sh = tracer\build\artifacts\after-install.sh
+		tracer\build\artifacts\after-remove.sh = tracer\build\artifacts\after-remove.sh
+		tracer\build\artifacts\createLogPath.sh = tracer\build\artifacts\createLogPath.sh
+		tracer\build\artifacts\dd-dotnet.cmd = tracer\build\artifacts\dd-dotnet.cmd
+		tracer\build\artifacts\dd-dotnet.sh = tracer\build\artifacts\dd-dotnet.sh
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{E5439139-6F94-44FA-9590-C32FCC1C7A93}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "instrumentation", "instrumentation", "{933F1D4B-1216-4BC1-956E-8C30818BAA0F}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "crank", "crank", "{E3FB283A-B766-4887-95E1-329667671921}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\build\crank\os.profiles.yml = tracer\build\crank\os.profiles.yml
+		tracer\build\crank\run.sh = tracer\build\crank\run.sh
+		tracer\build\crank\Samples.AspNetCoreSimpleController.yml = tracer\build\crank\Samples.AspNetCoreSimpleController.yml
+		tracer\build\crank\Security.Samples.AspNetCoreSimpleController.yml = tracer\build\crank\Security.Samples.AspNetCoreSimpleController.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{550362BF-A3A7-4F20-9590-24F4F8C380FF}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{7D231B65-AA8E-4917-85FF-BBBF7992B6FC}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "security", "security", "{0972AD57-B16B-494F-AE0A-091DD6F3B42B}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet", "aspnet", "{AAFFA51D-1357-4560-97DC-43AD039442E6}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-functions", "azure-functions", "{C4C1E313-C7C1-4490-AECE-0DD0062380A4}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\test\test-applications\azure-functions\Directory.Build.props = tracer\test\test-applications\azure-functions\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "debugger", "debugger", "{16427BFB-B4C6-46A9-A290-8EA51FF73FEA}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\test\test-applications\debugger\Directory.Build.props = tracer\test\test-applications\debugger\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependency-libs", "dependency-libs", "{0884B566-D22E-498C-BAA9-26D50ABCAE3A}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generated", "Generated", "{E1B0F72C-991A-409D-9266-DE5ED1BD940E}"
+	ProjectSection(SolutionItems) = preProject
+		tracer\build\PackageVersionsLatestMajors.g.props = tracer\build\PackageVersionsLatestMajors.g.props
+		tracer\build\PackageVersionsLatestMinors.g.props = tracer\build\PackageVersionsLatestMinors.g.props
+		tracer\build\PackageVersionsLatestSpecific.g.props = tracer\build\PackageVersionsLatestSpecific.g.props
+		tracer\build\supported_calltargets.g.json = tracer\build\supported_calltargets.g.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tracer", "tracer", "{82FFBC1A-6B13-4C0A-896A-90306AE4828F}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{07D12F26-2583-4C6F-AFBB-AA30FF339FC6}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-applications", "test-applications", "{F8C637E1-1F4F-4E3B-9E34-AAD61097C3F8}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-functions", "azure-functions", "{FE9F14E0-8DFF-413B-BB9E-49CEA4115A5D}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibrary", "tracer\test\test-applications\integrations\dependency-libs\Samples.ExampleLibrary\Samples.ExampleLibrary.csproj", "{FDB5C8D0-018D-4FF9-9680-C6A5078F819B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibraryTracer", "tracer\test\test-applications\integrations\dependency-libs\Samples.ExampleLibraryTracer\Samples.ExampleLibraryTracer.csproj", "{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.SqlServer", "tracer\test\test-applications\integrations\Samples.SqlServer\Samples.SqlServer.csproj", "{086FF8A0-9CEE-470A-9751-78B0F1340649}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Elasticsearch", "tracer\test\test-applications\integrations\Samples.Elasticsearch\Samples.Elasticsearch.csproj", "{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MongoDB", "tracer\test\test-applications\integrations\Samples.MongoDB\Samples.MongoDB.csproj", "{3493346B-44F6-4F50-8FB4-51D0090DF544}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Npgsql", "tracer\test\test-applications\integrations\Samples.Npgsql\Samples.Npgsql.csproj", "{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Elasticsearch.V5", "tracer\test\test-applications\integrations\Samples.Elasticsearch.V5\Samples.Elasticsearch.V5.csproj", "{AD119B05-A092-41AD-B68E-4AE2DB5A96D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpMessageHandler.StackOverflowException", "tracer\test\test-applications\regression\HttpMessageHandler.StackOverflowException\HttpMessageHandler.StackOverflowException.csproj", "{F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ServiceStack.Redis", "tracer\test\test-applications\integrations\Samples.ServiceStack.Redis\Samples.ServiceStack.Redis.csproj", "{8E1555D1-13D5-4DBF-9631-117D840C3158}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.StackExchange.Redis", "tracer\test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj", "{DC7D131A-AF99-46AB-9AA6-463443E3B992}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Wcf", "tracer\test\test-applications\integrations\Samples.Wcf\Samples.Wcf.csproj", "{DA0A44FB-D562-4776-AAFB-8266E78AA1A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataDogThreadTest", "tracer\test\test-applications\regression\DataDogThreadTest\DataDogThreadTest.csproj", "{3CDCE3AA-7CAF-4A27-B1D3-9D558B74D084}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GraphQL", "tracer\test\test-applications\integrations\Samples.GraphQL\Samples.GraphQL.csproj", "{43782238-E7BB-49D0-9541-1121DACA6EB5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis.StackOverflowException", "tracer\test\test-applications\regression\StackExchange.Redis.StackOverflowException\StackExchange.Redis.StackOverflowException.csproj", "{FA487690-E88C-4A57-9187-B71CB70C1AAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppDomainInstance", "tracer\test\test-applications\regression\dependency-libs\AppDomainInstance\AppDomainInstance.csproj", "{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoad.FileNotFoundException", "tracer\test\test-applications\regression\AssemblyLoad.FileNotFoundException\AssemblyLoad.FileNotFoundException.csproj", "{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MySql", "tracer\test\test-applications\integrations\Samples.MySql\Samples.MySql.csproj", "{42FA33DD-AEA3-4FF3-8319-F30244A666A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DatabaseHelper", "tracer\test\test-applications\integrations\dependency-libs\Samples.DatabaseHelper\Samples.DatabaseHelper.csproj", "{472DBA92-4FEA-4B9A-BA70-0E97B942E12D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyResolveMscorlibResources.InfiniteRecursionCrash", "tracer\test\test-applications\regression\AssemblyResolveMscorlibResources.InfiniteRecursionCrash\AssemblyResolveMscorlibResources.InfiniteRecursionCrash.csproj", "{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.TracingWithoutLimits", "tracer\test\test-applications\integrations\Samples.TracingWithoutLimits\Samples.TracingWithoutLimits.csproj", "{8BDF1DE0-E6DE-48AD-AAA3-CE09CB544E2C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.RateLimiter", "tracer\test\test-applications\integrations\Samples.RateLimiter\Samples.RateLimiter.csproj", "{EF718502-7760-45B5-A563-5F1B22A6B840}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc30", "tracer\test\test-applications\integrations\Samples.AspNetCoreMvc30\Samples.AspNetCoreMvc30.csproj", "{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc31", "tracer\test\test-applications\integrations\Samples.AspNetCoreMvc31\Samples.AspNetCoreMvc31.csproj", "{303F8E41-691F-4453-AB7D-88A0036C0465}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc21", "tracer\test\test-applications\integrations\Samples.AspNetCoreMvc21\Samples.AspNetCoreMvc21.csproj", "{D141BD06-DD95-4CAF-85CD-657116E0DAD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.StackExchange.Redis.Abstractions", "tracer\test\test-applications\regression\dependency-libs\Datadog.StackExchange.Redis.Abstractions\Datadog.StackExchange.Redis.Abstractions.csproj", "{24BE488C-A5F3-4228-8CAB-E60EBEA444EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.StackExchange.Redis", "tracer\test\test-applications\regression\dependency-libs\Datadog.StackExchange.Redis\Datadog.StackExchange.Redis.csproj", "{EB0B88E2-589A-4F65-8F98-D5B958D8104F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.StackExchange.Redis.StrongName", "tracer\test\test-applications\regression\dependency-libs\Datadog.StackExchange.Redis.StrongName\Datadog.StackExchange.Redis.StrongName.csproj", "{4E83BFB5-F225-4C3B-B96E-0AD1951A5630}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis.AssemblyConflict.SdkProject", "tracer\test\test-applications\regression\StackExchange.Redis.AssemblyConflict.SdkProject\StackExchange.Redis.AssemblyConflict.SdkProject.csproj", "{C41023C9-65C3-4FB3-9053-4DE963A81500}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Dapper", "tracer\test\test-applications\integrations\Samples.Dapper\Samples.Dapper.csproj", "{7E563BF6-47F2-4531-A1CE-FB9445DF3253}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DogStatsD.RaceCondition", "tracer\test\test-applications\regression\DogStatsD.RaceCondition\DogStatsD.RaceCondition.csproj", "{AAD9038B-8F16-4E09-93AF-B13E9F7ACD66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DatabaseHelper.netstandard", "tracer\test\test-applications\integrations\dependency-libs\Samples.DatabaseHelper.netstandard\Samples.DatabaseHelper.netstandard.csproj", "{8D949A40-5F4B-4EB0-B8FD-301B472C96AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.HttpMessageHandler", "tracer\test\test-applications\integrations\Samples.HttpMessageHandler\Samples.HttpMessageHandler.csproj", "{2F3B6271-B9A3-48A3-9DB6-847F3EF41F0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCoreAssemblyLoadFailureOlderNuGet", "tracer\test\test-applications\regression\NetCoreAssemblyLoadFailureOlderNuGet\NetCoreAssemblyLoadFailureOlderNuGet.csproj", "{D79491F0-CA92-439B-98CE-7AF9F57EBEB0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.SqlServer.NetFramework20", "tracer\test\test-applications\integrations\Samples.SqlServer.NetFramework20\Samples.SqlServer.NetFramework20.csproj", "{8276E670-FC3F-4EDE-9D51-6DAD90336C32}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DatabaseHelper.NetFramework20", "tracer\test\test-applications\integrations\dependency-libs\Samples.DatabaseHelper.NetFramework20\Samples.DatabaseHelper.NetFramework20.csproj", "{EC3C54CE-A3CD-434A-9E3C-DB6C5F5248EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Microsoft.Data.SqlClient", "tracer\test\test-applications\integrations\Samples.Microsoft.Data.SqlClient\Samples.Microsoft.Data.SqlClient.csproj", "{AA88952E-9393-4A4B-85B5-CC7F03629CE1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.NoMultiLoader", "tracer\test\test-applications\integrations\Samples.NoMultiLoader\Samples.NoMultiLoader.csproj", "{472B69A0-956F-42C0-9CB8-30107821C43B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.NoMultiLoader.Deps", "tracer\test\test-applications\integrations\dependency-libs\Samples.NoMultiLoader.Deps\Samples.NoMultiLoader.Deps.csproj", "{2A161C2D-DAA5-4F97-BA2B-783CF363C05B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.WebRequest.NetFramework20", "tracer\test\test-applications\integrations\Samples.WebRequest.NetFramework20\Samples.WebRequest.NetFramework20.csproj", "{5EE6B6EB-B768-47EC-882B-8DCACA2B1360}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.WebRequestHelper.NetFramework20", "tracer\test\test-applications\integrations\dependency-libs\Samples.WebRequestHelper.NetFramework20\Samples.WebRequestHelper.NetFramework20.csproj", "{B5A0C6B0-66C8-46EB-B699-44EB2DD1784A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.RabbitMQ", "tracer\test\test-applications\integrations\Samples.RabbitMQ\Samples.RabbitMQ.csproj", "{C1210E08-58E5-44D4-BE6F-634C3FC5E410}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.RuntimeMetrics", "tracer\test\test-applications\integrations\Samples.RuntimeMetrics\Samples.RuntimeMetrics.csproj", "{600953C4-BD8F-4A4B-A275-6D6F9EF48342}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.WebRequest", "tracer\test\test-applications\integrations\Samples.WebRequest\Samples.WebRequest.csproj", "{5C2829C2-ED0D-414C-B5A0-2BFDCA07B493}"
+EndProject
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Samples.SqlServer.Vb", "tracer\test\test-applications\integrations\dependency-libs\Samples.SqlServer.Vb\Samples.SqlServer.Vb.vbproj", "{CDE0C4D2-4B75-4ED0-988D-08E08B23B895}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.FakeDbCommand", "tracer\test\test-applications\integrations\Samples.FakeDbCommand\Samples.FakeDbCommand.csproj", "{0E036453-2C80-4FC9-A517-771F0071734B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Microsoft.Data.Sqlite", "tracer\test\test-applications\integrations\Samples.Microsoft.Data.Sqlite\Samples.Microsoft.Data.Sqlite.csproj", "{061AB58B-8235-4DAE-8D56-5F081DD78F5E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.SQLite.Core", "tracer\test\test-applications\integrations\Samples.SQLite.Core\Samples.SQLite.Core.csproj", "{69B678F6-51CF-4A5B-8DEC-1F9CEDC5C9E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.OracleMDA", "tracer\test\test-applications\integrations\Samples.OracleMDA\Samples.OracleMDA.csproj", "{BD46EFCC-177C-466E-81DF-39314B780ADA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DuplicateTypeProxy", "tracer\test\test-applications\regression\DuplicateTypeProxy\DuplicateTypeProxy.csproj", "{34B67004-7249-4EF1-8E12-6E6DA37EA6BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreRazorPages", "tracer\test\test-applications\integrations\Samples.AspNetCoreRazorPages\Samples.AspNetCoreRazorPages.csproj", "{1B9E6BF4-9D48-4988-9945-248096119E46}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.SQS", "tracer\test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj", "{3538EF5E-377E-430A-AFB8-F2DB5FAEDE95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.XUnitTests", "tracer\test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj", "{4AD438D9-D4E3-4EB5-8851-89DB4D1CFB9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.NUnitTests", "tracer\test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj", "{BC998ACD-353B-4A56-8A56-DF6200E141B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MSTestTests", "tracer\test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj", "{8EAABFB9-8A47-4B11-AD7F-AC8B373CDE49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Msmq", "tracer\test\test-applications\integrations\Samples.Msmq\Samples.Msmq.csproj", "{662B587F-97B5-4CEF-ABF9-6C76A6DBD29E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Kafka", "tracer\test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj", "{94B50277-FB50-4B42-BA79-770ADB24CB80}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.CosmosDb", "tracer\test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj", "{95613224-C1D7-4D4A-8926-F70DA26371CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Owin.WebApi2", "tracer\test\test-applications\integrations\Samples.Owin.WebApi2\Samples.Owin.WebApi2.csproj", "{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.Log4Net", "tracer\test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj", "{B93AD901-B761-486D-80AE-443742DB65E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.NLog", "tracer\test\test-applications\integrations\LogsInjection.NLog\LogsInjection.NLog.csproj", "{7203DD2B-739F-4223-AE50-D26A7FEEE1A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.Serilog", "tracer\test\test-applications\integrations\LogsInjection.Serilog\LogsInjection.Serilog.csproj", "{83290961-40BF-48CB-B925-FBBE48E629F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginApplication", "tracer\test\test-applications\integrations\dependency-libs\PluginApplication\PluginApplication.csproj", "{6E8D73F3-082C-455B-BBD5-03A156DCDD0F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjectionHelper", "tracer\test\test-applications\integrations\dependency-libs\LogsInjectionHelper\LogsInjectionHelper.csproj", "{65492DD4-CCD9-437A-B383-E7EB7AB872D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.ILogger", "tracer\test\test-applications\integrations\LogsInjection.ILogger\LogsInjection.ILogger.csproj", "{463A6FB2-1ABE-4B92-A470-97134D0BBC7E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Aerospike", "tracer\test\test-applications\integrations\Samples.Aerospike\Samples.Aerospike.csproj", "{7471A7A8-B89C-4C94-8EB1-24180E71CA1F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceBus.Minimal.NServiceBus", "tracer\test\test-applications\regression\ServiceBus.Minimal.NServiceBus\ServiceBus.Minimal.NServiceBus.csproj", "{9D5935CB-2DF2-46CB-A5E1-98BE134CAFCC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceBus.Minimal.Rebus", "tracer\test\test-applications\regression\ServiceBus.Minimal.Rebus\ServiceBus.Minimal.Rebus.csproj", "{6C599D79-87D0-476B-9CBA-F731E5627622}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceBus.Minimal.MassTransit", "tracer\test\test-applications\regression\ServiceBus.Minimal.MassTransit\ServiceBus.Minimal.MassTransit.csproj", "{B0E671B9-78DE-410F-A0AA-612FF1F900F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GraphQL3", "tracer\test\test-applications\integrations\Samples.GraphQL3\Samples.GraphQL3.csproj", "{CA3D605F-8DD7-4041-B024-70A24036AFA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GraphQL4", "tracer\test\test-applications\integrations\Samples.GraphQL4\Samples.GraphQL4.csproj", "{DA81EF3E-FDB3-417F-AA20-60FC495E3596}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Elasticsearch.V7", "tracer\test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj", "{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnumerateAssemblyReferences", "tracer\test\test-applications\regression\EnumerateAssemblyReferences\EnumerateAssemblyReferences.csproj", "{B22311CE-EC71-4ADD-ADC6-C466B2D10230}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureFunctions.V3InProcess", "tracer\test\test-applications\azure-functions\Samples.AzureFunctions.V3InProcess\Samples.AzureFunctions.V3InProcess.csproj", "{536F1D82-D40C-4E33-B7FA-76A0F17BF672}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Samples.Shared", "tracer\test\test-applications\Samples.Shared\Samples.Shared.shproj", "{5A806F4B-39E7-4F38-B36F-F5CFC4F8760A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MySqlConnector", "tracer\test\test-applications\integrations\Samples.MySqlConnector\Samples.MySqlConnector.csproj", "{73252693-2563-4B20-A2F5-F8DB37B91DBE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Couchbase", "tracer\test\test-applications\integrations\Samples.Couchbase\Samples.Couchbase.csproj", "{6F38B456-1D16-4842-AEE5-E74564FB506A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Couchbase3", "tracer\test\test-applications\integrations\Samples.Couchbase3\Samples.Couchbase3.csproj", "{65A66859-2735-4DD6-A927-B416B7A62D0F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMinimalApis", "tracer\test\test-applications\integrations\Samples.AspNetCoreMinimalApis\Samples.AspNetCoreMinimalApis.csproj", "{2A6D3042-C675-4EA3-A8E7-5BDD3C5758EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreSmokeTest", "tracer\test\test-applications\regression\AspNetCoreSmokeTest\AspNetCoreSmokeTest.csproj", "{BED94A61-6FD9-4103-BD35-70B4798C301C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.VersionConflict.1x", "tracer\test\test-applications\integrations\Samples.VersionConflict.1x\Samples.VersionConflict.1x.csproj", "{6F8B63EA-98D6-4909-BE9E-F39029C29C4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.VersionConflict.2x", "tracer\test\test-applications\integrations\Samples.VersionConflict.2x\Samples.VersionConflict.2x.csproj", "{3BC38BE0-B6FF-4B05-BC63-3614A5CF9393}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Data.DB2.DBCommand", "tracer\test\test-applications\regression\IBM.Data.DB2.DBCommand\IBM.Data.DB2.DBCommand.csproj", "{E961D189-3EF9-4D79-95A1-78D825B73B01}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Devart.Data.DBCommand", "tracer\test\test-applications\regression\Devart.Data.DBCommand\Devart.Data.DBCommand.csproj", "{24834112-8C25-4A3D-BDD3-0ACEC825FF2C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjectionHelper.VersionConflict", "tracer\test\test-applications\integrations\dependency-libs\LogsInjectionHelper.VersionConflict\LogsInjectionHelper.VersionConflict.csproj", "{E9D55D41-B161-492F-9EC7-FF2F2231A587}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.Serilog.VersionConflict.2x", "tracer\test\test-applications\integrations\LogsInjection.Serilog.VersionConflict.2x\LogsInjection.Serilog.VersionConflict.2x.csproj", "{268B6D05-B6D5-4D20-B2B1-0B9422A92D73}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.Serilog14.VersionConflict.2x", "tracer\test\test-applications\integrations\LogsInjection.Serilog14.VersionConflict.2x\LogsInjection.Serilog14.VersionConflict.2x.csproj", "{3C78C521-6507-4D3A-B92E-BC41CEE9D9F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.Log4Net.VersionConflict.2x", "tracer\test\test-applications\integrations\LogsInjection.Log4Net.VersionConflict.2x\LogsInjection.Log4Net.VersionConflict.2x.csproj", "{25B7D571-C385-4CA6-9B6A-573D3E3FF3C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.NLog.VersionConflict.2x", "tracer\test\test-applications\integrations\LogsInjection.NLog.VersionConflict.2x\LogsInjection.NLog.VersionConflict.2x.csproj", "{F19B5109-36AC-4A64-AFE6-FAF9E831C528}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.NLog20.VersionConflict.2x", "tracer\test\test-applications\integrations\LogsInjection.NLog20.VersionConflict.2x\LogsInjection.NLog20.VersionConflict.2x.csproj", "{0980BCDD-A231-42D1-B689-41A41BBA161A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.NLog10.VersionConflict.2x", "tracer\test\test-applications\integrations\LogsInjection.NLog10.VersionConflict.2x\LogsInjection.NLog10.VersionConflict.2x.csproj", "{D00DDBDA-66F5-490D-8C1C-16CC5E142170}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.ILogger.VersionConflict.2x", "tracer\test\test-applications\integrations\LogsInjection.ILogger.VersionConflict.2x\LogsInjection.ILogger.VersionConflict.2x.csproj", "{238F67DB-1E48-447C-B1B8-BDC692103791}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.LargePayload", "tracer\test\test-applications\integrations\Samples.LargePayload\Samples.LargePayload.csproj", "{C94E0739-1DA0-4657-8D53-FA4143F6FDA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.Lambda", "tracer\test\test-applications\integrations\Samples.AWS.Lambda\Samples.AWS.Lambda.csproj", "{31D192AF-5454-4D91-97E1-889723AAD309}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Console", "tracer\test\test-applications\integrations\Samples.Console\Samples.Console.csproj", "{887AC8BA-35A6-4646-BF9A-59357155805E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Telemetry", "tracer\test\test-applications\integrations\Samples.Telemetry\Samples.Telemetry.csproj", "{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox.AutomaticInstrumentation", "tracer\test\test-applications\regression\Sandbox.AutomaticInstrumentation\Sandbox.AutomaticInstrumentation.csproj", "{10619BA2-AED1-482A-8570-BB7C7B83DDDC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.TraceAnnotations", "tracer\test\test-applications\integrations\Samples.TraceAnnotations\Samples.TraceAnnotations.csproj", "{230A9B80-E1AA-469F-86F2-B7E257F14E66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.TraceAnnotations.VersionMismatch.BeforeFeature", "tracer\test\test-applications\integrations\Samples.TraceAnnotations.VersionMismatch.BeforeFeature\Samples.TraceAnnotations.VersionMismatch.BeforeFeature.csproj", "{0DF4363A-0DF4-4882-A39F-3C9F404B8DE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.TraceAnnotations.VersionMismatch.AfterFeature", "tracer\test\test-applications\integrations\Samples.TraceAnnotations.VersionMismatch.AfterFeature\Samples.TraceAnnotations.VersionMismatch.AfterFeature.csproj", "{FF2E8DD2-CA25-4D53-A77C-9F88E41F8C98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.TraceAnnotations.VersionMismatch.NewerNuGet", "tracer\test\test-applications\integrations\Samples.TraceAnnotations.VersionMismatch.NewerNuGet\Samples.TraceAnnotations.VersionMismatch.NewerNuGet.csproj", "{2CC63AEB-0098-4D3B-9606-F07692C03E90}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GrpcDotNet", "tracer\test\test-applications\integrations\Samples.GrpcDotNet\Samples.GrpcDotNet.csproj", "{DEACDE01-95FE-4777-B70A-F20A96AABEA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GrpcLegacy", "tracer\test\test-applications\integrations\Samples.GrpcLegacy\Samples.GrpcLegacy.csproj", "{754F73E1-F7A4-47C7-A3F7-DC59ADA5105A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Security.AspNetCoreBare", "tracer\test\test-applications\security\Samples.Security.AspNetCoreBare\Samples.Security.AspNetCoreBare.csproj", "{F6A03B6C-EBF9-4581-9904-EDC7270CF3BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoadContextRedirect", "tracer\test\test-applications\regression\AssemblyLoadContextRedirect\AssemblyLoadContextRedirect.csproj", "{C4CDF6A6-40E5-4CCD-AC4C-143F9F4398CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Probes", "tracer\test\test-applications\debugger\Samples.Probes\Samples.Probes.csproj", "{2BED2D88-0B51-468B-A559-DA7B4BACA00B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ProcessStart", "tracer\test\test-applications\integrations\Samples.ProcessStart\Samples.ProcessStart.csproj", "{B1F9F419-87E1-4B59-A954-9895FCD7949E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.HotChocolate", "tracer\test\test-applications\integrations\Samples.HotChocolate\Samples.HotChocolate.csproj", "{BBAD4449-D414-4A20-BCA2-DE9C40E4A866}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Probes.External", "tracer\test\test-applications\debugger\dependency-libs\Samples.Probes.External\Samples.Probes.External.csproj", "{9235DCFA-9EDD-48EF-B1DB-E15B738C85A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.Kafka", "tracer\test\test-applications\integrations\Samples.DataStreams.Kafka\Samples.DataStreams.Kafka.csproj", "{7415B0FB-A446-41D6-A0CD-D64B703F15AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.RabbitMQ", "tracer\test\test-applications\integrations\Samples.DataStreams.RabbitMQ\Samples.DataStreams.RabbitMQ.csproj", "{8DFE1168-B1CC-43D1-B256-B5708BADD47B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.WeakCipher", "tracer\test\test-applications\integrations\Samples.WeakCipher\Samples.WeakCipher.csproj", "{43C696FA-3812-4312-9529-98CECCD32A81}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Deduplication", "tracer\test\test-applications\integrations\Samples.Deduplication\Samples.Deduplication.csproj", "{63B3A841-F3E0-4D60-B85D-156D7251FFDF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureFunctions.V4InProcess", "tracer\test\test-applications\azure-functions\Samples.AzureFunctions.V4InProcess\Samples.AzureFunctions.V4InProcess.csproj", "{0F0F7D45-0E13-42B0-A158-8F303BBE8358}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Probes.TestRuns", "tracer\test\test-applications\debugger\dependency-libs\Samples.Probes.TestRuns\Samples.Probes.TestRuns.csproj", "{4F377216-3D76-4169-BE2B-8DA3A653DD5E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.OpenTelemetrySdk", "tracer\test\test-applications\integrations\Samples.OpenTelemetrySdk\Samples.OpenTelemetrySdk.csproj", "{CB56AC5A-D2C1-40DE-99D5-DCF9F44C9482}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.NetActivitySdk", "tracer\test\test-applications\integrations\Samples.NetActivitySdk\Samples.NetActivitySdk.csproj", "{560E1104-9A6E-41E7-AB3D-85BA2740A0F7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.InstrumentedTests", "tracer\test\test-applications\integrations\Samples.InstrumentedTests\Samples.InstrumentedTests.csproj", "{64E32F7A-8989-480E-AFE7-3BD343424F6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureFunctions.V4Isolated", "tracer\test\test-applications\azure-functions\Samples.AzureFunctions.V4Isolated\Samples.AzureFunctions.V4Isolated.csproj", "{BDEE131F-CCF5-49BD-9764-9C4A8864CE4E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.SimpleNotificationService", "tracer\test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj", "{901AC4F9-7DE5-4D13-85FD-384382E29F11}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GraphQL7", "tracer\test\test-applications\integrations\Samples.GraphQL7\Samples.GraphQL7.csproj", "{A996927A-9222-43F4-8552-810B69FF04DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Security.AspNetCore5", "tracer\test\test-applications\security\Samples.Security.AspNetCore5\Samples.Security.AspNetCore5.csproj", "{87D57940-9A6E-473C-A4D6-777E3BAFD5F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Security.AspNetCore2", "tracer\test\test-applications\security\Samples.Security.AspNetCore2\Samples.Security.AspNetCore2.csproj", "{C5E7978A-DE2A-4944-86DB-4721A110E720}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Trimming", "tracer\test\test-applications\integrations\Samples.Trimming\Samples.Trimming.csproj", "{289713D4-5259-4CC4-8CAA-DBF3BDCDCBC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ActivitySampleHelper", "tracer\test\test-applications\integrations\dependency-libs\ActivitySampleHelper\ActivitySampleHelper.csproj", "{51AF3B29-D107-4E22-8A85-DF02A8A898E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Probes.Unreferenced.External", "tracer\test\test-applications\debugger\dependency-libs\Samples.Probes.Unreferenced.External\Samples.Probes.Unreferenced.External.csproj", "{DE15D292-DC01-4AEA-B473-C2F2908341A7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox.LegacySecurityPolicy", "tracer\test\test-applications\regression\Sandbox.LegacySecurityPolicy\Sandbox.LegacySecurityPolicy.csproj", "{959E9599-8D99-43BC-8038-B91F76179C1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeepNestedHierarchy", "tracer\test\test-applications\regression\DeepNestedHierarchy\DeepNestedHierarchy.csproj", "{1B3E6BEE-F7AB-433E-A1D9-E8BE3782419B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.Kinesis", "tracer\test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj", "{C7DE0626-9EB6-475E-AA0C-CB9DE21D4FAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureServiceBus", "tracer\test\test-applications\integrations\Samples.AzureServiceBus\Samples.AzureServiceBus.csproj", "{BC44A41F-1BED-4438-9F66-0EA5607906D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.AzureServiceBus", "tracer\test\test-applications\integrations\Samples.DataStreams.AzureServiceBus\Samples.DataStreams.AzureServiceBus.csproj", "{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.DynamoDBv2", "tracer\test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj", "{D59C5649-BE0E-4A33-B868-B652D8614534}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Amazon.Lambda.RuntimeSupport", "tracer\test\test-applications\integrations\Samples.Amazon.Lambda.RuntimeSupport\Samples.Amazon.Lambda.RuntimeSupport.csproj", "{18A6904A-5AFD-4816-AC3F-9F5E433720B5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Remoting", "tracer\test\test-applications\integrations\Samples.Remoting\Samples.Remoting.csproj", "{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ManualInstrumentation", "tracer\test\test-applications\integrations\Samples.ManualInstrumentation\Samples.ManualInstrumentation.csproj", "{F24EB026-65FB-4247-ABF8-942B11ADAB64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.ILogger.ExtendedLogger", "tracer\test\test-applications\integrations\LogsInjection.ILogger.ExtendedLogger\LogsInjection.ILogger.ExtendedLogger.csproj", "{483A27EE-7682-417C-9FCA-C2171C13F693}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Yarp.DistributedTracing", "tracer\test\test-applications\integrations\Samples.Yarp.DistributedTracing\Samples.Yarp.DistributedTracing.csproj", "{E10243AE-34FC-47B5-B898-B5203C36920C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MSTestTests2", "tracer\test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj", "{0F1D9FB5-4415-40F1-B7B0-6DD5A3BAB0C4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Selenium", "tracer\test\test-applications\integrations\Samples.Selenium\Samples.Selenium.csproj", "{32193A01-04DD-463B-A84A-9A93167958A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.OpenTracing", "tracer\test\test-applications\integrations\Samples.OpenTracing\Samples.OpenTracing.csproj", "{79A63F25-A5F9-441C-8C52-F8033A9F8ABA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.ManualAPI", "tracer\test\test-applications\integrations\Samples.DataStreams.ManualAPI\Samples.DataStreams.ManualAPI.csproj", "{5E290FA1-E87B-4782-B977-EB5FA6C96EFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.CIVisibilityIpc", "tracer\test\test-applications\integrations\Samples.CIVisibilityIpc\Samples.CIVisibilityIpc.csproj", "{BA9613FB-8458-4C78-98DE-AA45BBE62F64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.CIVisibilityVersionMismatch", "tracer\test\test-applications\integrations\Samples.CIVisibilityVersionMismatch\Samples.CIVisibilityVersionMismatch.csproj", "{0D996EEE-7C04-4888-AF48-9C1E2F261A00}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RuntimeMetricsShutdown", "tracer\test\test-applications\regression\RuntimeMetricsShutdown\RuntimeMetricsShutdown.csproj", "{C4ABF344-3263-45D5-A074-03FB206FF309}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Debugger.AspNetCore5", "tracer\test\test-applications\debugger\Samples.Debugger.AspNetCore5\Samples.Debugger.AspNetCore5.csproj", "{3978A7D5-7B6E-4152-9C3A-5852F1F6E223}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.XUnitTestsRetries", "tracer\test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj", "{B8DAF87D-A30D-48AE-B630-C65A64D0C3AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.NUnitTestsRetries", "tracer\test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj", "{7131FE5A-6B27-4BBC-B0CF-09780F6D2DFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MSTestTestsRetries", "tracer\test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj", "{2CA0D70C-DFC1-458A-871B-328AB6E87E3A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.EventBridge", "tracer\test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj", "{D6155F26-8245-4B66-8944-79C3DF9F9DA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoadContextResolve", "tracer\test\test-applications\regression\AssemblyLoadContextResolve\AssemblyLoadContextResolve.csproj", "{8B1AF6A7-DD41-4347-B637-90C23D69B50E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Isolated.SdkV1", "tracer\test\test-applications\azure-functions\Samples.AzureFunctions.V4Isolated.SdkV1\Samples.AzureFunctions.V4Isolated.SdkV1.csproj", "{18767A3E-9ADC-485C-A8C7-50660D5B579D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FDB5C8D0-018D-4FF9-9680-C6A5078F819B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDB5C8D0-018D-4FF9-9680-C6A5078F819B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDB5C8D0-018D-4FF9-9680-C6A5078F819B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDB5C8D0-018D-4FF9-9680-C6A5078F819B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD119B05-A092-41AD-B68E-4AE2DB5A96D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD119B05-A092-41AD-B68E-4AE2DB5A96D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD119B05-A092-41AD-B68E-4AE2DB5A96D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD119B05-A092-41AD-B68E-4AE2DB5A96D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E1555D1-13D5-4DBF-9631-117D840C3158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E1555D1-13D5-4DBF-9631-117D840C3158}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E1555D1-13D5-4DBF-9631-117D840C3158}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E1555D1-13D5-4DBF-9631-117D840C3158}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC7D131A-AF99-46AB-9AA6-463443E3B992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC7D131A-AF99-46AB-9AA6-463443E3B992}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC7D131A-AF99-46AB-9AA6-463443E3B992}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC7D131A-AF99-46AB-9AA6-463443E3B992}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA0A44FB-D562-4776-AAFB-8266E78AA1A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA0A44FB-D562-4776-AAFB-8266E78AA1A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA0A44FB-D562-4776-AAFB-8266E78AA1A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA0A44FB-D562-4776-AAFB-8266E78AA1A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CDCE3AA-7CAF-4A27-B1D3-9D558B74D084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CDCE3AA-7CAF-4A27-B1D3-9D558B74D084}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CDCE3AA-7CAF-4A27-B1D3-9D558B74D084}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CDCE3AA-7CAF-4A27-B1D3-9D558B74D084}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43782238-E7BB-49D0-9541-1121DACA6EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43782238-E7BB-49D0-9541-1121DACA6EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43782238-E7BB-49D0-9541-1121DACA6EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43782238-E7BB-49D0-9541-1121DACA6EB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA487690-E88C-4A57-9187-B71CB70C1AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA487690-E88C-4A57-9187-B71CB70C1AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA487690-E88C-4A57-9187-B71CB70C1AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA487690-E88C-4A57-9187-B71CB70C1AAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42FA33DD-AEA3-4FF3-8319-F30244A666A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42FA33DD-AEA3-4FF3-8319-F30244A666A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42FA33DD-AEA3-4FF3-8319-F30244A666A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42FA33DD-AEA3-4FF3-8319-F30244A666A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{472DBA92-4FEA-4B9A-BA70-0E97B942E12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{472DBA92-4FEA-4B9A-BA70-0E97B942E12D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{472DBA92-4FEA-4B9A-BA70-0E97B942E12D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{472DBA92-4FEA-4B9A-BA70-0E97B942E12D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BDF1DE0-E6DE-48AD-AAA3-CE09CB544E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BDF1DE0-E6DE-48AD-AAA3-CE09CB544E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BDF1DE0-E6DE-48AD-AAA3-CE09CB544E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BDF1DE0-E6DE-48AD-AAA3-CE09CB544E2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF718502-7760-45B5-A563-5F1B22A6B840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF718502-7760-45B5-A563-5F1B22A6B840}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF718502-7760-45B5-A563-5F1B22A6B840}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF718502-7760-45B5-A563-5F1B22A6B840}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24BE488C-A5F3-4228-8CAB-E60EBEA444EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24BE488C-A5F3-4228-8CAB-E60EBEA444EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24BE488C-A5F3-4228-8CAB-E60EBEA444EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24BE488C-A5F3-4228-8CAB-E60EBEA444EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB0B88E2-589A-4F65-8F98-D5B958D8104F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB0B88E2-589A-4F65-8F98-D5B958D8104F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB0B88E2-589A-4F65-8F98-D5B958D8104F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB0B88E2-589A-4F65-8F98-D5B958D8104F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E83BFB5-F225-4C3B-B96E-0AD1951A5630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E83BFB5-F225-4C3B-B96E-0AD1951A5630}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E83BFB5-F225-4C3B-B96E-0AD1951A5630}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E83BFB5-F225-4C3B-B96E-0AD1951A5630}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C41023C9-65C3-4FB3-9053-4DE963A81500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C41023C9-65C3-4FB3-9053-4DE963A81500}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C41023C9-65C3-4FB3-9053-4DE963A81500}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C41023C9-65C3-4FB3-9053-4DE963A81500}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E563BF6-47F2-4531-A1CE-FB9445DF3253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E563BF6-47F2-4531-A1CE-FB9445DF3253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E563BF6-47F2-4531-A1CE-FB9445DF3253}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E563BF6-47F2-4531-A1CE-FB9445DF3253}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAD9038B-8F16-4E09-93AF-B13E9F7ACD66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAD9038B-8F16-4E09-93AF-B13E9F7ACD66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAD9038B-8F16-4E09-93AF-B13E9F7ACD66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAD9038B-8F16-4E09-93AF-B13E9F7ACD66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D949A40-5F4B-4EB0-B8FD-301B472C96AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D949A40-5F4B-4EB0-B8FD-301B472C96AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D949A40-5F4B-4EB0-B8FD-301B472C96AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D949A40-5F4B-4EB0-B8FD-301B472C96AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F3B6271-B9A3-48A3-9DB6-847F3EF41F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F3B6271-B9A3-48A3-9DB6-847F3EF41F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F3B6271-B9A3-48A3-9DB6-847F3EF41F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F3B6271-B9A3-48A3-9DB6-847F3EF41F0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D79491F0-CA92-439B-98CE-7AF9F57EBEB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D79491F0-CA92-439B-98CE-7AF9F57EBEB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D79491F0-CA92-439B-98CE-7AF9F57EBEB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D79491F0-CA92-439B-98CE-7AF9F57EBEB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8276E670-FC3F-4EDE-9D51-6DAD90336C32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8276E670-FC3F-4EDE-9D51-6DAD90336C32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8276E670-FC3F-4EDE-9D51-6DAD90336C32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8276E670-FC3F-4EDE-9D51-6DAD90336C32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC3C54CE-A3CD-434A-9E3C-DB6C5F5248EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC3C54CE-A3CD-434A-9E3C-DB6C5F5248EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC3C54CE-A3CD-434A-9E3C-DB6C5F5248EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC3C54CE-A3CD-434A-9E3C-DB6C5F5248EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA88952E-9393-4A4B-85B5-CC7F03629CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA88952E-9393-4A4B-85B5-CC7F03629CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA88952E-9393-4A4B-85B5-CC7F03629CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA88952E-9393-4A4B-85B5-CC7F03629CE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{472B69A0-956F-42C0-9CB8-30107821C43B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{472B69A0-956F-42C0-9CB8-30107821C43B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{472B69A0-956F-42C0-9CB8-30107821C43B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{472B69A0-956F-42C0-9CB8-30107821C43B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A161C2D-DAA5-4F97-BA2B-783CF363C05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A161C2D-DAA5-4F97-BA2B-783CF363C05B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A161C2D-DAA5-4F97-BA2B-783CF363C05B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A161C2D-DAA5-4F97-BA2B-783CF363C05B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EE6B6EB-B768-47EC-882B-8DCACA2B1360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EE6B6EB-B768-47EC-882B-8DCACA2B1360}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EE6B6EB-B768-47EC-882B-8DCACA2B1360}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5EE6B6EB-B768-47EC-882B-8DCACA2B1360}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5A0C6B0-66C8-46EB-B699-44EB2DD1784A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5A0C6B0-66C8-46EB-B699-44EB2DD1784A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5A0C6B0-66C8-46EB-B699-44EB2DD1784A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5A0C6B0-66C8-46EB-B699-44EB2DD1784A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1210E08-58E5-44D4-BE6F-634C3FC5E410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1210E08-58E5-44D4-BE6F-634C3FC5E410}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1210E08-58E5-44D4-BE6F-634C3FC5E410}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1210E08-58E5-44D4-BE6F-634C3FC5E410}.Release|Any CPU.Build.0 = Release|Any CPU
+		{600953C4-BD8F-4A4B-A275-6D6F9EF48342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{600953C4-BD8F-4A4B-A275-6D6F9EF48342}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{600953C4-BD8F-4A4B-A275-6D6F9EF48342}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{600953C4-BD8F-4A4B-A275-6D6F9EF48342}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C2829C2-ED0D-414C-B5A0-2BFDCA07B493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C2829C2-ED0D-414C-B5A0-2BFDCA07B493}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C2829C2-ED0D-414C-B5A0-2BFDCA07B493}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C2829C2-ED0D-414C-B5A0-2BFDCA07B493}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDE0C4D2-4B75-4ED0-988D-08E08B23B895}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDE0C4D2-4B75-4ED0-988D-08E08B23B895}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDE0C4D2-4B75-4ED0-988D-08E08B23B895}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDE0C4D2-4B75-4ED0-988D-08E08B23B895}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E036453-2C80-4FC9-A517-771F0071734B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E036453-2C80-4FC9-A517-771F0071734B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E036453-2C80-4FC9-A517-771F0071734B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E036453-2C80-4FC9-A517-771F0071734B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{061AB58B-8235-4DAE-8D56-5F081DD78F5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{061AB58B-8235-4DAE-8D56-5F081DD78F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{061AB58B-8235-4DAE-8D56-5F081DD78F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{061AB58B-8235-4DAE-8D56-5F081DD78F5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69B678F6-51CF-4A5B-8DEC-1F9CEDC5C9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69B678F6-51CF-4A5B-8DEC-1F9CEDC5C9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69B678F6-51CF-4A5B-8DEC-1F9CEDC5C9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69B678F6-51CF-4A5B-8DEC-1F9CEDC5C9E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD46EFCC-177C-466E-81DF-39314B780ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD46EFCC-177C-466E-81DF-39314B780ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD46EFCC-177C-466E-81DF-39314B780ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD46EFCC-177C-466E-81DF-39314B780ADA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34B67004-7249-4EF1-8E12-6E6DA37EA6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34B67004-7249-4EF1-8E12-6E6DA37EA6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34B67004-7249-4EF1-8E12-6E6DA37EA6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34B67004-7249-4EF1-8E12-6E6DA37EA6BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B9E6BF4-9D48-4988-9945-248096119E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B9E6BF4-9D48-4988-9945-248096119E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B9E6BF4-9D48-4988-9945-248096119E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B9E6BF4-9D48-4988-9945-248096119E46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3538EF5E-377E-430A-AFB8-F2DB5FAEDE95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3538EF5E-377E-430A-AFB8-F2DB5FAEDE95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3538EF5E-377E-430A-AFB8-F2DB5FAEDE95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3538EF5E-377E-430A-AFB8-F2DB5FAEDE95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4AD438D9-D4E3-4EB5-8851-89DB4D1CFB9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AD438D9-D4E3-4EB5-8851-89DB4D1CFB9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AD438D9-D4E3-4EB5-8851-89DB4D1CFB9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4AD438D9-D4E3-4EB5-8851-89DB4D1CFB9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC998ACD-353B-4A56-8A56-DF6200E141B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC998ACD-353B-4A56-8A56-DF6200E141B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC998ACD-353B-4A56-8A56-DF6200E141B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC998ACD-353B-4A56-8A56-DF6200E141B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EAABFB9-8A47-4B11-AD7F-AC8B373CDE49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EAABFB9-8A47-4B11-AD7F-AC8B373CDE49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EAABFB9-8A47-4B11-AD7F-AC8B373CDE49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EAABFB9-8A47-4B11-AD7F-AC8B373CDE49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{662B587F-97B5-4CEF-ABF9-6C76A6DBD29E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{662B587F-97B5-4CEF-ABF9-6C76A6DBD29E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{662B587F-97B5-4CEF-ABF9-6C76A6DBD29E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{662B587F-97B5-4CEF-ABF9-6C76A6DBD29E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94B50277-FB50-4B42-BA79-770ADB24CB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94B50277-FB50-4B42-BA79-770ADB24CB80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94B50277-FB50-4B42-BA79-770ADB24CB80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94B50277-FB50-4B42-BA79-770ADB24CB80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95613224-C1D7-4D4A-8926-F70DA26371CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95613224-C1D7-4D4A-8926-F70DA26371CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95613224-C1D7-4D4A-8926-F70DA26371CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B93AD901-B761-486D-80AE-443742DB65E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B93AD901-B761-486D-80AE-443742DB65E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B93AD901-B761-486D-80AE-443742DB65E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B93AD901-B761-486D-80AE-443742DB65E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7203DD2B-739F-4223-AE50-D26A7FEEE1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7203DD2B-739F-4223-AE50-D26A7FEEE1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7203DD2B-739F-4223-AE50-D26A7FEEE1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7203DD2B-739F-4223-AE50-D26A7FEEE1A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83290961-40BF-48CB-B925-FBBE48E629F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83290961-40BF-48CB-B925-FBBE48E629F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83290961-40BF-48CB-B925-FBBE48E629F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83290961-40BF-48CB-B925-FBBE48E629F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E8D73F3-082C-455B-BBD5-03A156DCDD0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E8D73F3-082C-455B-BBD5-03A156DCDD0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E8D73F3-082C-455B-BBD5-03A156DCDD0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E8D73F3-082C-455B-BBD5-03A156DCDD0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65492DD4-CCD9-437A-B383-E7EB7AB872D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65492DD4-CCD9-437A-B383-E7EB7AB872D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65492DD4-CCD9-437A-B383-E7EB7AB872D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65492DD4-CCD9-437A-B383-E7EB7AB872D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{463A6FB2-1ABE-4B92-A470-97134D0BBC7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{463A6FB2-1ABE-4B92-A470-97134D0BBC7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{463A6FB2-1ABE-4B92-A470-97134D0BBC7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{463A6FB2-1ABE-4B92-A470-97134D0BBC7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7471A7A8-B89C-4C94-8EB1-24180E71CA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7471A7A8-B89C-4C94-8EB1-24180E71CA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7471A7A8-B89C-4C94-8EB1-24180E71CA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7471A7A8-B89C-4C94-8EB1-24180E71CA1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D5935CB-2DF2-46CB-A5E1-98BE134CAFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D5935CB-2DF2-46CB-A5E1-98BE134CAFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D5935CB-2DF2-46CB-A5E1-98BE134CAFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D5935CB-2DF2-46CB-A5E1-98BE134CAFCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C599D79-87D0-476B-9CBA-F731E5627622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C599D79-87D0-476B-9CBA-F731E5627622}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C599D79-87D0-476B-9CBA-F731E5627622}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C599D79-87D0-476B-9CBA-F731E5627622}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0E671B9-78DE-410F-A0AA-612FF1F900F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0E671B9-78DE-410F-A0AA-612FF1F900F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0E671B9-78DE-410F-A0AA-612FF1F900F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0E671B9-78DE-410F-A0AA-612FF1F900F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA3D605F-8DD7-4041-B024-70A24036AFA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA3D605F-8DD7-4041-B024-70A24036AFA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA3D605F-8DD7-4041-B024-70A24036AFA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA3D605F-8DD7-4041-B024-70A24036AFA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA81EF3E-FDB3-417F-AA20-60FC495E3596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA81EF3E-FDB3-417F-AA20-60FC495E3596}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA81EF3E-FDB3-417F-AA20-60FC495E3596}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA81EF3E-FDB3-417F-AA20-60FC495E3596}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B22311CE-EC71-4ADD-ADC6-C466B2D10230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B22311CE-EC71-4ADD-ADC6-C466B2D10230}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B22311CE-EC71-4ADD-ADC6-C466B2D10230}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B22311CE-EC71-4ADD-ADC6-C466B2D10230}.Release|Any CPU.Build.0 = Release|Any CPU
+		{536F1D82-D40C-4E33-B7FA-76A0F17BF672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{536F1D82-D40C-4E33-B7FA-76A0F17BF672}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73252693-2563-4B20-A2F5-F8DB37B91DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73252693-2563-4B20-A2F5-F8DB37B91DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73252693-2563-4B20-A2F5-F8DB37B91DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73252693-2563-4B20-A2F5-F8DB37B91DBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F38B456-1D16-4842-AEE5-E74564FB506A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F38B456-1D16-4842-AEE5-E74564FB506A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F38B456-1D16-4842-AEE5-E74564FB506A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F38B456-1D16-4842-AEE5-E74564FB506A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65A66859-2735-4DD6-A927-B416B7A62D0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65A66859-2735-4DD6-A927-B416B7A62D0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65A66859-2735-4DD6-A927-B416B7A62D0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65A66859-2735-4DD6-A927-B416B7A62D0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A6D3042-C675-4EA3-A8E7-5BDD3C5758EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A6D3042-C675-4EA3-A8E7-5BDD3C5758EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A6D3042-C675-4EA3-A8E7-5BDD3C5758EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A6D3042-C675-4EA3-A8E7-5BDD3C5758EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BED94A61-6FD9-4103-BD35-70B4798C301C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BED94A61-6FD9-4103-BD35-70B4798C301C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BED94A61-6FD9-4103-BD35-70B4798C301C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BED94A61-6FD9-4103-BD35-70B4798C301C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F8B63EA-98D6-4909-BE9E-F39029C29C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F8B63EA-98D6-4909-BE9E-F39029C29C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F8B63EA-98D6-4909-BE9E-F39029C29C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F8B63EA-98D6-4909-BE9E-F39029C29C4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BC38BE0-B6FF-4B05-BC63-3614A5CF9393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BC38BE0-B6FF-4B05-BC63-3614A5CF9393}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BC38BE0-B6FF-4B05-BC63-3614A5CF9393}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BC38BE0-B6FF-4B05-BC63-3614A5CF9393}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E961D189-3EF9-4D79-95A1-78D825B73B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E961D189-3EF9-4D79-95A1-78D825B73B01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E961D189-3EF9-4D79-95A1-78D825B73B01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E961D189-3EF9-4D79-95A1-78D825B73B01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24834112-8C25-4A3D-BDD3-0ACEC825FF2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24834112-8C25-4A3D-BDD3-0ACEC825FF2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24834112-8C25-4A3D-BDD3-0ACEC825FF2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24834112-8C25-4A3D-BDD3-0ACEC825FF2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9D55D41-B161-492F-9EC7-FF2F2231A587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9D55D41-B161-492F-9EC7-FF2F2231A587}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9D55D41-B161-492F-9EC7-FF2F2231A587}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9D55D41-B161-492F-9EC7-FF2F2231A587}.Release|Any CPU.Build.0 = Release|Any CPU
+		{268B6D05-B6D5-4D20-B2B1-0B9422A92D73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{268B6D05-B6D5-4D20-B2B1-0B9422A92D73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{268B6D05-B6D5-4D20-B2B1-0B9422A92D73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{268B6D05-B6D5-4D20-B2B1-0B9422A92D73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C78C521-6507-4D3A-B92E-BC41CEE9D9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C78C521-6507-4D3A-B92E-BC41CEE9D9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C78C521-6507-4D3A-B92E-BC41CEE9D9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C78C521-6507-4D3A-B92E-BC41CEE9D9F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25B7D571-C385-4CA6-9B6A-573D3E3FF3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25B7D571-C385-4CA6-9B6A-573D3E3FF3C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25B7D571-C385-4CA6-9B6A-573D3E3FF3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25B7D571-C385-4CA6-9B6A-573D3E3FF3C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F19B5109-36AC-4A64-AFE6-FAF9E831C528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F19B5109-36AC-4A64-AFE6-FAF9E831C528}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F19B5109-36AC-4A64-AFE6-FAF9E831C528}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F19B5109-36AC-4A64-AFE6-FAF9E831C528}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0980BCDD-A231-42D1-B689-41A41BBA161A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0980BCDD-A231-42D1-B689-41A41BBA161A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0980BCDD-A231-42D1-B689-41A41BBA161A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0980BCDD-A231-42D1-B689-41A41BBA161A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D00DDBDA-66F5-490D-8C1C-16CC5E142170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D00DDBDA-66F5-490D-8C1C-16CC5E142170}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D00DDBDA-66F5-490D-8C1C-16CC5E142170}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D00DDBDA-66F5-490D-8C1C-16CC5E142170}.Release|Any CPU.Build.0 = Release|Any CPU
+		{238F67DB-1E48-447C-B1B8-BDC692103791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{238F67DB-1E48-447C-B1B8-BDC692103791}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{238F67DB-1E48-447C-B1B8-BDC692103791}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{238F67DB-1E48-447C-B1B8-BDC692103791}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C94E0739-1DA0-4657-8D53-FA4143F6FDA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C94E0739-1DA0-4657-8D53-FA4143F6FDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C94E0739-1DA0-4657-8D53-FA4143F6FDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C94E0739-1DA0-4657-8D53-FA4143F6FDA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31D192AF-5454-4D91-97E1-889723AAD309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31D192AF-5454-4D91-97E1-889723AAD309}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31D192AF-5454-4D91-97E1-889723AAD309}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31D192AF-5454-4D91-97E1-889723AAD309}.Release|Any CPU.Build.0 = Release|Any CPU
+		{887AC8BA-35A6-4646-BF9A-59357155805E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{887AC8BA-35A6-4646-BF9A-59357155805E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{887AC8BA-35A6-4646-BF9A-59357155805E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{887AC8BA-35A6-4646-BF9A-59357155805E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10619BA2-AED1-482A-8570-BB7C7B83DDDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10619BA2-AED1-482A-8570-BB7C7B83DDDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10619BA2-AED1-482A-8570-BB7C7B83DDDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10619BA2-AED1-482A-8570-BB7C7B83DDDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{230A9B80-E1AA-469F-86F2-B7E257F14E66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{230A9B80-E1AA-469F-86F2-B7E257F14E66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{230A9B80-E1AA-469F-86F2-B7E257F14E66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{230A9B80-E1AA-469F-86F2-B7E257F14E66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DF4363A-0DF4-4882-A39F-3C9F404B8DE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DF4363A-0DF4-4882-A39F-3C9F404B8DE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DF4363A-0DF4-4882-A39F-3C9F404B8DE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DF4363A-0DF4-4882-A39F-3C9F404B8DE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF2E8DD2-CA25-4D53-A77C-9F88E41F8C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF2E8DD2-CA25-4D53-A77C-9F88E41F8C98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF2E8DD2-CA25-4D53-A77C-9F88E41F8C98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF2E8DD2-CA25-4D53-A77C-9F88E41F8C98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CC63AEB-0098-4D3B-9606-F07692C03E90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CC63AEB-0098-4D3B-9606-F07692C03E90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CC63AEB-0098-4D3B-9606-F07692C03E90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CC63AEB-0098-4D3B-9606-F07692C03E90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEACDE01-95FE-4777-B70A-F20A96AABEA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEACDE01-95FE-4777-B70A-F20A96AABEA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEACDE01-95FE-4777-B70A-F20A96AABEA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEACDE01-95FE-4777-B70A-F20A96AABEA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{754F73E1-F7A4-47C7-A3F7-DC59ADA5105A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{754F73E1-F7A4-47C7-A3F7-DC59ADA5105A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{754F73E1-F7A4-47C7-A3F7-DC59ADA5105A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{754F73E1-F7A4-47C7-A3F7-DC59ADA5105A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6A03B6C-EBF9-4581-9904-EDC7270CF3BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6A03B6C-EBF9-4581-9904-EDC7270CF3BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6A03B6C-EBF9-4581-9904-EDC7270CF3BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6A03B6C-EBF9-4581-9904-EDC7270CF3BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4CDF6A6-40E5-4CCD-AC4C-143F9F4398CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4CDF6A6-40E5-4CCD-AC4C-143F9F4398CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4CDF6A6-40E5-4CCD-AC4C-143F9F4398CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4CDF6A6-40E5-4CCD-AC4C-143F9F4398CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BED2D88-0B51-468B-A559-DA7B4BACA00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BED2D88-0B51-468B-A559-DA7B4BACA00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BED2D88-0B51-468B-A559-DA7B4BACA00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BED2D88-0B51-468B-A559-DA7B4BACA00B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1F9F419-87E1-4B59-A954-9895FCD7949E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1F9F419-87E1-4B59-A954-9895FCD7949E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1F9F419-87E1-4B59-A954-9895FCD7949E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1F9F419-87E1-4B59-A954-9895FCD7949E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBAD4449-D414-4A20-BCA2-DE9C40E4A866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBAD4449-D414-4A20-BCA2-DE9C40E4A866}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBAD4449-D414-4A20-BCA2-DE9C40E4A866}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBAD4449-D414-4A20-BCA2-DE9C40E4A866}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9235DCFA-9EDD-48EF-B1DB-E15B738C85A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9235DCFA-9EDD-48EF-B1DB-E15B738C85A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9235DCFA-9EDD-48EF-B1DB-E15B738C85A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9235DCFA-9EDD-48EF-B1DB-E15B738C85A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7415B0FB-A446-41D6-A0CD-D64B703F15AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7415B0FB-A446-41D6-A0CD-D64B703F15AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7415B0FB-A446-41D6-A0CD-D64B703F15AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7415B0FB-A446-41D6-A0CD-D64B703F15AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DFE1168-B1CC-43D1-B256-B5708BADD47B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DFE1168-B1CC-43D1-B256-B5708BADD47B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DFE1168-B1CC-43D1-B256-B5708BADD47B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DFE1168-B1CC-43D1-B256-B5708BADD47B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43C696FA-3812-4312-9529-98CECCD32A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43C696FA-3812-4312-9529-98CECCD32A81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43C696FA-3812-4312-9529-98CECCD32A81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43C696FA-3812-4312-9529-98CECCD32A81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63B3A841-F3E0-4D60-B85D-156D7251FFDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63B3A841-F3E0-4D60-B85D-156D7251FFDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63B3A841-F3E0-4D60-B85D-156D7251FFDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63B3A841-F3E0-4D60-B85D-156D7251FFDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F0F7D45-0E13-42B0-A158-8F303BBE8358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F0F7D45-0E13-42B0-A158-8F303BBE8358}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F377216-3D76-4169-BE2B-8DA3A653DD5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F377216-3D76-4169-BE2B-8DA3A653DD5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F377216-3D76-4169-BE2B-8DA3A653DD5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F377216-3D76-4169-BE2B-8DA3A653DD5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB56AC5A-D2C1-40DE-99D5-DCF9F44C9482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB56AC5A-D2C1-40DE-99D5-DCF9F44C9482}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB56AC5A-D2C1-40DE-99D5-DCF9F44C9482}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB56AC5A-D2C1-40DE-99D5-DCF9F44C9482}.Release|Any CPU.Build.0 = Release|Any CPU
+		{560E1104-9A6E-41E7-AB3D-85BA2740A0F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{560E1104-9A6E-41E7-AB3D-85BA2740A0F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{560E1104-9A6E-41E7-AB3D-85BA2740A0F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{560E1104-9A6E-41E7-AB3D-85BA2740A0F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64E32F7A-8989-480E-AFE7-3BD343424F6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64E32F7A-8989-480E-AFE7-3BD343424F6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64E32F7A-8989-480E-AFE7-3BD343424F6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64E32F7A-8989-480E-AFE7-3BD343424F6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDEE131F-CCF5-49BD-9764-9C4A8864CE4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDEE131F-CCF5-49BD-9764-9C4A8864CE4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDEE131F-CCF5-49BD-9764-9C4A8864CE4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDEE131F-CCF5-49BD-9764-9C4A8864CE4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{901AC4F9-7DE5-4D13-85FD-384382E29F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{901AC4F9-7DE5-4D13-85FD-384382E29F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{901AC4F9-7DE5-4D13-85FD-384382E29F11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{901AC4F9-7DE5-4D13-85FD-384382E29F11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A996927A-9222-43F4-8552-810B69FF04DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A996927A-9222-43F4-8552-810B69FF04DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A996927A-9222-43F4-8552-810B69FF04DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A996927A-9222-43F4-8552-810B69FF04DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87D57940-9A6E-473C-A4D6-777E3BAFD5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D57940-9A6E-473C-A4D6-777E3BAFD5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D57940-9A6E-473C-A4D6-777E3BAFD5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D57940-9A6E-473C-A4D6-777E3BAFD5F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5E7978A-DE2A-4944-86DB-4721A110E720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5E7978A-DE2A-4944-86DB-4721A110E720}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5E7978A-DE2A-4944-86DB-4721A110E720}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5E7978A-DE2A-4944-86DB-4721A110E720}.Release|Any CPU.Build.0 = Release|Any CPU
+		{289713D4-5259-4CC4-8CAA-DBF3BDCDCBC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{289713D4-5259-4CC4-8CAA-DBF3BDCDCBC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{289713D4-5259-4CC4-8CAA-DBF3BDCDCBC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{289713D4-5259-4CC4-8CAA-DBF3BDCDCBC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51AF3B29-D107-4E22-8A85-DF02A8A898E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51AF3B29-D107-4E22-8A85-DF02A8A898E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51AF3B29-D107-4E22-8A85-DF02A8A898E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51AF3B29-D107-4E22-8A85-DF02A8A898E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE15D292-DC01-4AEA-B473-C2F2908341A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE15D292-DC01-4AEA-B473-C2F2908341A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE15D292-DC01-4AEA-B473-C2F2908341A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE15D292-DC01-4AEA-B473-C2F2908341A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{959E9599-8D99-43BC-8038-B91F76179C1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{959E9599-8D99-43BC-8038-B91F76179C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{959E9599-8D99-43BC-8038-B91F76179C1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{959E9599-8D99-43BC-8038-B91F76179C1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B3E6BEE-F7AB-433E-A1D9-E8BE3782419B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B3E6BEE-F7AB-433E-A1D9-E8BE3782419B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B3E6BEE-F7AB-433E-A1D9-E8BE3782419B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B3E6BEE-F7AB-433E-A1D9-E8BE3782419B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7DE0626-9EB6-475E-AA0C-CB9DE21D4FAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7DE0626-9EB6-475E-AA0C-CB9DE21D4FAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7DE0626-9EB6-475E-AA0C-CB9DE21D4FAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7DE0626-9EB6-475E-AA0C-CB9DE21D4FAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC44A41F-1BED-4438-9F66-0EA5607906D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC44A41F-1BED-4438-9F66-0EA5607906D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC44A41F-1BED-4438-9F66-0EA5607906D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC44A41F-1BED-4438-9F66-0EA5607906D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D59C5649-BE0E-4A33-B868-B652D8614534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D59C5649-BE0E-4A33-B868-B652D8614534}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D59C5649-BE0E-4A33-B868-B652D8614534}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D59C5649-BE0E-4A33-B868-B652D8614534}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18A6904A-5AFD-4816-AC3F-9F5E433720B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18A6904A-5AFD-4816-AC3F-9F5E433720B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18A6904A-5AFD-4816-AC3F-9F5E433720B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18A6904A-5AFD-4816-AC3F-9F5E433720B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F24EB026-65FB-4247-ABF8-942B11ADAB64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F24EB026-65FB-4247-ABF8-942B11ADAB64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F24EB026-65FB-4247-ABF8-942B11ADAB64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F24EB026-65FB-4247-ABF8-942B11ADAB64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{483A27EE-7682-417C-9FCA-C2171C13F693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{483A27EE-7682-417C-9FCA-C2171C13F693}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{483A27EE-7682-417C-9FCA-C2171C13F693}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{483A27EE-7682-417C-9FCA-C2171C13F693}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E10243AE-34FC-47B5-B898-B5203C36920C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E10243AE-34FC-47B5-B898-B5203C36920C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E10243AE-34FC-47B5-B898-B5203C36920C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E10243AE-34FC-47B5-B898-B5203C36920C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F1D9FB5-4415-40F1-B7B0-6DD5A3BAB0C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F1D9FB5-4415-40F1-B7B0-6DD5A3BAB0C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F1D9FB5-4415-40F1-B7B0-6DD5A3BAB0C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F1D9FB5-4415-40F1-B7B0-6DD5A3BAB0C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32193A01-04DD-463B-A84A-9A93167958A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32193A01-04DD-463B-A84A-9A93167958A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32193A01-04DD-463B-A84A-9A93167958A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32193A01-04DD-463B-A84A-9A93167958A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79A63F25-A5F9-441C-8C52-F8033A9F8ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A63F25-A5F9-441C-8C52-F8033A9F8ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79A63F25-A5F9-441C-8C52-F8033A9F8ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79A63F25-A5F9-441C-8C52-F8033A9F8ABA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E290FA1-E87B-4782-B977-EB5FA6C96EFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E290FA1-E87B-4782-B977-EB5FA6C96EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E290FA1-E87B-4782-B977-EB5FA6C96EFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E290FA1-E87B-4782-B977-EB5FA6C96EFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA9613FB-8458-4C78-98DE-AA45BBE62F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA9613FB-8458-4C78-98DE-AA45BBE62F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA9613FB-8458-4C78-98DE-AA45BBE62F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA9613FB-8458-4C78-98DE-AA45BBE62F64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D996EEE-7C04-4888-AF48-9C1E2F261A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D996EEE-7C04-4888-AF48-9C1E2F261A00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D996EEE-7C04-4888-AF48-9C1E2F261A00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D996EEE-7C04-4888-AF48-9C1E2F261A00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4ABF344-3263-45D5-A074-03FB206FF309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4ABF344-3263-45D5-A074-03FB206FF309}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4ABF344-3263-45D5-A074-03FB206FF309}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4ABF344-3263-45D5-A074-03FB206FF309}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3978A7D5-7B6E-4152-9C3A-5852F1F6E223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3978A7D5-7B6E-4152-9C3A-5852F1F6E223}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3978A7D5-7B6E-4152-9C3A-5852F1F6E223}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3978A7D5-7B6E-4152-9C3A-5852F1F6E223}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8DAF87D-A30D-48AE-B630-C65A64D0C3AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8DAF87D-A30D-48AE-B630-C65A64D0C3AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8DAF87D-A30D-48AE-B630-C65A64D0C3AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8DAF87D-A30D-48AE-B630-C65A64D0C3AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7131FE5A-6B27-4BBC-B0CF-09780F6D2DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7131FE5A-6B27-4BBC-B0CF-09780F6D2DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7131FE5A-6B27-4BBC-B0CF-09780F6D2DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7131FE5A-6B27-4BBC-B0CF-09780F6D2DFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CA0D70C-DFC1-458A-871B-328AB6E87E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CA0D70C-DFC1-458A-871B-328AB6E87E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CA0D70C-DFC1-458A-871B-328AB6E87E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CA0D70C-DFC1-458A-871B-328AB6E87E3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6155F26-8245-4B66-8944-79C3DF9F9DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6155F26-8245-4B66-8944-79C3DF9F9DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6155F26-8245-4B66-8944-79C3DF9F9DA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6155F26-8245-4B66-8944-79C3DF9F9DA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B1AF6A7-DD41-4347-B637-90C23D69B50E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B1AF6A7-DD41-4347-B637-90C23D69B50E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B1AF6A7-DD41-4347-B637-90C23D69B50E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B1AF6A7-DD41-4347-B637-90C23D69B50E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9518425A-36A5-4B8F-B0B8-6137DB88441D} = {8CEC2042-F11C-49F5-A674-2355793B600A}
+		{498A300E-D036-49B7-A43D-821D1CAF11A5} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{EFE48691-1FBA-41D5-9BFD-676771973F0C} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{AFA0AB23-64F0-4AC1-9050-6CE8FE06F580} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{8683D82A-2BBE-4199-9C36-C59F48804F90} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{CC53E5C5-9D3E-4AD9-A9CA-D2190463EB5B} = {A0C5FBBB-CFB2-4FB9-B8F0-55676E9DCF06}
+		{E5439139-6F94-44FA-9590-C32FCC1C7A93} = {8CEC2042-F11C-49F5-A674-2355793B600A}
+		{933F1D4B-1216-4BC1-956E-8C30818BAA0F} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{E3FB283A-B766-4887-95E1-329667671921} = {A0C5FBBB-CFB2-4FB9-B8F0-55676E9DCF06}
+		{550362BF-A3A7-4F20-9590-24F4F8C380FF} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
+		{7D231B65-AA8E-4917-85FF-BBBF7992B6FC} = {8CEC2042-F11C-49F5-A674-2355793B600A}
+		{0972AD57-B16B-494F-AE0A-091DD6F3B42B} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{AAFFA51D-1357-4560-97DC-43AD039442E6} = {0972AD57-B16B-494F-AE0A-091DD6F3B42B}
+		{C4C1E313-C7C1-4490-AECE-0DD0062380A4} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{16427BFB-B4C6-46A9-A290-8EA51FF73FEA} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{0884B566-D22E-498C-BAA9-26D50ABCAE3A} = {16427BFB-B4C6-46A9-A290-8EA51FF73FEA}
+		{E1B0F72C-991A-409D-9266-DE5ED1BD940E} = {A0C5FBBB-CFB2-4FB9-B8F0-55676E9DCF06}
+		{07D12F26-2583-4C6F-AFBB-AA30FF339FC6} = {82FFBC1A-6B13-4C0A-896A-90306AE4828F}
+		{F8C637E1-1F4F-4E3B-9E34-AAD61097C3F8} = {07D12F26-2583-4C6F-AFBB-AA30FF339FC6}
+		{FE9F14E0-8DFF-413B-BB9E-49CEA4115A5D} = {F8C637E1-1F4F-4E3B-9E34-AAD61097C3F8}
+		{FDB5C8D0-018D-4FF9-9680-C6A5078F819B} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{4B243CF1-4269-45C6-A238-1A9BFA58B8CC} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{086FF8A0-9CEE-470A-9751-78B0F1340649} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{C98950B1-DC4B-43DA-974F-EF2CF325EC2B} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{3493346B-44F6-4F50-8FB4-51D0090DF544} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{AD119B05-A092-41AD-B68E-4AE2DB5A96D9} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{8E1555D1-13D5-4DBF-9631-117D840C3158} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{DC7D131A-AF99-46AB-9AA6-463443E3B992} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{DA0A44FB-D562-4776-AAFB-8266E78AA1A6} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{3CDCE3AA-7CAF-4A27-B1D3-9D558B74D084} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{43782238-E7BB-49D0-9541-1121DACA6EB5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{FA487690-E88C-4A57-9187-B71CB70C1AAE} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2} = {EFE48691-1FBA-41D5-9BFD-676771973F0C}
+		{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{42FA33DD-AEA3-4FF3-8319-F30244A666A4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{472DBA92-4FEA-4B9A-BA70-0E97B942E12D} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{8BDF1DE0-E6DE-48AD-AAA3-CE09CB544E2C} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{EF718502-7760-45B5-A563-5F1B22A6B840} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{303F8E41-691F-4453-AB7D-88A0036C0465} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{24BE488C-A5F3-4228-8CAB-E60EBEA444EE} = {EFE48691-1FBA-41D5-9BFD-676771973F0C}
+		{EB0B88E2-589A-4F65-8F98-D5B958D8104F} = {EFE48691-1FBA-41D5-9BFD-676771973F0C}
+		{4E83BFB5-F225-4C3B-B96E-0AD1951A5630} = {EFE48691-1FBA-41D5-9BFD-676771973F0C}
+		{C41023C9-65C3-4FB3-9053-4DE963A81500} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{7E563BF6-47F2-4531-A1CE-FB9445DF3253} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{AAD9038B-8F16-4E09-93AF-B13E9F7ACD66} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{8D949A40-5F4B-4EB0-B8FD-301B472C96AE} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{2F3B6271-B9A3-48A3-9DB6-847F3EF41F0A} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{D79491F0-CA92-439B-98CE-7AF9F57EBEB0} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{8276E670-FC3F-4EDE-9D51-6DAD90336C32} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{EC3C54CE-A3CD-434A-9E3C-DB6C5F5248EA} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{AA88952E-9393-4A4B-85B5-CC7F03629CE1} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{472B69A0-956F-42C0-9CB8-30107821C43B} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{2A161C2D-DAA5-4F97-BA2B-783CF363C05B} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{5EE6B6EB-B768-47EC-882B-8DCACA2B1360} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{B5A0C6B0-66C8-46EB-B699-44EB2DD1784A} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{C1210E08-58E5-44D4-BE6F-634C3FC5E410} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{600953C4-BD8F-4A4B-A275-6D6F9EF48342} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{5C2829C2-ED0D-414C-B5A0-2BFDCA07B493} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{CDE0C4D2-4B75-4ED0-988D-08E08B23B895} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{0E036453-2C80-4FC9-A517-771F0071734B} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{061AB58B-8235-4DAE-8D56-5F081DD78F5E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{69B678F6-51CF-4A5B-8DEC-1F9CEDC5C9E2} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BD46EFCC-177C-466E-81DF-39314B780ADA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{34B67004-7249-4EF1-8E12-6E6DA37EA6BE} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{1B9E6BF4-9D48-4988-9945-248096119E46} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{3538EF5E-377E-430A-AFB8-F2DB5FAEDE95} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{4AD438D9-D4E3-4EB5-8851-89DB4D1CFB9C} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BC998ACD-353B-4A56-8A56-DF6200E141B6} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{8EAABFB9-8A47-4B11-AD7F-AC8B373CDE49} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{662B587F-97B5-4CEF-ABF9-6C76A6DBD29E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{94B50277-FB50-4B42-BA79-770ADB24CB80} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{95613224-C1D7-4D4A-8926-F70DA26371CA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BF1E5BA6-C0E5-4472-9D5D-2622231DD275} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{B93AD901-B761-486D-80AE-443742DB65E0} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{7203DD2B-739F-4223-AE50-D26A7FEEE1A4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{83290961-40BF-48CB-B925-FBBE48E629F3} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{6E8D73F3-082C-455B-BBD5-03A156DCDD0F} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{65492DD4-CCD9-437A-B383-E7EB7AB872D2} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{463A6FB2-1ABE-4B92-A470-97134D0BBC7E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{7471A7A8-B89C-4C94-8EB1-24180E71CA1F} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{9D5935CB-2DF2-46CB-A5E1-98BE134CAFCC} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{6C599D79-87D0-476B-9CBA-F731E5627622} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{B0E671B9-78DE-410F-A0AA-612FF1F900F2} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{CA3D605F-8DD7-4041-B024-70A24036AFA1} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{DA81EF3E-FDB3-417F-AA20-60FC495E3596} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{B22311CE-EC71-4ADD-ADC6-C466B2D10230} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{536F1D82-D40C-4E33-B7FA-76A0F17BF672} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
+		{5A806F4B-39E7-4F38-B36F-F5CFC4F8760A} = {9518425A-36A5-4B8F-B0B8-6137DB88441D}
+		{73252693-2563-4B20-A2F5-F8DB37B91DBE} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{6F38B456-1D16-4842-AEE5-E74564FB506A} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{65A66859-2735-4DD6-A927-B416B7A62D0F} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{2A6D3042-C675-4EA3-A8E7-5BDD3C5758EA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BED94A61-6FD9-4103-BD35-70B4798C301C} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{6F8B63EA-98D6-4909-BE9E-F39029C29C4F} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{3BC38BE0-B6FF-4B05-BC63-3614A5CF9393} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{E961D189-3EF9-4D79-95A1-78D825B73B01} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{24834112-8C25-4A3D-BDD3-0ACEC825FF2C} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{E9D55D41-B161-492F-9EC7-FF2F2231A587} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{268B6D05-B6D5-4D20-B2B1-0B9422A92D73} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{3C78C521-6507-4D3A-B92E-BC41CEE9D9F3} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{25B7D571-C385-4CA6-9B6A-573D3E3FF3C9} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{F19B5109-36AC-4A64-AFE6-FAF9E831C528} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{0980BCDD-A231-42D1-B689-41A41BBA161A} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{D00DDBDA-66F5-490D-8C1C-16CC5E142170} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{238F67DB-1E48-447C-B1B8-BDC692103791} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{C94E0739-1DA0-4657-8D53-FA4143F6FDA3} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{31D192AF-5454-4D91-97E1-889723AAD309} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{887AC8BA-35A6-4646-BF9A-59357155805E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{10619BA2-AED1-482A-8570-BB7C7B83DDDC} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{230A9B80-E1AA-469F-86F2-B7E257F14E66} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{0DF4363A-0DF4-4882-A39F-3C9F404B8DE5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{FF2E8DD2-CA25-4D53-A77C-9F88E41F8C98} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{2CC63AEB-0098-4D3B-9606-F07692C03E90} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{DEACDE01-95FE-4777-B70A-F20A96AABEA7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{754F73E1-F7A4-47C7-A3F7-DC59ADA5105A} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{F6A03B6C-EBF9-4581-9904-EDC7270CF3BD} = {0972AD57-B16B-494F-AE0A-091DD6F3B42B}
+		{C4CDF6A6-40E5-4CCD-AC4C-143F9F4398CA} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{2BED2D88-0B51-468B-A559-DA7B4BACA00B} = {16427BFB-B4C6-46A9-A290-8EA51FF73FEA}
+		{B1F9F419-87E1-4B59-A954-9895FCD7949E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BBAD4449-D414-4A20-BCA2-DE9C40E4A866} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{9235DCFA-9EDD-48EF-B1DB-E15B738C85A6} = {0884B566-D22E-498C-BAA9-26D50ABCAE3A}
+		{7415B0FB-A446-41D6-A0CD-D64B703F15AD} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{8DFE1168-B1CC-43D1-B256-B5708BADD47B} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{43C696FA-3812-4312-9529-98CECCD32A81} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{63B3A841-F3E0-4D60-B85D-156D7251FFDF} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{0F0F7D45-0E13-42B0-A158-8F303BBE8358} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
+		{4F377216-3D76-4169-BE2B-8DA3A653DD5E} = {0884B566-D22E-498C-BAA9-26D50ABCAE3A}
+		{CB56AC5A-D2C1-40DE-99D5-DCF9F44C9482} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{560E1104-9A6E-41E7-AB3D-85BA2740A0F7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{64E32F7A-8989-480E-AFE7-3BD343424F6A} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BDEE131F-CCF5-49BD-9764-9C4A8864CE4E} = {C4C1E313-C7C1-4490-AECE-0DD0062380A4}
+		{901AC4F9-7DE5-4D13-85FD-384382E29F11} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{A996927A-9222-43F4-8552-810B69FF04DF} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{87D57940-9A6E-473C-A4D6-777E3BAFD5F9} = {0972AD57-B16B-494F-AE0A-091DD6F3B42B}
+		{C5E7978A-DE2A-4944-86DB-4721A110E720} = {0972AD57-B16B-494F-AE0A-091DD6F3B42B}
+		{289713D4-5259-4CC4-8CAA-DBF3BDCDCBC0} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{51AF3B29-D107-4E22-8A85-DF02A8A898E5} = {8683D82A-2BBE-4199-9C36-C59F48804F90}
+		{DE15D292-DC01-4AEA-B473-C2F2908341A7} = {0884B566-D22E-498C-BAA9-26D50ABCAE3A}
+		{959E9599-8D99-43BC-8038-B91F76179C1C} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{1B3E6BEE-F7AB-433E-A1D9-E8BE3782419B} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{C7DE0626-9EB6-475E-AA0C-CB9DE21D4FAE} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BC44A41F-1BED-4438-9F66-0EA5607906D5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{D59C5649-BE0E-4A33-B868-B652D8614534} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{18A6904A-5AFD-4816-AC3F-9F5E433720B5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{F24EB026-65FB-4247-ABF8-942B11ADAB64} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{483A27EE-7682-417C-9FCA-C2171C13F693} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{E10243AE-34FC-47B5-B898-B5203C36920C} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{0F1D9FB5-4415-40F1-B7B0-6DD5A3BAB0C4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{32193A01-04DD-463B-A84A-9A93167958A4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{79A63F25-A5F9-441C-8C52-F8033A9F8ABA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{5E290FA1-E87B-4782-B977-EB5FA6C96EFE} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{BA9613FB-8458-4C78-98DE-AA45BBE62F64} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{0D996EEE-7C04-4888-AF48-9C1E2F261A00} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{C4ABF344-3263-45D5-A074-03FB206FF309} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{3978A7D5-7B6E-4152-9C3A-5852F1F6E223} = {16427BFB-B4C6-46A9-A290-8EA51FF73FEA}
+		{B8DAF87D-A30D-48AE-B630-C65A64D0C3AF} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{7131FE5A-6B27-4BBC-B0CF-09780F6D2DFE} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{2CA0D70C-DFC1-458A-871B-328AB6E87E3A} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{D6155F26-8245-4B66-8944-79C3DF9F9DA3} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
+		{8B1AF6A7-DD41-4347-B637-90C23D69B50E} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D} = {FE9F14E0-8DFF-413B-BB9E-49CEA4115A5D}
+	EndGlobalSection
+EndGlobal
diff --git a/Datadog.Trace.sln b/Datadog.Trace.sln
index b2e674c740b7..01f229af0fe7 100644
--- a/Datadog.Trace.sln
+++ b/Datadog.Trace.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.31903.286
 MinimumVisualStudioVersion = 15.0.26124.0
@@ -596,7 +596,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoadContextResolve"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AspNet.MultipleAppsInDomain", "tracer\test\test-applications\aspnet\Samples.AspNet.MultipleAppsInDomain\Samples.AspNet.MultipleAppsInDomain.csproj", "{A82EB6F8-D8D0-4763-B252-08CA3F39D153}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Security.AspNetCore5.DatabaseIntegration", "tracer\test\test-applications\security\Samples.Security.AspNetCore5.DatabaseIntegration\Samples.Security.AspNetCore5.DatabaseIntegration.csproj", "{067CE939-C803-4959-890A-B6B34C83F87A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tracer", "tracer", "{82FFBC1A-6B13-4C0A-896A-90306AE4828F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{07D12F26-2583-4C6F-AFBB-AA30FF339FC6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-applications", "test-applications", "{F8C637E1-1F4F-4E3B-9E34-AAD61097C3F8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-functions", "azure-functions", "{FE9F14E0-8DFF-413B-BB9E-49CEA4115A5D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AzureFunctions.V4Isolated.SdkV1", "tracer\test\test-applications\azure-functions\Samples.AzureFunctions.V4Isolated.SdkV1\Samples.AzureFunctions.V4Isolated.SdkV1.csproj", "{18767A3E-9ADC-485C-A8C7-50660D5B579D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1430,10 +1438,10 @@ Global
 		{A82EB6F8-D8D0-4763-B252-08CA3F39D153}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A82EB6F8-D8D0-4763-B252-08CA3F39D153}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A82EB6F8-D8D0-4763-B252-08CA3F39D153}.Release|Any CPU.Build.0 = Release|Any CPU
-		{067CE939-C803-4959-890A-B6B34C83F87A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{067CE939-C803-4959-890A-B6B34C83F87A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{067CE939-C803-4959-890A-B6B34C83F87A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{067CE939-C803-4959-890A-B6B34C83F87A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1666,7 +1674,10 @@ Global
 		{D6155F26-8245-4B66-8944-79C3DF9F9DA3} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
 		{8B1AF6A7-DD41-4347-B637-90C23D69B50E} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
 		{A82EB6F8-D8D0-4763-B252-08CA3F39D153} = {AFA0AB23-64F0-4AC1-9050-6CE8FE06F580}
-		{067CE939-C803-4959-890A-B6B34C83F87A} = {0972AD57-B16B-494F-AE0A-091DD6F3B42B}
+		{07D12F26-2583-4C6F-AFBB-AA30FF339FC6} = {82FFBC1A-6B13-4C0A-896A-90306AE4828F}
+		{F8C637E1-1F4F-4E3B-9E34-AAD61097C3F8} = {07D12F26-2583-4C6F-AFBB-AA30FF339FC6}
+		{FE9F14E0-8DFF-413B-BB9E-49CEA4115A5D} = {F8C637E1-1F4F-4E3B-9E34-AAD61097C3F8}
+		{18767A3E-9ADC-485C-A8C7-50660D5B579D} = {FE9F14E0-8DFF-413B-BB9E-49CEA4115A5D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index c57c43565ccf..2a2516a4c202 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -10,6 +10,64 @@
 
 
 
+
+## [Release 3.8.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v3.8.0)
+
+## Summary
+
+- [ASM] Improved error handling and reporting
+- [ASM/IAST] Fix a crash occurring when an attribute is decorated with itself
+- [Dynamic Instrumentation] Fix errors in symbol upload and exception replay
+- [AWS Lambda] Encode non-ascii error messages
+
+## Changes
+
+### Tracer
+* [Tracing] Refactor internal Span Links API (#6341)
+* Support relative path in `DD_DOTNET_TRACER_HOME` (#6434)
+* Add support for `[DuckPropertyOrField]` (#6463)
+
+### ASM
+* [ASM] Log `FormatException` from `get_Uri` as debug (#6489)
+* [ASM] Update Iast Log Warning to Error (#6492)
+* [ASM] upgrade warning to error (#6421)
+* [ASM] Fix IAST benchmark tests (#6462)
+* [ASM] Error metric for unknown operator errors (#6465)
+* [ASM] Introduce SecurityReporter for all reporting functions of SecurityCoordinator (#6481)
+* [ASM] Normalise aspects exception logging (#6495)
+* Fix build issues on aspects on net5.0 (#6500)
+
+### Debugger
+* [Dynamic Instrumentation] Hotfix SymDB and ER (#6468)
+
+### Serverless
+* [serverless] encode lambda error.msg and error.type (#6438)
+
+### Fixes
+* [IAST] Fix recursive custom attribute crash (#6470)
+
+### Build / Test
+* [IAST] Skip failing tests (#6455)
+* repo: mandatory issue templates (AIDM-424) (#6456)
+* K8s Lib Injection tests: run on a matrix (#6458)
+* [Build] Fix version bump autogen files error (#6464)
+* Fix the build and some versions (#6466)
+* [IAST] skip dotnet 2.1 tests that can't work (#6467)
+* Exclude common failure in smoke tests (#6469)
+* allow running exploration tests on mac (#6474)
+* [Test Package Versions Bump] Updating package versions (#6450)
+* [Test Package Versions Bump] Updating package versions (#6478)
+* [Test Package Versions Bump] Updating package versions (#6486)
+* Parallelize unit tests (#6483)
+* [IAST] Propagation tests reorg (#6487)
+* fix UpdateVendoredCode on mac (#6490)
+
+### Miscellaneous
+* [Crashtracking] Add a setting to disable crashtracking filtering (#6452)
+
+
+[Changes since 3.7.0](https://github.com/DataDog/dd-trace-dotnet/compare/v3.7.0...v3.8.0)

+
 ## [Release 3.7.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v3.7.0)
 
 ## Summary
diff --git a/profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt
index c970b43e905c..9afabbe9b4c5 100644
--- a/profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt
+++ b/profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Project definition
 # ******************************************************
 
-project("Datadog.Linux.ApiWrapper" VERSION 3.8.0)
+project("Datadog.Linux.ApiWrapper" VERSION 3.9.0)
 
 # ******************************************************
 # Compiler options
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt
index cad747c2cabe..60d88cd1138a 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Project definition
 # ******************************************************
 
-project("Datadog.Profiler.Native.Linux" VERSION 3.8.0)
+project("Datadog.Profiler.Native.Linux" VERSION 3.9.0)
 
 option(RUN_ASAN "Build with Clang Undefined-Behavior Sanitizer" OFF)
 option(RUN_UBSAN "Build with Clang Undefined-Behavior Sanitizer" OFF)
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc
index a108e4e339fb..4164f364fe20 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc
@@ -62,8 +62,8 @@ END
 
 // ------- version info -------------------------------------------------------
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION             3,8,0,0
-PRODUCTVERSION          3,8,0,0
+FILEVERSION             3,9,0,0
+PRODUCTVERSION          3,9,0,0
 FILEFLAGSMASK           VS_FF_PRERELEASE
 FILEOS                  VOS_NT
 FILETYPE                VFT_DLL
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Datadog"
             VALUE "FileDescription", "Continuous Profiler for .NET Applications"
-            VALUE "FileVersion", "3.8.0.0"
+            VALUE "FileVersion", "3.9.0.0"
             VALUE "InternalName", "Native Profiler Engine"
             VALUE "LegalCopyright", "(c) Datadog 2020-2022"
             VALUE "OriginalFilename", "Datadog.Profiler.Native.dll"
             VALUE "ProductName", "Continuous Profiler for .NET Applications"
-            VALUE "ProductVersion", "3.8.0.0"
+            VALUE "ProductVersion", "3.9.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h
index 7cd4ab54d82f..2c9082816795 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h
@@ -3,4 +3,4 @@
 
 #pragma once
 
-constexpr auto PROFILER_VERSION = "3.8.0";
+constexpr auto PROFILER_VERSION = "3.9.0";
diff --git a/profiler/src/ProfilerEngine/ProductVersion.props b/profiler/src/ProfilerEngine/ProductVersion.props
index 87caf658f96c..7f2a3a94d2c7 100644
--- a/profiler/src/ProfilerEngine/ProductVersion.props
+++ b/profiler/src/ProfilerEngine/ProductVersion.props
@@ -5,7 +5,7 @@
 
   <!-- * * * * * * * * * * * INPUTS. Update this section EVERY time the component is shipped/released! * * * * * * * * * * *                -->
   <PropertyGroup>
-    <ProductVersion>3.8.0</ProductVersion>
+    <ProductVersion>3.9.0</ProductVersion>
   </PropertyGroup>
   <!-- * * * * * * * * * * * END OF INPUTS.  * * * * * * * * * * *                                                                          -->
 
diff --git a/profiler/test/Datadog.Profiler.IntegrationTests/Datadog.Profiler.IntegrationTests.csproj b/profiler/test/Datadog.Profiler.IntegrationTests/Datadog.Profiler.IntegrationTests.csproj
index 46d9247ce849..8c63b4fa47ee 100644
--- a/profiler/test/Datadog.Profiler.IntegrationTests/Datadog.Profiler.IntegrationTests.csproj
+++ b/profiler/test/Datadog.Profiler.IntegrationTests/Datadog.Profiler.IntegrationTests.csproj
@@ -28,24 +28,24 @@
     <None Remove="GarbageCollections\3x3GCs-64.bevents" />
     <None Remove="xunit.runner.json" />
     <Content Include="Allocations\allocations-32.bevents">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Allocations\allocations-64.bevents">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Contention\lockContention-32.bevents">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Contention\lockContention-64.bevents">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="GarbageCollections\3x3GCs-32.bevents">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="GarbageCollections\3x3GCs-64.bevents">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="Always" />
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/profiler/test/Datadog.Profiler.IntegrationTests/LinuxOnly/WrapperLibraryTest.cs b/profiler/test/Datadog.Profiler.IntegrationTests/LinuxOnly/WrapperLibraryTest.cs
index a6fdc6461dc3..9f9558fa38be 100644
--- a/profiler/test/Datadog.Profiler.IntegrationTests/LinuxOnly/WrapperLibraryTest.cs
+++ b/profiler/test/Datadog.Profiler.IntegrationTests/LinuxOnly/WrapperLibraryTest.cs
@@ -85,7 +85,8 @@ public void EnsureAppDoesNotCrashIfProfilerDeactivateAndTracerActivated(string a
         [TestAppFact("Samples.ExceptionGenerator")]
         public void GenerateDumpIfDbgRequested(string appName, string framework, string appAssembly)
         {
-            var runner = new TestApplicationRunner(appName, framework, appAssembly, _output, enableTracer: true, commandLine: "--scenario 7");
+            // The continuous profiler is disabled for this test because it's not needed and it *might* be causing some failures
+            var runner = new TestApplicationRunner(appName, framework, appAssembly, _output, enableTracer: true, enableProfiler: false, commandLine: "--scenario 7");
 
             runner.Environment.SetVariable("COMPlus_DbgEnableMiniDump", "1");
             runner.Environment.SetVariable("COMPlus_DbgMiniDumpName", "/dev/null");
diff --git a/shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt b/shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
index d39024ef678b..f0e837ee2a71 100644
--- a/shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
+++ b/shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 # Project definition
 # ******************************************************
 
-project("Datadog.Trace.ClrProfiler.Native" VERSION 3.8.0)
+project("Datadog.Trace.ClrProfiler.Native" VERSION 3.9.0)
 
 if (UNIVERSAL)
    find_package(GlibcCompat REQUIRED)
diff --git a/shared/src/Datadog.Trace.ClrProfiler.Native/Resource.rc b/shared/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
index b12b19397b3a..04c6cd2ce7ae 100644
--- a/shared/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
+++ b/shared/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
@@ -57,8 +57,8 @@ VS_VERSION_INFO VERSIONINFO
 #else
  FILEFLAGS 0x0L
 #endif
- FILEVERSION             3,8,0,0
- PRODUCTVERSION          3,8,0,0
+ FILEVERSION             3,9,0,0
+ PRODUCTVERSION          3,9,0,0
  FILEOS                  VOS_NT
  FILETYPE                VFT_DLL
 BEGIN
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Datadog"
             VALUE "FileDescription", "Native loader for Datadog .NET APM"
-            VALUE "FileVersion", "3.8.0.0"
+            VALUE "FileVersion", "3.9.0.0"
             VALUE "InternalName", "Native loader"
             VALUE "LegalCopyright", "(c) Datadog 2020-2022"
             VALUE "OriginalFilename", "Datadog.Trace.ClrProfiler.Native.dll"
             VALUE "ProductName", "Native loader for Datadog .NET APM"
-            VALUE "ProductVersion", "3.8.0.0"
+            VALUE "ProductVersion", "3.9.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/shared/src/msi-installer/WindowsInstaller.wixproj b/shared/src/msi-installer/WindowsInstaller.wixproj
index 0add22ca9ea3..f8f70dd24c72 100644
--- a/shared/src/msi-installer/WindowsInstaller.wixproj
+++ b/shared/src/msi-installer/WindowsInstaller.wixproj
@@ -17,9 +17,9 @@
     <IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
     <SuppressPdbOutput>True</SuppressPdbOutput>
     <DefineSolutionProperties>false</DefineSolutionProperties>
-    <OutputName>datadog-dotnet-apm-3.8.0-$(Platform)</OutputName> <!-- -The regex recognizes this line -->
+    <OutputName>datadog-dotnet-apm-3.9.0-$(Platform)</OutputName> <!-- -The regex recognizes this line -->
     <MonitoringHomeDirectory Condition="'$(MonitoringHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\..\bin\monitoring-home</MonitoringHomeDirectory>
-    <DefineConstants>InstallerVersion=3.8.0;MonitoringHomeDirectory=$(MonitoringHomeDirectory);</DefineConstants>
+    <DefineConstants>InstallerVersion=3.9.0;MonitoringHomeDirectory=$(MonitoringHomeDirectory);</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>$(DefineConstants);Debug</DefineConstants>
diff --git a/shared/src/native-src/version.h b/shared/src/native-src/version.h
index 17bf9ba7b2bb..df115fc5e00b 100644
--- a/shared/src/native-src/version.h
+++ b/shared/src/native-src/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-constexpr auto PROFILER_VERSION = "3.8.0";
+constexpr auto PROFILER_VERSION = "3.9.0";
diff --git a/tracer/Datadog.Trace.proj b/tracer/Datadog.Trace.proj
index eef70803f37a..ebc76d953922 100644
--- a/tracer/Datadog.Trace.proj
+++ b/tracer/Datadog.Trace.proj
@@ -7,7 +7,6 @@
   <ItemGroup>
     <CppProject Include="src\**\*.vcxproj"/>
     <CppTestProject Include="test\**\*.vcxproj"/>
-    <FrameworkReproduction Include="test\test-applications\regression\StackExchange.Redis.AssemblyConflict.LegacyProject\StackExchange.Redis.AssemblyConflict.LegacyProject.csproj" />
   </ItemGroup>
 
   <!--  Used by CompileNativeSrcWindows-->
@@ -24,14 +23,7 @@
     </MSBuild>
   </Target>
 
-  <!--  Used by CompileFrameworkReproductions-->
-  <Target Name="BuildFrameworkReproductions">
-    <MSBuild Targets="Build" Projects="@(FrameworkReproduction)">
-      <Output TaskParameter="TargetOutputs" ItemName="CollectedBuildOutput"/>
-    </MSBuild>
-  </Target>
-
-  <!-- Used by CompileMultiApiPackageVersionSamples -->
+  <!-- Used by CompileSamples -->
   <Target Name="RestoreSamplesForPackageVersionsOnly" Condition="'$(TestAllPackageVersions)'=='true'">
 
     <ItemGroup>
@@ -46,7 +38,7 @@
     </MSBuild>
   </Target>
 
-  <!-- Used by CompileMultiApiPackageVersionSamples -->
+  <!-- Used by CompileSamples -->
   <Target Name="RestoreAndBuildSamplesForPackageVersionsOnly" Condition="'$(TestAllPackageVersions)'=='true'" DependsOnTargets="RestoreSamplesForPackageVersionsOnly">
 
     <ItemGroup>
diff --git a/tracer/build/PackageVersionsLatestMajors.g.props b/tracer/build/PackageVersionsLatestMajors.g.props
index 9efecb411655..40361e2b0bb1 100644
--- a/tracer/build/PackageVersionsLatestMajors.g.props
+++ b/tracer/build/PackageVersionsLatestMajors.g.props
@@ -13,109 +13,109 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
 <Project>
   <ItemGroup>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -139,163 +139,163 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Amazon.Lambda.RuntimeSupport</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -1831,7 +1831,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -1867,7 +1867,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -1879,7 +1879,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -1891,7 +1891,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -1903,7 +1903,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -1915,7 +1915,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -1927,7 +1927,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -2737,7 +2737,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Microsoft.Data.Sqlite</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -2767,31 +2767,31 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -2821,25 +2821,25 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -2851,7 +2851,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -2887,7 +2887,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -2899,7 +2899,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -2911,7 +2911,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -2923,7 +2923,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -2935,7 +2935,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -2971,7 +2971,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -2983,7 +2983,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -2995,7 +2995,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -3007,7 +3007,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -3019,7 +3019,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3031,7 +3031,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3043,7 +3043,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3055,7 +3055,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3067,7 +3067,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3079,7 +3079,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3091,7 +3091,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3103,7 +3103,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3115,7 +3115,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -3127,7 +3127,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3139,7 +3139,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3151,7 +3151,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3163,7 +3163,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3175,7 +3175,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3187,7 +3187,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3199,7 +3199,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3211,7 +3211,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3223,7 +3223,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -3235,7 +3235,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3247,7 +3247,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3259,7 +3259,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3271,7 +3271,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3283,7 +3283,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3295,7 +3295,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3307,7 +3307,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3319,7 +3319,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3331,7 +3331,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -3343,7 +3343,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3355,7 +3355,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3367,7 +3367,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3379,7 +3379,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3391,7 +3391,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3403,7 +3403,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3415,7 +3415,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3427,7 +3427,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -3439,13 +3439,13 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -3463,37 +3463,37 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
diff --git a/tracer/build/PackageVersionsLatestMinors.g.props b/tracer/build/PackageVersionsLatestMinors.g.props
index c2819b2b92b7..5076b614a9c5 100644
--- a/tracer/build/PackageVersionsLatestMinors.g.props
+++ b/tracer/build/PackageVersionsLatestMinors.g.props
@@ -31,7 +31,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -49,7 +49,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -67,7 +67,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -85,7 +85,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -103,7 +103,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -121,7 +121,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -139,7 +139,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -157,7 +157,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -175,7 +175,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -199,7 +199,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -217,7 +217,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -235,7 +235,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -253,7 +253,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -271,7 +271,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -289,7 +289,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -307,7 +307,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -325,7 +325,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -343,7 +343,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -529,7 +529,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -547,7 +547,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -565,7 +565,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -583,7 +583,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -601,7 +601,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -619,7 +619,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -637,7 +637,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -655,7 +655,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -673,7 +673,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -697,7 +697,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -715,7 +715,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -733,7 +733,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -751,7 +751,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -769,7 +769,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -787,7 +787,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -805,7 +805,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -823,7 +823,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -841,7 +841,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -859,7 +859,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -877,7 +877,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -895,7 +895,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -913,7 +913,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -931,7 +931,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -949,7 +949,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -967,7 +967,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -985,7 +985,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -1003,7 +1003,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -9445,7 +9445,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -9547,7 +9547,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -9595,7 +9595,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -9643,7 +9643,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -9691,7 +9691,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -9739,7 +9739,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -9787,7 +9787,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -13357,7 +13357,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -13477,7 +13477,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -13525,7 +13525,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -13573,7 +13573,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -13621,7 +13621,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -13669,7 +13669,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -13789,7 +13789,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -13837,7 +13837,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -13885,7 +13885,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -13933,7 +13933,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -14011,7 +14011,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -14305,7 +14305,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -14383,7 +14383,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -14461,7 +14461,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -14539,7 +14539,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -14617,7 +14617,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -14911,7 +14911,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -14989,7 +14989,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -15067,7 +15067,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -15145,7 +15145,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -15210,6 +15210,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net462</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -15270,6 +15276,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -15330,6 +15342,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -15390,6 +15408,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
@@ -15450,6 +15474,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net5.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
@@ -15510,6 +15540,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net6.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
@@ -15570,6 +15606,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net7.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
@@ -15630,6 +15672,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net8.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
@@ -15690,6 +15738,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net9.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
@@ -15750,6 +15804,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net462</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -15810,6 +15870,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -15870,6 +15936,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -15930,6 +16002,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
@@ -15990,6 +16068,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net5.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
@@ -16050,6 +16134,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net6.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
@@ -16110,6 +16200,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net7.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
@@ -16170,6 +16266,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net8.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
@@ -16230,6 +16332,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net9.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTests2</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
@@ -16290,6 +16398,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net462</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -16350,6 +16464,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -16410,6 +16530,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -16470,6 +16596,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
@@ -16530,6 +16662,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net5.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
@@ -16590,6 +16728,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net6.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
@@ -16650,6 +16794,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net7.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
@@ -16710,6 +16860,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net8.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
       <Properties>ApiVersion=2.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
@@ -16770,6 +16926,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net9.0</TargetFramework>
+      <RequiresDockerDependency>None</RequiresDockerDependency>
+      <SampleName>Samples.MSTestTestsRetries</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
@@ -16848,6 +17010,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net462</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -16926,6 +17094,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -17004,6 +17178,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.0</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -17082,6 +17262,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
@@ -17160,6 +17346,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net5.0</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
@@ -17238,6 +17430,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net6.0</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
@@ -17316,6 +17514,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net7.0</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
@@ -17394,6 +17598,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net8.0</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
       <Properties>ApiVersion=1.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
@@ -17472,6 +17682,12 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
+    <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>net9.0</TargetFramework>
+      <RequiresDockerDependency>All</RequiresDockerDependency>
+      <SampleName>Samples.Kafka</SampleName>
+    </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
       <Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
@@ -17713,7 +17929,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -18235,7 +18451,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -18481,7 +18697,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -18727,7 +18943,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -18973,7 +19189,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -19219,7 +19435,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -19465,7 +19681,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
diff --git a/tracer/build/PackageVersionsLatestSpecific.g.props b/tracer/build/PackageVersionsLatestSpecific.g.props
index d59a8aaf7da7..8535e2e30749 100644
--- a/tracer/build/PackageVersionsLatestSpecific.g.props
+++ b/tracer/build/PackageVersionsLatestSpecific.g.props
@@ -25,7 +25,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -37,7 +37,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -49,7 +49,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -61,7 +61,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -73,7 +73,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -85,7 +85,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -97,7 +97,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -109,7 +109,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -121,7 +121,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
-      <Properties>ApiVersion=3.7.404.5;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.405.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.DynamoDBv2</SampleName>
@@ -139,7 +139,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -151,7 +151,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -163,7 +163,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -175,7 +175,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -187,7 +187,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -199,7 +199,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -211,7 +211,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -223,7 +223,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -235,7 +235,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.Kinesis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.Kinesis\Samples.AWS.Kinesis.csproj">
-      <Properties>ApiVersion=3.7.402.41;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.54;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.Kinesis</SampleName>
@@ -271,7 +271,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -283,7 +283,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -295,7 +295,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -307,7 +307,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -319,7 +319,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -331,7 +331,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -343,7 +343,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -355,7 +355,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -367,7 +367,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SQS</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SQS\Samples.AWS.SQS.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SQS</SampleName>
@@ -385,7 +385,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -397,7 +397,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -409,7 +409,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -421,7 +421,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -433,7 +433,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -445,7 +445,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -457,7 +457,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -469,7 +469,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -481,7 +481,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.SimpleNotificationService\Samples.AWS.SimpleNotificationService.csproj">
-      <Properties>ApiVersion=3.7.400.64;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.400.77;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.SimpleNotificationService</SampleName>
@@ -499,7 +499,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -517,7 +517,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -535,7 +535,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -553,7 +553,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -571,7 +571,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -589,7 +589,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -607,7 +607,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -625,7 +625,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -643,7 +643,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.AWS.EventBridge</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.EventBridge\Samples.AWS.EventBridge.csproj">
-      <Properties>ApiVersion=3.7.402.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.402.19;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.AWS.EventBridge</SampleName>
@@ -2683,7 +2683,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -2719,7 +2719,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -2731,7 +2731,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -2743,7 +2743,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -2755,7 +2755,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -2767,7 +2767,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -2779,7 +2779,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.StackExchange.Redis</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.StackExchange.Redis\Samples.StackExchange.Redis.csproj">
-      <Properties>ApiVersion=2.8.22;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.24;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.StackExchange.Redis</SampleName>
@@ -3607,7 +3607,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -3667,7 +3667,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -3679,7 +3679,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -3691,7 +3691,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -3703,7 +3703,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTests\Samples.XUnitTests.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTests</SampleName>
@@ -3715,7 +3715,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -3775,7 +3775,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -3787,7 +3787,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -3799,7 +3799,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -3811,7 +3811,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.XUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.XUnitTestsRetries\Samples.XUnitTestsRetries.csproj">
-      <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.XUnitTestsRetries</SampleName>
@@ -3835,7 +3835,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -3931,7 +3931,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -3955,7 +3955,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -3979,7 +3979,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -4003,7 +4003,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTests\Samples.NUnitTests.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTests</SampleName>
@@ -4027,7 +4027,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -4123,7 +4123,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -4147,7 +4147,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -4171,7 +4171,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -4195,7 +4195,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.NUnitTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.NUnitTestsRetries\Samples.NUnitTestsRetries.csproj">
-      <Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=4.3.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.NUnitTestsRetries</SampleName>
@@ -4213,7 +4213,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4231,7 +4231,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4249,7 +4249,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4267,7 +4267,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4285,7 +4285,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4303,7 +4303,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4321,7 +4321,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4339,7 +4339,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4357,7 +4357,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests\Samples.MSTestTests.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests</SampleName>
@@ -4375,7 +4375,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4393,7 +4393,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4411,7 +4411,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4429,7 +4429,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4447,7 +4447,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4465,7 +4465,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4483,7 +4483,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4501,7 +4501,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4519,7 +4519,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTests2</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTests2\Samples.MSTestTests2.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTests2</SampleName>
@@ -4537,7 +4537,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4555,7 +4555,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4573,7 +4573,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4591,7 +4591,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4609,7 +4609,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4627,7 +4627,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4645,7 +4645,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4663,7 +4663,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4681,7 +4681,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.MSTestTestsRetries</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.MSTestTestsRetries\Samples.MSTestTestsRetries.csproj">
-      <Properties>ApiVersion=3.6.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.MSTestTestsRetries</SampleName>
@@ -4699,7 +4699,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4717,7 +4717,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp2.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4735,7 +4735,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4753,7 +4753,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4771,7 +4771,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4789,7 +4789,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4807,7 +4807,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4825,7 +4825,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4843,7 +4843,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.Kafka</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.Kafka\Samples.Kafka.csproj">
-      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=2.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>All</RequiresDockerDependency>
       <SampleName>Samples.Kafka</SampleName>
@@ -4855,7 +4855,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net462</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -4891,7 +4891,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>netcoreapp3.1</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -4903,7 +4903,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net5.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -4915,7 +4915,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net6.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -4927,7 +4927,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net7.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -4939,7 +4939,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net8.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
@@ -4951,7 +4951,7 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
       <SampleName>Samples.CosmosDb</SampleName>
     </PackageVersionSample>
     <PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
-      <Properties>ApiVersion=3.46.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <Properties>ApiVersion=3.46.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
       <TargetFramework>net9.0</TargetFramework>
       <RequiresDockerDependency>None</RequiresDockerDependency>
       <SampleName>Samples.CosmosDb</SampleName>
diff --git a/tracer/build/_build/Build.ExplorationTests.cs b/tracer/build/_build/Build.ExplorationTests.cs
index f67ba5de580e..3e204570f03f 100644
--- a/tracer/build/_build/Build.ExplorationTests.cs
+++ b/tracer/build/_build/Build.ExplorationTests.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Nuke.Common;
 using Nuke.Common.IO;
 using Nuke.Common.Tools.DotNet;
@@ -335,7 +337,11 @@ void CreateLineProbesFile(ExplorationTestDescription testDescription)
                 var metadataReaders = new List<Tuple<object, MethodInfo, string>>();
                 foreach (var testAssemblyPath in testAssembliesPaths)
                 {
-                    var currentAssembly = Assembly.LoadFile(testAssemblyPath);
+                    if (!TryLoadAssembly(testAssemblyPath, out var currentAssembly))
+                    {
+                        continue;
+                    }
+
                     var symbolExtractor = createMethod?.Invoke(null, new object[] { currentAssembly });
                     if (symbolExtractor == null)
                     {
@@ -442,6 +448,26 @@ void CreateLineProbesFile(ExplorationTestDescription testDescription)
         }
     }
 
+    static bool TryLoadAssembly(string testAssemblyPath, [NotNullWhen(true)] out Assembly assembly)
+    {
+        try
+        {
+            assembly = Assembly.LoadFile(testAssemblyPath);
+            return true;
+        }
+        catch (BadImageFormatException e)
+        {
+            // ignore
+        }
+        catch (Exception e)
+        {
+            Logger.Warning(e, $"Fail to load assembly: {testAssemblyPath}");
+        }
+
+        assembly = null;
+        return false;
+    }
+
     string GetTracerAssemblyPath(TargetFramework framework)
     {
         TargetFramework tracerFramework = null;
@@ -483,7 +509,8 @@ static string[] GetAllTestAssemblies(string rootPath)
 
         bool Exclude(string path)
         {
-            return path.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}");
+            // skip obj folder and the `testhost`process itself
+            return path.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}") || Path.GetFileNameWithoutExtension(path).Equals("testhost");
         }
 
         bool IsSupportedExtension(string path)
@@ -599,20 +626,20 @@ public static ExplorationTestDescription GetExplorationTestDescription(Explorati
             {
                 Name = ExplorationTestName.eShopOnWeb,
                 GitRepositoryUrl = "https://github.com/dotnet-architecture/eShopOnWeb.git",
-                GitRepositoryTag = "netcore2.1",
+                GitRepositoryTag = "main",
                 IsGitShallowCloneSupported = true,
                 PathToUnitTestProject = "tests/UnitTests",
-                SupportedFrameworks = new[] { TargetFramework.NETCOREAPP2_1 },
+                SupportedFrameworks = new[] { TargetFramework.NET8_0 }
             },
             ExplorationTestName.protobuf => new ExplorationTestDescription()
             {
                 Name = ExplorationTestName.protobuf,
                 GitRepositoryUrl = "https://github.com/protocolbuffers/protobuf.git",
-                GitRepositoryTag = "v3.19.1",
+                GitRepositoryTag = "v3.23.0", // min version targeting net6.0 in tests
                 IsGitShallowCloneSupported = true,
                 IsGitSubmodulesRequired = true,
                 PathToUnitTestProject = "csharp/src/Google.Protobuf.Test",
-                SupportedFrameworks = new[] { TargetFramework.NETCOREAPP2_1 },
+                SupportedFrameworks = new[] { TargetFramework.NET6_0 },
                 TestsToIgnore = new string[]
                 {
                     "Google.Protobuf.CodedInputStreamTest.MaliciousRecursion",
diff --git a/tracer/build/_build/Build.Steps.cs b/tracer/build/_build/Build.Steps.cs
index fc5d751d6a7a..777831dc6de9 100644
--- a/tracer/build/_build/Build.Steps.cs
+++ b/tracer/build/_build/Build.Steps.cs
@@ -35,6 +35,7 @@
 partial class Build
 {
     [Solution("Datadog.Trace.sln")] readonly Solution Solution;
+    [Solution("Datadog.Trace.Samples.g.sln")] readonly Solution SamplesSolution;
     AbsolutePath TracerDirectory => RootDirectory / "tracer";
     AbsolutePath SharedDirectory => RootDirectory / "shared";
     AbsolutePath ProfilerDirectory => RootDirectory / "profiler";
@@ -207,9 +208,15 @@ bool RequiresThoroughTesting()
         var integrationChangedFiles = TargetFrameworks
             .SelectMany(tfm => new[]
             {
+                // Changes to the definitions (new integrations etc)
                 $"tracer/src/Datadog.Trace/Generated/{tfm}/Datadog.Trace.SourceGenerators/Datadog.Trace.SourceGenerators.InstrumentationDefinitions.InstrumentationDefinitionsGenerator",
                 $"tracer/src/Datadog.Trace/Generated/{tfm}/Datadog.Trace.SourceGenerators/AspectsDefinitionsGenerator",
             })
+            .Concat(new [] {
+                // Changes to the integrations themselves, e.g. change in behaviour
+                "tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation",
+                "tracer/src/Datadog.Trace/Iast/Aspects"
+            })
             .ToList();
 
         var hasIntegrationChanges = gitChangedFiles.Any(s => integrationChangedFiles.Any(s.Contains));
@@ -1263,96 +1270,17 @@ void PrepareMonitoringHomeLinuxForPackaging(AbsolutePath assetsDirectory, string
         .DependsOn(RunProfilerNativeUnitTestsLinux)
         .After(CompileProfilerNativeTests);
 
-    Target CompileDependencyLibs => _ => _
-        .Unlisted()
-        .After(Restore)
-        .After(CompileManagedSrc)
-        .Executes(() =>
-        {
-            var projects = TracerDirectory.GlobFiles(
-                "test/test-applications/integrations/dependency-libs/**/*.csproj",
-                "test/test-applications/integrations/**/*.vbproj"
-            );
-
-            DotnetBuild(projects, noDependencies: false);
-        });
-
-    Target CompileRegressionDependencyLibs => _ => _
-        .Unlisted()
-        .After(Restore)
-        .After(CompileManagedSrc)
-        .Executes(() =>
-        {
-            var projects = TracerDirectory.GlobFiles(
-                "test/test-applications/regression/dependency-libs/**/Datadog.StackExchange.Redis*.csproj"
-            );
-
-            DotnetBuild(projects, noDependencies: false);
-        });
-
-    Target CompileRegressionSamples => _ => _
-        .Unlisted()
-        .DependsOn(HackForMissingMsBuildLocation)
-        .After(Restore)
-        .After(CompileRegressionDependencyLibs)
-        .Requires(() => Framework)
-        .Executes(() =>
-        {
-            var regressionLibs = Solution.GetProject(Projects.DataDogThreadTest).Directory.Parent
-                .GlobFiles("**/*.csproj")
-                .Where(absPath =>
-                {
-                    var path = absPath.ToString();
-                    return (path, Solution.GetProject(path).TryGetTargetFrameworks()) switch
-                    {
-                        _ when path.Contains("ExpenseItDemo") => false,
-                        _ when path.Contains("StackExchange.Redis.AssemblyConflict.LegacyProject") => false,
-                        _ when path.Contains("MismatchedTracerVersions") => false,
-                        _ when path.Contains("dependency-libs") => false,
-                        _ when !string.IsNullOrWhiteSpace(SampleName) => path.Contains(SampleName, StringComparison.OrdinalIgnoreCase),
-                        (_, { } targets) => targets.Contains(Framework),
-                        _ => true,
-                    };
-                });
-
-            // Allow restore here, otherwise things go wonky with runtime identifiers
-            // in some target frameworks. No, I don't know why
-            DotnetBuild(regressionLibs, framework: Framework, noRestore: false);
-        });
-
-    Target CompileFrameworkReproductions => _ => _
-        .Unlisted()
-        .Description("Builds .NET Framework projects (non SDK-based projects)")
-        .After(CompileRegressionDependencyLibs)
-        .After(CompileDependencyLibs)
-        .Requires(() => IsWin)
-        .Executes(() =>
-        {
-            // We have to use the full MSBuild here, as dotnet msbuild doesn't copy the EDMX assets for embedding correctly
-            // seems similar to https://github.com/dotnet/sdk/issues/8360
-            MSBuild(s => s
-                .SetTargetPath(MsBuildProject)
-                .SetMSBuildPath()
-                .DisableRestore()
-                .EnableNoDependencies()
-                .SetConfiguration(BuildConfiguration)
-                .SetTargetPlatformAnyCPU()
-                .SetTargets("BuildFrameworkReproductions")
-                .SetMaxCpuCount(null));
-        });
-
     Target CompileIntegrationTests => _ => _
         .Unlisted()
         .After(CompileManagedSrc)
         .After(CompileManagedTestHelpers)
-        .After(CompileRegressionSamples)
-        .After(CompileFrameworkReproductions)
         .After(PublishIisSamples)
         .After(BuildRunnerTool)
         .Requires(() => Framework)
         .Requires(() => MonitoringHomeDirectory != null)
         .Executes(() =>
         {
+            // Compile the dependent samples.
             if (!Framework.ToString().StartsWith("net46"))
             {
                 // we need to build RazorPages before integration tests for .net46x
@@ -1368,156 +1296,203 @@ _ when path.Contains("dependency-libs") => false,
             DotnetBuild(projects, framework: Framework);
         });
 
-    Target CompileSamplesWindows => _ => _
+    Target CompileSamples => _ => _
+         .Description("Compiles all the sample projects")
+         .Unlisted()
+         .After(Clean)
+         .DependsOn(HackForMissingMsBuildLocation)
+         .Executes(() =>
+          {
+              if (TestAllPackageVersions)
+              {
+                  // Explicitly compiles the prerequisites which MSbuild doesn't
+                  // (no, I don't know why, I can't seem to convince it to do this automatically)
+                  var projects = TracerDirectory.GlobFiles(
+                      "test/test-applications/integrations/dependency-libs/**/*.csproj",
+                      "test/test-applications/integrations/**/*.vbproj"
+                  );
+
+                  DotnetBuild(projects, noDependencies: false, noRestore: false);
+
+                  // these are defined in Datadog.Trace.proj - they only build the projects that have multiple package versions of their NuGet dependencies
+                  var targets = new[] { "RestoreSamplesForPackageVersionsOnly", "RestoreAndBuildSamplesForPackageVersionsOnly" };
+                  var frameworks = Framework is null || string.IsNullOrEmpty(Framework)
+                                       ? TestingFrameworks
+                                       : new[] { Framework };
+
+                  foreach (var framework in frameworks)
+                  {
+                      foreach (var target in targets)
+                      {
+                          // /nowarn:NU1701 - Package 'x' was restored using '.NETFramework,Version=v4.6.1' instead of the project target framework '.NETCoreApp,Version=v2.1'.
+                          // /nowarn:NETSDK1138 - Package 'x' was restored using '.NETFramework,Version=v4.6.1' instead of the project target framework '.NETCoreApp,Version=v2.1'.
+                          MSBuild(x => x
+                                      .SetTargetPath(MsBuildProject)
+                                      .SetTargets(target)
+                                      .SetConfiguration(BuildConfiguration)
+                                      .SetProperty("TargetFramework", framework.ToString())
+                                      .SetProperty("BuildInParallel", "true")
+                                      .SetProperty("CheckEolTargetFramework", "false")
+                                      .SetProperty("ManuallyCopyCodeCoverageFiles", "false")
+                                      .When(!string.IsNullOrEmpty(SampleName), o => o.SetProperty("SampleName", SampleName))
+                                      .When(!string.IsNullOrEmpty(NugetPackageDirectory), o => o.SetProperty("RestorePackagesPath", NugetPackageDirectory))
+                                      .SetProcessArgumentConfigurator(arg => arg.Add("/nowarn:NU1701").Add($"/bl:\"{(BuildDataDirectory / $"build_{DateTime.UtcNow.Ticks}.binlog")}\""))
+                                      .When(TestAllPackageVersions, o => o.SetProperty("TestAllPackageVersions", "true"))
+                                      .When(IncludeMinorPackageVersions, o => o.SetProperty("IncludeMinorPackageVersions", "true"))
+                          );
+                      }
+                  }
+
+                  // All done with the multi-api version
+                  return;
+              }
+
+              // Build the "standalone" samples (i.e. the single-api-version samples)
+              var samples = GetSamplesToBuild();
+              Logger.Information("Building {SampleName}", samples);
+
+              // TODO: set Samples.Trimming as don't build, as we have to explicitly build that on every platform anyway
+              DotNetBuild(config => config
+                                   .SetConfiguration(BuildConfiguration)
+                                   .SetProperty("BuildInParallel", "true")
+                                   .SetProcessArgumentConfigurator(arg => arg.Add("/nowarn:NU1701"))
+                                   .When(Framework is not null, x => x.SetFramework(Framework))
+                                   .SetProjectFile(samples));
+
+              string GetSamplesToBuild()
+              {
+                  // If a specific sample name was not given, build whole samples solution
+                  if (string.IsNullOrWhiteSpace(SampleName))
+                  {
+                      return SamplesSolution;
+                  }
+
+                  // Filter to a single candidate SampleName
+                  var candidates =
+                      TracerDirectory.GlobFiles("test/test-applications/integrations/**/*.csproj")
+                                     .Select(x => Solution.GetProject(x))
+                                     .Where(project => project is not null
+                                                    && project.Path.ToString().Contains(SampleName, StringComparison.OrdinalIgnoreCase));
+
+                  if (Framework is not null)
+                  {
+                      // exclude projects that can't be built for this TFM
+                      candidates = candidates.Where(project => project.TryGetTargetFrameworks()?.Contains(Framework) ?? true);
+                  }
+
+                  var allMatches = candidates.ToList();
+                  if (allMatches.Count == 0)
+                  {
+                      throw new InvalidOperationException($"No sample projects found matching '{SampleName}'." +
+                                                          (string.IsNullOrEmpty(Framework) ? $" Does the project support the specified framework '{Framework}'?" : " ") +
+                                                          "Alternatively, exclude the SampleName parameter to build all samples instead");
+                  }
+
+                  if (allMatches.Count == 1)
+                  {
+                      return allMatches.First();
+                  }
+
+                  // try to find best "exact" match
+                  // exact name match
+                  var bestMatches = allMatches.Where(x => x.Name.Equals(SampleName, StringComparison.Ordinal)).ToList();
+                  if(bestMatches.Count == 1)
+                  {
+                      return bestMatches.First();
+                  }
+
+                  // case insensitive exact name match
+                  bestMatches = allMatches.Where(x => x.Name.Equals(SampleName, StringComparison.OrdinalIgnoreCase)).ToList();
+                  if(bestMatches.Count == 1)
+                  {
+                      return bestMatches.First();
+                  }
+
+                  // case insensitive path suffix match
+                  bestMatches = allMatches.Where(x => x.Path.ToString().EndsWith(SampleName, StringComparison.OrdinalIgnoreCase)).ToList();
+                  if(bestMatches.Count == 1)
+                  {
+                      return bestMatches.First();
+                  }
+
+                  // no way to choose between them
+                  throw new InvalidOperationException($"Found multiple sample projects matching '{SampleName}'. " +
+                                                      string.Join(",", allMatches.Select(x => $"'{x.Name}'")) +
+                                                      ". Provide an exact match for the name of of the project, or a path suffix");
+              }
+          });
+
+    Target CompileTrimmingSamples => _ => _
+        .Description("Compiles the trimming samples")
+        .After(CompileManagedSrc)
+        .Requires(() => Framework)
         .Unlisted()
+        .After(Clean)
         .DependsOn(HackForMissingMsBuildLocation)
-        .After(CompileDependencyLibs)
-        .After(CompileFrameworkReproductions)
-        .Requires(() => MonitoringHomeDirectory != null)
-        .Requires(() => Framework)
         .Executes(() =>
         {
-            if (TestAllPackageVersions)
-            {
-                // TODO this is hacky as I couldn't figure out what was going on here so I opted to just delete everything each time
-                //      for some reason projects that declare specific TargetFrameworks in the project file
-                //      will duplicate their package versions
-                //      e.g. Samples.GraphQL4\bin\4.1.0\Debug\net7.0\bin\4.3.0
-                //      this will go on and create a ton of folders/files
-                //      my hacky workaround for this at the moment is to simply remove the bin/obj directories beforehand
-                //      GrpcDotNet, GraphQL4, and HotChocolate samples had this issue
-                Logger.Information("Cleaning up sample projects that use multiple package versions");
-
-                var multiPackageProjects = new List<string>();
-                var samplesFile = BuildDirectory / "PackageVersionsGeneratorDefinitions.json";
-                using var fs = File.OpenRead(samplesFile);
-                var json = JsonDocument.Parse(fs);
-                multiPackageProjects = json.RootElement
-                                           .EnumerateArray()
-                                           .Select(e => e.GetProperty("SampleProjectName").GetString())
-                                           .Distinct()
-                                           .Where(name => name switch
-                                           {
-                                               "Samples.MySql" => false, // the "non package version" is _ALSO_ tested separately
-                                               _ => true
-                                           })
-                                           .ToList();
-                var patterns = new List<string>();
-
-                foreach (var dir in multiPackageProjects)
-                {
-                    patterns.Add($"test/test-applications/integrations/{dir}/bin");
-                    patterns.Add($"test/test-applications/integrations/{dir}/obj");
-                }
-
-                TracerDirectory.GlobDirectories(patterns.ToArray()).ForEach(x => DeleteDirectory(x));
-
-                // these are defined in the Datadog.Trace.proj - they only build the projects that have multiple package versions of their NuGet
-                var targets = new[] { "RestoreSamplesForPackageVersionsOnly", "RestoreAndBuildSamplesForPackageVersionsOnly" };
+            // It's a bit of a hack putting these here, but hopefully it _works_ at least
+            CompileSamplesThatDependOnDatadogTrace();
 
-                // /nowarn:NU1701 - Package 'x' was restored using '.NETFramework,Version=v4.6.1' instead of the project target framework '.NETCoreApp,Version=v2.1'.
-                // /nowarn:NETSDK1138 - Package 'x' was restored using '.NETFramework,Version=v4.6.1' instead of the project target framework '.NETCoreApp,Version=v2.1'.
-                foreach (var target in targets)
-                {
-                    MSBuild(x => x
-                        .SetTargetPath(MsBuildProject)
-                        .SetTargets(target)
-                        .SetConfiguration(BuildConfiguration)
-                        .EnableNoDependencies()
-                        .SetProperty("TargetFramework", Framework.ToString())
-                        .SetProperty("BuildInParallel", "true")
-                        .SetProperty("CheckEolTargetFramework", "false")
-                        .SetProperty("SampleName", SampleName ?? string.Empty)
-                        .When(!string.IsNullOrEmpty(NugetPackageDirectory), o => o.SetProperty("RestorePackagesPath", NugetPackageDirectory))
-                        .SetProcessArgumentConfigurator(arg => arg.Add("/nowarn:NU1701"))
-                        .When(TestAllPackageVersions, o => o.SetProperty("TestAllPackageVersions", "true"))
-                        .When(IncludeMinorPackageVersions, o => o.SetProperty("IncludeMinorPackageVersions", "true"))
-                    );
-                }
-            }
-            else
+            // This is separated from CompileSamples, because we can only publish for the actual platform we're on,
+            var trimmingSamples = new []
             {
-                // This does some "unnecessary" rebuilding and restoring
-                var includeIntegration = TracerDirectory.GlobFiles("test/test-applications/integrations/**/*.csproj");
-                var includeInstrumentation = TracerDirectory.GlobFiles("test/test-applications/instrumentation/**/*.csproj");
-                // Don't build aspnet full framework sample in this step
-                var includeSecurity = TracerDirectory.GlobFiles("test/test-applications/security/*/*.csproj");
-
-                var exclude = TracerDirectory.GlobFiles("test/test-applications/integrations/dependency-libs/**/*.csproj")
-                                             .Concat(TracerDirectory.GlobFiles("test/test-applications/debugger/dependency-libs/**/*.csproj"))
-                                             .Concat(TracerDirectory.GlobFiles("test/test-applications/integrations/Samples.AzureServiceBus/*.csproj"));
-
-                var projects = includeIntegration
-                    .Concat(includeInstrumentation)
-                    .Concat(includeSecurity)
-                    .Select(x => Solution.GetProject(x))
-                    .Where(project =>
-                    (project, project.TryGetTargetFrameworks(), project.RequiresDockerDependency()) switch
-                    {
-                        _ when exclude.Contains(project.Path) => false,
-                        _ when !string.IsNullOrWhiteSpace(SampleName) => project.Path.ToString().Contains(SampleName, StringComparison.OrdinalIgnoreCase),
-                        (_, _, DockerDependencyType.All) => false, // can't use docker on Windows
-                        (_, { } targets, _) => targets.Contains(Framework),
-                        _ => true,
-                    }
-                );
-
-                // /nowarn:NU1701 - Package 'x' was restored using '.NETFramework,Version=v4.6.1' instead of the project target framework '.NETCoreApp,Version=v2.1'.
-                DotNetBuild(config => config
-                    .SetConfiguration(BuildConfiguration)
-                    .SetTargetPlatformAnyCPU()
-                    .EnableNoDependencies()
-                    .SetProperty("BuildInParallel", "true")
-                    .SetProcessArgumentConfigurator(arg => arg.Add("/nowarn:NU1701"))
-                    .CombineWith(projects, (s, project) => s
-                        // we have to build this one for all frameworks (because of reasons)
-                        .When(!project.Name.Contains("MultiDomainHost"), x => x.SetFramework(Framework))
-                        .SetProjectFile(project)));
-
-                var projectsToPublish = includeIntegration
-                   .Select(x =>
-                    {
-                        var project = Solution.GetProject(x);
-                        return project?.Name switch
-                        {
-                            "Samples.Trimming" => (project, include: Framework.IsGreaterThanOrEqualTo(TargetFramework.NET6_0), r2r: false),
-                            "Samples.ManualInstrumentation" => (project, include: Framework.IsGreaterThanOrEqualTo(TargetFramework.NETCOREAPP2_1), r2r: true),
-                            _ => (project, include: false, r2r: false),
-                        };
-                    })
-                   .Where(x => (x, x.project.TryGetTargetFrameworks(), x.project.RequiresDockerDependency()) switch
-                    {
-                        ({include: false }, _, _) => false,
-                        _ when exclude.Contains(x.project.Path) => false,
-                        _ when !string.IsNullOrWhiteSpace(SampleName) => x.project.Path.ToString().Contains(SampleName, StringComparison.OrdinalIgnoreCase),
-                        (_, _, DockerDependencyType.All) => false, // can't use docker on Windows
-                        (_, { } targets, _) => targets.Contains(Framework),
-                        _ => true,
-                    });
+                (project: "Samples.Trimming",include: Framework.IsGreaterThanOrEqualTo(TargetFramework.NET6_0), r2r: false),
+                (project: "Samples.ManualInstrumentation",include: Framework.IsGreaterThanOrEqualTo(TargetFramework.NETCOREAPP2_1), r2r: true),
+            };
+            var projectsToPublish = trimmingSamples
+                                   .Select(x => (project: Solution.GetProject(x.project), x.include, x.r2r))
+                                   .Where(x => (x, x.project.TryGetTargetFrameworks(), x.project.RequiresDockerDependency()) switch
+                                    {
+                                        ({include: false }, _, _) => false,
+                                        _ when !string.IsNullOrWhiteSpace(SampleName) => x.project.Path.ToString().Contains(SampleName, StringComparison.OrdinalIgnoreCase),
+                                        (_, _, DockerDependencyType.All) => false, // can't use docker on Windows
+                                        (_, { } targets, _) => targets.Contains(Framework),
+                                        _ => true,
+                                    });
+            var rid = (Platform, TargetPlatform.ToString()) switch
+            {
+                (PlatformFamily.Linux, "x64") => IsAlpine ? "linux-musl-x64" : "linux-x64",
+                (PlatformFamily.Linux, "ARM64") => IsAlpine ? "linux-musl-arm64" : "linux-arm64",
+                (PlatformFamily.OSX, "x64") => "osx-x64",
+                (PlatformFamily.OSX, "ARM64") => "osx-arm64",
+                (PlatformFamily.Windows, "ARM64" or "ARM64EC") => "win-arm64",
+                (PlatformFamily.Windows, "x64") => "win-x64",
+                (PlatformFamily.Windows, "x86") => "win-x86",
+                _ => throw new InvalidOperationException($"Unknown platform {Platform} ({RuntimeInformation.ProcessArchitecture})"),
+            };
 
-                var rid = TargetPlatform.ToString() switch
+            DotNetPublish(config => config
+                .SetConfiguration(BuildConfiguration)
+                .SetRuntime(rid)
+                .SetFramework(Framework)
+                .CombineWith(projectsToPublish,
+                    (s, project) => s
+                        .SetProject(project.project)
+                        .When(project.r2r, x => x.SetPublishReadyToRun(true))));
+
+            void CompileSamplesThatDependOnDatadogTrace()
+            {
+                // These are either directly used by the integration tests or depend on Datadog.Trace already being built
+                // It would be preferable to have these all in a separate "build" solution to avoid complexity,
+                // but we'll do that later
+                var directDatadogTraceReferences = Solution
+                                                  .AllProjects
+                                                  .Where(project => project.SolutionFolder.Name == "instrumentation"
+                                                                 && project.ReferencesDatadogTrace()
+                                                                 && project.TryGetTargetFrameworks()?.Contains(Framework) != false);
+
+                foreach (var project in directDatadogTraceReferences)
                 {
-                    "x64" => "win-x64",
-                    "x86" => "win-x86",
-                    "ARM64" or "ARM64EC" => "win-arm64",
-                    _ => throw new InvalidOperationException("Unsupported architecture " + RuntimeInformation.ProcessArchitecture),
-                };
-
-                DotNetPublish(config => config
-                   .SetConfiguration(BuildConfiguration)
-                   .SetFramework(Framework)
-                   .SetRuntime(rid)
-                   .CombineWith(projectsToPublish, (s, project) => s
-                      .SetProject(project.project)
-                      .When(project.r2r, x => x.SetPublishReadyToRun(true))));
+                    DotnetBuild(project, framework: Framework);
+                }
             }
         });
 
     Target PublishIisSamples => _ => _
         .Unlisted()
         .After(CompileManagedTestHelpers)
-        .After(CompileRegressionSamples)
-        .After(CompileFrameworkReproductions)
+        .After(CompileSamples)
         .OnlyWhenStatic(() => IsWin)
         .Executes(() =>
         {
@@ -1547,8 +1522,8 @@ _ when exclude.Contains(x.project.Path) => false,
         .Unlisted()
         .After(BuildTracerHome)
         .After(CompileIntegrationTests)
-        .After(CompileSamplesWindows)
-        .After(CompileFrameworkReproductions)
+        .After(CompileSamples)
+        .After(CompileTrimmingSamples)
         .After(BuildWindowsIntegrationTests)
         .DependsOn(CleanTestLogs)
         .Requires(() => IsWin)
@@ -1613,7 +1588,6 @@ _ when exclude.Contains(x.project.Path) => false,
     Target CompileAzureFunctionsSamplesWindows => _ => _
         .Unlisted()
         .DependsOn(HackForMissingMsBuildLocation)
-        .After(CompileFrameworkReproductions)
         .Requires(() => MonitoringHomeDirectory != null)
         .Requires(() => Framework)
         .Executes(() =>
@@ -1682,8 +1656,8 @@ _ when exclude.Contains(x.project.Path) => false,
         .Unlisted()
         .After(BuildTracerHome)
         .After(CompileIntegrationTests)
-        .After(CompileRegressionSamples)
-        .After(CompileFrameworkReproductions)
+        .After(CompileSamples)
+        .After(CompileTrimmingSamples)
         .After(BuildNativeLoader)
         .DependsOn(CleanTestLogs)
         .Requires(() => IsWin)
@@ -1723,7 +1697,6 @@ _ when exclude.Contains(x.project.Path) => false,
     Target RunWindowsTracerIisIntegrationTests => _ => _
         .After(BuildTracerHome)
         .After(CompileIntegrationTests)
-        .After(CompileFrameworkReproductions)
         .After(PublishIisSamples)
         .Triggers(PrintSnapshotsDiff)
         .Requires(() => Framework)
@@ -1733,7 +1706,6 @@ _ when exclude.Contains(x.project.Path) => false,
     Target RunWindowsSecurityIisIntegrationTests => _ => _
         .After(BuildTracerHome)
         .After(CompileIntegrationTests)
-        .After(CompileFrameworkReproductions)
         .After(PublishIisSamples)
         .Triggers(PrintSnapshotsDiff)
         .Requires(() => Framework)
@@ -1773,7 +1745,6 @@ void RunWindowsIisIntegrationTests(Project project)
     Target RunWindowsMsiIntegrationTests => _ => _
         .After(BuildTracerHome)
         .After(CompileIntegrationTests)
-        .After(CompileFrameworkReproductions)
         .After(PublishIisSamples)
         .Triggers(PrintSnapshotsDiff)
         .Requires(() => Framework)
@@ -1817,199 +1788,10 @@ void RunWindowsIisIntegrationTests(Project project)
             ProjectModelTasks.Initialize();
         });
 
-    Target CompileSamplesLinuxOrOsx => _ => _
-        .Unlisted()
-        .DependsOn(HackForMissingMsBuildLocation)
-        .After(CompileManagedSrc)
-        .After(CompileRegressionDependencyLibs)
-        .After(CompileDependencyLibs)
-        .After(CompileManagedTestHelpers)
-        .Requires(() => MonitoringHomeDirectory != null)
-        .Requires(() => Framework)
-        .Executes(() =>
-        {
-            MakeGrpcToolsExecutable();
-
-            // There's nothing specifically linux-y here, it's just that we only build a subset of projects
-            // for testing on linux.
-            var sampleProjects = TracerDirectory.GlobFiles("test/test-applications/integrations/*/*.csproj");
-            var securitySampleProjects = TracerDirectory.GlobFiles("test/test-applications/security/*/*.csproj");
-            var regressionProjects = TracerDirectory.GlobFiles("test/test-applications/regression/*/*.csproj");
-            var instrumentationProjects = TracerDirectory.GlobFiles("test/test-applications/instrumentation/*/*.csproj");
-
-            // These samples are currently skipped.
-            var projectsToSkip = new[]
-            {
-                "Samples.AzureServiceBus", // We are not running in CI because we haven't set up an emulator
-                "Samples.Msmq",  // Doesn't run on Linux
-                "Samples.Owin.WebApi2", // Doesn't run on Linux
-                "Samples.RateLimiter", // I think we _should_ run this one (assuming it has tests)
-                "Samples.SqlServer.NetFramework20",
-                "Samples.TracingWithoutLimits", // I think we _should_ run this one (assuming it has tests)
-                "Samples.Wcf",
-                "Samples.WebRequest.NetFramework20",
-                "DogStatsD.RaceCondition",
-                "StackExchange.Redis.AssemblyConflict.LegacyProject",
-                "MismatchedTracerVersions",
-                "IBM.Data.DB2.DBCommand",
-                "Sandbox.AutomaticInstrumentation", // Doesn't run on Linux
-                "Sandbox.LegacySecurityPolicy", // Doesn't run on Linux
-                "Samples.Trimming",
-            };
-
-            // These sample projects are built using RestoreAndBuildSamplesForPackageVersions
-            // so no point building them now
-            var multiPackageProjects = new List<string>();
-            if (TestAllPackageVersions)
-            {
-                var samplesFile = BuildDirectory / "PackageVersionsGeneratorDefinitions.json";
-                using var fs = File.OpenRead(samplesFile);
-                var json = JsonDocument.Parse(fs);
-                multiPackageProjects = json.RootElement
-                                           .EnumerateArray()
-                                           .Select(e => e.GetProperty("SampleProjectName").GetString())
-                                           .Distinct()
-                                           .Where(name => name switch
-                                            {
-                                                "Samples.MySql" => false, // the "non package version" is _ALSO_ tested separately
-                                                _ => true
-                                            })
-                                           .ToList();
-            }
-
-            var projectsToBuild = sampleProjects
-                .Concat(securitySampleProjects)
-                .Concat(regressionProjects)
-                .Concat(instrumentationProjects)
-                .Select(path => (path, project: Solution.GetProject(path)))
-                .Where(x => (IncludeTestsRequiringDocker, x.project) switch
-                {
-                    // filter out or to integration tests that have docker dependencies
-                    (null, _) => true,
-                    (_, null) => true,
-                    (_, { } p) when !string.IsNullOrWhiteSpace(SampleName) => p.Name.Contains(SampleName, StringComparison.OrdinalIgnoreCase),
-                    (false, { } p) => p.RequiresDockerDependency() == DockerDependencyType.None,
-                    (true, { } p) => p.RequiresDockerDependency() != DockerDependencyType.None,
-                })
-                .Where(x =>
-                           x.project?.Name switch
-                                  {
-                                      var name when projectsToSkip.Contains(name) => false,
-                                      var name when multiPackageProjects.Contains(name) => false,
-                                      _ when !string.IsNullOrWhiteSpace(SampleName) => x.project?.Name?.Contains(SampleName, StringComparison.OrdinalIgnoreCase) ?? false,
-                                      _ => x.project.TryGetTargetFrameworks().Contains(Framework),
-                                  })
-                .Select(x => x.path)
-                .ToArray();
-
-            // do the build and publish separately to avoid dependency issues
-
-            DotnetBuild(projectsToBuild, framework: Framework, noRestore: false);
-
-            DotNetPublish(x => x
-                    .EnableNoRestore()
-                    .EnableNoBuild()
-                    .EnableNoDependencies()
-                    .SetConfiguration(BuildConfiguration)
-                    .SetFramework(Framework)
-                    .SetNoWarnDotNetCore3()
-                    .When(TestAllPackageVersions, o => o.SetProperty("TestAllPackageVersions", "true"))
-                    .When(IncludeMinorPackageVersions, o => o.SetProperty("IncludeMinorPackageVersions", "true"))
-                    .When(!string.IsNullOrEmpty(NugetPackageDirectory), o => o.SetPackageDirectory(NugetPackageDirectory))
-                    .CombineWith(projectsToBuild, (c, project) => c
-                        .SetProject(project)));
-
-            // We have to explicitly publish the trimming sample separately (written so we can add to this later if needs be)
-            var projectsToPublish = sampleProjects
-               .Select(x =>
-                {
-                    var project = Solution.GetProject(x);
-                    return project?.Name switch
-                    {
-                        "Samples.Trimming" => (project, include: Framework.IsGreaterThanOrEqualTo(TargetFramework.NET6_0), r2r: false),
-                        "Samples.ManualInstrumentation" => (project, include: Framework.IsGreaterThanOrEqualTo(TargetFramework.NETCOREAPP2_1), r2r: true),
-                        _ => (project, include: false, r2r: false),
-                    };
-                })
-               .Where(x => (IncludeTestsRequiringDocker, x) switch
-                {
-                    // filter out or to integration tests that have docker dependencies
-                    (_, {include: false }) => false,
-                    (null, _) => true,
-                    (_, { project: null}) => true,
-                    (_, { } p) when !string.IsNullOrWhiteSpace(SampleName) => p.project.Name.Contains(SampleName, StringComparison.OrdinalIgnoreCase),
-                    (false, { } p) => p.project.RequiresDockerDependency() == DockerDependencyType.None,
-                    (true, { } p) => p.project.RequiresDockerDependency() != DockerDependencyType.None,
-                });
-
-            var rid = (IsLinux, IsArm64) switch
-            {
-                (true, false) => IsAlpine ? "linux-musl-x64" : "linux-x64",
-                (true, true) => IsAlpine ? "linux-musl-arm64" : "linux-arm64",
-                (false, false) => "osx-x64",
-                (false, true) => "osx-arm64",
-            };
-            DotNetPublish(config => config
-               .SetConfiguration(BuildConfiguration)
-               .SetFramework(Framework)
-               .SetRuntime(rid)
-               .CombineWith(projectsToPublish, (s, project) => s
-                  .SetProject(project.project)
-                  .When(project.r2r, x => x.SetPublishReadyToRun(true))));
-        });
-
-    Target CompileMultiApiPackageVersionSamples => _ => _
-        .Unlisted()
-        .DependsOn(HackForMissingMsBuildLocation)
-        .After(CompileManagedSrc)
-        .After(CompileRegressionDependencyLibs)
-        .After(CompileDependencyLibs)
-        .After(CompileManagedTestHelpers)
-        .After(CompileSamplesLinuxOrOsx)
-        .Requires(() => MonitoringHomeDirectory != null)
-        .Requires(() => Framework)
-        .Executes(() =>
-        {
-            // Build and restore for all versions
-            // Annoyingly this rebuilds everything again and again.
-            var targets = new[] { "RestoreSamplesForPackageVersionsOnly", "RestoreAndBuildSamplesForPackageVersionsOnly" };
-
-            // /nowarn:NU1701 - Package 'x' was restored using '.NETFramework,Version=v4.6.1' instead of the project target framework '.NETCoreApp,Version=v2.1'.
-            // /nowarn:NETSDK1138 - Package 'x' was restored using '.NETFramework,Version=v4.6.1' instead of the project target framework '.NETCoreApp,Version=v2.1'.
-            var sampleName = string.IsNullOrWhiteSpace(SampleName) ? string.Empty : SampleName;
-            foreach (var target in targets)
-            {
-                // TODO: When IncludeTestsRequiringDocker is set, only build required samples
-                DotNetMSBuild(x => x
-                    .SetTargetPath(MsBuildProject)
-                    .SetTargets(target)
-                    .SetConfiguration(BuildConfiguration)
-                    .EnableNoDependencies()
-                    .SetProperty("TargetFramework", Framework.ToString())
-                    .SetProperty("BuildInParallel", "true")
-                    .SetProperty("CheckEolTargetFramework", "false")
-                    .SetProperty("SampleName", sampleName)
-                    .When(IncludeTestsRequiringDocker.HasValue, o => o.SetProperty("IncludeTestsRequiringDocker", IncludeTestsRequiringDocker!.Value ? "true" : "false"))
-                    .When(IsArm64, o => o.SetProperty("IsArm64", "true"))
-                    .When(IsAlpine, o => o.SetProperty("IsAlpine", "true"))
-                    .When(!string.IsNullOrEmpty(NugetPackageDirectory), o => o.SetProperty("RestorePackagesPath", NugetPackageDirectory))
-                    .SetProcessArgumentConfigurator(arg => arg.Add("/nowarn:NU1701"))
-                    .When(TestAllPackageVersions, o => o.SetProperty("TestAllPackageVersions", "true"))
-                    .When(IncludeMinorPackageVersions, o => o.SetProperty("IncludeMinorPackageVersions", "true"))
-                );
-
-                MakeGrpcToolsExecutable(); // for use in the second target
-            }
-        });
-
     Target CompileLinuxOrOsxIntegrationTests => _ => _
         .Unlisted()
         .After(CompileManagedSrc)
-        .After(CompileRegressionDependencyLibs)
-        .After(CompileDependencyLibs)
         .After(CompileManagedTestHelpers)
-        .After(CompileSamplesLinuxOrOsx)
-        .After(CompileMultiApiPackageVersionSamples)
         .After(BuildRunnerTool)
         .Requires(() => MonitoringHomeDirectory != null)
         .Requires(() => Framework)
@@ -2031,11 +1813,7 @@ var name when multiPackageProjects.Contains(name) => false,
     Target CompileLinuxDdDotnetIntegrationTests => _ => _
         .Unlisted()
         .After(CompileManagedSrc)
-        .After(CompileRegressionDependencyLibs)
-        .After(CompileDependencyLibs)
         .After(CompileManagedTestHelpers)
-        .After(CompileSamplesLinuxOrOsx)
-        .After(CompileMultiApiPackageVersionSamples)
         .Requires(() => MonitoringHomeDirectory != null)
         .Executes(() =>
         {
@@ -2075,6 +1853,7 @@ var name when multiPackageProjects.Contains(name) => false,
 
     Target RunLinuxIntegrationTests => _ => _
         .After(CompileLinuxOrOsxIntegrationTests)
+        .After(CompileTrimmingSamples)
         .DependsOn(CleanTestLogs)
         .Description("Runs the linux integration tests")
         .Requires(() => Framework)
@@ -2359,7 +2138,7 @@ var name when multiPackageProjects.Contains(name) => false,
     Target CopyServerlessArtifacts => _ => _
        .Description("Copies monitoring-home into the serverless artifacts directory")
        .Unlisted()
-       .After(CompileSamplesLinuxOrOsx, CompileMultiApiPackageVersionSamples)
+       .After(CompileSamples, CompileTrimmingSamples)
        .Executes(() =>
         {
             // This is a bit hacky, we can probably improve it once/if we output monitoring home into the BuildArtifactsDirectory too
@@ -2911,41 +2690,6 @@ static LogLevel ParseNativeLogLevel(string value)
             };
     }
 
-    private void MakeGrpcToolsExecutable()
-    {
-        var packageDirectory = NugetPackageDirectory;
-        if (string.IsNullOrEmpty(NugetPackageDirectory))
-        {
-            Logger.Information("NugetPackageDirectory not set, querying for global-package location");
-            var packageLocation = "global-packages";
-            var output = DotNet($"nuget locals {packageLocation} --list");
-
-            var expected = $"{packageLocation}: ";
-            var location = output
-                              .Where(x => x.Type == OutputType.Std)
-                              .Select(x => x.Text)
-                              .FirstOrDefault(x => x.StartsWith(expected))
-                             ?.Substring(expected.Length);
-
-            if (string.IsNullOrEmpty(location))
-            {
-                Logger.Information("Couldn't determine global-package location, skipping chmod +x on grpc.tools");
-                return;
-            }
-
-            packageDirectory = (AbsolutePath)(location);
-        }
-
-        Logger.Information($"Using '{packageDirectory}' for NuGet package location");
-
-        // GRPC runs a tool for codegen, which apparently isn't automatically marked as executable
-        var grpcTools = GlobFiles(packageDirectory / "grpc.tools", "**/tools/linux_*/*");
-        foreach (var toolPath in grpcTools)
-        {
-            Chmod.Value.Invoke(" +x " + toolPath);
-        }
-    }
-
     private AbsolutePath GetResultsDirectory(Project proj) => BuildDataDirectory / "results" / proj.Name;
 
     private void EnsureResultsDirectory(Project proj) => EnsureCleanDirectory(GetResultsDirectory(proj));
diff --git a/tracer/build/_build/Build.Utilities.cs b/tracer/build/_build/Build.Utilities.cs
index d39ad75444a3..f34b82ea80ef 100644
--- a/tracer/build/_build/Build.Utilities.cs
+++ b/tracer/build/_build/Build.Utilities.cs
@@ -19,6 +19,7 @@
 using Microsoft.VisualStudio.Services.WebApi;
 using Nuke.Common;
 using Nuke.Common.IO;
+using Nuke.Common.ProjectModel;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.MSBuild;
@@ -402,6 +403,75 @@ partial class Build
             ReplaceReceivedFilesInSnapshots();
       });
 
+    Target RegenerateSolutions
+        => _ => _
+               .Description("Regenerates the 'build' solutions based on the 'master' solution")
+               .Executes(() =>
+                {
+                    // Create a copy of the "full solution"
+                    var sln = ProjectModelTasks.CreateSolution(
+                        fileName: RootDirectory / "Datadog.Trace.Samples.g.sln",
+                        solutions: new[] { Solution },
+                        randomizeProjectIds: false);
+
+                    // Remove everything except the standalone test-application projects
+                    sln.AllProjects
+                       .Where(x => !IsTestApplication(x))
+                       .ForEach(x =>
+                        {
+                            Logger.Information("Removing project '{Name}'", x.Name);
+                            sln.RemoveProject(x);
+                        });
+                    
+                    sln.Save();
+
+                    bool IsTestApplication(Project x)
+                    {
+                        // We explicitly don't build some of these because
+                        // 1. They're a pain to build
+                        // 2. They aren't actually run in the CI (something we should address in the future)
+                        if (x.Name is "ExpenseItDemo" or "StackExchange.Redis.AssemblyConflict.LegacyProject" or "_build")
+                        {
+                            return false;
+                        }
+
+                        // Include test-applications, but exclude the following for now:
+                        // - test-applications/aspnet
+                        // - test-applications/security/aspnet
+                        // These currently aren't published to separate folders, are minimal, can't be
+                        // built on macos, and don't take long to build, so not a big value in building
+                        // them separately currently
+                        var solutionFolder = x.SolutionFolder;
+                        while (solutionFolder is not null)
+                        {
+                            if(solutionFolder.Name == "aspnet"
+                                && solutionFolder.SolutionFolder?.Name == "test-applications")
+                            {
+                                return false;
+                            }
+
+                            if(solutionFolder.Name == "aspnet"
+                                && solutionFolder.SolutionFolder?.Name == "security"
+                                && solutionFolder.SolutionFolder?.SolutionFolder?.Name == "test-applications")
+                            {
+                                return false;
+                            }
+
+                            if (solutionFolder.Name == "test-applications")
+                            {
+                                // Exclude projects which directly reference Datadog.Trace - these need to be
+                                // built with the "main" solution as they're inherently not standalone
+                                return !x.ReferencesDatadogTrace();
+                            }
+
+                            solutionFolder = solutionFolder.SolutionFolder;
+                        }
+
+                        return false;
+                    }
+                });
+
+
     private void ReplaceReceivedFilesInSnapshots()
     {
         var snapshotsDirectory = TestsDirectory / "snapshots";
diff --git a/tracer/build/_build/Build.VariableGenerations.cs b/tracer/build/_build/Build.VariableGenerations.cs
index f61697b19bd0..aaa9d1a69027 100644
--- a/tracer/build/_build/Build.VariableGenerations.cs
+++ b/tracer/build/_build/Build.VariableGenerations.cs
@@ -23,6 +23,7 @@ Target GenerateVariables
                   .Executes(() =>
                    {
                        GenerateConditionVariables();
+                       GenerateUnitTestFrameworkMatrices();
 
                        GenerateIntegrationTestsWindowsMatrices();
                        GenerateIntegrationTestsLinuxMatrices();
@@ -100,6 +101,38 @@ void GenerateConditionVariableBasedOnGitChange(string variableName, string[] fil
                 }
             }
 
+            void GenerateUnitTestFrameworkMatrices()
+            {
+                GenerateTfmsMatrix("unit_tests_windows_matrix", TestingFrameworks);
+                var unixFrameworks = TestingFrameworks.Except(new[] { TargetFramework.NET461, TargetFramework.NET462, TargetFramework.NETSTANDARD2_0 }).ToList();
+                GenerateTfmsMatrix("unit_tests_macos_matrix", unixFrameworks);
+                GenerateLinuxMatrix("x64", unixFrameworks);
+                GenerateLinuxMatrix("arm64", unixFrameworks);
+
+                void GenerateTfmsMatrix(string name, IEnumerable<TargetFramework> frameworks)
+                {
+                    var matrix = frameworks
+                       .ToDictionary(t => t.ToString(), t => new { framework = t, });
+
+                    Logger.Information(JsonConvert.SerializeObject(matrix, Formatting.Indented));
+                    AzurePipelines.Instance.SetOutputVariable(name, JsonConvert.SerializeObject(matrix, Formatting.None));
+                }
+
+                void GenerateLinuxMatrix(string platform, IEnumerable<TargetFramework> frameworks)
+                {
+                    var matrix = new Dictionary<string, object>();
+
+                    foreach (var framework in frameworks)
+                    {
+                        matrix.Add($"glibc_{framework}", new { framework = framework, baseImage = "debian", artifactSuffix = $"linux-{platform}"});
+                        matrix.Add($"musl_{framework}", new { framework = framework, baseImage = "alpine", artifactSuffix = $"linux-musl-{platform}"});
+                    }
+
+                    Logger.Information(JsonConvert.SerializeObject(matrix, Formatting.Indented));
+                    AzurePipelines.Instance.SetOutputVariable($"unit_tests_linux_{platform}_matrix", JsonConvert.SerializeObject(matrix, Formatting.None));
+                }
+            }
+
             void GenerateIntegrationTestsWindowsMatrices()
             {
                 GenerateIntegrationTestsWindowsMatrix();
@@ -171,6 +204,8 @@ void GenerateIntegrationTestsWindowsAzureFunctionsMatrix()
                     // new {framework = TargetFramework.NETCOREAPP3_1, runtimeInstall = v3Install, runtimeUninstall = v3Uninstall },
                     new {framework = TargetFramework.NET6_0 },
                     new {framework = TargetFramework.NET7_0 },
+                    new {framework = TargetFramework.NET8_0 },
+                    new {framework = TargetFramework.NET9_0 },
                 };
 
                 var matrix = new Dictionary<string, object>();
@@ -205,7 +240,7 @@ void GenerateIntegrationTestsWindowsIISMatrix(params TargetFramework[] targetFra
 
             void GenerateIntegrationTestsWindowsMsiMatrix(params TargetFramework[] targetFrameworks)
             {
-                var targetPlatforms = new[] { 
+                var targetPlatforms = new[] {
                     (targetPlaform: "x64", enable32Bit: false),
                     (targetPlaform: "x64", enable32Bit: true),
                 };
@@ -235,8 +270,8 @@ void GenerateIntegrationTestsLinuxMatrix()
             {
                 var baseImages = new []
                 {
-                    (baseImage: "debian", artifactSuffix: "linux-x64"), 
-                    (baseImage: "alpine", artifactSuffix: "linux-musl-x64"), 
+                    (baseImage: "debian", artifactSuffix: "linux-x64"),
+                    (baseImage: "alpine", artifactSuffix: "linux-musl-x64"),
                 };
 
                 var targetFrameworks = TestingFrameworks.Except(new[] { TargetFramework.NET461, TargetFramework.NET462, TargetFramework.NETSTANDARD2_0 });
@@ -285,8 +320,8 @@ void GenerateIntegrationTestsDebuggerLinuxMatrix()
                 var targetFrameworks = TestingFrameworksDebugger.Except(new[] { TargetFramework.NET462 });
                 var baseImages = new []
                 {
-                    (baseImage: "debian", artifactSuffix: "linux-x64"), 
-                    (baseImage: "alpine", artifactSuffix: "linux-musl-x64"), 
+                    (baseImage: "debian", artifactSuffix: "linux-x64"),
+                    (baseImage: "alpine", artifactSuffix: "linux-musl-x64"),
                 };
                 var optimizations = new[] { "true", "false" };
 
@@ -365,8 +400,8 @@ void GenerateExplorationTestsLinuxMatrix(IEnumerable<string> useCases)
 
                 var baseImages = new []
                 {
-                    (baseImage: "debian", artifactSuffix: "linux-x64"), 
-                    (baseImage: "alpine", artifactSuffix: "linux-musl-x64"), 
+                    (baseImage: "debian", artifactSuffix: "linux-x64"),
+                    (baseImage: "alpine", artifactSuffix: "linux-musl-x64"),
                 };
 
                 var matrix = new Dictionary<string, object>();
@@ -420,7 +455,7 @@ void GenerateSmokeTestsMatrices()
 
                 // tracer home smoke tests
                 GenerateWindowsTracerHomeSmokeTestsMatrix();
-                
+
                 // macos smoke tests
                 GenerateMacosDotnetToolNugetSmokeTestsMatrix();
 
@@ -1089,7 +1124,7 @@ void GenerateLinuxDotnetToolNugetSmokeTestsMatrix()
                             new (publishFramework: TargetFramework.NET8_0, "8.0-jammy"),
                             new (publishFramework: TargetFramework.NET7_0, "7.0-bullseye-slim"),
                             new (publishFramework: TargetFramework.NET6_0, "6.0-bullseye-slim"),
-                            // We can't install prerelease versions of the dotnet-tool nuget in .NET Core 3.1, because the --prerelease flag isn't available 
+                            // We can't install prerelease versions of the dotnet-tool nuget in .NET Core 3.1, because the --prerelease flag isn't available
                             new (publishFramework: TargetFramework.NETCOREAPP3_1, "3.1-bullseye"),
                         }.Where(x=> !IsPrerelease || x.PublishFramework != TargetFramework.NETCOREAPP3_1).ToArray(),
                         platformSuffix: "linux-x64",
@@ -1106,7 +1141,7 @@ void GenerateLinuxDotnetToolNugetSmokeTestsMatrix()
                             new (publishFramework: TargetFramework.NET7_0, "7.0-alpine3.16"),
                             new (publishFramework: TargetFramework.NET6_0, "6.0-alpine3.16"),
                             new (publishFramework: TargetFramework.NETCOREAPP3_1, "3.1-alpine3.15"),
-                            // We can't install prerelease versions of the dotnet-tool nuget in .NET Core 3.1, because the --prerelease flag isn't available 
+                            // We can't install prerelease versions of the dotnet-tool nuget in .NET Core 3.1, because the --prerelease flag isn't available
                         }.Where(x=> !IsPrerelease || x.PublishFramework != TargetFramework.NETCOREAPP3_1).ToArray(),
                         platformSuffix: "linux-musl-x64",
                         dockerName: "mcr.microsoft.com/dotnet/sdk"
@@ -1410,14 +1445,14 @@ static bool IsGitBaseBranch(string baseBranch)
         {
             branch = Environment.GetEnvironmentVariable(AzureBuildSourceBranchName);
         }
-        
+
         Console.WriteLine("Base Branch: {0}", baseBranch);
         Console.WriteLine("Current Branch: {0}", branch);
 
         var cleanBranch = CleanBranchName(branch);
         var cleanBaseBranch = CleanBranchName(baseBranch);
         Console.Write("  {0} == {1}? ", cleanBranch, cleanBaseBranch);
-        
+
         if (string.Equals(cleanBranch, cleanBaseBranch, StringComparison.OrdinalIgnoreCase))
         {
             Console.WriteLine("true");
diff --git a/tracer/build/_build/Build.cs b/tracer/build/_build/Build.cs
index 41ed45412815..f1127f2147ae 100644
--- a/tracer/build/_build/Build.cs
+++ b/tracer/build/_build/Build.cs
@@ -63,7 +63,7 @@ partial class Build : NukeBuild
     const int LatestMajorVersion = 3;
 
     [Parameter("The current version of the source and build")]
-    readonly string Version = "3.8.0";
+    readonly string Version = "3.9.0";
 
     [Parameter("Whether the current build version is a prerelease(for packaging purposes)")]
     readonly bool IsPrerelease = false;
@@ -129,6 +129,7 @@ public Build()
                             Logger.Information($"IsAlpine: {IsAlpine}");
                             Logger.Information($"Version: {Version}");
                             Logger.Information($"RuntimeIdentifier: {RuntimeIdentifier}");
+                            Logger.Information($"TestFrameworks: {string.Join(",", TestingFrameworks.Select(x => x.ToString()))}");
                         });
 
     Target Clean => _ => _
@@ -270,9 +271,7 @@ void DeleteReparsePoints(string path)
         .Unlisted()
         .Requires(() => IsWin)
         .Description("Builds the integration tests for Windows")
-        .DependsOn(CompileDependencyLibs)
         .DependsOn(CompileManagedTestHelpers)
-        .DependsOn(CompileSamplesWindows)
         .DependsOn(CompileIntegrationTests)
         .DependsOn(BuildRunnerTool);
 
@@ -280,7 +279,6 @@ void DeleteReparsePoints(string path)
         .Unlisted()
         .Requires(() => IsWin)
         .Description("Builds the ASP.NET integration tests for Windows")
-        .DependsOn(CompileDependencyLibs)
         .DependsOn(CompileManagedTestHelpers)
         .DependsOn(PublishIisSamples)
         .DependsOn(CompileIntegrationTests);
@@ -290,21 +288,21 @@ void DeleteReparsePoints(string path)
         .Requires(() => IsWin)
         .Description("Builds the regression tests for Windows")
         .DependsOn(CompileManagedTestHelpers)
-        .DependsOn(CompileRegressionDependencyLibs)
-        .DependsOn(CompileRegressionSamples)
-        .DependsOn(CompileFrameworkReproductions)
         .DependsOn(CompileIntegrationTests);
 
     Target BuildAndRunWindowsIntegrationTests => _ => _
         .Requires(() => IsWin)
         .Description("Builds and runs the Windows (non-IIS) integration tests")
         .DependsOn(BuildWindowsIntegrationTests)
+        .DependsOn(CompileSamples)
+        .DependsOn(CompileTrimmingSamples)
         .DependsOn(RunWindowsIntegrationTests);
 
     Target BuildAndRunWindowsRegressionTests => _ => _
         .Requires(() => IsWin)
         .Description("Builds and runs the Windows regression tests")
         .DependsOn(BuildWindowsRegressionTests)
+        .DependsOn(CompileSamples)
         .DependsOn(RunWindowsRegressionTests);
 
     Target BuildAndRunWindowsAzureFunctionsTests => _ => _
@@ -319,11 +317,7 @@ void DeleteReparsePoints(string path)
     Target BuildLinuxIntegrationTests => _ => _
         .Requires(() => !IsWin)
         .Description("Builds the linux integration tests")
-        .DependsOn(CompileDependencyLibs)
-        .DependsOn(CompileRegressionDependencyLibs)
         .DependsOn(CompileManagedTestHelpers)
-        .DependsOn(CompileSamplesLinuxOrOsx)
-        .DependsOn(CompileMultiApiPackageVersionSamples)
         .DependsOn(CompileLinuxOrOsxIntegrationTests)
         .DependsOn(CompileLinuxDdDotnetIntegrationTests)
         .DependsOn(BuildRunnerTool)
@@ -339,11 +333,7 @@ void DeleteReparsePoints(string path)
     Target BuildOsxIntegrationTests => _ => _
         .Requires(() => IsOsx)
         .Description("Builds the osx integration tests")
-        .DependsOn(CompileDependencyLibs)
-        .DependsOn(CompileRegressionDependencyLibs)
         .DependsOn(CompileManagedTestHelpers)
-        .DependsOn(CompileSamplesLinuxOrOsx)
-        .DependsOn(CompileMultiApiPackageVersionSamples)
         .DependsOn(CompileLinuxOrOsxIntegrationTests)
         .DependsOn(BuildRunnerTool)
         .DependsOn(CopyServerlessArtifacts);
@@ -352,6 +342,8 @@ void DeleteReparsePoints(string path)
         .Requires(() => IsOsx)
         .Description("Builds and runs the osx integration tests. Requires docker-compose dependencies")
         .DependsOn(BuildOsxIntegrationTests)
+        .DependsOn(CompileSamples)
+        .DependsOn(CompileTrimmingSamples)
         .DependsOn(RunOsxIntegrationTests);
 
     Target BuildAndRunToolArtifactTests => _ => _
diff --git a/tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs b/tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs
index 061e8d24822b..35533651b512 100644
--- a/tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs
+++ b/tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs
@@ -231,27 +231,31 @@ static AdoNetSignature GetAdoNetSignature(TypeDefinition type, CustomAttribute a
                 int? integrationKind = null;
                 int? returnType = null;
                 string callTargetType = null;
+                var instrumentationCategory = InstrumentationCategory.Tracing;
 
                 foreach (var namedArgument in attribute.Properties)
                 {
                     switch (namedArgument.Name)
                     {
-                        case nameof(AdoNetSignatureAttributeProperties.MethodName):
+                        case nameof(AdoNetTargetSignatureAttributeProperties.MethodName):
                             methodName = namedArgument.Argument.Value?.ToString();
                             break;
-                        case nameof(AdoNetSignatureAttributeProperties.ReturnTypeName):
+                        case nameof(AdoNetTargetSignatureAttributeProperties.ReturnTypeName):
                             returnTypeName = namedArgument.Argument.Value?.ToString();
                             break;
-                        case nameof(AdoNetSignatureAttributeProperties.ParameterTypeNames):
+                        case nameof(AdoNetTargetSignatureAttributeProperties.ParameterTypeNames):
                             parameterTypeNames = GetStringArray(namedArgument.Argument.Value);
                             break;
-                        case nameof(AdoNetSignatureAttributeProperties.CallTargetType):
+                        case nameof(AdoNetTargetSignatureAttributeProperties.CallTargetType):
                             callTargetType = ((TypeDefinition)namedArgument.Argument.Value).FullName;
                             break;
-                        case nameof(AdoNetSignatureAttributeProperties.CallTargetIntegrationKind):
+                        case nameof(AdoNetTargetSignatureAttributeProperties.CallTargetIntegrationKind):
                             integrationKind = namedArgument.Argument.Value as int?;
                             break;
-                        case nameof(AdoNetSignatureAttributeProperties.ReturnType):
+                        case nameof(AdoNetTargetSignatureAttributeProperties.InstrumentationCategory):
+                            instrumentationCategory = (InstrumentationCategory)(namedArgument.Argument.Value as uint?).GetValueOrDefault();
+                            break;
+                        case nameof(AdoNetTargetSignatureAttributeProperties.ReturnType):
                             returnType = namedArgument.Argument.Value as int?;
                             break;
                         default:
@@ -279,9 +283,10 @@ static AdoNetSignature GetAdoNetSignature(TypeDefinition type, CustomAttribute a
                     targetMethodName: methodName!,
                     targetReturnType: returnTypeName,
                     targetParameterTypes: parameterTypeNames ?? Array.Empty<string>(),
+                    returnType: returnType ?? 0,
                     instrumentationTypeName: callTargetType!.ToString(),
                     callTargetIntegrationKind: integrationKind ?? 0,
-                    returnType: returnType ?? 0);
+                    instrumentationCategory: instrumentationCategory);
             }
 
             static List<AssemblyCallTargetDefinitionSource> GetAdoNetClientInstruments(CustomAttribute attribute)
@@ -421,7 +426,7 @@ static List<CallTargetDefinitionSource> MergeAdoNetAttributes(List<AssemblyCallT
                                     instrumentationTypeName: signature.InstrumentationTypeName,
                                     integrationKind: signature.CallTargetIntegrationKind,
                                     isAdoNetIntegration: true,
-                                    instrumentationCategory: InstrumentationCategory.Tracing);
+                                    instrumentationCategory: signature.InstrumentationCategory);
 
                             res.Add(callTargetSource);
                         }
@@ -511,15 +516,18 @@ internal static void GenerateNativeFile(Dictionary<CallTargetDefinitionSource, T
                 // </copyright>
                 // <auto-generated/>
                 #include "generated_definitions.h"
+                #include "../../../../shared/src/native-src/version.h"
 
                 namespace trace
                 {
                 int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
                 {
+                std::string version = PROFILER_VERSION;
+                std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
+                shared::WSTRING nameW = ToWSTRING(name);
+                WCHAR* assemblyName = (WCHAR*) (nameW.c_str());
                 """);
 
-            var assemblyName = $"Datadog.Trace, Version={version}.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
-            sb.AppendLine($"WCHAR* assemblyName = (WCHAR*)WStr(\"{assemblyName}\");");
             sb.AppendLine();
 
             // Retrieve all signatures
@@ -713,7 +721,7 @@ public CallTargetDefinitionSource(string integrationName, string assemblyName, s
 
         internal record AdoNetSignature
         {
-            public AdoNetSignature(string className, string targetMethodName, string targetReturnType, string[] targetParameterTypes, string instrumentationTypeName, int callTargetIntegrationKind, int returnType)
+            public AdoNetSignature(string className, string targetMethodName, string targetReturnType, string[] targetParameterTypes, string instrumentationTypeName, int callTargetIntegrationKind, int returnType, InstrumentationCategory instrumentationCategory)
             {
                 ClassName = className;
                 TargetMethodName = targetMethodName;
@@ -721,6 +729,7 @@ public AdoNetSignature(string className, string targetMethodName, string targetR
                 TargetParameterTypes = new(targetParameterTypes);
                 InstrumentationTypeName = instrumentationTypeName;
                 CallTargetIntegrationKind = callTargetIntegrationKind;
+                InstrumentationCategory = instrumentationCategory;
                 ReturnType = returnType;
             }
 
@@ -736,6 +745,8 @@ public AdoNetSignature(string className, string targetMethodName, string targetR
 
             public int CallTargetIntegrationKind { get; }
 
+            public InstrumentationCategory InstrumentationCategory { get; }
+
             public int ReturnType { get; }
         }
 
@@ -793,14 +804,15 @@ private static class InstrumentAttributeProperties
             public const string InstrumentationCategory = nameof(InstrumentationCategory);
         }
 
-        private static class AdoNetSignatureAttributeProperties
+        private static class AdoNetTargetSignatureAttributeProperties
         {
             public const string MethodName = nameof(MethodName);
             public const string ReturnTypeName = nameof(ReturnTypeName);
             public const string ParameterTypeNames = nameof(ParameterTypeNames);
+            public const string ReturnType = nameof(ReturnType);
             public const string CallTargetType = nameof(CallTargetType);
             public const string CallTargetIntegrationKind = nameof(CallTargetIntegrationKind);
-            public const string ReturnType = nameof(ReturnType);
+            public const string InstrumentationCategory = nameof(InstrumentationCategory);
         }
 
         private static class AdoNetInstrumentAttributeProperties
diff --git a/tracer/build/_build/GeneratePackageVersions/MSBuildPropsFileGenerator.cs b/tracer/build/_build/GeneratePackageVersions/MSBuildPropsFileGenerator.cs
index 5d1d04da8052..9db08db6f3fd 100644
--- a/tracer/build/_build/GeneratePackageVersions/MSBuildPropsFileGenerator.cs
+++ b/tracer/build/_build/GeneratePackageVersions/MSBuildPropsFileGenerator.cs
@@ -48,7 +48,7 @@ with the correct arguments outside of Visual Studio.
       <SkipArm64>true</SkipArm64>";
 
         private const string EntryFormat =
-@"    <PackageVersionSample Include=""test\test-applications\integrations\{0}\{0}.csproj"">
+@"    <PackageVersionSample Include=""test\test-applications\{4}\{0}\{0}.csproj"">
       <Properties>ApiVersion={1};RestoreRecursive=false;BuildProjectReferences=false</Properties>{2}
       <RequiresDockerDependency>{3}</RequiresDockerDependency>
       <SampleName>{0}</SampleName>
@@ -90,7 +90,19 @@ public override void Write(PackageVersionEntry packageVersionEntry, IEnumerable<
 
                     var properties = targetFrameworkProperty + skipAlpineProperty + skipArm64Property;
 
-                    FileStringBuilder.AppendLine(string.Format(EntryFormat, packageVersionEntry.SampleProjectName, packageVersion, properties, requiresDockerDependency));
+                    // HACK: support Azure Functions as it is in a different location
+                    var testFolder = "integrations";
+                    if (packageVersionEntry.SampleProjectName.Contains("Samples.AzureFunctions"))
+                    {
+                        testFolder = "azure-functions";
+                    }
+
+                    FileStringBuilder.AppendLine(string.Format(EntryFormat,
+                                                               packageVersionEntry.SampleProjectName,   // {0}
+                                                               packageVersion,                          // {1}
+                                                               properties,                              // {2}
+                                                               requiresDockerDependency,                // {3}
+                                                               testFolder));                            // {4}
                 }
             }
 
diff --git a/tracer/build/_build/Honeypot/IntegrationGroups.cs b/tracer/build/_build/Honeypot/IntegrationGroups.cs
index 4909af83077e..9fd4019362af 100644
--- a/tracer/build/_build/Honeypot/IntegrationGroups.cs
+++ b/tracer/build/_build/Honeypot/IntegrationGroups.cs
@@ -81,7 +81,8 @@ static IntegrationMap()
             NugetPackages.Add("Serilog", new [] { "Serilog" });
             NugetPackages.Add("NLog", new [] { "NLog" });
             NugetPackages.Add("log4net", new [] { "log4net" });
-            NugetPackages.Add("Microsoft.Azure.Functions.Worker.Core", new string[] { });
+            NugetPackages.Add("Microsoft.Azure.Functions.Worker.Core", new string[] { "Microsoft.Azure.Functions.Worker.Core" });
+            NugetPackages.Add("Microsoft.Azure.Functions.Worker", new string[] { "Microsoft.Azure.Functions.Worker" });
             NugetPackages.Add("Microsoft.Azure.WebJobs.Host", new [] { "Microsoft.Azure.WebJobs" });
             NugetPackages.Add("Microsoft.Azure.WebJobs.Script.Grpc", new string[] { });
             NugetPackages.Add("Microsoft.Azure.WebJobs.Script.WebHost", new string[] { });
diff --git a/tracer/build/_build/NukeExtensions/DockerDependencyType.cs b/tracer/build/_build/NukeExtensions/DockerDependencyType.cs
index ad30a5dc4ec8..3c01fb5bb76b 100644
--- a/tracer/build/_build/NukeExtensions/DockerDependencyType.cs
+++ b/tracer/build/_build/NukeExtensions/DockerDependencyType.cs
@@ -1,4 +1,4 @@
-public enum DockerDependencyType
+public enum DockerDependencyType
 {
     /// <summary>
     /// Does not require Docker to run sample
@@ -14,4 +14,9 @@
     /// Requires Docker on all platforms except Windows to run samples.
     /// </summary>
     LinuxAndMac,
+
+    /// <summary>
+    /// Contains both tests that require Docker and tests that do not.
+    /// </summary>
+    Mixed,
 }
diff --git a/tracer/build/_build/NukeExtensions/ProjectExtensions.cs b/tracer/build/_build/NukeExtensions/ProjectExtensions.cs
index a32011d11393..8817debbe944 100644
--- a/tracer/build/_build/NukeExtensions/ProjectExtensions.cs
+++ b/tracer/build/_build/NukeExtensions/ProjectExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.IO;
 using Nuke.Common.ProjectModel;
 using Logger = Serilog.Log;
 
@@ -43,6 +44,29 @@ public static DockerDependencyType RequiresDockerDependency(this Project project
         }
     }
 
+    public static bool ReferencesDatadogTrace(this Project project)
+    {
+        try
+        {
+            if(Path.GetExtension(project.Path) != ".csproj")
+            {
+                return false;
+            }
+
+            // Using GetMsBuildProject() instead of built-in so that we can cache the MSBuild projects,
+            // because this is very expensive
+            var propertyValue = GetMsBuildProject(project).GetProperty("AllowDatadogTraceReference")?.EvaluatedValue;
+            return propertyValue is not null
+                && bool.TryParse(propertyValue, out var result)
+                && result;
+        }
+        catch (Exception ex)
+        {
+            Logger.Information(ex, "Error checking ReferencesDatadogTrace for {ProjectName}", project?.Name);
+            return false;
+        }
+    }
+
     static Microsoft.Build.Evaluation.Project GetMsBuildProject(Project project)
     {
         return MsBuildProjects.GetOrAdd(project.Path, x => ProjectModelTasks.ParseProject(x));
diff --git a/tracer/build/_build/UpdateVendors/UpdateVendors.cs b/tracer/build/_build/UpdateVendors/UpdateVendors.cs
index 82f5909b1fb7..e382ab9f0ba2 100644
--- a/tracer/build/_build/UpdateVendors/UpdateVendors.cs
+++ b/tracer/build/_build/UpdateVendors/UpdateVendors.cs
@@ -71,10 +71,14 @@ private static async Task UpdateVendor(VendoredDependency dependency, AbsolutePa
             File.Delete(projFile);
             Console.WriteLine($"Renamed {libraryName} project file.");
 
-            // Delete the assembly properties
-            var assemblyPropertiesFolder = Path.Combine(sourceLocation, @"Properties");
-            SafeDeleteDirectory(assemblyPropertiesFolder);
-            Console.WriteLine($"Deleted {libraryName} assembly properties file.");
+            // Delete the assembly info file
+            var assemblyInfo = Path.Combine(sourceLocation, @"Properties", "AssemblyInfo.cs");
+            if (File.Exists(assemblyInfo))
+            {
+                File.Delete(assemblyInfo);
+            }
+
+            Console.WriteLine($"Deleted {libraryName} assembly info file.");
 
             Console.WriteLine($"Running transforms on files for {libraryName}.");
 
@@ -111,7 +115,9 @@ private static bool ShouldDropFile(VendoredDependency dependency, string basePat
             foreach (var relativeFileToDrop in dependency.RelativePathsToExclude)
             {
                 var absolutePath = Path.Combine(basePath, relativeFileToDrop).Replace('/', '\\');
-                if (normalizedFilePath.Equals(absolutePath, StringComparison.OrdinalIgnoreCase))
+                if (normalizedFilePath.Equals(absolutePath, StringComparison.OrdinalIgnoreCase)
+                 || (absolutePath.EndsWith('\\') &&
+                     normalizedFilePath.StartsWith(absolutePath, StringComparison.OrdinalIgnoreCase)))
                 {
                     return true;
                 }
diff --git a/tracer/build/_build/UpdateVendors/VendoredDependency.cs b/tracer/build/_build/UpdateVendors/VendoredDependency.cs
index 7f911712c89e..15a082e3c2d1 100644
--- a/tracer/build/_build/UpdateVendors/VendoredDependency.cs
+++ b/tracer/build/_build/UpdateVendors/VendoredDependency.cs
@@ -15,12 +15,34 @@ public class VendoredDependency
     {
         private const string AutoGeneratedMessage = @"//------------------------------------------------------------------------------
 // <auto-generated />
-// This file was automatically generated by the UpdateVendors tool.
+// This file was automatically generated by the UpdateVendoredCode tool.
 //------------------------------------------------------------------------------
 ";
 
         static VendoredDependency()
         {
+            Add(
+                libraryName: "Microsoft.OpenApi",
+                "1.6.23",
+                "https://github.com/microsoft/OpenAPI.NET/archive/1.6.23.zip",
+                new[] { "OpenAPI.NET-1.6.23", "src", "Microsoft.OpenApi" },
+                filePath => RewriteCsFileWithStandardTransform(filePath, "Microsoft.OpenApi"),
+                new[]
+                {
+                    "Extensions/OpenApiElementExtensions.cs",
+                    "Extensions/OpenApiSerializableExtensions.cs",
+                    "Extensions/OpenApiTypeMapper.cs",
+                    "MicrosoftExtensions/", // whole folder
+                    "Services/CopyReferences.cs",
+                    "Services/OpenApiFilterService.cs",
+                    "Services/OpenApiUrlTreeNode.cs",
+                    "Services/OperationSearch.cs",
+                    "Services/SearchResult.cs",
+                    "Validations/", // whole folder
+                    "Writers/FormattingStreamWriter.cs",
+                    "Writers/OpenApiYamlWriter.cs"
+                });
+
             Add(
                 libraryName: "Serilog",
                 version: "2.10.0",
diff --git a/tracer/build/_build/_build.csproj b/tracer/build/_build/_build.csproj
index 71daf46fc325..e31f57e6602a 100644
--- a/tracer/build/_build/_build.csproj
+++ b/tracer/build/_build/_build.csproj
@@ -61,7 +61,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Honeypot\Datadog.Dependabot.Honeypot.template" />
-    <EmbeddedResource Include="Honeypot\Datadog.Dependabot.Honeypot.template" />
+    <None Remove="Honeypot/Datadog.Dependabot.Honeypot.template"/>
+    <EmbeddedResource Include="Honeypot/Datadog.Dependabot.Honeypot.template">
+      <!-- We have to force this name because somehow on macOS, it's named without the first 'Honeypot.' -->
+      <LogicalName>Honeypot.Datadog.Dependabot.Honeypot.template</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>
diff --git a/tracer/build/artifacts/dd-dotnet.sh b/tracer/build/artifacts/dd-dotnet.sh
index 98857df64a8c..250a841a25cc 100755
--- a/tracer/build/artifacts/dd-dotnet.sh
+++ b/tracer/build/artifacts/dd-dotnet.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TRACER_VERSION="3.8.0"
+TRACER_VERSION="3.9.0"
 
 # Get the directory of the script
 DIR=$(dirname "$(readlink -f "$0")")
diff --git a/tracer/build/supported_calltargets.g.json b/tracer/build/supported_calltargets.g.json
index 64d5a9520402..1bb5d9aef965 100644
--- a/tracer/build/supported_calltargets.g.json
+++ b/tracer/build/supported_calltargets.g.json
@@ -87,7 +87,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -111,7 +111,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -135,7 +135,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -157,7 +157,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -181,7 +181,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -344,7 +344,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -366,7 +366,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -390,7 +390,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -414,7 +414,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -438,7 +438,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -462,7 +462,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -484,7 +484,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -506,7 +506,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -530,7 +530,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -554,7 +554,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -717,7 +717,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -741,7 +741,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -765,7 +765,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -787,7 +787,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "AdoNet",
@@ -811,7 +811,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Aerospike",
@@ -2563,7 +2563,7 @@
       "Item3": 0
     },
     "MaximumVersion": {
-      "Item1": 1,
+      "Item1": 2,
       "Item2": 65535,
       "Item3": 65535
     },
@@ -9177,7 +9177,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9551,7 +9551,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9575,7 +9575,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9597,7 +9597,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9621,7 +9621,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9643,7 +9643,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9667,7 +9667,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9691,7 +9691,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9713,7 +9713,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -9737,7 +9737,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -10182,7 +10182,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -10206,7 +10206,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -10230,7 +10230,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -10252,7 +10252,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "MySql",
@@ -10276,7 +10276,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "NLog",
@@ -10667,7 +10667,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Npgsql",
@@ -10691,7 +10691,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Npgsql",
@@ -10713,7 +10713,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Npgsql",
@@ -10737,7 +10737,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "NUnit",
@@ -11119,7 +11119,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11143,7 +11143,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11167,7 +11167,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11189,7 +11189,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11213,7 +11213,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11235,7 +11235,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11487,7 +11487,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11511,7 +11511,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11533,7 +11533,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11557,7 +11557,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11579,7 +11579,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11603,7 +11603,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11627,7 +11627,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11649,7 +11649,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Oracle",
@@ -11673,7 +11673,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Process",
@@ -12885,7 +12885,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -12909,7 +12909,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -12933,7 +12933,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -12955,7 +12955,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -12979,7 +12979,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13001,7 +13001,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13025,7 +13025,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13049,7 +13049,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13071,7 +13071,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13095,7 +13095,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13329,7 +13329,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13353,7 +13353,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13377,7 +13377,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13399,7 +13399,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13423,7 +13423,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13657,7 +13657,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13681,7 +13681,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13705,7 +13705,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13727,7 +13727,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13751,7 +13751,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13773,7 +13773,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13797,7 +13797,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13821,7 +13821,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13843,7 +13843,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "SqlClient",
@@ -13867,7 +13867,7 @@
     "InstrumentationTypeName": "Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration",
     "IntegrationKind": 0,
     "IsAdoNetIntegration": true,
-    "InstrumentationCategory": 1
+    "InstrumentationCategory": 4
   },
   {
     "IntegrationName": "Sqlite",
diff --git a/tracer/build/supported_versions.json b/tracer/build/supported_versions.json
index f27595214cc0..6f34e68455da 100644
--- a/tracer/build/supported_versions.json
+++ b/tracer/build/supported_versions.json
@@ -242,9 +242,9 @@
         "minVersionAvailableInclusive": "3.1.0",
         "minVersionSupportedInclusive": "3.1.0",
         "minVersionTestedInclusive": "3.1.5.3",
-        "maxVersionSupportedInclusive": "3.7.404.5",
-        "maxVersionAvailableInclusive": "3.7.404.5",
-        "maxVersionTestedInclusive": "3.7.404.5"
+        "maxVersionSupportedInclusive": "3.7.405.3",
+        "maxVersionAvailableInclusive": "3.7.405.3",
+        "maxVersionTestedInclusive": "3.7.405.3"
       }
     ]
   },
@@ -259,9 +259,9 @@
         "minVersionAvailableInclusive": "3.3.100",
         "minVersionSupportedInclusive": "3.3.100",
         "minVersionTestedInclusive": "3.3.102.16",
-        "maxVersionSupportedInclusive": "3.7.402.6",
-        "maxVersionAvailableInclusive": "3.7.402.6",
-        "maxVersionTestedInclusive": "3.7.402.6"
+        "maxVersionSupportedInclusive": "3.7.402.19",
+        "maxVersionAvailableInclusive": "3.7.402.19",
+        "maxVersionTestedInclusive": "3.7.402.19"
       }
     ]
   },
@@ -276,9 +276,9 @@
         "minVersionAvailableInclusive": "3.1.0",
         "minVersionSupportedInclusive": "3.1.0",
         "minVersionTestedInclusive": "3.1.3.5",
-        "maxVersionSupportedInclusive": "3.7.402.41",
-        "maxVersionAvailableInclusive": "3.7.402.41",
-        "maxVersionTestedInclusive": "3.7.402.41"
+        "maxVersionSupportedInclusive": "3.7.402.54",
+        "maxVersionAvailableInclusive": "3.7.402.54",
+        "maxVersionTestedInclusive": "3.7.402.54"
       }
     ]
   },
@@ -310,8 +310,8 @@
         "minVersionAvailableInclusive": "3.1.0",
         "minVersionSupportedInclusive": "3.1.0",
         "minVersionTestedInclusive": null,
-        "maxVersionSupportedInclusive": "3.7.400.64",
-        "maxVersionAvailableInclusive": "3.7.400.64",
+        "maxVersionSupportedInclusive": "3.7.400.77",
+        "maxVersionAvailableInclusive": "3.7.400.77",
         "maxVersionTestedInclusive": null
       }
     ]
@@ -327,9 +327,9 @@
         "minVersionAvailableInclusive": "3.1.0",
         "minVersionSupportedInclusive": "3.1.0",
         "minVersionTestedInclusive": "3.1.2.1",
-        "maxVersionSupportedInclusive": "3.7.400.64",
-        "maxVersionAvailableInclusive": "3.7.400.64",
-        "maxVersionTestedInclusive": "3.7.400.64"
+        "maxVersionSupportedInclusive": "3.7.400.77",
+        "maxVersionAvailableInclusive": "3.7.400.77",
+        "maxVersionTestedInclusive": "3.7.400.77"
       }
     ]
   },
@@ -344,9 +344,9 @@
         "minVersionAvailableInclusive": "3.1.0",
         "minVersionSupportedInclusive": "3.1.0",
         "minVersionTestedInclusive": "3.1.0.13",
-        "maxVersionSupportedInclusive": "3.7.400.64",
-        "maxVersionAvailableInclusive": "3.7.400.64",
-        "maxVersionTestedInclusive": "3.7.400.64"
+        "maxVersionSupportedInclusive": "3.7.400.77",
+        "maxVersionAvailableInclusive": "3.7.400.77",
+        "maxVersionTestedInclusive": "3.7.400.77"
       }
     ]
   },
@@ -354,8 +354,18 @@
     "integrationName": "AzureFunctions",
     "assemblyName": "Microsoft.Azure.Functions.Worker.Core",
     "minAssemblyVersionInclusive": "1.4.0",
-    "maxAssemblyVersionInclusive": "1.65535.65535",
-    "packages": []
+    "maxAssemblyVersionInclusive": "2.65535.65535",
+    "packages": [
+      {
+        "name": "Microsoft.Azure.Functions.Worker.Core",
+        "minVersionAvailableInclusive": "1.0.0",
+        "minVersionSupportedInclusive": "1.4.0",
+        "minVersionTestedInclusive": null,
+        "maxVersionSupportedInclusive": "2.0.0",
+        "maxVersionAvailableInclusive": "2.0.0",
+        "maxVersionTestedInclusive": null
+      }
+    ]
   },
   {
     "integrationName": "AzureFunctions",
@@ -416,9 +426,9 @@
         "minVersionAvailableInclusive": "3.0.0",
         "minVersionSupportedInclusive": "3.6.0",
         "minVersionTestedInclusive": "3.6.0",
-        "maxVersionSupportedInclusive": "3.46.0",
-        "maxVersionAvailableInclusive": "3.46.0",
-        "maxVersionTestedInclusive": "3.46.0"
+        "maxVersionSupportedInclusive": "3.46.1",
+        "maxVersionAvailableInclusive": "3.46.1",
+        "maxVersionTestedInclusive": "3.46.1"
       }
     ]
   },
@@ -550,8 +560,8 @@
         "minVersionAvailableInclusive": "3.0.0",
         "minVersionSupportedInclusive": "3.0.0",
         "minVersionTestedInclusive": null,
-        "maxVersionSupportedInclusive": "3.29.1",
-        "maxVersionAvailableInclusive": "3.29.1",
+        "maxVersionSupportedInclusive": "3.29.3",
+        "maxVersionAvailableInclusive": "3.29.3",
         "maxVersionTestedInclusive": null
       }
     ]
@@ -768,9 +778,9 @@
         "minVersionAvailableInclusive": "0.0.1",
         "minVersionSupportedInclusive": "1.4.0",
         "minVersionTestedInclusive": "1.4.4",
-        "maxVersionSupportedInclusive": "2.6.1",
-        "maxVersionAvailableInclusive": "2.6.1",
-        "maxVersionTestedInclusive": "2.6.1"
+        "maxVersionSupportedInclusive": "2.8.0",
+        "maxVersionAvailableInclusive": "2.8.0",
+        "maxVersionTestedInclusive": "2.8.0"
       }
     ]
   },
@@ -852,8 +862,8 @@
         "minVersionAvailableInclusive": "1.1.11",
         "minVersionSupportedInclusive": "1.1.11",
         "minVersionTestedInclusive": null,
-        "maxVersionSupportedInclusive": "3.6.4",
-        "maxVersionAvailableInclusive": "3.6.4",
+        "maxVersionSupportedInclusive": "3.7.0",
+        "maxVersionAvailableInclusive": "3.7.0",
         "maxVersionTestedInclusive": null
       }
     ]
@@ -954,9 +964,9 @@
         "minVersionAvailableInclusive": "2.5.7.10213",
         "minVersionSupportedInclusive": "3.0.0",
         "minVersionTestedInclusive": "3.6.1",
-        "maxVersionSupportedInclusive": "4.3.0",
-        "maxVersionAvailableInclusive": "4.3.0",
-        "maxVersionTestedInclusive": "4.3.0"
+        "maxVersionSupportedInclusive": "4.3.2",
+        "maxVersionAvailableInclusive": "4.3.2",
+        "maxVersionTestedInclusive": "4.3.2"
       }
     ]
   },
@@ -1012,8 +1022,8 @@
         "minVersionAvailableInclusive": "12.1.21",
         "minVersionSupportedInclusive": "12.1.21",
         "minVersionTestedInclusive": null,
-        "maxVersionSupportedInclusive": "23.6.1",
-        "maxVersionAvailableInclusive": "23.6.1",
+        "maxVersionSupportedInclusive": "23.7.0",
+        "maxVersionAvailableInclusive": "23.7.0",
         "maxVersionTestedInclusive": null
       }
     ]
@@ -1193,9 +1203,9 @@
         "minVersionAvailableInclusive": "1.0.187",
         "minVersionSupportedInclusive": "1.0.187",
         "minVersionTestedInclusive": "1.0.488",
-        "maxVersionSupportedInclusive": "2.8.22",
-        "maxVersionAvailableInclusive": "2.8.22",
-        "maxVersionTestedInclusive": "2.8.22"
+        "maxVersionSupportedInclusive": "2.8.24",
+        "maxVersionAvailableInclusive": "2.8.24",
+        "maxVersionTestedInclusive": "2.8.24"
       }
     ]
   },
@@ -1302,9 +1312,9 @@
         "minVersionAvailableInclusive": "1.7.0.1540",
         "minVersionSupportedInclusive": "2.2.0",
         "minVersionTestedInclusive": "2.2.0",
-        "maxVersionSupportedInclusive": "2.9.2",
-        "maxVersionAvailableInclusive": "2.9.2",
-        "maxVersionTestedInclusive": "2.9.2"
+        "maxVersionSupportedInclusive": "2.9.3",
+        "maxVersionAvailableInclusive": "2.9.3",
+        "maxVersionTestedInclusive": "2.9.3"
       }
     ]
   },
@@ -1319,8 +1329,8 @@
         "minVersionAvailableInclusive": "2.0.0",
         "minVersionSupportedInclusive": "2.2.0",
         "minVersionTestedInclusive": null,
-        "maxVersionSupportedInclusive": "2.9.2",
-        "maxVersionAvailableInclusive": "2.9.2",
+        "maxVersionSupportedInclusive": "2.9.3",
+        "maxVersionAvailableInclusive": "2.9.3",
         "maxVersionTestedInclusive": null
       }
     ]
diff --git a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
index 54dfcb93af3e..8e1db2e60223 100644
--- a/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
+++ b/tracer/dependabot/Datadog.Dependabot.Integrations.csproj
@@ -18,33 +18,33 @@
 
     <!-- Integration: AWSSDK.Core -->
     <!--    Assembly: AWSSDK.Core -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Core/3.7.400.64 -->
-    <PackageReference Include="AWSSDK.Core" Version="3.7.400.64" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Core/3.7.400.77 -->
+    <PackageReference Include="AWSSDK.Core" Version="3.7.400.77" />
 
     <!-- Integration: AWSSDK.DynamoDBv2 -->
     <!--    Assembly: AWSSDK.DynamoDBv2 -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.DynamoDBv2/3.7.404.5 -->
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.404.5" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.DynamoDBv2/3.7.405.3 -->
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.405.3" />
 
     <!-- Integration: AWSSDK.EventBridge -->
     <!--    Assembly: AWSSDK.EventBridge -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.EventBridge/3.7.402.6 -->
-    <PackageReference Include="AWSSDK.EventBridge" Version="3.7.402.6" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.EventBridge/3.7.402.19 -->
+    <PackageReference Include="AWSSDK.EventBridge" Version="3.7.402.19" />
 
     <!-- Integration: AWSSDK.Kinesis -->
     <!--    Assembly: AWSSDK.Kinesis -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Kinesis/3.7.402.41 -->
-    <PackageReference Include="AWSSDK.Kinesis" Version="3.7.402.41" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.Kinesis/3.7.402.54 -->
+    <PackageReference Include="AWSSDK.Kinesis" Version="3.7.402.54" />
 
     <!-- Integration: AWSSDK.SimpleNotificationService -->
     <!--    Assembly: AWSSDK.SimpleNotificationService -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/3.7.400.64 -->
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.400.64" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/3.7.400.77 -->
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.400.77" />
 
     <!-- Integration: AWSSDK.SQS -->
     <!--    Assembly: AWSSDK.SQS -->
-    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SQS/3.7.400.64 -->
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.64" />
+    <!-- Latest package https://www.nuget.org/packages/AWSSDK.SQS/3.7.400.77 -->
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.77" />
 
     <!-- Integration: Azure.Messaging.ServiceBus -->
     <!--    Assembly: Azure.Messaging.ServiceBus -->
@@ -53,8 +53,8 @@
 
     <!-- Integration: Confluent.Kafka -->
     <!--    Assembly: Confluent.Kafka -->
-    <!-- Latest package https://www.nuget.org/packages/Confluent.Kafka/2.6.1 -->
-    <PackageReference Include="Confluent.Kafka" Version="2.6.1" />
+    <!-- Latest package https://www.nuget.org/packages/Confluent.Kafka/2.8.0 -->
+    <PackageReference Include="Confluent.Kafka" Version="2.8.0" />
 
     <!-- Integration: Couchbase.NetClient -->
     <!--    Assembly: Couchbase.NetClient -->
@@ -68,8 +68,8 @@
 
     <!-- Integration: Google.Protobuf -->
     <!--    Assembly: Google.Protobuf -->
-    <!-- Latest package https://www.nuget.org/packages/Google.Protobuf/3.29.1 -->
-    <PackageReference Include="Google.Protobuf" Version="3.29.1" />
+    <!-- Latest package https://www.nuget.org/packages/Google.Protobuf/3.29.3 -->
+    <PackageReference Include="Google.Protobuf" Version="3.29.3" />
 
     <!-- Integration: GraphQL -->
     <!--    Assembly: GraphQL -->
@@ -160,8 +160,13 @@
 
     <!-- Integration: Microsoft.Azure.Cosmos.Client -->
     <!--    Assembly: Microsoft.Azure.Cosmos.Client -->
-    <!-- Latest package https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.46.0 -->
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.46.0" />
+    <!-- Latest package https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.46.1 -->
+    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.46.1" />
+
+    <!-- Integration: Microsoft.Azure.Functions.Worker.Core -->
+    <!--    Assembly: Microsoft.Azure.Functions.Worker.Core -->
+    <!-- Latest package https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Core/2.0.0 -->
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Core" Version="2.0.0" />
 
     <!-- Integration: Microsoft.Azure.WebJobs.Host -->
     <!--    Assembly: Microsoft.Azure.WebJobs.Host -->
@@ -217,8 +222,8 @@
 
     <!-- Integration: Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter -->
     <!--    Assembly: Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter -->
-    <!-- Latest package https://www.nuget.org/packages/MSTest.TestAdapter/3.6.4 -->
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
+    <!-- Latest package https://www.nuget.org/packages/MSTest.TestAdapter/3.7.0 -->
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
 
     <!-- Integration: MySql.Data -->
     <!--    Assembly: MySql.Data -->
@@ -242,8 +247,8 @@
 
     <!-- Integration: nunit.framework -->
     <!--    Assembly: nunit.framework -->
-    <!-- Latest package https://www.nuget.org/packages/NUnit/4.3.0 -->
-    <PackageReference Include="NUnit" Version="4.3.0" />
+    <!-- Latest package https://www.nuget.org/packages/NUnit/4.3.2 -->
+    <PackageReference Include="NUnit" Version="4.3.2" />
 
     <!-- Integration: OpenTelemetry -->
     <!--    Assembly: OpenTelemetry -->
@@ -257,8 +262,8 @@
 
     <!-- Integration: Oracle.ManagedDataAccess -->
     <!--    Assembly: Oracle.ManagedDataAccess -->
-    <!-- Latest package https://www.nuget.org/packages/Oracle.ManagedDataAccess/23.6.1 -->
-    <PackageReference Include="Oracle.ManagedDataAccess" Version="23.6.1" />
+    <!-- Latest package https://www.nuget.org/packages/Oracle.ManagedDataAccess/23.7.0 -->
+    <PackageReference Include="Oracle.ManagedDataAccess" Version="23.7.0" />
 
     <!-- Integration: RabbitMQ.Client -->
     <!--    Assembly: RabbitMQ.Client -->
@@ -282,8 +287,8 @@
 
     <!-- Integration: StackExchange.Redis -->
     <!--    Assembly: StackExchange.Redis -->
-    <!-- Latest package https://www.nuget.org/packages/StackExchange.Redis/2.8.22 -->
-    <PackageReference Include="StackExchange.Redis" Version="2.8.22" />
+    <!-- Latest package https://www.nuget.org/packages/StackExchange.Redis/2.8.24 -->
+    <PackageReference Include="StackExchange.Redis" Version="2.8.24" />
 
     <!-- Integration: StackExchange.Redis.StrongName -->
     <!--    Assembly: StackExchange.Redis.StrongName -->
@@ -329,13 +334,13 @@
 
     <!-- Integration: xunit.execution.desktop -->
     <!--    Assembly: xunit.execution.desktop -->
-    <!-- Latest package https://www.nuget.org/packages/xunit/2.9.2 -->
-    <PackageReference Include="xunit" Version="2.9.2" />
+    <!-- Latest package https://www.nuget.org/packages/xunit/2.9.3 -->
+    <PackageReference Include="xunit" Version="2.9.3" />
 
     <!-- Integration: xunit.execution.dotnet -->
     <!--    Assembly: xunit.execution.dotnet -->
-    <!-- Latest package https://www.nuget.org/packages/xunit.extensibility.execution/2.9.2 -->
-    <PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
+    <!-- Latest package https://www.nuget.org/packages/xunit.extensibility.execution/2.9.3 -->
+    <PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
 
     <!-- Integration: Yarp.ReverseProxy -->
     <!--    Assembly: Yarp.ReverseProxy -->
diff --git a/tracer/dependabot/Datadog.Dependabot.Vendors.csproj b/tracer/dependabot/Datadog.Dependabot.Vendors.csproj
index cefa00f782b0..57a26e75a5b2 100644
--- a/tracer/dependabot/Datadog.Dependabot.Vendors.csproj
+++ b/tracer/dependabot/Datadog.Dependabot.Vendors.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <RootNamespace>Datadog.Dependabot.Honeypot</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- https://www.nuget.org/packages/Microsoft.OpenApi/1.6.23 -->
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.23" />
+
     <!-- https://www.nuget.org/packages/Serilog/2.10.0 -->
     <PackageReference Include="Serilog" Version="2.10.0" />
 
@@ -30,18 +33,24 @@
     <!-- https://www.nuget.org/packages/IndieSystem.Text.RegularExpressions/0.6 -->
     <PackageReference Include="IndieSystem.Text.RegularExpressions" Version="0.6" />
 
-    <!-- https://www.nuget.org/packages/System.Collections.Immutable/1.0.0 -->
+    <!-- https://www.nuget.org/packages/System.Collections.Immutable/7.0.0 -->
     <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
 
-    <!-- https://www.nuget.org/packages/System.Memory/1.0.0 -->
+    <!-- https://www.nuget.org/packages/System.Memory/4.5.5 -->
     <PackageReference Include="System.Memory" Version="4.5.5" />
 
-    <!-- https://www.nuget.org/packages/System.Reflection.Metadata/1.0.0 -->
+    <!-- https://www.nuget.org/packages/System.Private.CoreLib/1.0.0 -->
+    <PackageReference Include="System.Private.CoreLib" Version="1.0.0" />
+
+    <!-- https://www.nuget.org/packages/System.Reflection.Metadata/7.0.2 -->
     <PackageReference Include="System.Reflection.Metadata" Version="7.0.2" />
 
     <!-- https://www.nuget.org/packages/ICSharpCode.SharpZipLib/1.3.3 -->
     <PackageReference Include="ICSharpCode.SharpZipLib" Version="1.3.3" />
 
+    <!-- https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/1.0.0 -->
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="1.0.0" />
+
   </ItemGroup>
 
 </Project>
diff --git a/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj b/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj
index dc5e326c3749..1992ad11decc 100644
--- a/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj
+++ b/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace.Bundle" Version="3.7.0" />
+    <PackageReference Include="Datadog.Trace.Bundle" Version="3.8.0" />
     <PackageReference Include="log4net" Version="2.0.12" />
     <PackageReference Include="log4net.Ext.Json" Version="2.0.8.3" />
   </ItemGroup>
diff --git a/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj b/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj
index 27519377cfe8..7fd97cea7caf 100644
--- a/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj
+++ b/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace.Bundle" Version="3.7.0" />
+    <PackageReference Include="Datadog.Trace.Bundle" Version="3.8.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
diff --git a/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj b/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj
index fab470a9e313..9d7424f75cc0 100644
--- a/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj
+++ b/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace.Bundle" Version="3.7.0" />
+    <PackageReference Include="Datadog.Trace.Bundle" Version="3.8.0" />
     <PackageReference Include="NLog" Version="4.0.0" />
   </ItemGroup>
 
diff --git a/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj b/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj
index 82ebc289ff35..ea440a778b42 100644
--- a/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj
+++ b/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace.Bundle" Version="3.7.0" />
+    <PackageReference Include="Datadog.Trace.Bundle" Version="3.8.0" />
     <PackageReference Include="NLog" Version="4.5.11" />
   </ItemGroup>
 
diff --git a/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj b/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj
index 4cc59859e86d..b6c485c2dade 100644
--- a/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj
+++ b/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace.Bundle" Version="3.7.0" />
+    <PackageReference Include="Datadog.Trace.Bundle" Version="3.8.0" />
     <PackageReference Include="NLog" Version="4.6.7" />
   </ItemGroup>
 
diff --git a/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj b/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj
index 862ab0e31abc..4574f1e0970f 100644
--- a/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj
+++ b/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace.Bundle" Version="3.7.0" />
+    <PackageReference Include="Datadog.Trace.Bundle" Version="3.8.0" />
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
diff --git a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile
index 118105bcc0e3..9e4657d190c5 100644
--- a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile
+++ b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile
@@ -16,7 +16,7 @@ COPY --from=build /app/out .
 
 # Set up Datadog APM
 RUN apk --no-cache update && apk add curl
-ARG TRACER_VERSION=3.7.0
+ARG TRACER_VERSION=3.8.0
 RUN mkdir -p /var/log/datadog
 RUN mkdir -p /opt/datadog
 RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \
diff --git a/tracer/samples/ConsoleApp/Alpine3.9.dockerfile b/tracer/samples/ConsoleApp/Alpine3.9.dockerfile
index 7c690836dc82..0f965151c22f 100644
--- a/tracer/samples/ConsoleApp/Alpine3.9.dockerfile
+++ b/tracer/samples/ConsoleApp/Alpine3.9.dockerfile
@@ -16,7 +16,7 @@ COPY --from=build /app/out .
 
 # Set up Datadog APM
 RUN apk --no-cache update && apk add curl
-ARG TRACER_VERSION=3.7.0
+ARG TRACER_VERSION=3.8.0
 RUN mkdir -p /var/log/datadog
 RUN mkdir -p /opt/datadog
 RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \
diff --git a/tracer/samples/ConsoleApp/Debian.dockerfile b/tracer/samples/ConsoleApp/Debian.dockerfile
index a3d1f8e6a4c7..e941afdaa270 100644
--- a/tracer/samples/ConsoleApp/Debian.dockerfile
+++ b/tracer/samples/ConsoleApp/Debian.dockerfile
@@ -15,7 +15,7 @@ WORKDIR /app
 COPY --from=build /app/out .
 
 # Set up Datadog APM
-ARG TRACER_VERSION=3.7.0
+ARG TRACER_VERSION=3.8.0
 RUN mkdir -p /var/log/datadog
 RUN mkdir -p /opt/datadog
 RUN curl -LO https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm_${TRACER_VERSION}_amd64.deb
diff --git a/tracer/samples/OpenTelemetry/Debian.dockerfile b/tracer/samples/OpenTelemetry/Debian.dockerfile
index 3039e9ebb30d..82b34e0c4bf7 100644
--- a/tracer/samples/OpenTelemetry/Debian.dockerfile
+++ b/tracer/samples/OpenTelemetry/Debian.dockerfile
@@ -16,7 +16,7 @@ WORKDIR /app
 COPY --from=build /app/out .
 
 # Download the Datadog .NET Tracer
-ARG TRACER_VERSION=3.7.0
+ARG TRACER_VERSION=3.8.0
 RUN mkdir -p /var/log/datadog
 RUN mkdir -p /opt/datadog
 RUN curl -LO https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm_${TRACER_VERSION}_amd64.deb
diff --git a/tracer/samples/ServiceFabricRemoting/WeatherService.NetCore31/WeatherService.NetCore31.csproj b/tracer/samples/ServiceFabricRemoting/WeatherService.NetCore31/WeatherService.NetCore31.csproj
index 0716d36a058f..4ecfb5349556 100644
--- a/tracer/samples/ServiceFabricRemoting/WeatherService.NetCore31/WeatherService.NetCore31.csproj
+++ b/tracer/samples/ServiceFabricRemoting/WeatherService.NetCore31/WeatherService.NetCore31.csproj
@@ -10,10 +10,10 @@
 
   <ItemGroup>
     <None Include="..\DatadogInstall.bat" Link="DatadogInstall.bat">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\DatadogInstall.ps1" Link="DatadogInstall.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/samples/ServiceFabricRemoting/WeatherService.NetFx461/WeatherService.NetFx461.csproj b/tracer/samples/ServiceFabricRemoting/WeatherService.NetFx461/WeatherService.NetFx461.csproj
index 658adab83763..384f051a335d 100644
--- a/tracer/samples/ServiceFabricRemoting/WeatherService.NetFx461/WeatherService.NetFx461.csproj
+++ b/tracer/samples/ServiceFabricRemoting/WeatherService.NetFx461/WeatherService.NetFx461.csproj
@@ -10,10 +10,10 @@
 
   <ItemGroup>
     <None Include="..\DatadogInstall.bat" Link="DatadogInstall.bat">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\DatadogInstall.ps1" Link="DatadogInstall.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/samples/ServiceFabricRemoting/WebApp/WebApp.csproj b/tracer/samples/ServiceFabricRemoting/WebApp/WebApp.csproj
index 016cb9e0705e..a53d81560d1f 100644
--- a/tracer/samples/ServiceFabricRemoting/WebApp/WebApp.csproj
+++ b/tracer/samples/ServiceFabricRemoting/WebApp/WebApp.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <None Include="..\DatadogInstall.bat" Link="DatadogInstall.bat">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\DatadogInstall.ps1" Link="DatadogInstall.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/samples/WindowsContainer/Dockerfile b/tracer/samples/WindowsContainer/Dockerfile
index 4d3da81f606f..c7ad6deb85cb 100644
--- a/tracer/samples/WindowsContainer/Dockerfile
+++ b/tracer/samples/WindowsContainer/Dockerfile
@@ -6,7 +6,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:5.0-windowsservercore-ltsc2019 AS base
 WORKDIR /app
 
-ARG TRACER_VERSION=3.7.0
+ARG TRACER_VERSION=3.8.0
 ENV DD_TRACER_VERSION=$TRACER_VERSION
 ENV ASPNETCORE_URLS=http://*.80
 
diff --git a/tracer/src/Datadog.Trace.BenchmarkDotNet/Datadog.Trace.BenchmarkDotNet.csproj b/tracer/src/Datadog.Trace.BenchmarkDotNet/Datadog.Trace.BenchmarkDotNet.csproj
index b088d1f1e4d9..d6d2bc5cab1f 100644
--- a/tracer/src/Datadog.Trace.BenchmarkDotNet/Datadog.Trace.BenchmarkDotNet.csproj
+++ b/tracer/src/Datadog.Trace.BenchmarkDotNet/Datadog.Trace.BenchmarkDotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <Title>Datadog CI Visibility - BenchmarkDotNet</Title>
     <Description>BenchmarkDotNet exporter for Datadog CI Visibility</Description>
     <Nullable>enable</Nullable>
diff --git a/tracer/src/Datadog.Trace.Bundle/Datadog.Trace.Bundle.csproj b/tracer/src/Datadog.Trace.Bundle/Datadog.Trace.Bundle.csproj
index 2a1331d73955..b303a8a67649 100644
--- a/tracer/src/Datadog.Trace.Bundle/Datadog.Trace.Bundle.csproj
+++ b/tracer/src/Datadog.Trace.Bundle/Datadog.Trace.Bundle.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <Title>Datadog APM Auto-instrumentation Assets</Title>
     <Description>Auto-instrumentation assets for Datadog APM</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
index 4cbdaca89ca0..bf38e38a2aae 100644
--- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
+++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
@@ -6,7 +6,7 @@
     <OutputPath>..\bin\ProfilerResources\</OutputPath>
 
     <!-- NuGet -->
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
 
     <!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp2.0) -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetCore.cs b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetCore.cs
index 8bc690f88360..bebb9b738ae7 100644
--- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetCore.cs
+++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetCore.cs
@@ -33,11 +33,11 @@ private static string ResolveManagedProfilerDirectory()
             }
 
             var tracerHomeDirectory = ReadEnvironmentVariable("DD_DOTNET_TRACER_HOME") ?? string.Empty;
-            var fullPath = Path.Combine(tracerHomeDirectory, tracerFrameworkDirectory);
+            var fullPath = Path.GetFullPath(Path.Combine(tracerHomeDirectory, tracerFrameworkDirectory));
 
             if (!Directory.Exists(fullPath))
             {
-                StartupLogger.Log($"The tracer home directory cannot be found at '{fullPath}', based on the DD_DOTNET_TRACER_HOME value '{tracerHomeDirectory}'");
+                StartupLogger.Log($"The tracer home directory cannot be found at '{fullPath}', based on the DD_DOTNET_TRACER_HOME value '{tracerHomeDirectory}' and current directory {Environment.CurrentDirectory}");
                 return null;
             }
 
diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetFramework.cs b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetFramework.cs
index 5cebb1be71bc..9b504c1e8131 100644
--- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetFramework.cs
+++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.NetFramework.cs
@@ -19,10 +19,10 @@ public partial class Startup
         private static string ResolveManagedProfilerDirectory()
         {
             var tracerHomeDirectory = ReadEnvironmentVariable("DD_DOTNET_TRACER_HOME") ?? string.Empty;
-            var fullPath = Path.Combine(tracerHomeDirectory, "net461");
+            var fullPath = Path.GetFullPath(Path.Combine(tracerHomeDirectory, "net461"));
             if (!Directory.Exists(fullPath))
             {
-                StartupLogger.Log($"The tracer home directory cannot be found at '{fullPath}', based on the DD_DOTNET_TRACER_HOME value '{tracerHomeDirectory}'");
+                StartupLogger.Log($"The tracer home directory cannot be found at '{fullPath}', based on the DD_DOTNET_TRACER_HOME value '{tracerHomeDirectory}' and current directory {Environment.CurrentDirectory}");
                 return null;
             }
 
diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
index 060c6b87e6a8..c32b977b8786 100644
--- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
+++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
@@ -16,7 +16,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Loader
     /// </summary>
     public partial class Startup
     {
-        private const string AssemblyName = "Datadog.Trace, Version=3.8.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
+        private const string AssemblyName = "Datadog.Trace, Version=3.9.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
         private const string AzureAppServicesKey = "DD_AZURE_APP_SERVICES";
 
         private static int _startupCtorInitialized;
diff --git a/tracer/src/Datadog.Trace.Coverage.collector/CoverageCollector.cs b/tracer/src/Datadog.Trace.Coverage.collector/CoverageCollector.cs
index 7c307339b042..0426b1f04c4b 100644
--- a/tracer/src/Datadog.Trace.Coverage.collector/CoverageCollector.cs
+++ b/tracer/src/Datadog.Trace.Coverage.collector/CoverageCollector.cs
@@ -183,7 +183,7 @@ private void ProcessFolder(string folder, SearchOption searchOption)
                         {
                             List<Exception>? exceptions = null;
                             var remain = 3;
-                            Retry:
+                        Retry:
                             if (--remain > 0)
                             {
                                 try
@@ -305,9 +305,9 @@ private void ProcessFolder(string folder, SearchOption searchOption)
             // Is not part of the spec but useful for support tickets.
             // We try to extract session variables (from out of process sessions)
             // and try to send a message to the IPC server for setting the test.code_coverage.injected tag.
-            var extractedContext = SpanContextPropagator.Instance.Extract(
-                EnvironmentHelpers.GetEnvironmentVariables(),
-                new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
+            var extractedContext = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(
+                            EnvironmentHelpers.GetEnvironmentVariables(),
+                            new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
 
             if (extractedContext.SpanContext is { } sessionContext)
             {
diff --git a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
index c811e498ba7f..8e5d918fd4ef 100644
--- a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
+++ b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
   </PropertyGroup>
 
   <!-- For VS testing purposes only, copy all implementation assemblies to the
diff --git a/tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj b/tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj
index 6e2b30f9ab5f..5976a95faf6b 100644
--- a/tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj
+++ b/tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- NuGet -->
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <TargetFrameworks>net461;netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <PackageId>Datadog.Trace</PackageId>
     <Title>Datadog APM</Title>
diff --git a/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj b/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
index 4232a591cb01..fef6ac8fa7fe 100644
--- a/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
+++ b/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- NuGet -->
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <Title>Datadog APM - OpenTracing</Title>
     <Description>Provides OpenTracing support for Datadog APM</Description>
     <PackageTags>$(PackageTags);OpenTracing</PackageTags>
diff --git a/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/AdoNetSignature.cs b/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/AdoNetSignature.cs
index 4271f15187f6..701f0c6edace 100644
--- a/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/AdoNetSignature.cs
+++ b/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/AdoNetSignature.cs
@@ -3,19 +3,21 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
+using Datadog.Trace.ClrProfiler;
 using Datadog.Trace.SourceGenerators.Helpers;
 
 namespace Datadog.Trace.SourceGenerators.InstrumentationDefinitions;
 
 internal record AdoNetSignature
 {
-    public AdoNetSignature(string targetMethodName, string? targetReturnType, string[] targetParameterTypes, string instrumentationTypeName, int callTargetIntegrationKind, int returnType)
+    public AdoNetSignature(string targetMethodName, string? targetReturnType, string[] targetParameterTypes, string instrumentationTypeName, int callTargetIntegrationKind, int returnType, InstrumentationCategory instrumentationCategory)
     {
         TargetMethodName = targetMethodName;
         TargetReturnType = targetReturnType;
         TargetParameterTypes = new(targetParameterTypes);
         InstrumentationTypeName = instrumentationTypeName;
         CallTargetIntegrationKind = callTargetIntegrationKind;
+        InstrumentationCategory = instrumentationCategory;
         ReturnType = returnType;
     }
 
@@ -29,5 +31,7 @@ public AdoNetSignature(string targetMethodName, string? targetReturnType, string
 
     public int CallTargetIntegrationKind { get; }
 
+    public InstrumentationCategory InstrumentationCategory { get; }
+
     public int ReturnType { get; }
 }
diff --git a/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/Constants.cs b/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/Constants.cs
index 0632ba47fefa..2604250df780 100644
--- a/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/Constants.cs
+++ b/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/Constants.cs
@@ -36,6 +36,7 @@ public static class AdoNetSignatureAttributeProperties
         public const string ParameterTypeNames = nameof(ParameterTypeNames);
         public const string CallTargetType = nameof(CallTargetType);
         public const string CallTargetIntegrationKind = nameof(CallTargetIntegrationKind);
+        public const string InstrumentationCategory = nameof(InstrumentationCategory);
         public const string ReturnType = nameof(ReturnType);
     }
 
diff --git a/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/InstrumentationDefinitionsGenerator.cs b/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/InstrumentationDefinitionsGenerator.cs
index 9c29e6ddaad2..2eb081df2328 100644
--- a/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/InstrumentationDefinitionsGenerator.cs
+++ b/tracer/src/Datadog.Trace.SourceGenerators/InstrumentationDefinitions/InstrumentationDefinitionsGenerator.cs
@@ -366,6 +366,7 @@ private static Result<EquatableArray<CallTargetDefinitionSource>> GetCallTargetD
             int? integrationKind = null;
             int? returnType = null;
             string? callTargetType = null;
+            InstrumentationCategory instrumentationCategory = InstrumentationCategory.Tracing;
 
             foreach (KeyValuePair<string, TypedConstant> namedArgument in attributeData.NamedArguments)
             {
@@ -392,6 +393,9 @@ private static Result<EquatableArray<CallTargetDefinitionSource>> GetCallTargetD
                     case nameof(Constants.AdoNetSignatureAttributeProperties.CallTargetIntegrationKind):
                         integrationKind = namedArgument.Value.Value as int?;
                         break;
+                    case nameof(Constants.AdoNetSignatureAttributeProperties.InstrumentationCategory):
+                        instrumentationCategory = (InstrumentationCategory)(namedArgument.Value.Value as uint?).GetValueOrDefault();
+                        break;
                     case nameof(Constants.AdoNetSignatureAttributeProperties.ReturnType):
                         returnType = namedArgument.Value.Value as int?;
                         break;
@@ -457,6 +461,7 @@ private static Result<EquatableArray<CallTargetDefinitionSource>> GetCallTargetD
                         targetParameterTypes: parameterTypeNames ?? Array.Empty<string>(),
                         instrumentationTypeName: callTargetType!.ToString(),
                         callTargetIntegrationKind: integrationKind ?? 0,
+                        instrumentationCategory: instrumentationCategory,
                         returnType: returnType ?? 0)));
         }
 
@@ -702,7 +707,7 @@ private static Result<EquatableArray<AssemblyCallTargetDefinitionSource>> GetAss
                         instrumentationTypeName: signature.Signature.InstrumentationTypeName,
                         integrationKind: signature.Signature.CallTargetIntegrationKind,
                         isAdoNetIntegration: true,
-                        instrumentationCategory: InstrumentationCategory.Tracing);
+                        instrumentationCategory: signature.Signature.InstrumentationCategory);
 
                 return new Result<CallTargetDefinitionSource?>(callTargetSource, default);
             }
diff --git a/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.Attributes.cs b/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.Attributes.cs
index bee0077c2984..da3b3a45d19f 100644
--- a/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.Attributes.cs
+++ b/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.Attributes.cs
@@ -122,7 +122,7 @@ public TelemetryMetricAttribute(string metricName)
         /// which has a single tag
         /// </summary>
         [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-        internal class TelemetryMetricAttribute<TTag> : System.Attribute
+        internal class TelemetryMetricAttribute<TTag> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
             where TTag : System.Enum
         {
             /// <summary>
@@ -132,10 +132,8 @@ internal class TelemetryMetricAttribute<TTag> : System.Attribute
             /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
             /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
             public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+                : base(metricName, isCommon, nameSpace)
             {
-                MetricName = metricName;
-                IsCommon = isCommon;
-                NameSpace = nameSpace;
             }
 
             /// <summary>
@@ -145,45 +143,119 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
             /// <param name="metricName">The name of the metric, as reported to Datadog</param>
             /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
             public TelemetryMetricAttribute(string metricName, bool isCommon)
-                : this(metricName, isCommon, null!)
+                : base(metricName, isCommon, null!)
             {
             }
 
             /// <summary>
             /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-            /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+            /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
             /// </summary>
             /// <param name="metricName">The name of the metric, as reported to Datadog</param>
             public TelemetryMetricAttribute(string metricName)
-                : this(metricName, isCommon: true, null!)
+                : base(metricName, isCommon: true, null!)
             {
             }
+        }
 
+        /// <summary>
+        /// Used to describe a specific metric defined as a field
+        /// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+        /// which has two tags
+        /// </summary>
+        [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+        internal class TelemetryMetricAttribute<TTag1, TTag2> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+            where TTag1 : System.Enum
+            where TTag2 : System.Enum
+        {
             /// <summary>
-            /// Gets the name of the metric, as reported to Datadog
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
             /// </summary>
-            public string MetricName { get; }
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+                : base(metricName, isCommon, nameSpace)
+            {
+            }
 
             /// <summary>
-            /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace
             /// </summary>
-            public bool IsCommon { get; }
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon)
+                : base(metricName, isCommon, null!)
+            {
+            }
 
             /// <summary>
-            /// Gets the namespace of the metric, if not the default (Tracer)
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
             /// </summary>
-            public string? NameSpace { get; }
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            public TelemetryMetricAttribute(string metricName)
+                : base(metricName, isCommon: true, null!)
+            {
+            }
         }
+        
+        /// <summary>
+        /// Used to describe a specific metric defined as a field
+        /// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+        /// which has two tags
+        /// </summary>
+        [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+        internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+            where TTag1 : System.Enum
+            where TTag2 : System.Enum
+            where TTag3 : System.Enum
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// </summary>
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+                : base(metricName, isCommon, nameSpace)
+            {
+            }
 
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace
+            /// </summary>
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon)
+                : base(metricName, isCommon, null!)
+            {
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+            /// </summary>
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            public TelemetryMetricAttribute(string metricName)
+                : base(metricName, isCommon: true, null!)
+            {
+            }
+        }
+        
         /// <summary>
         /// Used to describe a specific metric defined as a field
         /// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
         /// which has two tags
         /// </summary>
         [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-        internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
+        internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
             where TTag1 : System.Enum
             where TTag2 : System.Enum
+            where TTag3 : System.Enum
+            where TTag4 : System.Enum
         {
             /// <summary>
             /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
@@ -192,10 +264,8 @@ internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
             /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
             /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
             public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+                : base(metricName, isCommon, nameSpace)
             {
-                MetricName = metricName;
-                IsCommon = isCommon;
-                NameSpace = nameSpace;
             }
 
             /// <summary>
@@ -205,34 +275,112 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
             /// <param name="metricName">The name of the metric, as reported to Datadog</param>
             /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
             public TelemetryMetricAttribute(string metricName, bool isCommon)
-                : this(metricName, isCommon, null!)
+                : base(metricName, isCommon, null!)
             {
             }
 
             /// <summary>
             /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-            /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+            /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
             /// </summary>
             /// <param name="metricName">The name of the metric, as reported to Datadog</param>
             public TelemetryMetricAttribute(string metricName)
-                : this(metricName, isCommon: true, null!)
+                : base(metricName, isCommon: true, null!)
+            {
+            }
+        }
+        
+        /// <summary>
+        /// Used to describe a specific metric defined as a field
+        /// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+        /// which has two tags
+        /// </summary>
+        [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+        internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+            where TTag1 : System.Enum
+            where TTag2 : System.Enum
+            where TTag3 : System.Enum
+            where TTag4 : System.Enum
+            where TTag5 : System.Enum
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// </summary>
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+                : base(metricName, isCommon, nameSpace)
             {
             }
 
             /// <summary>
-            /// Gets the name of the metric, as reported to Datadog
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace
             /// </summary>
-            public string MetricName { get; }
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon)
+                : base(metricName, isCommon, null!)
+            {
+            }
 
             /// <summary>
-            /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
             /// </summary>
-            public bool IsCommon { get; }
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            public TelemetryMetricAttribute(string metricName)
+                : base(metricName, isCommon: true, null!)
+            {
+            }
+        }
+        
+        /// <summary>
+        /// Used to describe a specific metric defined as a field
+        /// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+        /// which has two tags
+        /// </summary>
+        [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+        internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5, TTag6> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+            where TTag1 : System.Enum
+            where TTag2 : System.Enum
+            where TTag3 : System.Enum
+            where TTag4 : System.Enum
+            where TTag5 : System.Enum
+            where TTag6 : System.Enum
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// </summary>
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+                : base(metricName, isCommon, nameSpace)
+            {
+            }
 
             /// <summary>
-            /// Gets the namespace of the metric, if not the default (Tracer)
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace
             /// </summary>
-            public string? NameSpace { get; }
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+            public TelemetryMetricAttribute(string metricName, bool isCommon)
+                : base(metricName, isCommon, null!)
+            {
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+            /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+            /// </summary>
+            /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+            public TelemetryMetricAttribute(string metricName)
+                : base(metricName, isCommon: true, null!)
+            {
+            }
         }
         """;
 }
diff --git a/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.cs b/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.cs
index a84981ec4da1..68c3cab96e6d 100644
--- a/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.cs
+++ b/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/Sources.cs
@@ -97,28 +97,15 @@ internal partial interface IMetricsTelemetryCollector
                 sb.AppendLine();
                 var (property, metric) = names[i];
 
-                if (metric.Tag2FullyQualifiedName is { } tagName2)
-                {
-                    var tagName1 = metric.Tag1FullyQualifiedName!;
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int increment = 1);
-                        """);
-                }
-                else if (metric.Tag1FullyQualifiedName is { } tagName)
-                {
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}({{tagName}} tag, int increment = 1);
-                        """);
-                }
-                else
-                {
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}(int increment = 1);
-                        """);
-                }
+                sb.Append(
+                    $$"""
+                          public void Record{{details.ShortName}}{{property}}(
+                      """);
+
+                var array = metric.TagFullyQualifiedNames.AsArray() ?? [];
+                WriteTagArgList(sb, array);
+
+                sb.AppendLine("int increment = 1);");
             }
         }
 
@@ -153,28 +140,15 @@ internal partial interface IMetricsTelemetryCollector
                 sb.AppendLine();
                 var (property, metric) = names[i];
 
-                if (metric.Tag2FullyQualifiedName is { } tagName2)
-                {
-                    var tagName1 = metric.Tag1FullyQualifiedName!;
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int value);
-                        """);
-                }
-                else if (metric.Tag1FullyQualifiedName is { } tagName)
-                {
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}({{tagName}} tag, int value);
-                        """);
-                }
-                else
-                {
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}(int value);
-                        """);
-                }
+                sb.Append(
+                    $$"""
+                          public void Record{{details.ShortName}}{{property}}(
+                      """);
+
+                var array = metric.TagFullyQualifiedNames.AsArray() ?? [];
+                WriteTagArgList(sb, array);
+
+                sb.AppendLine("int value);");
             }
         }
 
@@ -209,28 +183,15 @@ internal partial interface IMetricsTelemetryCollector
                 sb.AppendLine();
                 var (property, metric) = names[i];
 
-                if (metric.Tag2FullyQualifiedName is { } tagName2)
-                {
-                    var tagName1 = metric.Tag1FullyQualifiedName!;
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, double value);
-                        """);
-                }
-                else if (metric.Tag1FullyQualifiedName is { } tagName)
-                {
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}({{tagName}} tag, double value);
-                        """);
-                }
-                else
-                {
-                    sb.AppendLine(
-                        $$"""
-                            public void Record{{details.ShortName}}{{property}}(double value);
-                        """);
-                }
+                sb.Append(
+                    $$"""
+                          public void Record{{details.ShortName}}{{property}}(
+                      """);
+
+                var array = metric.TagFullyQualifiedNames.AsArray() ?? [];
+                WriteTagArgList(sb, array);
+
+                sb.AppendLine("double value);");
             }
         }
 
@@ -760,38 +721,13 @@ internal partial class {{collectorName}}
                 var (property, metric) = names[i];
                 var index = metricsToLocation[i];
 
-                if (metric.Tag2FullyQualifiedName is { } tagName2)
+                if (doRecord)
                 {
-                    if (doRecord)
-                    {
-                        WriteRecordCount(sb, in details, property, index, metric.Tag1FullyQualifiedName!, tagName2, enumDictionary[tagName2].Count);
-                    }
-                    else
-                    {
-                        WriteNoopCount(sb, in details, property, metric.Tag1FullyQualifiedName!, tagName2);
-                    }
-                }
-                else if (metric.Tag1FullyQualifiedName is { } tagName)
-                {
-                    if (doRecord)
-                    {
-                        WriteRecordCount(sb, in details, property, index, tagName);
-                    }
-                    else
-                    {
-                        WriteNoopCount(sb, in details, property, tagName);
-                    }
+                    WriteRecordCount(sb, in details, property, index, metric.TagFullyQualifiedNames, enumDictionary);
                 }
                 else
                 {
-                    if (doRecord)
-                    {
-                        WriteRecordCount(sb, details, property, index);
-                    }
-                    else
-                    {
-                        WriteNoopCount(sb, in details, property);
-                    }
+                    WriteNoopCount(sb, in details, property, metric.TagFullyQualifiedNames, enumDictionary);
                 }
             }
         }
@@ -860,38 +796,13 @@ internal partial class {{collectorName}}
                 var (property, metric) = names[i];
                 var index = metricsToLocation[i];
 
-                if (metric.Tag2FullyQualifiedName is { } tagName2)
-                {
-                    if (doRecord)
-                    {
-                        WriteRecordGauge(sb, in details, property, index, metric.Tag1FullyQualifiedName!, tagName2, enumDictionary[tagName2].Count);
-                    }
-                    else
-                    {
-                        WriteNoopGauge(sb, in details, property, metric.Tag1FullyQualifiedName!, tagName2);
-                    }
-                }
-                else if (metric.Tag1FullyQualifiedName is { } tagName)
+                if (doRecord)
                 {
-                    if (doRecord)
-                    {
-                        WriteRecordGauge(sb, in details, property, index, tagName);
-                    }
-                    else
-                    {
-                        WriteNoopGauge(sb, in details, property, tagName);
-                    }
+                    WriteRecordGauge(sb, in details, property, index, metric.TagFullyQualifiedNames, enumDictionary);
                 }
                 else
                 {
-                    if (doRecord)
-                    {
-                        WriteRecordGauge(sb, details, property, index);
-                    }
-                    else
-                    {
-                        WriteNoopGauge(sb, in details, property);
-                    }
+                    WriteNoopGauge(sb, in details, property, metric.TagFullyQualifiedNames, enumDictionary);
                 }
             }
         }
@@ -959,38 +870,13 @@ internal partial class {{collectorName}}
                 var (property, metric) = names[i];
                 var index = metricsToLocation[i];
 
-                if (metric.Tag2FullyQualifiedName is { } tagName2)
+                if (doRecord)
                 {
-                    if (doRecord)
-                    {
-                        WriteRecordDistribution(sb, in details, property, index, metric.Tag1FullyQualifiedName!, tagName2, enumDictionary[tagName2].Count);
-                    }
-                    else
-                    {
-                        WriteNoopDistribution(sb, in details, property, metric.Tag1FullyQualifiedName!, tagName2);
-                    }
-                }
-                else if (metric.Tag1FullyQualifiedName is { } tagName)
-                {
-                    if (doRecord)
-                    {
-                        WriteRecordDistribution(sb, in details, property, index, tagName);
-                    }
-                    else
-                    {
-                        WriteNoopDistribution(sb, in details, property, tagName);
-                    }
+                    WriteRecordDistribution(sb, in details, property, index, metric.TagFullyQualifiedNames, enumDictionary);
                 }
                 else
                 {
-                    if (doRecord)
-                    {
-                        WriteRecordDistribution(sb, details, property, index);
-                    }
-                    else
-                    {
-                        WriteNoopDistribution(sb, in details, property);
-                    }
+                    WriteNoopDistribution(sb, in details, property, metric.TagFullyQualifiedNames, enumDictionary);
                 }
             }
         }
@@ -1027,69 +913,96 @@ private static void AddAggregatedMetrics(StringBuilder sb, in TelemetryMetricGen
             return;
         }
 
-        var i = 0;
+        var index = 0;
         foreach (var (_, metric) in names)
         {
             sb.AppendLine(
                 $$"""
-                            // {{metric.MetricName}}, index = {{i}}
+                            // {{metric.MetricName}}, index = {{index}}
                 """);
             const string prefix =
                 """
                             new(
                 """;
-            if (metric.Tag1FullyQualifiedName is { } tag1Type && enumDictionary[tag1Type].AsArray() is { } tag1Values)
+
+            // Write the cartesian product of all the arrays
+            var tags = metric.TagFullyQualifiedNames.AsArray() ?? [];
+            List<string[]> tagValues = new(tags.Length);
+            bool haveTags = false;
+
+            foreach (var tag in tags)
             {
-                foreach (var tag1Value in tag1Values)
+                var values = enumDictionary[tag].AsArray() ?? [];
+                tagValues.Add([..values]);
+                haveTags |= values.Length > 0;
+            }
+
+            if (haveTags)
+            {
+                // Could reduce allocations here, e.g. use stackalloc, but in a loop so meh
+                var indices = new int[tagValues.Count];
+                while (true)
                 {
-                    if (metric.Tag2FullyQualifiedName is { } tag2Type && enumDictionary[tag2Type].AsArray() is { } tag2Values)
+                    index++;
+                    // Build the current combination
+                    // if every entry is empty, we write null instead of an array
+                    // so need to check first
+                    bool haveNonNullValues = false;
+                    for (var i = 0; i < tagValues.Count; i++)
                     {
-                        foreach (var tag2Value in tag2Values)
+                        if (!string.IsNullOrEmpty(tagValues[i][indices[i]]))
                         {
-                            i++;
-                            sb.Append(prefix);
-
-                            if (string.IsNullOrEmpty(tag1Value) && string.IsNullOrEmpty(tag2Value))
-                            {
-                                sb.AppendLine("null),");
-                                continue;
-                            }
-
-                            sb.Append("new[] { ");
-
-                            WriteAllValues(sb, tag1Value);
-                            WriteAllValues(sb, tag2Value);
+                            haveNonNullValues = true;
+                            break;
+                        }
+                    }
 
-                            sb.Remove(sb.Length - 2, 2); // remove the final ', '
-                            sb.AppendLine(" }),");
+                    if (haveNonNullValues)
+                    {
+                        // write the full set
+                        sb.Append($$"""{{prefix}}new[] { """);
+                        for (var i = 0; i < tagValues.Count; i++)
+                        {
+                            WriteAllValues(sb, tagValues[i][indices[i]]);
                         }
+
+                        sb.Remove(sb.Length - 2, 2); // remove the final ', '
+                        sb.AppendLine(" }),");
                     }
                     else
                     {
-                        i++;
-                        sb.Append(prefix);
+                        // no non-empty tags
+                        sb.AppendLine($$"""{{prefix}}null),""");
+                    }
 
-                        if (string.IsNullOrEmpty(tag1Value))
+                    // Advance to the next combination
+                    var incrementIndex = tagValues.Count - 1;
+                    while (incrementIndex >= 0)
+                    {
+                        indices[incrementIndex]++;
+                        if (indices[incrementIndex] < tagValues[incrementIndex].Length)
                         {
-                            sb.AppendLine("null),");
-                            continue;
+                            // We've successfully incremented this index, so we're ready to write the next combo
+                            break;
                         }
 
-                        sb.Append("new[] { ");
-
-                        WriteAllValues(sb, tag1Value);
+                        // we went off the end, so reset, and increment the first tag
+                        indices[incrementIndex] = 0;
+                        incrementIndex--;
+                    }
 
-                        sb.Remove(sb.Length - 2, 2); // remove the final ', '
-                        sb.AppendLine(" }),");
+                    // If we've wrapped around at the first index, we're done
+                    if (incrementIndex < 0)
+                    {
+                        break;
                     }
                 }
             }
             else
             {
-                i++;
-                sb
-                   .Append(prefix)
-                   .AppendLine("null),");
+                // no tags
+                index++;
+                sb.AppendLine($$"""{{prefix}}null),""");
             }
         }
 
@@ -1160,196 +1073,311 @@ private static string GetValues(
         return sb.ToString();
     }
 
-    private static void WriteRecordCount(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index)
+    private static void WriteRecordCount(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, int index, EquatableArray<string> tagNames, Dictionary<string, EquatableArray<string>> enumDictionary)
     {
-        sb.AppendLine(
+        var tagArray = tagNames.AsArray() ?? [];
+        if (tagArray.Length == 0)
+        {
+            // we don't need to keep this separate technically, could easily inline it, but it would change the generated code
+            // very slightly (though the IL will remain the same)
+
+            sb.AppendLine(
+                $$"""
+                      public void Record{{details.ShortName}}{{property}}(int increment = 1)
+                      {
+                          Interlocked.Add(ref _buffer.{{details.ShortName}}[{{index}}], increment);
+                      }
+                  """);
+            return;
+        }
+
+        // Produces something similar to this:
+        // public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int increment = 1)
+        // {
+        //     var index = {{index}} + ((int)tag1 * {{tag2EntryCount}}) + (int)tag2;
+        //     Interlocked.Add(ref _buffer.{{details.ShortName}}[index], increment);
+        // }
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}(int increment = 1)
-                  {
-                      Interlocked.Add(ref _buffer.{{details.ShortName}}[{{index}}], increment);
-                  }
+                  public void Record{{details.ShortName}}{{property}}(
               """);
-    }
 
-    private static void WriteRecordCount(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index, string tagName)
-    {
-        sb.AppendLine(
+        WriteTagArgList(sb, tagArray);
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName}} tag, int increment = 1)
+              int increment = 1)
                   {
-                      var index = {{index}} + (int)tag;
-                      Interlocked.Add(ref _buffer.{{details.ShortName}}[index], increment);
-                  }
+                      var index = {{index}}
               """);
-    }
 
-    private static void WriteRecordCount(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, int index, string tagName1, string tagName2, int tag2EntryCount)
-    {
+        WriteTagIndices(sb, enumDictionary, tagArray);
+
         sb.AppendLine(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int increment = 1)
-                  {
-                      var index = {{index}} + ((int)tag1 * {{tag2EntryCount}}) + (int)tag2;
+              ;
                       Interlocked.Add(ref _buffer.{{details.ShortName}}[index], increment);
                   }
               """);
     }
 
-    private static void WriteRecordGauge(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index)
+    private static void WriteRecordGauge(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, int index, EquatableArray<string> tagNames, Dictionary<string, EquatableArray<string>> enumDictionary)
     {
-        sb.AppendLine(
+        var tagArray = tagNames.AsArray() ?? [];
+        if (tagArray.Length == 0)
+        {
+            // we don't need to keep this separate technically, could easily inline it, but it would change the generated code
+            // very slightly (though the IL will remain the same)
+
+            sb.AppendLine(
+                $$"""
+                      public void Record{{details.ShortName}}{{property}}(int value)
+                      {
+                          Interlocked.Exchange(ref _buffer.{{details.ShortName}}[{{index}}], value);
+                      }
+                  """);
+            return;
+        }
+
+        // Produces something similar to this:
+        // public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int value)
+        // {
+        //     var index = {{index}} + ((int)tag1 * {{tag2EntryCount}}) + (int)tag2;
+        //     Interlocked.Exchange(ref _buffer.{{details.ShortName}}[index], value);
+        // }
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}(int value)
-                  {
-                      Interlocked.Exchange(ref _buffer.{{details.ShortName}}[{{index}}], value);
-                  }
+                  public void Record{{details.ShortName}}{{property}}(
               """);
-    }
 
-    private static void WriteRecordGauge(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index, string tagName)
-    {
-        sb.AppendLine(
+        WriteTagArgList(sb, tagArray);
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName}} tag, int value)
+              int value)
                   {
-                      var index = {{index}} + (int)tag;
-                      Interlocked.Exchange(ref _buffer.{{details.ShortName}}[index], value);
-                  }
+                      var index = {{index}}
               """);
-    }
 
-    private static void WriteRecordGauge(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index, string tagName1, string tagName2, int tag2EntryCount)
-    {
+        WriteTagIndices(sb, enumDictionary, tagArray);
+
         sb.AppendLine(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int value)
-                  {
-                      var index = {{index}} + ((int)tag1 * {{tag2EntryCount}}) + (int)tag2;
+              ;
                       Interlocked.Exchange(ref _buffer.{{details.ShortName}}[index], value);
                   }
               """);
     }
 
-    private static void WriteRecordDistribution(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index)
+    private static void WriteRecordDistribution(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, int index, EquatableArray<string> tagNames, Dictionary<string, EquatableArray<string>> enumDictionary)
     {
-        sb.AppendLine(
+        var tagArray = tagNames.AsArray() ?? [];
+        if (tagArray.Length == 0)
+        {
+            // we don't need to keep this separate technically, could easily inline it, but it would change the generated code
+            // very slightly (though the IL will remain the same)
+            sb.AppendLine(
+                $$"""
+                      public void Record{{details.ShortName}}{{property}}(double value)
+                      {
+                          _buffer.{{details.ShortName}}[{{index}}].TryEnqueue(value);
+                      }
+                  """);
+            return;
+        }
+
+        // Produces something similar to this:
+        // public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int value)
+        // {
+        //     var index = {{index}} + ((int)tag1 * {{tag2EntryCount}}) + (int)tag2;
+        //     Interlocked.Exchange(ref _buffer.{{details.ShortName}}[index], value);
+        // }
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}(double value)
-                  {
-                      _buffer.{{details.ShortName}}[{{index}}].TryEnqueue(value);
-                  }
+                  public void Record{{details.ShortName}}{{property}}(
               """);
-    }
 
-    private static void WriteRecordDistribution(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index, string tagName)
-    {
-        sb.AppendLine(
+        WriteTagArgList(sb, tagArray);
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName}} tag, double value)
+              double value)
                   {
-                      var index = {{index}} + (int)tag;
-                      _buffer.{{details.ShortName}}[index].TryEnqueue(value);
-                  }
+                      var index = {{index}}
               """);
-    }
 
-    private static void WriteRecordDistribution(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, int index, string tagName1, string tagName2, int tag2EntryCount)
-    {
+        WriteTagIndices(sb, enumDictionary, tagArray);
+
         sb.AppendLine(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, double value)
-                  {
-                      var index = {{index}} + ((int)tag1 * {{tag2EntryCount}}) + (int)tag2;
+              ;
                       _buffer.{{details.ShortName}}[index].TryEnqueue(value);
                   }
               """);
     }
 
-    private static void WriteNoopCount(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property)
+    private static void WriteTagArgList(StringBuilder sb, string[] tagArray)
     {
-        sb.AppendLine(
-            $$"""
-                  public void Record{{details.ShortName}}{{property}}(int increment = 1)
-                  {
-                  }
-              """);
-    }
+        for (var i = 0; i < tagArray.Length; i++)
+        {
+            sb.Append(tagArray[i])
+              .Append(" tag");
 
-    private static void WriteNoopCount(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, string tagName)
-    {
-        sb.AppendLine(
-            $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName}} tag, int increment = 1)
-                  {
-                  }
-              """);
+            if (tagArray.Length > 1)
+            {
+                sb.Append(i + 1);
+            }
+
+            sb.Append(", ");
+        }
     }
 
-    private static void WriteNoopCount(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, string tagName1, string tagName2)
+    private static void WriteTagIndices(StringBuilder sb, Dictionary<string, EquatableArray<string>> enumDictionary, string[] tagArray)
     {
-        sb.AppendLine(
-            $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int increment = 1)
-                  {
-                  }
-              """);
+        if (tagArray.Length == 0)
+        {
+            return;
+        }
+
+        Span<int> multipliers = stackalloc int[tagArray.Length];
+        var indexer = 1;
+
+        // set the multipliers for each tag
+        for (var i = tagArray.Length - 1; i >= 0; i--)
+        {
+            multipliers[i] = indexer;
+            indexer *= enumDictionary.TryGetValue(tagArray[i], out var entries) ? entries.Count : 1;
+        }
+
+        for (var i = 0; i < tagArray.Length; i++)
+        {
+            var multiplier = multipliers[i];
+            if (multiplier == 1)
+            {
+                sb.Append(" + (int)tag");
+
+                if (tagArray.Length > 1)
+                {
+                    sb.Append(i + 1);
+                }
+            }
+            else
+            {
+                sb.Append(" + ((int)tag")
+                  .Append(i + 1)
+                  .Append(" * ")
+                  .Append(multiplier)
+                  .Append(')');
+            }
+        }
     }
 
-    private static void WriteNoopGauge(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property)
+    private static void WriteNoopCount(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, EquatableArray<string> tagNames, Dictionary<string, EquatableArray<string>> enumDictionary)
     {
-        sb.AppendLine(
+        var tagArray = tagNames.AsArray() ?? [];
+        if (tagArray.Length == 0)
+        {
+            // we don't need to keep this separate technically, could easily inline it, but it would change the generated code
+            // very slightly (though the IL will remain the same)
+            sb.AppendLine(
+                $$"""
+                      public void Record{{details.ShortName}}{{property}}(int increment = 1)
+                      {
+                      }
+                  """);
+            return;
+        }
+
+        // Produces something similar to this:
+        // public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int increment = 1)
+        // {
+        // }
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}(int value)
-                  {
-                  }
+                  public void Record{{details.ShortName}}{{property}}(
               """);
-    }
 
-    private static void WriteNoopGauge(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, string tagName)
-    {
+        WriteTagArgList(sb, tagArray);
+
         sb.AppendLine(
-            $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName}} tag, int value)
+              """
+              int increment = 1)
                   {
                   }
               """);
     }
 
-    private static void WriteNoopGauge(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, string tagName1, string tagName2)
+    private static void WriteNoopGauge(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, EquatableArray<string> tagNames, Dictionary<string, EquatableArray<string>> enumDictionary)
     {
-        sb.AppendLine(
+        var tagArray = tagNames.AsArray() ?? [];
+        if (tagArray.Length == 0)
+        {
+            // we don't need to keep this separate technically, could easily inline it, but it would change the generated code
+            // very slightly (though the IL will remain the same)
+            sb.AppendLine(
+                $$"""
+                      public void Record{{details.ShortName}}{{property}}(int value)
+                      {
+                      }
+                  """);
+            return;
+        }
+
+        // Produces something similar to this:
+        // public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int value)
+        // {
+        // }
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int value)
-                  {
-                  }
+                  public void Record{{details.ShortName}}{{property}}(
               """);
-    }
 
-    private static void WriteNoopDistribution(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property)
-    {
+        WriteTagArgList(sb, tagArray);
+
         sb.AppendLine(
-            $$"""
-                  public void Record{{details.ShortName}}{{property}}(double value)
+              """
+              int value)
                   {
                   }
               """);
     }
 
-    private static void WriteNoopDistribution(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, string tagName)
+    private static void WriteNoopDistribution(StringBuilder sb,  in TelemetryMetricGenerator.EnumDetails details, string property, EquatableArray<string> tagNames, Dictionary<string, EquatableArray<string>> enumDictionary)
     {
-        sb.AppendLine(
+        var tagArray = tagNames.AsArray() ?? [];
+        if (tagArray.Length == 0)
+        {
+            // we don't need to keep this separate technically, could easily inline it, but it would change the generated code
+            // very slightly (though the IL will remain the same)
+            sb.AppendLine(
+                $$"""
+                      public void Record{{details.ShortName}}{{property}}(double value)
+                      {
+                      }
+                  """);
+            return;
+        }
+
+        // Produces something similar to this:
+        // public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, int value)
+        // {
+        // }
+
+        sb.Append(
             $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName}} tag, double value)
-                  {
-                  }
+                  public void Record{{details.ShortName}}{{property}}(
               """);
-    }
 
-    private static void WriteNoopDistribution(StringBuilder sb, in TelemetryMetricGenerator.EnumDetails details, string property, string tagName1, string tagName2)
-    {
+        WriteTagArgList(sb, tagArray);
+
         sb.AppendLine(
-            $$"""
-                  public void Record{{details.ShortName}}{{property}}({{tagName1}} tag1, {{tagName2}} tag2, double value)
+              """
+              double value)
                   {
                   }
               """);
diff --git a/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/TelemetryMetricGenerator.cs b/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/TelemetryMetricGenerator.cs
index 8f00708c8e15..f5a9180e9e3d 100644
--- a/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/TelemetryMetricGenerator.cs
+++ b/tracer/src/Datadog.Trace.SourceGenerators/TelemetryMetric/TelemetryMetricGenerator.cs
@@ -136,15 +136,16 @@ static Dictionary<string, EquatableArray<string>> GetEnumDictionary(in EnumDetai
             {
                 locations[i] = index;
                 var (_, metric) = names[i];
-                var tag1Count = metric.Tag1FullyQualifiedName is { } tag1Type && enumDictionary[tag1Type].AsArray() is { } tag1Values
-                                    ? tag1Values.Length
-                                    : 1;
 
-                var tag2Count = metric.Tag2FullyQualifiedName is { } tag2Type && enumDictionary[tag2Type].AsArray() is { } tag2Values
-                                    ? tag2Values.Length
-                                    : 1;
+                var entryCount = 1;
+                foreach (var tagType in metric.TagFullyQualifiedNames.AsArray() ?? [])
+                {
+                    if (enumDictionary[tagType].AsArray() is { } tagValues)
+                    {
+                        entryCount *= tagValues.Length;
+                    }
+                }
 
-                var entryCount = tag1Count * tag2Count;
                 entryCounts[i] = entryCount;
                 index += entryCount;
             }
@@ -224,8 +225,7 @@ private static void GenerateAggregateCollectors(in ImmutableArray<EnumDetails> e
             string? metricName = null;
             bool isCommon = true;
             string? nameSpace = null;
-            string? tag1FullyQualifiedName = null;
-            string? tag2FullyQualifiedName = null;
+            string[]? tagFullyQualifiedNames = null;
             foreach (var attribute in memberSymbol.GetAttributes())
             {
                 if (attribute.AttributeClass?.Name is "TelemetryMetricAttribute" or "TelemetryMetric"
@@ -245,24 +245,20 @@ private static void GenerateAggregateCollectors(in ImmutableArray<EnumDetails> e
                         nameSpace = args[2].Value?.ToString();
                     }
 
-                    var tagCount = attribute.AttributeClass.TypeParameters.Length;
-                    if (tagCount > 0)
-                    {
-                        var tag1TypeParameter = attribute.AttributeClass.TypeArguments[0];
-                        tag1FullyQualifiedName = tag1TypeParameter.ToString();
-                        if (!enumTypeDictionary.ContainsKey(tag1FullyQualifiedName))
-                        {
-                            enumTypeDictionary[tag1FullyQualifiedName] = GetTagValues(tag1TypeParameter, ref diagnostics);
-                        }
-                    }
-
-                    if (tagCount == 2)
+                    var typeArgCount = attribute.AttributeClass.TypeParameters.Length;
+                    if (typeArgCount > 0)
                     {
-                        var tag2TypeParameter = attribute.AttributeClass.TypeArguments[1];
-                        tag2FullyQualifiedName = tag2TypeParameter.ToString();
-                        if (!enumTypeDictionary.ContainsKey(tag2FullyQualifiedName))
+                        tagFullyQualifiedNames ??= new string[typeArgCount];
+                        for (var typeArg = 0; typeArg < typeArgCount; typeArg++)
                         {
-                            enumTypeDictionary[tag2FullyQualifiedName] = GetTagValues(tag2TypeParameter, ref diagnostics);
+                            var tagType = attribute.AttributeClass.TypeArguments[typeArg];
+                            var tagFullyQualifiedName = tagType.ToString();
+                            if (!enumTypeDictionary.ContainsKey(tagFullyQualifiedName))
+                            {
+                                enumTypeDictionary[tagFullyQualifiedName] = GetTagValues(tagType, ref diagnostics);
+                            }
+
+                            tagFullyQualifiedNames[typeArg] = tagFullyQualifiedName;
                         }
                     }
                 }
@@ -276,7 +272,8 @@ private static void GenerateAggregateCollectors(in ImmutableArray<EnumDetails> e
                 continue;
             }
 
-            members.Add((memberSymbol.Name, new MetricDetails(metricName!, isCommon, nameSpace, tag1FullyQualifiedName, tag2FullyQualifiedName)));
+            var tagNames = tagFullyQualifiedNames is not null ? new EquatableArray<string>(tagFullyQualifiedNames) : new();
+            members.Add((memberSymbol.Name, new MetricDetails(metricName!, isCommon, nameSpace, tagNames)));
             if (!uniqueValues.Add($"{metricName} {nameSpace ?? string.Empty} {(isCommon ? "true" : "false")}"))
             {
                 diagnostics ??= new List<DiagnosticInfo>();
@@ -388,16 +385,14 @@ internal readonly record struct MetricDetails
         public readonly string MetricName;
         public readonly bool IsCommon;
         public readonly string? NameSpace;
-        public readonly string? Tag1FullyQualifiedName;
-        public readonly string? Tag2FullyQualifiedName;
+        public readonly EquatableArray<string> TagFullyQualifiedNames;
 
-        public MetricDetails(string metricName, bool isCommon, string? nameSpace, string? tag1FullyQualifiedName, string? tag2FullyQualifiedName)
+        public MetricDetails(string metricName, bool isCommon, string? nameSpace, EquatableArray<string> tagFullyQualifiedNames)
         {
             MetricName = metricName;
             IsCommon = isCommon;
             NameSpace = nameSpace;
-            Tag1FullyQualifiedName = tag1FullyQualifiedName;
-            Tag2FullyQualifiedName = tag2FullyQualifiedName;
+            TagFullyQualifiedNames = tagFullyQualifiedNames;
         }
     }
 }
diff --git a/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/BeforeAfterAspectCodeFixProvider.cs b/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/BeforeAfterAspectCodeFixProvider.cs
index d0384990df58..b1197bbf4172 100644
--- a/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/BeforeAfterAspectCodeFixProvider.cs
+++ b/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/BeforeAfterAspectCodeFixProvider.cs
@@ -106,7 +106,7 @@ private async Task<Document> AddTryCatch(Document document, MethodDeclarationSyn
         // create the trystatementsyntax with the internals of the method declaration
         var catchDeclaration = SyntaxFactory.CatchDeclaration(SyntaxFactory.IdentifierName("Exception"), SyntaxFactory.Identifier("ex"));
         var logExpression = SyntaxFactory.ExpressionStatement(
-            SyntaxFactory.ParseExpression($$"""IastModule.Log.Error(ex, $"Error invoking {nameof({{typeName}})}.{nameof({{methodName}})}")"""));
+            SyntaxFactory.ParseExpression($$"""IastModule.LogAspectException(ex, $"{nameof({{typeName}})}.{nameof({{methodName}})}")"""));
         var returnStatement = paramName is not null
                                   ? SyntaxFactory.ReturnStatement(SyntaxFactory.IdentifierName(paramName))
                                   : SyntaxFactory.ReturnStatement();
diff --git a/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/ReplaceAspectCodeFixProvider.cs b/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/ReplaceAspectCodeFixProvider.cs
index ea5be4493f7c..d43a0a418329 100644
--- a/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/ReplaceAspectCodeFixProvider.cs
+++ b/tracer/src/Datadog.Trace.Tools.Analyzers/AspectAnalyzers/ReplaceAspectCodeFixProvider.cs
@@ -106,7 +106,7 @@ private async Task<Document> AddTryCatch(Document document, MethodDeclarationSyn
 
         var catchDeclaration = SyntaxFactory.CatchDeclaration(SyntaxFactory.IdentifierName("Exception"), SyntaxFactory.Identifier("ex"));
         var logExpression = SyntaxFactory.ExpressionStatement(
-            SyntaxFactory.ParseExpression($$"""IastModule.Log.Error(ex, $"Error invoking {nameof({{typeName}})}.{nameof({{methodName}})}")"""));
+            SyntaxFactory.ParseExpression($$"""IastModule.LogAspectException(ex, $"{nameof({{typeName}})}.{nameof({{methodName}})}")"""));
 
         var catchSyntax = SyntaxFactory.CatchClause()
                                        .WithDeclaration(catchDeclaration)
diff --git a/tracer/src/Datadog.Trace.Tools.Runner/ConfigureCiCommand.cs b/tracer/src/Datadog.Trace.Tools.Runner/ConfigureCiCommand.cs
index ffe32315a7c2..daf1d8c4191a 100644
--- a/tracer/src/Datadog.Trace.Tools.Runner/ConfigureCiCommand.cs
+++ b/tracer/src/Datadog.Trace.Tools.Runner/ConfigureCiCommand.cs
@@ -71,6 +71,8 @@ private async Task ExecuteAsync(InvocationContext context)
                 return;
             }
 
+            await initResults.UploadRepositoryChangesTask().ConfigureAwait(false);
+
             if (!TryExtractCiName(name, out var ciName))
             {
                 context.ExitCode = 1;
diff --git a/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj b/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj
index b7cf9b2d31d4..f43bc62b941b 100644
--- a/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj
+++ b/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <Title>Datadog APM Auto-instrumentation Runner</Title>
     <Copyright>Copyright 2020 Datadog, Inc.</Copyright>
     <Description>Auto-instrumentation dotnet global tool for Datadog APM</Description>
@@ -61,8 +61,8 @@
       </ItemGroup>
       <ItemGroup>
         <Content Include="..\Datadog.Trace.Bundle\home\**\*.*" LinkBase="home">
-          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-          <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
         </Content>
 
         <Content Update="..\Datadog.Trace.Bundle\home\**\readme.txt">
diff --git a/tracer/src/Datadog.Trace.Tools.dd_dotnet/CreatedumpCommand.cs b/tracer/src/Datadog.Trace.Tools.dd_dotnet/CreatedumpCommand.cs
index 1d0c5adc06d0..6298bd0930a1 100644
--- a/tracer/src/Datadog.Trace.Tools.dd_dotnet/CreatedumpCommand.cs
+++ b/tracer/src/Datadog.Trace.Tools.dd_dotnet/CreatedumpCommand.cs
@@ -586,14 +586,18 @@ private unsafe void GenerateCrashReport(int pid, int? signal, int? crashThread)
                 "System.InvalidProgramException",
                 "System.MissingFieldException",
                 "System.MissingMemberException",
-                "System.BadImageFormatException",
-                "System.TypeLoadException"
+                "System.BadImageFormatException"
             };
 
             if (exceptionType.StartsWith("Datadog", StringComparison.OrdinalIgnoreCase) || suspiciousExceptionTypes.Contains(exceptionType))
             {
                 isSuspicious = true;
             }
+            else if (exceptionType == "System.TypeLoadException")
+            {
+                isSuspicious = exception.Message?.Contains("datadog", StringComparison.OrdinalIgnoreCase) == true
+                    || exception.StackTrace.Any(f => f.Method != null && IsMethodSuspicious(f.Method));
+            }
         }
 
         if (!isSuspicious)
diff --git a/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj b/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj
index 30c430b15ddd..30cbde8016d0 100644
--- a/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj
+++ b/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <Title>Datadog APM Auto-instrumentation Launcher</Title>
     <Copyright>Copyright 2020 Datadog, Inc.</Copyright>
     <Description>Auto-instrumentation dotnet tool for Datadog APM</Description>
diff --git a/tracer/src/Datadog.Trace.Trimming/Datadog.Trace.Trimming.csproj b/tracer/src/Datadog.Trace.Trimming/Datadog.Trace.Trimming.csproj
index 9445c902aab1..7a3ec13aa4d2 100644
--- a/tracer/src/Datadog.Trace.Trimming/Datadog.Trace.Trimming.csproj
+++ b/tracer/src/Datadog.Trace.Trimming/Datadog.Trace.Trimming.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <!-- Unconditionally add a prerelease suffix to the package, but keep the rest of the name so we can associate it with the rest of the release -->
     <Version Condition="!$(Version.EndsWith('-prerelease'))">$(Version)-prerelease</Version>
   </PropertyGroup>
diff --git a/tracer/src/Datadog.Trace.Trimming/build/Datadog.Trace.Trimming.xml b/tracer/src/Datadog.Trace.Trimming/build/Datadog.Trace.Trimming.xml
index 6567951c659f..52dbf326a37d 100644
--- a/tracer/src/Datadog.Trace.Trimming/build/Datadog.Trace.Trimming.xml
+++ b/tracer/src/Datadog.Trace.Trimming/build/Datadog.Trace.Trimming.xml
@@ -223,6 +223,7 @@
       <type fullname="System.Diagnostics.DebuggerBrowsableState" />
       <type fullname="System.Diagnostics.DebuggerDisplayAttribute" />
       <type fullname="System.Diagnostics.DebuggerHiddenAttribute" />
+      <type fullname="System.Diagnostics.DebuggerNonUserCodeAttribute" />
       <type fullname="System.Diagnostics.DebuggerStepThroughAttribute" />
       <type fullname="System.Diagnostics.DebuggerTypeProxyAttribute" />
    </assembly>
@@ -246,6 +247,7 @@
       <type fullname="System.Diagnostics.SymbolStore.SymDocumentType" />
    </assembly>
    <assembly fullname="System.Diagnostics.Tools">
+      <type fullname="System.CodeDom.Compiler.GeneratedCodeAttribute" />
       <type fullname="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
    </assembly>
    <assembly fullname="System.Diagnostics.TraceSource">
@@ -494,6 +496,7 @@
       <type fullname="System.Buffers.SpanAction`2" />
       <type fullname="System.Byte" />
       <type fullname="System.Char" />
+      <type fullname="System.CodeDom.Compiler.GeneratedCodeAttribute" />
       <type fullname="System.Collections.ArrayList" />
       <type fullname="System.Collections.DictionaryEntry" />
       <type fullname="System.Collections.Generic.ICollection`1" />
@@ -538,6 +541,8 @@
       <type fullname="System.Diagnostics.CodeAnalysis.AllowNullAttribute" />
       <type fullname="System.Diagnostics.CodeAnalysis.DoesNotReturnAttribute" />
       <type fullname="System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute" />
+      <type fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" />
+      <type fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes" />
       <type fullname="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
       <type fullname="System.Diagnostics.CodeAnalysis.MaybeNullAttribute" />
       <type fullname="System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute" />
@@ -546,6 +551,8 @@
       <type fullname="System.Diagnostics.CodeAnalysis.NotNullAttribute" />
       <type fullname="System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute" />
       <type fullname="System.Diagnostics.CodeAnalysis.NotNullWhenAttribute" />
+      <type fullname="System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute" />
+      <type fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute" />
       <type fullname="System.Diagnostics.ConditionalAttribute" />
       <type fullname="System.Diagnostics.DebuggableAttribute" />
       <type fullname="System.Diagnostics.DebuggableAttribute/DebuggingModes" />
@@ -554,6 +561,7 @@
       <type fullname="System.Diagnostics.DebuggerBrowsableState" />
       <type fullname="System.Diagnostics.DebuggerDisplayAttribute" />
       <type fullname="System.Diagnostics.DebuggerHiddenAttribute" />
+      <type fullname="System.Diagnostics.DebuggerNonUserCodeAttribute" />
       <type fullname="System.Diagnostics.DebuggerStepThroughAttribute" />
       <type fullname="System.Diagnostics.DebuggerTypeProxyAttribute" />
       <type fullname="System.Diagnostics.StackTraceHiddenAttribute" />
@@ -719,6 +727,7 @@
       <type fullname="System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1" />
       <type fullname="System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder" />
       <type fullname="System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder`1" />
+      <type fullname="System.Runtime.CompilerServices.CallerArgumentExpressionAttribute" />
       <type fullname="System.Runtime.CompilerServices.CallerFilePathAttribute" />
       <type fullname="System.Runtime.CompilerServices.CallerLineNumberAttribute" />
       <type fullname="System.Runtime.CompilerServices.CompilationRelaxationsAttribute" />
@@ -970,7 +979,10 @@
    </assembly>
    <assembly fullname="System.Security.Cryptography.Primitives">
       <type fullname="System.Security.Cryptography.AsymmetricAlgorithm" />
+      <type fullname="System.Security.Cryptography.CryptoStream" />
+      <type fullname="System.Security.Cryptography.CryptoStreamMode" />
       <type fullname="System.Security.Cryptography.HashAlgorithm" />
+      <type fullname="System.Security.Cryptography.ICryptoTransform" />
    </assembly>
    <assembly fullname="System.Text.Encoding.Extensions">
       <type fullname="System.Text.UnicodeEncoding" />
diff --git a/tracer/src/Datadog.Trace/Activity/OtlpHelpers.cs b/tracer/src/Datadog.Trace/Activity/OtlpHelpers.cs
index 91ad56f5a3bf..816daca016ce 100644
--- a/tracer/src/Datadog.Trace/Activity/OtlpHelpers.cs
+++ b/tracer/src/Datadog.Trace/Activity/OtlpHelpers.cs
@@ -254,9 +254,7 @@ private static void ExtractActivityLinks<TInner>(Span span, IActivity5? activity
                 spanContext.LastParentId = traceState.LastParent;
                 spanContext.PropagatedTags = traceTags;
 
-                var extractedSpan = new Span(spanContext, DateTimeOffset.Now, new CommonTags());
-                var spanLink = span.AddSpanLink(extractedSpan);
-
+                List<KeyValuePair<string, string>> attributes = new();
                 if (duckLink.Tags is not null)
                 {
                     foreach (var kvp in duckLink.Tags)
@@ -271,18 +269,20 @@ private static void ExtractActivityLinks<TInner>(Span span, IActivity5? activity
                                 {
                                     if (item?.ToString() is { } value)
                                     {
-                                        spanLink.AddAttribute($"{kvp.Key}.{index}", value);
+                                        attributes.Add(new($"{kvp.Key}.{index}", value));
                                         index++;
                                     }
                                 }
                             }
                             else if (kvp.Value?.ToString() is { } kvpValue)
                             {
-                                spanLink.AddAttribute(kvp.Key, kvpValue);
+                                attributes.Add(new(kvp.Key, kvpValue));
                             }
                         }
                     }
                 }
+
+                span.AddLink(new SpanLink(spanContext, attributes));
             }
         }
 
diff --git a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Core.cs b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Core.cs
index 6026f1b84e2e..40ec7f1b4da9 100644
--- a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Core.cs
+++ b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Core.cs
@@ -26,10 +26,9 @@ private SecurityCoordinator(Security security, Span span, HttpTransport transpor
         _security = security;
         _localRootSpan = TryGetRoot(span);
         _httpTransport = transport;
+        Reporter = new SecurityReporter(_localRootSpan, transport, true);
     }
 
-    private static bool CanAccessHeaders => true;
-
     internal static SecurityCoordinator? TryGet(Security security, Span span)
     {
         var context = CoreHttpContextStore.Instance.Get();
@@ -59,27 +58,6 @@ private static void GetCookieKeyValueFromIndex(IRequestCookieCollection cookies,
         value = cookie.Value;
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    internal static void CollectHeaders(Span internalSpan)
-    {
-        if (AspNetCoreAvailabilityChecker.IsAspNetCoreAvailable())
-        {
-            CollectHeadersImpl(internalSpan);
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        static void CollectHeadersImpl(Span internalSpan)
-        {
-            var context = CoreHttpContextStore.Instance.Get();
-            internalSpan = TryGetRoot(internalSpan);
-            if (context is not null)
-            {
-                var headers = new HeadersCollectionAdapter(context.Request.Headers);
-                AddRequestHeaders(internalSpan, headers);
-            }
-        }
-    }
-
     internal void BlockAndReport(IResult? result)
     {
         if (result is not null)
@@ -89,7 +67,7 @@ internal void BlockAndReport(IResult? result)
                 throw new BlockException(result, result.RedirectInfo ?? result.BlockInfo!);
             }
 
-            TryReport(result, result.ShouldBlock);
+            Reporter.TryReport(result, result.ShouldBlock);
         }
     }
 
@@ -97,7 +75,7 @@ internal void ReportAndBlock(IResult? result)
     {
         if (result is not null)
         {
-            TryReport(result, result.ShouldBlock);
+            Reporter.TryReport(result, result.ShouldBlock);
 
             if (result.ShouldBlock)
             {
@@ -128,7 +106,13 @@ private Dictionary<string, object> GetBasicRequestArgsForWaf()
             }
         }
 
-        var addressesDictionary = new Dictionary<string, object> { { AddressesConstants.RequestMethod, request.Method }, { AddressesConstants.ResponseStatus, request.HttpContext.Response.StatusCode.ToString() }, { AddressesConstants.RequestUriRaw, request.GetUrlForWaf() }, { AddressesConstants.RequestClientIp, _localRootSpan.GetTag(Tags.HttpClientIp) } };
+        var addressesDictionary = new Dictionary<string, object>
+        {
+            { AddressesConstants.RequestMethod, request.Method },
+            { AddressesConstants.ResponseStatus, request.HttpContext.Response.StatusCode.ToString() },
+            { AddressesConstants.RequestUriRaw, request.GetUrlForWaf() },
+            { AddressesConstants.RequestClientIp, _localRootSpan.GetTag(Tags.HttpClientIp) }
+        };
 
         var userId = _localRootSpan.Context?.TraceContext?.Tags.GetTag(Tags.User.Id);
         if (!string.IsNullOrEmpty(userId))
diff --git a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Framework.cs b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Framework.cs
index 5e4d9a33f488..0cfedc68be93 100644
--- a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Framework.cs
+++ b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Framework.cs
@@ -27,33 +27,15 @@ internal readonly partial struct SecurityCoordinator
     private const string WebApiControllerHandlerTypeFullname = "System.Web.Http.WebHost.HttpControllerHandler";
     private static readonly Lazy<Action<IResult, HttpStatusCode, string>?> _throwHttpResponseRedirectException = new(CreateThrowHttpResponseExceptionDynMethForRedirect);
     private static readonly Lazy<Action<IResult, HttpStatusCode, string, string>?> _throwHttpResponseException = new(CreateThrowHttpResponseExceptionDynMeth);
-    private static readonly bool? UsingIntegratedPipeline;
-
-    static SecurityCoordinator()
-    {
-        if (UsingIntegratedPipeline == null)
-        {
-            try
-            {
-                UsingIntegratedPipeline = TryGetUsingIntegratedPipelineBool();
-            }
-            catch (Exception ex)
-            {
-                UsingIntegratedPipeline = false;
-                Log.Error(ex, "Unable to query the IIS pipeline. Request and response information may be limited.");
-            }
-        }
-    }
 
     private SecurityCoordinator(Security security, Span span, HttpTransport transport)
     {
         _security = security;
         _localRootSpan = TryGetRoot(span);
         _httpTransport = transport;
+        Reporter = new SecurityReporter(_localRootSpan, transport, true);
     }
 
-    private bool CanAccessHeaders => UsingIntegratedPipeline is true or null;
-
     internal static SecurityCoordinator? TryGet(Security security, Span span)
     {
         if (HttpContext.Current is not { } current)
@@ -283,16 +265,16 @@ private SecurityCoordinator(Security security, Span span, HttpTransport transpor
     /// <summary>
     /// Framework can do it all at once, but framework only unfortunately
     /// </summary>
-    internal void BlockAndReport(Dictionary<string, object> args, bool lastWafCall = false)
+    internal void BlockAndReport(Dictionary<string, object> args, bool lastWafCall = false, bool isInHttpTracingModule = false)
     {
         var result = RunWaf(args, lastWafCall);
         if (result is not null)
         {
-            var reporting = MakeReportingFunction(result);
+            var reporting = Reporter.MakeReportingFunction(result);
 
             if (result.ShouldBlock)
             {
-                ChooseBlockingMethodAndBlock(result, reporting, result.BlockInfo, result.RedirectInfo);
+                ChooseBlockingMethodAndBlock(result, reporting, result.BlockInfo, result.RedirectInfo, isInHttpTracingModule);
             }
 
             // here we assume if we haven't blocked we'll have collected the correct status elsewhere
@@ -304,7 +286,7 @@ internal void ReportAndBlock(IResult? result)
     {
         if (result is not null)
         {
-            var reporting = MakeReportingFunction(result);
+            var reporting = Reporter.MakeReportingFunction(result);
             reporting(null, result.ShouldBlock);
 
             if (result.ShouldBlock)
@@ -323,26 +305,12 @@ internal void ReportAndBlock(IResult? result)
         }
     }
 
-    private Action<int?, bool> MakeReportingFunction(IResult result)
-    {
-        var securityCoordinator = this;
-        return (status, blocked) =>
-        {
-            if (result.ShouldBlock)
-            {
-                securityCoordinator._httpTransport.MarkBlocked();
-            }
-
-            securityCoordinator.TryReport(result, blocked, status);
-        };
-    }
-
-    private void ChooseBlockingMethodAndBlock(IResult result, Action<int?, bool> reporting, Dictionary<string, object?>? blockInfo, Dictionary<string, object?>? redirectInfo)
+    private void ChooseBlockingMethodAndBlock(IResult result, Action<int?, bool> reporting, Dictionary<string, object?>? blockInfo, Dictionary<string, object?>? redirectInfo, bool inTracingHttpModule = false)
     {
         var headers = RequestDataHelper.GetHeaders(_httpTransport.Context.Request) ?? new NameValueCollection();
         var blockingAction = _security.GetBlockingAction([headers["Accept"]], blockInfo, redirectInfo);
         var isWebApiRequest = _httpTransport.Context.CurrentHandler?.GetType().FullName == WebApiControllerHandlerTypeFullname;
-        if (isWebApiRequest)
+        if (isWebApiRequest && !inTracingHttpModule)
         {
             if (!blockingAction.IsRedirect && _throwHttpResponseException.Value is { } throwException)
             {
@@ -371,7 +339,7 @@ private void WriteAndEndResponse(BlockingAction blockingAction)
         httpResponse.Cookies.Clear();
 
         // cant clear headers, on some iis version we get a platform not supported exception
-        if (CanAccessHeaders)
+        if (Reporter.CanAccessHeaders)
         {
             var keys = httpResponse.Headers.Keys.Cast<string>().ToList();
             foreach (var key in keys)
@@ -400,8 +368,8 @@ private void WriteAndEndResponse(BlockingAction blockingAction)
     public Dictionary<string, object> GetBasicRequestArgsForWaf()
     {
         var request = _httpTransport.Context.Request;
-        var headers = RequestDataHelper.GetHeaders(request);
-        var headersDic = ExtractHeadersFromRequest(request.Headers);
+        var headers = request.Headers;
+        var headersDic = ExtractHeaders(headers.AllKeys, key => GetHeaderValueForWaf(headers, key));
         var cookiesDic = ExtractCookiesFromRequest(request);
 
         var queryString = RequestDataHelper.GetQueryString(request);
@@ -473,8 +441,6 @@ public Dictionary<string, object> GetBasicRequestArgsForWaf()
         return dict;
     }
 
-    internal static Dictionary<string, object> ExtractHeadersFromRequest(NameValueCollection headers) => ExtractHeaders(headers.AllKeys, key => GetHeaderValueForWaf(headers, key));
-
     private static object GetHeaderAsArray(string[] value) => value.Length == 1 ? value[0] : value;
 
     private static object GetHeaderValueForWaf(NameValueCollection headers, string currentKey) => GetHeaderAsArray(RequestDataHelper.GetNameValueCollectionValues(headers, currentKey) ?? []);
@@ -511,18 +477,7 @@ public Dictionary<string, object> GetResponseHeadersForWaf()
         return headersDic;
     }
 
-    internal static void CollectHeaders(Span internalSpan)
-    {
-        var context = HttpContext.Current;
-
-        if (context != null)
-        {
-            var headers = new NameValueHeadersCollection(context.Request.Headers);
-            AddRequestHeaders(internalSpan, headers);
-        }
-    }
-
-    internal class HttpTransport : HttpTransportBase
+    internal class HttpTransport(HttpContext context) : HttpTransportBase
     {
         private const string WafKey = "waf";
 
@@ -530,16 +485,11 @@ internal class HttpTransport : HttpTransportBase
 
         private static bool _canReadHttpResponseHeaders = true;
 
-        public HttpTransport(HttpContext context)
-        {
-            Context = context;
-        }
-
         internal override bool IsBlocked => Context.Items[BlockingAction.BlockDefaultActionName] is true;
 
         internal override int StatusCode => Context.Response.StatusCode;
 
-        public override HttpContext Context { get; }
+        public override HttpContext Context { get; } = context;
 
         internal override IDictionary<string, object>? RouteData => Context.Request.RequestContext.RouteData?.Values;
 
diff --git a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.cs b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.cs
index 1ccf8ab4a152..84cb2b3c8cc7 100644
--- a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.cs
+++ b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.cs
@@ -7,17 +7,12 @@
 #pragma warning disable CS0282
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Datadog.Trace.AppSec.Waf;
 using Datadog.Trace.Logging;
-using Datadog.Trace.Telemetry;
-using Datadog.Trace.Telemetry.Metrics;
 using Datadog.Trace.Util;
-using Datadog.Trace.Vendors.Serilog.Events;
 #if !NETFRAMEWORK
 using Microsoft.AspNetCore.Http;
 #else
-using System.Collections.Specialized;
 using System.Web;
 #endif
 
@@ -36,32 +31,9 @@ internal readonly partial struct SecurityCoordinator
 
     public bool IsBlocked => _httpTransport.IsBlocked;
 
-    public void MarkBlocked() => _httpTransport.MarkBlocked();
+    public SecurityReporter Reporter { get; }
 
-    private static void LogMatchesIfDebugEnabled(IReadOnlyCollection<object>? results, bool blocked)
-    {
-        if (Log.IsEnabled(LogEventLevel.Debug) && results != null)
-        {
-            foreach (var result in results)
-            {
-                if (result is Dictionary<string, object?> match)
-                {
-                    if (blocked)
-                    {
-                        Log.Debug("DDAS-0012-02: Blocking current transaction (rule: {RuleId})", match["rule"]);
-                    }
-                    else
-                    {
-                        Log.Debug("DDAS-0012-01: Detecting an attack from rule {RuleId}", match["rule"]);
-                    }
-                }
-                else
-                {
-                    Log.Debug("{Result} not of expected type", result);
-                }
-            }
-        }
-    }
+    public void MarkBlocked() => _httpTransport.MarkBlocked();
 
     public IResult? Scan(bool lastTime = false)
     {
@@ -73,7 +45,7 @@ private static void LogMatchesIfDebugEnabled(IReadOnlyCollection<object>? result
 
     public IResult? RunWaf(Dictionary<string, object> args, bool lastWafCall = false, bool runWithEphemeral = false, bool isRasp = false)
     {
-        LogAddressIfDebugEnabled(args);
+        SecurityReporter.LogAddressIfDebugEnabled(args);
         IResult? result = null;
         try
         {
@@ -108,7 +80,7 @@ private static void LogMatchesIfDebugEnabled(IReadOnlyCollection<object>? result
                     result = additiveContext.Run(args, _security.Settings.WafTimeoutMicroSeconds);
                 }
 
-                RecordTelemetry(result);
+                SecurityReporter.RecordTelemetry(result);
             }
         }
         catch (Exception ex) when (ex is not BlockException)
@@ -130,46 +102,13 @@ private static void LogMatchesIfDebugEnabled(IReadOnlyCollection<object>? result
         return result;
     }
 
-    private static void RecordTelemetry(IResult? result)
-    {
-        if (result == null)
-        {
-            return;
-        }
-
-        if (result.Timeout)
-        {
-            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.WafTimeout);
-        }
-        else if (result.ShouldBlock)
-        {
-            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.RuleTriggeredAndBlocked);
-        }
-        else if (result.ShouldReportSecurityResult)
-        {
-            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.RuleTriggered);
-        }
-        else
-        {
-            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.Normal);
-        }
-    }
-
-    public void AddResponseHeadersToSpanAndCleanup()
-    {
-        if (_localRootSpan.IsAppsecEvent())
-        {
-            AddResponseHeaderTags(CanAccessHeaders);
-        }
-
-        _httpTransport.DisposeAdditiveContext();
-    }
+    internal static Span TryGetRoot(Span span) => span.Context.TraceContext?.RootSpan ?? span;
 
     internal static Dictionary<string, object>? ExtractCookiesFromRequest(HttpRequest request)
     {
         var cookies = RequestDataHelper.GetCookies(request);
 
-        if (cookies is not null && cookies.Count is > 0)
+        if (cookies is { Count: > 0 })
         {
             var cookiesCount = cookies.Count;
             var cookiesDic = new Dictionary<string, object>(cookiesCount);
@@ -234,6 +173,4 @@ private static Dictionary<string, object> ExtractHeaders(ICollection<string> key
 
         return headersDic;
     }
-
-    private static Span TryGetRoot(Span span) => span.Context.TraceContext?.RootSpan ?? span;
 }
diff --git a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.Core.cs b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.Core.cs
new file mode 100644
index 000000000000..01ed24be886d
--- /dev/null
+++ b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.Core.cs
@@ -0,0 +1,47 @@
+// <copyright file="SecurityReporter.Core.cs" company="Datadog">
+// 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.
+// </copyright>
+
+#nullable enable
+#if !NETFRAMEWORK
+using System.Runtime.CompilerServices;
+using Datadog.Trace.Headers;
+
+namespace Datadog.Trace.AppSec.Coordinator;
+
+internal partial class SecurityReporter
+{
+    private bool CanAccessHeaders => true;
+
+    /// <summary>
+    /// Outside of a web context this can't work and there are no web assemblies to load so without the no inlining, this would cause a load assembly exception
+    /// </summary>
+    /// <param name="span">the span to report on</param>
+    /// <param name="searchRootSpan">should we fetch the root span for you</param>
+    internal static void SafeCollectHeaders(Span span, bool searchRootSpan = true)
+    {
+        if (AspNetCoreAvailabilityChecker.IsAspNetCoreAvailable())
+        {
+            CollectHeadersSafe(searchRootSpan);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        void CollectHeadersSafe(bool searchRootSpanImpl)
+        {
+            var context = CoreHttpContextStore.Instance.Get();
+            if (context is not null)
+            {
+                var securityReporter = new SecurityReporter(span, new SecurityCoordinator.HttpTransport(context), !searchRootSpanImpl);
+                securityReporter.CollectHeaders();
+            }
+        }
+    }
+
+    internal void CollectHeaders()
+    {
+        var headers = new HeadersCollectionAdapter(_httpTransport.Context.Request.Headers);
+        AddRequestHeaders(headers);
+    }
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.Framework.cs b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.Framework.cs
new file mode 100644
index 000000000000..52f8d9ef03f4
--- /dev/null
+++ b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.Framework.cs
@@ -0,0 +1,72 @@
+// <copyright file="SecurityReporter.Framework.cs" company="Datadog">
+// 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.
+// </copyright>
+
+#nullable enable
+#if NETFRAMEWORK
+using System;
+using System.Runtime.CompilerServices;
+using System.Web;
+using Datadog.Trace.AppSec.Waf;
+using Datadog.Trace.Headers;
+using Datadog.Trace.Vendors.Serilog;
+
+namespace Datadog.Trace.AppSec.Coordinator;
+
+internal partial class SecurityReporter
+{
+    private static readonly bool? UsingIntegratedPipeline;
+
+    static SecurityReporter()
+    {
+        if (UsingIntegratedPipeline == null)
+        {
+            try
+            {
+                UsingIntegratedPipeline = TryGetUsingIntegratedPipelineBool();
+            }
+            catch (Exception ex)
+            {
+                UsingIntegratedPipeline = false;
+                Log.Error(ex, "Unable to query the IIS pipeline. Request and response information may be limited.");
+            }
+        }
+    }
+
+    internal bool CanAccessHeaders => UsingIntegratedPipeline is true or null;
+
+    /// <summary>
+    /// ! This method should be called from within a try-catch block !
+    /// If the application is running in partial trust, then trying to call this method will result in
+    /// a SecurityException to be thrown at the method CALLSITE, not inside the <c>TryGetUsingIntegratedPipelineBool(..)</c> method itself.
+    /// </summary>
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static bool TryGetUsingIntegratedPipelineBool() => HttpRuntime.UsingIntegratedPipeline;
+
+    internal static void SafeCollectHeaders(Span internalSpan, bool isRoot)
+    {
+        var context = HttpContext.Current;
+        var securityReporter = new SecurityReporter(internalSpan, new SecurityCoordinator.HttpTransport(context), isRoot);
+        if (context != null)
+        {
+            var headers = new NameValueHeadersCollection(context.Request.Headers);
+            securityReporter.AddRequestHeaders(headers);
+        }
+    }
+
+    internal Action<int?, bool> MakeReportingFunction(IResult result)
+    {
+        var httpTransport = _httpTransport;
+        return (status, blocked) =>
+        {
+            if (result.ShouldBlock)
+            {
+                httpTransport.MarkBlocked();
+            }
+
+            TryReport(result, blocked, status);
+        };
+    }
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Reporter.cs b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.cs
similarity index 56%
rename from tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Reporter.cs
rename to tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.cs
index a3f210c80da8..647f7d27f7c8 100644
--- a/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityCoordinator.Reporter.cs
+++ b/tracer/src/Datadog.Trace/AppSec/Coordinator/SecurityReporter.cs
@@ -1,9 +1,10 @@
-// <copyright file="SecurityCoordinator.Reporter.cs" company="Datadog">
+// <copyright file="SecurityReporter.cs" company="Datadog">
 // 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.
 // </copyright>
 
 #nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -11,16 +12,19 @@
 using System.IO.Compression;
 using Datadog.Trace.AppSec.AttackerFingerprint;
 using Datadog.Trace.AppSec.Waf;
-using Datadog.Trace.ExtensionMethods;
+using Datadog.Trace.AppSec.Waf.ReturnTypes.Managed;
 using Datadog.Trace.Headers;
 using Datadog.Trace.Propagators;
 using Datadog.Trace.Sampling;
+using Datadog.Trace.Telemetry;
+using Datadog.Trace.Telemetry.Metrics;
 using Datadog.Trace.Vendors.Newtonsoft.Json;
+using Datadog.Trace.Vendors.Serilog;
 using Datadog.Trace.Vendors.Serilog.Events;
 
 namespace Datadog.Trace.AppSec.Coordinator;
 
-internal readonly partial struct SecurityCoordinator
+internal partial class SecurityReporter
 {
     private const int MaxApiSecurityTagValueLength = 25000;
 
@@ -62,18 +66,16 @@ internal readonly partial struct SecurityCoordinator
     };
 
     private static readonly Dictionary<string, string?> ResponseHeaders = new() { { "content-length", string.Empty }, { "content-type", string.Empty }, { "Content-Encoding", string.Empty }, { "Content-Language", string.Empty } };
+    private readonly HttpTransportBase _httpTransport;
+    private readonly Span _span;
 
-    private static void AddRequestHeaders(Span span, IHeadersCollection headers)
-    {
-        AddHeaderTags(span, headers, RequestHeaders, SpanContextPropagator.HttpRequestHeadersTagPrefix);
-    }
-
-    private static void AddHeaderTags(Span span, IHeadersCollection headers, Dictionary<string, string?> headersToCollect, string prefix)
+    internal SecurityReporter(Span span, HttpTransportBase httpTransport, bool isRoot = false)
     {
-        SpanContextPropagator.Instance.AddHeadersToSpanAsTags(span, headers, headersToCollect, defaultTagPrefix: prefix);
+        _span = isRoot ? span : SecurityCoordinator.TryGetRoot(span);
+        _httpTransport = httpTransport;
     }
 
-    private static void LogAddressIfDebugEnabled(IDictionary<string, object> args)
+    internal static void LogAddressIfDebugEnabled(IDictionary<string, object> args)
     {
         if (Log.IsEnabled(LogEventLevel.Debug))
         {
@@ -84,21 +86,84 @@ private static void LogAddressIfDebugEnabled(IDictionary<string, object> args)
         }
     }
 
-    internal static void ReportWafInitInfoOnce(Security security, Span span)
+    internal void AddRequestHeaders(IHeadersCollection headers) => AddHeaderTags(_span, headers, RequestHeaders, SpanContextPropagator.HttpRequestHeadersTagPrefix);
+
+    internal void AddResponseHeadersToSpanAndCleanup()
+    {
+        if (_span.IsAppsecEvent())
+        {
+            AddResponseHeaderTags();
+        }
+
+        _httpTransport.DisposeAdditiveContext();
+    }
+
+    private static void AddHeaderTags(Span span, IHeadersCollection headers, Dictionary<string, string?> headersToCollect, string prefix) => Tracer.Instance.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(span, headers, headersToCollect, defaultTagPrefix: prefix);
+
+    private static void LogMatchesIfDebugEnabled(IReadOnlyCollection<object>? results, bool blocked)
+    {
+        if (Log.IsEnabled(LogEventLevel.Debug) && results != null)
+        {
+            foreach (var result in results)
+            {
+                if (result is Dictionary<string, object?> match)
+                {
+                    if (blocked)
+                    {
+                        Log.Debug("DDAS-0012-02: Blocking current transaction (rule: {RuleId})", match["rule"]);
+                    }
+                    else
+                    {
+                        Log.Debug("DDAS-0012-01: Detecting an attack from rule {RuleId}", match["rule"]);
+                    }
+                }
+                else
+                {
+                    Log.Debug("{Result} not of expected type", result);
+                }
+            }
+        }
+    }
+
+    internal static void RecordTelemetry(IResult? result)
+    {
+        if (result is null)
+        {
+            return;
+        }
+
+        if (result.Timeout)
+        {
+            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.WafTimeout);
+        }
+        else if (result.ShouldBlock)
+        {
+            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.RuleTriggeredAndBlocked);
+        }
+        else if (result.ShouldReportSecurityResult)
+        {
+            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.RuleTriggered);
+        }
+        else
+        {
+            TelemetryFactory.Metrics.RecordCountWafRequests(MetricTags.WafAnalysis.Normal);
+        }
+    }
+
+    internal void ReportWafInitInfoOnce(InitResult? initResult)
     {
-        if (security.WafInitResult is { Reported: false })
+        if (initResult is { Reported: false })
         {
-            span = TryGetRoot(span);
-            security.WafInitResult.Reported = true;
-            span.Context.TraceContext?.SetSamplingPriority(SamplingPriorityValues.UserKeep, SamplingMechanism.Asm);
-            span.SetMetric(Metrics.AppSecWafInitRulesLoaded, security.WafInitResult.LoadedRules);
-            span.SetMetric(Metrics.AppSecWafInitRulesErrorCount, security.WafInitResult.FailedToLoadRules);
-            if (security.WafInitResult.HasErrors && !Security.HasOnlyUnknownMatcherErrors(security.WafInitResult.Errors))
+            initResult.Reported = true;
+            _span.Context.TraceContext?.SetSamplingPriority(SamplingPriorityValues.UserKeep, SamplingMechanism.Asm);
+            _span.SetMetric(Metrics.AppSecWafInitRulesLoaded, initResult.LoadedRules);
+            _span.SetMetric(Metrics.AppSecWafInitRulesErrorCount, initResult.FailedToLoadRules);
+            if (initResult.HasErrors && !Security.HasOnlyUnknownMatcherErrors(initResult.Errors))
             {
-                span.SetTag(Tags.AppSecWafInitRuleErrors, security.WafInitResult.ErrorMessage);
+                _span.SetTag(Tags.AppSecWafInitRuleErrors, initResult.ErrorMessage);
             }
 
-            span.SetTag(Tags.AppSecWafVersion, security.DdlibWafVersion);
+            _span.SetTag(Tags.AppSecWafVersion, initResult.Waf?.Version);
         }
     }
 
@@ -115,54 +180,55 @@ internal void TryReport(IResult result, bool blocked, int? status = null)
         if (!_httpTransport.ReportedExternalWafsRequestHeaders)
         {
             headers = _httpTransport.GetRequestHeaders();
-            AddHeaderTags(_localRootSpan, headers, ExternalWafsRequestHeaders, SpanContextPropagator.HttpRequestHeadersTagPrefix);
+            AddHeaderTags(_span, headers, ExternalWafsRequestHeaders, SpanContextPropagator.HttpRequestHeadersTagPrefix);
             _httpTransport.ReportedExternalWafsRequestHeaders = true;
         }
 
-        AttackerFingerprintHelper.AddSpanTags(_localRootSpan, result);
+        AttackerFingerprintHelper.AddSpanTags(_span, result);
 
         if (result.ShouldReportSecurityResult)
         {
-            _localRootSpan.SetTag(Tags.AppSecEvent, "true");
+            _span.SetTag(Tags.AppSecEvent, "true");
             if (blocked)
             {
-                _localRootSpan.SetTag(Tags.AppSecBlocked, "true");
+                _span.SetTag(Tags.AppSecBlocked, "true");
             }
 
-            _security.SetTraceSamplingPriority(_localRootSpan);
+            var security = Security.Instance;
+            security.SetTraceSamplingPriority(_span);
 
             LogMatchesIfDebugEnabled(result.Data, blocked);
 
-            var traceContext = _localRootSpan.Context.TraceContext;
+            var traceContext = _span.Context.TraceContext;
             if (result.Data != null)
             {
                 traceContext.AppSecRequestContext.AddWafSecurityEvents(result.Data);
             }
 
-            var clientIp = _localRootSpan.GetTag(Tags.HttpClientIp);
+            var clientIp = _span.GetTag(Tags.HttpClientIp);
             if (!string.IsNullOrEmpty(clientIp))
             {
-                _localRootSpan.SetTag(Tags.ActorIp, clientIp);
+                _span.SetTag(Tags.ActorIp, clientIp);
             }
 
             if (traceContext is { Origin: null })
             {
-                _localRootSpan.SetTag(Tags.Origin, "appsec");
+                _span.SetTag(Tags.Origin, "appsec");
                 traceContext.Origin = "appsec";
             }
 
-            _localRootSpan.SetMetric(Metrics.AppSecWafDuration, result.AggregatedTotalRuntime);
-            _localRootSpan.SetMetric(Metrics.AppSecWafAndBindingsDuration, result.AggregatedTotalRuntimeWithBindings);
+            _span.SetMetric(Metrics.AppSecWafDuration, result.AggregatedTotalRuntime);
+            _span.SetMetric(Metrics.AppSecWafAndBindingsDuration, result.AggregatedTotalRuntimeWithBindings);
             headers ??= _httpTransport.GetRequestHeaders();
-            AddHeaderTags(_localRootSpan, headers, RequestHeaders, SpanContextPropagator.HttpRequestHeadersTagPrefix);
+            AddHeaderTags(_span, headers, RequestHeaders, SpanContextPropagator.HttpRequestHeadersTagPrefix);
 
             if (status is not null)
             {
-                _localRootSpan.SetHttpStatusCode(status.Value, isServer: true, Tracer.Instance.Settings);
+                _span.SetHttpStatusCode(status.Value, isServer: true, Tracer.Instance.Settings);
             }
         }
 
-        AddRaspSpanMetrics(result, _localRootSpan);
+        AddRaspSpanMetrics(result, _span);
 
         if (result.ExtractSchemaDerivatives?.Count > 0)
         {
@@ -181,7 +247,7 @@ internal void TryReport(IResult result, bool blocked, int? status = null)
                     if (memoryStream.TryGetBuffer(out var bytesResult))
                     {
                         var gzipBase64 = Convert.ToBase64String(bytesResult.Array!, bytesResult.Offset, bytesResult.Count);
-                        _localRootSpan.SetTag(derivative.Key, gzipBase64);
+                        _span.SetTag(derivative.Key, gzipBase64);
                     }
                     else
                     {
@@ -202,19 +268,19 @@ private void AddRaspSpanMetrics(IResult result, Span localRootSpan)
         }
     }
 
-    private void AddResponseHeaderTags(bool canAccessHeaders)
+    internal void AddResponseHeaderTags()
     {
         TryAddEndPoint();
-        var headers = canAccessHeaders ? _httpTransport.GetResponseHeaders() : new NameValueHeadersCollection(new NameValueCollection());
-        AddHeaderTags(_localRootSpan, headers, ResponseHeaders, SpanContextPropagator.HttpResponseHeadersTagPrefix);
+        var headers = CanAccessHeaders ? _httpTransport.GetResponseHeaders() : new NameValueHeadersCollection(new NameValueCollection());
+        AddHeaderTags(_span, headers, ResponseHeaders, SpanContextPropagator.HttpResponseHeadersTagPrefix);
     }
 
     private void TryAddEndPoint()
     {
-        var route = _localRootSpan.GetTag(Tags.AspNetCoreRoute) ?? _localRootSpan.GetTag(Tags.AspNetRoute);
+        var route = _span.GetTag(Tags.AspNetCoreRoute) ?? _span.GetTag(Tags.AspNetRoute);
         if (route != null)
         {
-            _localRootSpan.SetTag(Tags.HttpEndpoint, route);
+            _span.SetTag(Tags.HttpEndpoint, route);
         }
     }
 }
diff --git a/tracer/src/Datadog.Trace/AppSec/EventTrackingSdk.cs b/tracer/src/Datadog.Trace/AppSec/EventTrackingSdk.cs
index bb223ecdc66f..a72733e2718c 100644
--- a/tracer/src/Datadog.Trace/AppSec/EventTrackingSdk.cs
+++ b/tracer/src/Datadog.Trace/AppSec/EventTrackingSdk.cs
@@ -67,17 +67,18 @@ internal static void TrackUserLoginSuccessEvent(string userId, IDictionary<strin
             }
         }
 
-        if (internalSpan is not null)
-        {
-            FillUp(internalSpan);
-        }
+        FillUp(internalSpan);
     }
 
     private static void FillUp(Span span)
     {
-        span = span.Context.TraceContext?.RootSpan ?? span;
+        if (span is null)
+        {
+            return;
+        }
+
         Security.Instance.SetTraceSamplingPriority(span);
-        SecurityCoordinator.CollectHeaders(span);
+        SecurityReporter.SafeCollectHeaders(span, true);
     }
 
     /// <summary>
@@ -134,10 +135,7 @@ internal static void TrackUserLoginFailureEvent(string userId, bool exists, IDic
             }
         }
 
-        if (spanInternal is not null)
-        {
-            FillUp(spanInternal);
-        }
+        FillUp(spanInternal);
     }
 
     /// <summary>
diff --git a/tracer/src/Datadog.Trace/AppSec/Waf/NativeBindings/WafLibraryInvoker.cs b/tracer/src/Datadog.Trace/AppSec/Waf/NativeBindings/WafLibraryInvoker.cs
index 532f26d30e21..432d1e9fd071 100644
--- a/tracer/src/Datadog.Trace/AppSec/Waf/NativeBindings/WafLibraryInvoker.cs
+++ b/tracer/src/Datadog.Trace/AppSec/Waf/NativeBindings/WafLibraryInvoker.cs
@@ -243,37 +243,24 @@ internal void SetupLogging(bool wafDebugEnabled)
 
         internal string[] GetKnownAddresses(IntPtr wafHandle)
         {
-            try
-            {
-                if (!IsKnowAddressesSuported())
-                {
-                    return Array.Empty<string>();
-                }
-
-                uint size = 0;
-                var result = _getKnownAddresses(wafHandle, ref size);
+            uint size = 0;
+            var result = _getKnownAddresses(wafHandle, ref size);
 
-                if (size == 0)
-                {
-                    return Array.Empty<string>();
-                }
-
-                string[] knownAddresses = new string[size];
+            if (size == 0)
+            {
+                return Array.Empty<string>();
+            }
 
-                for (uint i = 0; i < size; i++)
-                {
-                    // Calculate the pointer to each string
-                    var stringPtr = Marshal.ReadIntPtr(result, (int)i * IntPtr.Size);
-                    knownAddresses[i] = Marshal.PtrToStringAnsi(stringPtr);
-                }
+            string[] knownAddresses = new string[size];
 
-                return knownAddresses;
-            }
-            catch (Exception ex)
+            for (uint i = 0; i < size; i++)
             {
-                Log.Error(ex, "Error while getting known addresses");
-                return Array.Empty<string>();
+                // Calculate the pointer to each string
+                var stringPtr = Marshal.ReadIntPtr(result, (int)i * IntPtr.Size);
+                knownAddresses[i] = Marshal.PtrToStringAnsi(stringPtr);
             }
+
+            return knownAddresses;
         }
 
         internal bool IsKnowAddressesSuported(string libVersion = null)
diff --git a/tracer/src/Datadog.Trace/AppSec/Waf/Waf.cs b/tracer/src/Datadog.Trace/AppSec/Waf/Waf.cs
index cae8ecb0bc67..17921e6de850 100644
--- a/tracer/src/Datadog.Trace/AppSec/Waf/Waf.cs
+++ b/tracer/src/Datadog.Trace/AppSec/Waf/Waf.cs
@@ -113,7 +113,33 @@ public bool IsKnowAddressesSuported()
 
         public string[] GetKnownAddresses()
         {
-            return _wafLibraryInvoker.GetKnownAddresses(_wafHandle);
+            bool lockAcquired = false;
+            try
+            {
+                if (_wafLocker.EnterWriteLock())
+                {
+                    lockAcquired = true;
+
+                    var result = _wafLibraryInvoker.GetKnownAddresses(_wafHandle);
+                    return result;
+                }
+                else
+                {
+                    return Array.Empty<string>();
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Error while getting known addresses");
+                return Array.Empty<string>();
+            }
+            finally
+            {
+                if (lockAcquired)
+                {
+                    _wafLocker.ExitWriteLock();
+                }
+            }
         }
 
         private unsafe UpdateResult UpdateWafAndDispose(IEncodeResult updateData)
diff --git a/tracer/src/Datadog.Trace/AspNet/TracingHttpModule.cs b/tracer/src/Datadog.Trace/AspNet/TracingHttpModule.cs
index df4f96fd4b6b..f1123066c582 100644
--- a/tracer/src/Datadog.Trace/AspNet/TracingHttpModule.cs
+++ b/tracer/src/Datadog.Trace/AspNet/TracingHttpModule.cs
@@ -140,7 +140,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                     {
                         // extract propagated http headers
                         headers = requestHeaders.Wrap();
-                        extractedContext = SpanContextPropagator.Instance.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
+                        extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
                     }
                     catch (Exception ex)
                     {
@@ -158,7 +158,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 scope.Span.DecorateWebServerSpan(resourceName: null, httpMethod, host, url, userAgent, tags);
                 if (headers is not null)
                 {
-                    SpanContextPropagator.Instance.AddHeadersToSpanAsTags(scope.Span, headers.Value, tracer.Settings.HeaderTags, defaultTagPrefix: SpanContextPropagator.HttpRequestHeadersTagPrefix);
+                    tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(scope.Span, headers.Value, tracer.Settings.HeaderTags, defaultTagPrefix: SpanContextPropagator.HttpRequestHeadersTagPrefix);
                 }
 
                 if (tracer.Settings.IpHeaderEnabled || Security.Instance.AppsecEnabled)
@@ -174,7 +174,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 if (HttpRuntime.UsingIntegratedPipeline)
                 {
                     var injectedContext = new PropagationContext(scope.Span.Context, Baggage.Current);
-                    SpanContextPropagator.Instance.Inject(injectedContext, requestHeaders.Wrap());
+                    tracer.TracerManager.SpanContextPropagator.Inject(injectedContext, requestHeaders.Wrap());
                 }
 
                 httpContext.Items[_httpContextScopeKey] = scope;
@@ -185,8 +185,8 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                 var security = Security.Instance;
                 if (security.AppsecEnabled)
                 {
-                    SecurityCoordinator.ReportWafInitInfoOnce(security, scope.Span);
                     var securityCoordinator = SecurityCoordinator.Get(security, scope.Span, httpContext);
+                    securityCoordinator.Reporter.ReportWafInitInfoOnce(security.WafInitResult);
 
                     // request args
                     var args = securityCoordinator.GetBasicRequestArgsForWaf();
@@ -201,7 +201,7 @@ private void OnBeginRequest(object sender, EventArgs eventArgs)
                         }
                     }
 
-                    securityCoordinator.BlockAndReport(args);
+                    securityCoordinator.BlockAndReport(args, isInHttpTracingModule: true);
                 }
 
                 var iastInstance = Iast.Iast.Instance;
@@ -273,9 +273,9 @@ private void OnEndRequest(object sender, EventArgs eventArgs)
                                 }
                             }
 
-                            securityCoordinator.BlockAndReport(args, true);
+                            securityCoordinator.BlockAndReport(args, true, isInHttpTracingModule: true);
 
-                            securityCoordinator.AddResponseHeadersToSpanAndCleanup();
+                            securityCoordinator.Reporter.AddResponseHeadersToSpanAndCleanup();
                             securityContextCleaned = true;
                         }
 
diff --git a/tracer/src/Datadog.Trace/Ci/CITracerManagerFactory.cs b/tracer/src/Datadog.Trace/Ci/CITracerManagerFactory.cs
index f9de8e04c31c..9f7e654dc012 100644
--- a/tracer/src/Datadog.Trace/Ci/CITracerManagerFactory.cs
+++ b/tracer/src/Datadog.Trace/Ci/CITracerManagerFactory.cs
@@ -56,6 +56,7 @@ protected override TracerManager CreateTracerManagerFrom(
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager)
         {
+            telemetry.RecordCiVisibilitySettings(_settings);
             if (_useLockedManager)
             {
                 return new CITracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager);
diff --git a/tracer/src/Datadog.Trace/Ci/IntelligentTestRunnerClient.cs b/tracer/src/Datadog.Trace/Ci/IntelligentTestRunnerClient.cs
index 712f9a336b97..35fa3dc318d7 100644
--- a/tracer/src/Datadog.Trace/Ci/IntelligentTestRunnerClient.cs
+++ b/tracer/src/Datadog.Trace/Ci/IntelligentTestRunnerClient.cs
@@ -413,14 +413,21 @@ async Task<SettingsResponse> InternalGetSettingsAsync(byte[] state, bool finalTr
                 var settingsResponse = deserializedResult.Data?.Attributes ?? default;
                 TelemetryFactory.Metrics.RecordCountCIVisibilityGitRequestsSettingsResponse(settingsResponse switch
                 {
-                    { CodeCoverage: true, TestsSkipping: true, EarlyFlakeDetection.Enabled: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipEnabled,
-                    { CodeCoverage: true, TestsSkipping: false, EarlyFlakeDetection.Enabled: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipDisabled,
-                    { CodeCoverage: false, TestsSkipping: true, EarlyFlakeDetection.Enabled: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipEnabled,
-                    { CodeCoverage: false, TestsSkipping: false, EarlyFlakeDetection.Enabled: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipDisabled_EFDEnabled,
-                    { CodeCoverage: true, TestsSkipping: true, EarlyFlakeDetection.Enabled: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipEnabled_EFDEnabled,
-                    { CodeCoverage: true, TestsSkipping: false, EarlyFlakeDetection.Enabled: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipDisabled_EFDEnabled,
-                    { CodeCoverage: false, TestsSkipping: true, EarlyFlakeDetection.Enabled: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipEnabled_EFDEnabled,
-                    _ => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipDisabled,
+                    { CodeCoverage: true, TestsSkipping: true, EarlyFlakeDetection.Enabled: false, FlakyTestRetries: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipEnabled_AtrDisabled,
+                    { CodeCoverage: true, TestsSkipping: false, EarlyFlakeDetection.Enabled: false, FlakyTestRetries: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipDisabled_AtrDisabled,
+                    { CodeCoverage: false, TestsSkipping: true, EarlyFlakeDetection.Enabled: false, FlakyTestRetries: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipEnabled_AtrDisabled,
+                    { CodeCoverage: false, TestsSkipping: false, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipDisabled_EFDEnabled_AtrDisabled,
+                    { CodeCoverage: true, TestsSkipping: true, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipEnabled_EFDEnabled_AtrDisabled,
+                    { CodeCoverage: true, TestsSkipping: false, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipDisabled_EFDEnabled_AtrDisabled,
+                    { CodeCoverage: false, TestsSkipping: true, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: false } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipEnabled_EFDEnabled_AtrDisabled,
+                    { CodeCoverage: true, TestsSkipping: true, EarlyFlakeDetection.Enabled: false, FlakyTestRetries: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipEnabled_AtrEnabled,
+                    { CodeCoverage: true, TestsSkipping: false, EarlyFlakeDetection.Enabled: false, FlakyTestRetries: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipDisabled_AtrEnabled,
+                    { CodeCoverage: false, TestsSkipping: true, EarlyFlakeDetection.Enabled: false, FlakyTestRetries: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipEnabled_AtrEnabled,
+                    { CodeCoverage: false, TestsSkipping: false, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipDisabled_EFDEnabled_AtrEnabled,
+                    { CodeCoverage: true, TestsSkipping: true, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipEnabled_EFDEnabled_AtrEnabled,
+                    { CodeCoverage: true, TestsSkipping: false, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageEnabled_ItrSkipDisabled_EFDEnabled_AtrEnabled,
+                    { CodeCoverage: false, TestsSkipping: true, EarlyFlakeDetection.Enabled: true, FlakyTestRetries: true } => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipEnabled_EFDEnabled_AtrEnabled,
+                    _ => MetricTags.CIVisibilityITRSettingsResponse.CoverageDisabled_ItrSkipDisabled_AtrDisabled,
                 });
                 return settingsResponse;
             }
diff --git a/tracer/src/Datadog.Trace/Ci/Telemetry/TelemetryHelper.cs b/tracer/src/Datadog.Trace/Ci/Telemetry/TelemetryHelper.cs
index 6934ca4d2680..0d2e22947fae 100644
--- a/tracer/src/Datadog.Trace/Ci/Telemetry/TelemetryHelper.cs
+++ b/tracer/src/Datadog.Trace/Ci/Telemetry/TelemetryHelper.cs
@@ -174,12 +174,24 @@ public static MetricTags.CIVisibilityExitCodes GetTelemetryExitCodeFromExitCode(
                 return MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Module;
             case MetricTags.CIVisibilityTestingEventType.Session:
             {
+                var settings = CIVisibility.Settings;
+                if (settings.Logs)
+                {
+                    return CIEnvironmentValues.Instance switch
+                    {
+                        { CodeOwners: not null, IsCI: true } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_HasCodeOwner_IsSupportedCi_WithAgentlessLog,
+                        { CodeOwners: not null, IsCI: false } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_HasCodeOwner_UnsupportedCi_WithAgentlessLog,
+                        { CodeOwners: null, IsCI: true } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_NoCodeOwner_IsSupportedCi_WithAgentlessLog,
+                        { CodeOwners: null, IsCI: false } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_NoCodeOwner_UnsupportedCi_WithAgentlessLog,
+                    };
+                }
+
                 return CIEnvironmentValues.Instance switch
                 {
-                    { CodeOwners: not null, IsCI: true } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_HasCodeOwner_IsSupportedCi,
-                    { CodeOwners: not null, IsCI: false } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_HasCodeOwner_UnsupportedCi,
-                    { CodeOwners: null, IsCI: true } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_NoCodeOwner_IsSupportedCi,
-                    { CodeOwners: null, IsCI: false } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_NoCodeOwner_UnsupportedCi,
+                    { CodeOwners: not null, IsCI: true } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_HasCodeOwner_IsSupportedCi_WithoutAgentlessLog,
+                    { CodeOwners: not null, IsCI: false } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_HasCodeOwner_UnsupportedCi_WithoutAgentlessLog,
+                    { CodeOwners: null, IsCI: true } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_NoCodeOwner_IsSupportedCi_WithoutAgentlessLog,
+                    { CodeOwners: null, IsCI: false } => MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum.Session_NoCodeOwner_UnsupportedCi_WithoutAgentlessLog,
                 };
             }
         }
diff --git a/tracer/src/Datadog.Trace/Ci/TestModule.cs b/tracer/src/Datadog.Trace/Ci/TestModule.cs
index 3548119ba96f..e6fe4637fcf3 100644
--- a/tracer/src/Datadog.Trace/Ci/TestModule.cs
+++ b/tracer/src/Datadog.Trace/Ci/TestModule.cs
@@ -130,7 +130,7 @@ internal TestModule(string name, string? framework, string? frameworkVersion, Da
 
             // Extract session variables (from out of process sessions)
             var environmentVariables = EnvironmentHelpers.GetEnvironmentVariables();
-            var context = SpanContextPropagator.Instance.Extract(
+            var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(
                 environmentVariables, new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
 
             if (context.SpanContext is { } sessionContext)
diff --git a/tracer/src/Datadog.Trace/Ci/TestSession.cs b/tracer/src/Datadog.Trace/Ci/TestSession.cs
index 46b4ef907ea2..28bf8829bb4e 100644
--- a/tracer/src/Datadog.Trace/Ci/TestSession.cs
+++ b/tracer/src/Datadog.Trace/Ci/TestSession.cs
@@ -548,7 +548,7 @@ private void OnIpcMessageReceived(object message)
             [TestSuiteVisibilityTags.TestSessionWorkingDirectoryEnvironmentVariable] = tags.WorkingDirectory,
         };
 
-        SpanContextPropagator.Instance.Inject(
+        Tracer.Instance.TracerManager.SpanContextPropagator.Inject(
             new PropagationContext(span.Context, Baggage.Current),
             (IDictionary)environmentVariables,
             new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/ContextPropagation.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/ContextPropagation.cs
index 82878fb00952..dc9db44412b2 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/ContextPropagation.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/ContextPropagation.cs
@@ -83,7 +83,7 @@ private static string BuildContextJson(PropagationContext context, string? event
             var jsonBuilder = Util.StringBuilderCache.Acquire();
             jsonBuilder.Append('{');
 
-            SpanContextPropagator.Instance.Inject(context, jsonBuilder, new StringBuilderCarrierSetter());
+            Tracer.Instance.TracerManager.SpanContextPropagator.Inject(context, jsonBuilder, new StringBuilderCarrierSetter());
 
             // Inject start time and bus name
             var startTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/ContextPropagation.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/ContextPropagation.cs
index 708d81eebc7c..a572bcb5c306 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/ContextPropagation.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/ContextPropagation.cs
@@ -69,7 +69,7 @@ public static void InjectTraceIntoData<TRecordRequest>(TRecordRequest record, Sc
 
             try
             {
-                SpanContextPropagator.Instance.Inject(context, propagatedContext, default(DictionaryGetterAndSetter));
+                Tracer.Instance.TracerManager.SpanContextPropagator.Inject(context, propagatedContext, default(DictionaryGetterAndSetter));
                 jsonData[KinesisKey] = propagatedContext;
 
                 var memoryStreamData = DictionaryToMemoryStream(jsonData);
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Lambda/LambdaCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Lambda/LambdaCommon.cs
index 0c246f7627cd..03998c8cb8d7 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Lambda/LambdaCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Lambda/LambdaCommon.cs
@@ -25,7 +25,7 @@ internal abstract class LambdaCommon
 
     internal static Scope CreatePlaceholderScope(Tracer tracer, NameValueHeadersCollection headers)
     {
-        var context = SpanContextPropagator.Instance.Extract(headers).MergeBaggageInto(Baggage.Current);
+        var context = tracer.TracerManager.SpanContextPropagator.Extract(headers).MergeBaggageInto(Baggage.Current);
 
         var span = tracer.StartSpan(
             PlaceholderOperationName,
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Shared/ContextPropagation.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Shared/ContextPropagation.cs
index 95991c0a17a2..a4b5d2b8657c 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Shared/ContextPropagation.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Shared/ContextPropagation.cs
@@ -22,7 +22,7 @@ private static void Inject(PropagationContext context, IDictionary messageAttrib
             // Consolidate headers into one JSON object with <header_name>:<value>
             var sb = Util.StringBuilderCache.Acquire();
             sb.Append('{');
-            SpanContextPropagator.Instance.Inject(context, sb, default(StringBuilderCarrierSetter));
+            Tracer.Instance.TracerManager.SpanContextPropagator.Inject(context, sb, default(StringBuilderCarrierSetter));
 
             if (context.SpanContext?.PathwayContext is { } pathwayContext)
             {
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetClientInstrumentMethodsAttribute.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetClientInstrumentMethodsAttribute.cs
index 5cd7f2c280e8..8490de156843 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetClientInstrumentMethodsAttribute.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetClientInstrumentMethodsAttribute.cs
@@ -4,6 +4,7 @@
 // </copyright>
 
 using System;
+using System.ComponentModel;
 
 namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet
 {
@@ -101,6 +102,11 @@ internal enum AdoNetTargetSignatureReturnType
             /// </summary>
             public string[] ParameterTypeNames { get; set; }
 
+            /// <summary>
+            /// Gets or sets the return type to use with this signature
+            /// </summary>
+            public AdoNetTargetSignatureReturnType ReturnType { get; set; } = AdoNetTargetSignatureReturnType.Default;
+
             /// <summary>
             /// Gets or sets the CallTarget Class used to instrument the method
             /// </summary>
@@ -112,9 +118,9 @@ internal enum AdoNetTargetSignatureReturnType
             public CallTargetKind CallTargetIntegrationKind { get; set; } = CallTargetKind.Default;
 
             /// <summary>
-            /// Gets or sets the return type to use with this signature
+            /// Gets or sets the call target instrumentation category
             /// </summary>
-            public AdoNetTargetSignatureReturnType ReturnType { get; set; } = AdoNetTargetSignatureReturnType.Default;
+            public InstrumentationCategory InstrumentationCategory { get; set; } = InstrumentationCategory.Tracing;
         }
 
         [AdoNetTargetSignature(
@@ -288,9 +294,10 @@ internal class CommandExecuteScalarWithBehaviorAttribute : Attribute
         [AdoNetTargetSignature(
             MethodName = AdoNetConstants.MethodNames.Read,
             ReturnTypeName = ClrNames.Bool,
-            CallTargetType = typeof(ReaderReadIntegration))]
+            CallTargetType = typeof(ReaderReadIntegration),
+            InstrumentationCategory = InstrumentationCategory.Iast)]
         [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-        internal class ReaderReadAttribute : Attribute
+        internal class IastReaderReadAttribute : Attribute
         {
         }
 
@@ -298,18 +305,20 @@ internal class ReaderReadAttribute : Attribute
             MethodName = AdoNetConstants.MethodNames.ReadAsync,
             ReturnTypeName = AdoNetConstants.TypeNames.ObjectTaskType,
             ParameterTypeNames = new[] { ClrNames.CancellationToken },
-            CallTargetType = typeof(ReaderReadAsyncIntegration))]
+            CallTargetType = typeof(ReaderReadAsyncIntegration),
+            InstrumentationCategory = InstrumentationCategory.Iast)]
         [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-        internal class ReaderReadAsyncAttribute : Attribute
+        internal class IastReaderReadAsyncAttribute : Attribute
         {
         }
 
         [AdoNetTargetSignature(
             MethodName = AdoNetConstants.MethodNames.Close,
             ReturnTypeName = ClrNames.Void,
-            CallTargetType = typeof(ReaderCloseIntegration))]
+            CallTargetType = typeof(ReaderCloseIntegration),
+            InstrumentationCategory = InstrumentationCategory.Iast)]
         [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-        internal class ReaderCloseAttribute : Attribute
+        internal class IastReaderCloseAttribute : Attribute
         {
         }
 
@@ -317,9 +326,10 @@ internal class ReaderCloseAttribute : Attribute
             MethodName = AdoNetConstants.MethodNames.GetString,
             ReturnTypeName = ClrNames.String,
             ParameterTypeNames = new[] { ClrNames.Int32 },
-            CallTargetType = typeof(ReaderGetStringIntegration))]
+            CallTargetType = typeof(ReaderGetStringIntegration),
+            InstrumentationCategory = InstrumentationCategory.Iast)]
         [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-        internal class ReaderGetStringAttribute : Attribute
+        internal class IastReaderGetStringAttribute : Attribute
         {
         }
 
@@ -327,9 +337,10 @@ internal class ReaderGetStringAttribute : Attribute
             MethodName = AdoNetConstants.MethodNames.GetValue,
             ReturnTypeName = ClrNames.Object,
             ParameterTypeNames = new[] { ClrNames.Int32 },
-            CallTargetType = typeof(ReaderGetStringIntegration))]
+            CallTargetType = typeof(ReaderGetStringIntegration),
+            InstrumentationCategory = InstrumentationCategory.Iast)]
         [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-        internal class ReaderGetValueAttribute : Attribute
+        internal class IastReaderGetValueAttribute : Attribute
         {
         }
     }
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetDefinitions.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetDefinitions.cs
index ad69933f64be..746770719d33 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetDefinitions.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetDefinitions.cs
@@ -100,11 +100,11 @@
     TargetMethodAttributes = new[]
     {
         // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -118,11 +118,11 @@
     TargetMethodAttributes = new[]
     {
         // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -136,11 +136,11 @@
     TargetMethodAttributes = new[]
     {
         // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -154,9 +154,9 @@
     TargetMethodAttributes = new[]
     {
         // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/MySql/MySqlDefinitions.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/MySql/MySqlDefinitions.cs
index 1e540c405432..0907cae23106 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/MySql/MySqlDefinitions.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/MySql/MySqlDefinitions.cs
@@ -132,12 +132,11 @@
     DataReaderTaskType = "System.Threading.Tasks.Task`1[MySql.Data.MySqlClient.MySqlDataReader]",
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -150,12 +149,11 @@
     DataReaderTaskType = "System.Threading.Tasks.Task`1[MySql.Data.MySqlClient.MySqlDataReader]",
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -168,10 +166,9 @@
     DataReaderTaskType = "System.Threading.Tasks.Task`1[MySqlConnector.MySqlDataReader]",
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Npgsql/NpgsqlDefinitions.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Npgsql/NpgsqlDefinitions.cs
index d4103394896c..a2919470aa47 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Npgsql/NpgsqlDefinitions.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Npgsql/NpgsqlDefinitions.cs
@@ -48,10 +48,9 @@
     DataReaderTaskType = "System.Threading.Tasks.Task`1[Npgsql.NpgsqlDataReader]",
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
         // no Close, we need to implement Close(bool, bool, bool) instead
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Oracle/OracleDefinitions.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Oracle/OracleDefinitions.cs
index cce297402b13..6207a232b280 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Oracle/OracleDefinitions.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Oracle/OracleDefinitions.cs
@@ -93,12 +93,11 @@
     DataReaderTaskType = "System.Threading.Tasks.Task`1[Oracle.ManagedDataAccess.Client.OracleDataReader]",
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -112,12 +111,11 @@
     DataReaderTaskType = "System.Threading.Tasks.Task`1[Oracle.ManagedDataAccess.Client.OracleDataReader]",
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -130,10 +128,9 @@
     DataReaderTaskType = "System.Threading.Tasks.Task`1[Oracle.DataAccess.Client.OracleDataReader]",
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs
index 96fcfd3bed3f..18434ad9c5b8 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/SqlClient/SqlClientDefinitions.cs
@@ -115,12 +115,11 @@
     DataReaderTaskType = TypeNames.DbDataReaderTaskType,
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -133,12 +132,11 @@
     DataReaderTaskType = TypeNames.DbDataReaderTaskType,
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -151,10 +149,9 @@
     DataReaderTaskType = TypeNames.DbDataReaderTaskType,
     TargetMethodAttributes = new[]
     {
-        // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Sqlite/SqliteDefinitions.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Sqlite/SqliteDefinitions.cs
index 130150e705c5..edd9010665bd 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Sqlite/SqliteDefinitions.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/Sqlite/SqliteDefinitions.cs
@@ -72,11 +72,11 @@
     TargetMethodAttributes = new[]
     {
         // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
 
 [assembly: AdoNetClientInstrumentMethods(
@@ -90,9 +90,9 @@
     TargetMethodAttributes = new[]
     {
         // string System.Data.Common.DbDataReader.GetString()
-        typeof(ReaderReadAttribute),
-        typeof(ReaderReadAsyncAttribute),
-        typeof(ReaderCloseAttribute),
-        typeof(ReaderGetStringAttribute),
-        typeof(ReaderGetValueAttribute),
+        typeof(IastReaderReadAttribute),
+        typeof(IastReaderReadAsyncAttribute),
+        typeof(IastReaderCloseAttribute),
+        typeof(IastReaderGetStringAttribute),
+        typeof(IastReaderGetValueAttribute),
     })]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetMvcIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetMvcIntegration.cs
index 51b7910bbed5..a4e7f98da39a 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetMvcIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetMvcIntegration.cs
@@ -137,7 +137,7 @@ internal static Scope CreateScope(ControllerContextStruct controllerContext)
                         {
                             // extract propagated http headers
                             headers = httpContext.Request.Headers.Wrap();
-                            extractedContext = SpanContextPropagator.Instance.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
+                            extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headers.Value).MergeBaggageInto(Baggage.Current);
                         }
                         catch (Exception ex)
                         {
@@ -164,7 +164,7 @@ internal static Scope CreateScope(ControllerContextStruct controllerContext)
 
                     if (headers is not null)
                     {
-                        SpanContextPropagator.Instance.AddHeadersToSpanAsTags(span, headers.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix);
+                        tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(span, headers.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix);
                     }
 
                     if (tracer.Settings.IpHeaderEnabled || Security.Instance.AppsecEnabled)
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetWebApi2Integration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetWebApi2Integration.cs
index 4c4810829f45..e3e0858737d1 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetWebApi2Integration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNet/AspNetWebApi2Integration.cs
@@ -58,7 +58,7 @@ internal static Scope CreateScope(IHttpControllerContext controllerContext, out
                     {
                         // extract propagated http headers
                         headersCollection = new HttpHeadersCollection(request.Headers);
-                        extractedContext = SpanContextPropagator.Instance.Extract(headersCollection.Value).MergeBaggageInto(Baggage.Current);
+                        extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headersCollection.Value).MergeBaggageInto(Baggage.Current);
                     }
                     catch (Exception ex)
                     {
@@ -101,7 +101,7 @@ internal static Scope CreateScope(IHttpControllerContext controllerContext, out
 
                 if (headersCollection is not null)
                 {
-                    SpanContextPropagator.Instance.AddHeadersToSpanAsTags(scope.Span, headersCollection.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix, request.Headers.UserAgent.ToString());
+                    tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(scope.Span, headersCollection.Value, tracer.Settings.HeaderTags, SpanContextPropagator.HttpRequestHeadersTagPrefix, request.Headers.UserAgent.ToString());
                 }
 
                 tags.SetAnalyticsSampleRate(IntegrationId, tracer.Settings, enabledWithGlobalSetting: true);
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/BlockingMiddleware.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/BlockingMiddleware.cs
index 3aa36284d69c..a785e217773b 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/BlockingMiddleware.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/BlockingMiddleware.cs
@@ -97,7 +97,7 @@ internal async Task Invoke(HttpContext context)
                         securityCoordinator.MarkBlocked();
                     }
 
-                    securityCoordinator.TryReport(result, endedResponse);
+                    securityCoordinator.Reporter.TryReport(result, endedResponse);
                     // security will be disposed in endrequest of diagnostic observer in any case
                 }
             }
@@ -123,13 +123,13 @@ internal async Task Invoke(HttpContext context)
                 {
                     if (Tracer.Instance?.ActiveScope?.Span is Span span)
                     {
-                        var securityCoordinator = SecurityCoordinator.Get(security, span, new SecurityCoordinator.HttpTransport(context));
+                        var securityReporter = new SecurityReporter(span, new SecurityCoordinator.HttpTransport(context));
                         if (!blockException.Reported)
                         {
-                            securityCoordinator.TryReport(blockException.Result, endedResponse);
+                            securityReporter.TryReport(blockException.Result, endedResponse);
                         }
 
-                        securityCoordinator.AddResponseHeadersToSpanAndCleanup();
+                        securityReporter.AddResponseHeadersToSpanAndCleanup();
                     }
                     else
                     {
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/AuthenticationHttpContextExtensionsIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/AuthenticationHttpContextExtensionsIntegration.cs
index 3d830211da8a..a80eae30954e 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/AuthenticationHttpContextExtensionsIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/AuthenticationHttpContextExtensionsIntegration.cs
@@ -118,7 +118,7 @@ internal static object OnAsyncMethodEnd<TTarget>(object returnValue, Exception e
                 }
 
                 UserEventsCommon.RecordMetricsLoginSuccessIfNotFound(foundUserId, foundLogin);
-                SecurityCoordinator.CollectHeaders(span);
+                SecurityReporter.SafeCollectHeaders(span);
             }
 
             return returnValue;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInIntegration.cs
index acff3e048d9a..87c87c3a87a6 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInIntegration.cs
@@ -96,7 +96,7 @@ internal static TReturn OnAsyncMethodEnd<TTarget, TReturn>(TTarget instance, TRe
                 setTag(Tags.AppSec.EventsUsers.LoginEvent.FailureAutoMode, SecuritySettings.UserTrackingIdentMode);
             }
 
-            SecurityCoordinator.CollectHeaders(span);
+            SecurityReporter.SafeCollectHeaders(span);
             security.SetTraceSamplingPriority(span);
         }
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInUserIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInUserIntegration.cs
index 438e2f5cdb32..5bbc71e45eed 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInUserIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/SignInManagerPasswordSignInUserIntegration.cs
@@ -117,7 +117,7 @@ internal static TReturn OnAsyncMethodEnd<TTarget, TReturn>(TTarget instance, TRe
 
                 UserEventsCommon.RecordMetricsLoginFailureIfNotFound(foundUserId, foundLogin);
                 tryAddTag(Tags.AppSec.EventsUsers.LoginEvent.FailureUserExists, userExists ? "true" : "false");
-                SecurityCoordinator.CollectHeaders(span);
+                SecurityReporter.SafeCollectHeaders(span);
             }
 #if !NETCOREAPP3_1_OR_GREATER
             else if (userExists)
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/UserManagerCreateIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/UserManagerCreateIntegration.cs
index eb23bda2f507..8d9b4c5080b1 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/UserManagerCreateIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/UserManagerCreateIntegration.cs
@@ -109,7 +109,7 @@ internal static TReturn OnAsyncMethodEnd<TTarget, TReturn>(TTarget instance, TRe
             }
 
             security.SetTraceSamplingPriority(span);
-            SecurityCoordinator.CollectHeaders(span);
+            SecurityReporter.SafeCollectHeaders(span);
         }
 
         return returnValue;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs
index 97452dd48c0f..55eaa3437569 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs
@@ -296,7 +296,7 @@ internal static void OverridePropagatedContext<TTarget, TTypeData>(Tracer tracer
                 // the existing datadog headers
                 var useNullableHeaders = !string.IsNullOrEmpty(useNullableHeadersCapability);
                 var context = new PropagationContext(span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, new RpcHttpHeadersCollection<TTarget>(typedData.Http, useNullableHeaders));
+                tracer.TracerManager.SpanContextPropagator.Inject(context, new RpcHttpHeadersCollection<TTarget>(typedData.Http, useNullableHeaders));
             }
         }
 
@@ -342,7 +342,7 @@ private static PropagationContext ExtractPropagatedContextFromHttp<T>(T context,
                     return default;
                 }
 
-                return SpanContextPropagator.Instance.Extract(new HttpHeadersCollection(httpRequest.Headers));
+                return Tracer.Instance.TracerManager.SpanContextPropagator.Extract(new HttpHeadersCollection(httpRequest.Headers));
             }
             catch (Exception ex)
             {
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/Isolated/FunctionExecutionMiddlewareInvokeIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/Isolated/FunctionExecutionMiddlewareInvokeIntegration.cs
index 702a180544da..4e098dbcadb1 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/Isolated/FunctionExecutionMiddlewareInvokeIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/Isolated/FunctionExecutionMiddlewareInvokeIntegration.cs
@@ -1,4 +1,4 @@
-// <copyright file="FunctionExecutionMiddlewareInvokeIntegration.cs" company="Datadog">
+// <copyright file="FunctionExecutionMiddlewareInvokeIntegration.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -20,7 +20,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Azure.Functions;
     ReturnTypeName = ClrNames.Task,
     ParameterTypeNames = new[] { "Microsoft.Azure.Functions.Worker.FunctionContext" },
     MinimumVersion = "1.4.0",
-    MaximumVersion = "1.*.*",
+    MaximumVersion = "2.*.*",
     IntegrationName = AzureFunctionsCommon.IntegrationName)]
 [Browsable(false)]
 [EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcAspNetCoreServer/GrpcDotNetServerCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcAspNetCoreServer/GrpcDotNetServerCommon.cs
index 063aae8d2b13..ba32294ec596 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcAspNetCoreServer/GrpcDotNetServerCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcAspNetCoreServer/GrpcDotNetServerCommon.cs
@@ -1,4 +1,4 @@
-// <copyright file="GrpcDotNetServerCommon.cs" company="Datadog">
+// <copyright file="GrpcDotNetServerCommon.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -35,7 +35,7 @@ internal static class GrpcDotNetServerCommon
                 var tags = new GrpcServerTags();
                 GrpcCommon.AddGrpcTags(tags, tracer, method.GrpcType, name: method.Name, path: method.FullName, serviceName: method.ServiceName);
 
-                var extractedContext = ExtractPropagatedContext(requestMessage).MergeBaggageInto(Baggage.Current);
+                var extractedContext = ExtractPropagatedContext(tracer, requestMessage).MergeBaggageInto(Baggage.Current);
 
                 // If we have a local span (e.g. from aspnetcore) then use that as the parent
                 // Otherwise, use the distributed context as the parent
@@ -57,14 +57,14 @@ internal static class GrpcDotNetServerCommon
             return scope;
         }
 
-        private static PropagationContext ExtractPropagatedContext(HttpRequest request)
+        private static PropagationContext ExtractPropagatedContext(Tracer tracer, HttpRequest request)
         {
             try
             {
                 // extract propagation details from http headers
                 if (request.Headers is { } requestHeaders)
                 {
-                    return SpanContextPropagator.Instance.Extract(new HeadersCollectionAdapter(requestHeaders));
+                    return tracer.TracerManager.SpanContextPropagator.Extract(new HeadersCollectionAdapter(requestHeaders));
                 }
             }
             catch (Exception ex)
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcNetClient/GrpcDotNetClientCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcNetClient/GrpcDotNetClientCommon.cs
index 70ecc1f31ca9..9dc27704cd45 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcNetClient/GrpcDotNetClientCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcDotNet/GrpcNetClient/GrpcDotNetClientCommon.cs
@@ -56,7 +56,7 @@ internal static class GrpcDotNetClientCommon
                 // add distributed tracing headers to the HTTP request
                 // These will be overwritten by the HttpClient integration if that is enabled, per the RFC
                 var context = new PropagationContext(span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, new HttpHeadersCollection(requestMessage.Headers));
+                tracer.TracerManager.SpanContextPropagator.Inject(context, new HttpHeadersCollection(requestMessage.Headers));
 
                 // Add the request metadata as tags
                 if (grpcCall.Options.Headers is { Count: > 0 })
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Client/GrpcLegacyClientCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Client/GrpcLegacyClientCommon.cs
index 2b2c314c6b27..f42d9c7153f6 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Client/GrpcLegacyClientCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Client/GrpcLegacyClientCommon.cs
@@ -39,7 +39,7 @@ internal static class GrpcLegacyClientCommon
             {
                 // try extracting all the details we need
                 var requestMetadataWrapper = new MetadataHeadersCollection(requestMetadata);
-                var existingContext = SpanContextPropagator.Instance.Extract(requestMetadataWrapper);
+                var existingContext = tracer.TracerManager.SpanContextPropagator.Extract(requestMetadataWrapper);
                 var existingSpanContext = existingContext.SpanContext;
 
                 // If this operation creates the trace, then we will need to re-apply the sampling priority
@@ -145,7 +145,7 @@ public static void InjectHeaders<TMethod, TCallOptions>(Tracer tracer, TMethod m
 
                 // Add the propagation headers
                 var context = new PropagationContext(span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, collection);
+                tracer.TracerManager.SpanContextPropagator.Inject(context, collection);
             }
             catch (Exception ex)
             {
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Server/GrpcLegacyServerCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Server/GrpcLegacyServerCommon.cs
index 5bb0aa9e03d2..9aa3318b879c 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Server/GrpcLegacyServerCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Grpc/GrpcLegacy/Server/GrpcLegacyServerCommon.cs
@@ -1,4 +1,4 @@
-// <copyright file="GrpcLegacyServerCommon.cs" company="Datadog">
+// <copyright file="GrpcLegacyServerCommon.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -35,7 +35,7 @@ internal class GrpcLegacyServerCommon
 
                 if (spanContext is null)
                 {
-                    var extractedContext = ExtractPropagatedContext(metadata).MergeBaggageInto(Baggage.Current);
+                    var extractedContext = ExtractPropagatedContext(tracer, metadata).MergeBaggageInto(Baggage.Current);
                     spanContext = extractedContext.SpanContext;
                 }
 
@@ -62,13 +62,13 @@ internal class GrpcLegacyServerCommon
             return scope;
         }
 
-        private static PropagationContext ExtractPropagatedContext(IMetadata? metadata)
+        private static PropagationContext ExtractPropagatedContext(Tracer tracer, IMetadata? metadata)
         {
             try
             {
                 if (metadata is not null)
                 {
-                    return SpanContextPropagator.Instance.Extract(new MetadataHeadersCollection(metadata));
+                    return tracer.TracerManager.SpanContextPropagator.Extract(new MetadataHeadersCollection(metadata));
                 }
             }
             catch (Exception ex)
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/HttpClient/HttpMessageHandlerCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/HttpClient/HttpMessageHandlerCommon.cs
index e55c07ba0e05..f3d0ceffef0a 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/HttpClient/HttpMessageHandlerCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/HttpClient/HttpMessageHandlerCommon.cs
@@ -44,7 +44,7 @@ public static CallTargetState OnMethodBegin<TTarget, TRequest>(TTarget instance,
 
             // add propagation headers to the HTTP request
             var context = new PropagationContext(scope?.Span.Context, Baggage.Current);
-            SpanContextPropagator.Instance.Inject(context, new HttpHeadersCollection(headers));
+            tracer.TracerManager.SpanContextPropagator.Inject(context, new HttpHeadersCollection(headers));
 
             return scope is null ? CallTargetState.GetDefault() : new CallTargetState(scope);
         }
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_BeginGetResponse_Integration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_BeginGetResponse_Integration.cs
index 07cfe82199d5..d01fe00aecea 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_BeginGetResponse_Integration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_BeginGetResponse_Integration.cs
@@ -65,7 +65,7 @@ internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, AsyncCa
                     // Additionally, add the request headers to a cache to indicate that distributed tracing headers were
                     // added by us, not the application
                     var context = new PropagationContext(span?.Context, Baggage.Current);
-                    SpanContextPropagator.Instance.Inject(context, request.Headers.Wrap());
+                    tracer.TracerManager.SpanContextPropagator.Inject(context, request.Headers.Wrap());
                     HeadersInjectedCache.SetInjectedHeaders(request.Headers);
                 }
             }
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponseV9_Integration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponseV9_Integration.cs
index d9e2414b41d3..13f48b095da3 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponseV9_Integration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponseV9_Integration.cs
@@ -1,4 +1,4 @@
-// <copyright file="HttpWebRequest_EndGetResponseV9_Integration.cs" company="Datadog">
+// <copyright file="HttpWebRequest_EndGetResponseV9_Integration.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -63,7 +63,7 @@ public class HttpWebRequest_EndGetResponseV9_Integration
                 // We've already propagated baggage through the HTTP headers at this point,
                 // and when this method is called this is presumably the "bottom" of the call chain,
                 // and it may have been called on an entirely different thread.
-                existingContext = SpanContextPropagator.Instance.Extract(headers);
+                existingContext = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(headers);
             }
 
             var existingSpanContext = existingContext.SpanContext;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponse_Integration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponse_Integration.cs
index 8a3ddae399fd..2e0902f94e02 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponse_Integration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/HttpWebRequest_EndGetResponse_Integration.cs
@@ -77,7 +77,7 @@ internal static CallTargetReturn<TReturn> OnMethodEnd<TTarget, TReturn>(TTarget
                     // We've already propagated baggage through the HTTP headers at this point,
                     // and when this method is called this is presumably the "bottom" of the call chain,
                     // and it may have been called on an entirely different thread.
-                    existingContext = SpanContextPropagator.Instance.Extract(headers);
+                    existingContext = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(headers);
                 }
 
                 var existingSpanContext = existingContext.SpanContext;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/WebRequestCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/WebRequestCommon.cs
index 3235e5bfe7e8..46bd8533c8d6 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/WebRequestCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Http/WebRequest/WebRequestCommon.cs
@@ -67,7 +67,7 @@ public static bool TryInjectHeaders<TTarget>(TTarget instance)
                         // Additionally, add the request headers to a cache to indicate that distributed tracing headers were
                         // added by us, not the application
                         var context = new PropagationContext(span?.Context, Baggage.Current);
-                        SpanContextPropagator.Instance.Inject(context, request.Headers.Wrap());
+                        tracer.TracerManager.SpanContextPropagator.Inject(context, request.Headers.Wrap());
                         HeadersInjectedCache.SetInjectedHeaders(request.Headers);
                         return true;
                     }
@@ -93,14 +93,15 @@ public static CallTargetState GetResponse_OnMethodBegin<TTarget>(TTarget instanc
                 // that we have injected context into
                 PropagationContext cachedContext = default;
 
+                var tracer = Tracer.Instance;
+
                 if (HeadersInjectedCache.TryGetInjectedHeaders(request.Headers))
                 {
                     var headers = request.Headers.Wrap();
-                    cachedContext = SpanContextPropagator.Instance.Extract(headers).MergeBaggageInto(Baggage.Current);
+                    cachedContext = tracer.TracerManager.SpanContextPropagator.Extract(headers).MergeBaggageInto(Baggage.Current);
                 }
 
                 var cachedSpanContext = cachedContext.SpanContext;
-                var tracer = Tracer.Instance;
                 int? cachedSamplingPriority = null;
 
                 // If this operation creates the trace, then we need to re-apply the sampling priority
@@ -132,7 +133,7 @@ public static CallTargetState GetResponse_OnMethodBegin<TTarget>(TTarget instanc
                         // add propagation headers to the HTTP request
                         var context = new PropagationContext(scope.Span.Context, Baggage.Current);
                         var headers = request.Headers.Wrap();
-                        SpanContextPropagator.Instance.Inject(context, headers);
+                        tracer.TracerManager.SpanContextPropagator.Inject(context, headers);
 
                         tracer.TracerManager.Telemetry.IntegrationGeneratedSpan(IntegrationId);
                         return new CallTargetState(scope);
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/IbmMq/IbmMqHelper.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/IbmMq/IbmMqHelper.cs
index 0787fe96df36..8cfea48d6836 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/IbmMq/IbmMqHelper.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/IbmMq/IbmMqHelper.cs
@@ -57,7 +57,7 @@ internal static IbmMqHeadersAdapterNoop GetHeadersAdapter(IMqMessage message)
             span.SetTag(Tags.SpanKind, SpanKinds.Producer);
 
             var context = new PropagationContext(span.Context, Baggage.Current);
-            SpanContextPropagator.Instance.Inject(context, GetHeadersAdapter(message));
+            tracer.TracerManager.SpanContextPropagator.Inject(context, GetHeadersAdapter(message));
         }
         catch (Exception ex)
         {
@@ -97,7 +97,7 @@ internal static IbmMqHeadersAdapterNoop GetHeadersAdapter(IMqMessage message)
             try
             {
                 var headers = GetHeadersAdapter(message);
-                extractedContext = SpanContextPropagator.Instance.Extract(headers).MergeBaggageInto(Baggage.Current);
+                extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headers).MergeBaggageInto(Baggage.Current);
             }
             catch (Exception ex)
             {
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Kafka/KafkaHelper.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Kafka/KafkaHelper.cs
index 6c77a345aa6c..5d4e4df8c4ea 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Kafka/KafkaHelper.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Kafka/KafkaHelper.cs
@@ -165,7 +165,7 @@ private static long GetMessageSize<T>(T message)
 
                     try
                     {
-                        extractedContext = SpanContextPropagator.Instance.Extract(headers).MergeBaggageInto(Baggage.Current);
+                        extractedContext = tracer.TracerManager.SpanContextPropagator.Extract(headers).MergeBaggageInto(Baggage.Current);
                     }
                     catch (Exception ex)
                     {
@@ -324,7 +324,7 @@ internal static void TryInjectHeaders<TTopicPartitionMarker, TMessage>(
                 var adapter = new KafkaHeadersCollectionAdapter(message.Headers);
 
                 var context = new PropagationContext(span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, adapter);
+                Tracer.Instance.TracerManager.SpanContextPropagator.Inject(context, adapter);
 
                 if (dataStreamsManager.IsEnabled)
                 {
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicGetIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicGetIntegration.cs
index 90587f8a0751..4b21c26ea6c2 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicGetIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicGetIntegration.cs
@@ -79,7 +79,7 @@ internal static CallTargetReturn<TResult> OnMethodEnd<TTarget, TResult>(TTarget
                     {
                         basicProperties = basicGetResult.BasicProperties;
 
-                        extractedContext = SpanContextPropagator.Instance.Extract(basicPropertiesHeaders, default(ContextPropagation)).MergeBaggageInto(Baggage.Current);
+                        extractedContext = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(basicPropertiesHeaders, default(ContextPropagation)).MergeBaggageInto(Baggage.Current);
                     }
                     catch (Exception ex)
                     {
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicPublishIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicPublishIntegration.cs
index 0521e9668842..c92f7e996379 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicPublishIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/BasicPublishIntegration.cs
@@ -58,7 +58,8 @@ internal static CallTargetState OnMethodBegin<TTarget, TBasicProperties, TBody>(
             // Tags is not null if span is not null, but keep analysis happy, as there's no attribute for that
             if (scope != null && tags is not null)
             {
-                Tracer.Instance.CurrentTraceSettings.Schema.RemapPeerService(tags);
+                var tracer = Tracer.Instance;
+                tracer.CurrentTraceSettings.Schema.RemapPeerService(tags);
 
                 string exchangeDisplayName = string.IsNullOrEmpty(exchange) ? "<default>" : exchange;
                 string routingKeyDisplayName = string.IsNullOrEmpty(routingKey) ? "<all>" : routingKey.StartsWith("amq.gen-") ? "<generated>" : routingKey;
@@ -80,7 +81,7 @@ internal static CallTargetState OnMethodBegin<TTarget, TBasicProperties, TBody>(
                     }
 
                     var context = new PropagationContext(scope.Span.Context, Baggage.Current);
-                    SpanContextPropagator.Instance.Inject(context, basicProperties.Headers, default(ContextPropagation));
+                    tracer.TracerManager.SpanContextPropagator.Inject(context, basicProperties.Headers, default(ContextPropagation));
 
                     RabbitMQIntegration.SetDataStreamsCheckpointOnProduce(
                         Tracer.Instance,
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/RabbitMQIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/RabbitMQIntegration.cs
index 73d7cf0007a1..547c4db7dc9d 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/RabbitMQIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/RabbitMQIntegration.cs
@@ -181,7 +181,9 @@ internal static CallTargetState BasicDeliver_OnMethodBegin<TTarget, TBasicProper
             where TBasicProperties : IBasicProperties
             where TBody : IBody, IDuckType // ReadOnlyMemory<byte> body in 6.0.0
         {
-            if (IsActiveScopeRabbitMQ(Tracer.Instance))
+            var tracer = Tracer.Instance;
+
+            if (IsActiveScopeRabbitMQ(tracer))
             {
                 // we are already instrumenting this,
                 // don't instrument nested methods that belong to the same stacktrace
@@ -204,7 +206,7 @@ internal static CallTargetState BasicDeliver_OnMethodBegin<TTarget, TBasicProper
             {
                 try
                 {
-                    extractedContext = SpanContextPropagator.Instance
+                    extractedContext = tracer.TracerManager.SpanContextPropagator
                                                             .Extract(basicProperties.Headers, default(ContextPropagation))
                                                             .MergeBaggageInto(Baggage.Current);
                 }
@@ -215,7 +217,7 @@ internal static CallTargetState BasicDeliver_OnMethodBegin<TTarget, TBasicProper
             }
 
             var scope = CreateScope(
-                Tracer.Instance,
+                tracer,
                 out var tags,
                 "basic.deliver",
                 context: extractedContext,
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/HttpProcessMessageIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/HttpProcessMessageIntegration.cs
index 63f4cb0ae002..d95b4bf2f668 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/HttpProcessMessageIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/HttpProcessMessageIntegration.cs
@@ -67,7 +67,7 @@ internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, IMessag
                     // At the same time, we don't want to set an active scope now, because it's possible that GetResponse will never be called.
                     // Instead, we generate a spancontext and inject it in the headers. GetResponse will fetch them and create an active scope with the right id.
                     var context = new PropagationContext(scope.Span.Context, Baggage.Current);
-                    SpanContextPropagator.Instance.Inject(context, requestHeaders, (headers, key, value) => headers[key] = value);
+                    tracer.TracerManager.SpanContextPropagator.Inject(context, requestHeaders, (headers, key, value) => headers[key] = value);
 
                     // "Disable" tracing so that the regular WebRequest instrumentation does not fire for this request
                     requestHeaders["x-datadog-tracing-enabled"] = "false";
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/IpcTcpProcessMessageIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/IpcTcpProcessMessageIntegration.cs
index 67790cd4facd..3bca7199b819 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/IpcTcpProcessMessageIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Client/IpcTcpProcessMessageIntegration.cs
@@ -60,7 +60,7 @@ internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, IMessag
             if (tracer.Settings.IsIntegrationEnabled(RemotingIntegration.IntegrationId) && tracer.InternalActiveScope is var scope)
             {
                 var context = new PropagationContext(scope.Span.Context, Baggage.Current);
-                SpanContextPropagator.Instance.Inject(context, requestHeaders, (headers, key, value) => headers[key] = value);
+                tracer.TracerManager.SpanContextPropagator.Inject(context, requestHeaders, (headers, key, value) => headers[key] = value);
             }
 
             return CallTargetState.GetDefault();
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Server/ProcessMessageIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Server/ProcessMessageIntegration.cs
index df86bd9196d2..a998c1af5d0d 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Server/ProcessMessageIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/Server/ProcessMessageIntegration.cs
@@ -72,7 +72,7 @@ internal static CallTargetState OnMethodBegin<TTarget, TServerSinkStack>(TTarget
 
             try
             {
-                extractedContext = SpanContextPropagator.Instance
+                extractedContext = Tracer.Instance.TracerManager.SpanContextPropagator
                                                         .Extract(requestHeaders, (headers, key) => headers[key] is { } value ? [value.ToString()] : [])
                                                         .MergeBaggageInto(Baggage.Current);
             }
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/CoverageGetCoverageResultIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/CoverageGetCoverageResultIntegration.cs
index 1fe575f81e3d..c7d44cb81f2b 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/CoverageGetCoverageResultIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/CoverageGetCoverageResultIntegration.cs
@@ -64,7 +64,7 @@ internal static CallTargetReturn<TReturn> OnMethodEnd<TTarget, TReturn>(TTarget
             var percentage = coverageDetails.Percent;
             DotnetCommon.Log.Information("CoverageGetCoverageResult.Percentage: {Value}", percentage);
 
-            var context = SpanContextPropagator.Instance.Extract(
+            var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(
                 EnvironmentHelpers.GetEnvironmentVariables(),
                 new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/DotnetCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/DotnetCommon.cs
index 835fd8197f35..38d1a815cf1b 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/DotnetCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/DotnetCommon.cs
@@ -1,4 +1,4 @@
-// <copyright file="DotnetCommon.cs" company="Datadog">
+// <copyright file="DotnetCommon.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -92,7 +92,7 @@ internal static bool IsMsBuildTask
             }
 
             // Let's detect if we already have a session for this test process
-            var context = SpanContextPropagator.Instance.Extract(
+            var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(
                 EnvironmentHelpers.GetEnvironmentVariables(),
                 new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/ManagedVanguardStopIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/ManagedVanguardStopIntegration.cs
index 9d4356ef5dc5..071989ee150f 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/ManagedVanguardStopIntegration.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Testing/DotnetTest/ManagedVanguardStopIntegration.cs
@@ -1,4 +1,4 @@
-// <copyright file="ManagedVanguardStopIntegration.cs" company="Datadog">
+// <copyright file="ManagedVanguardStopIntegration.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -51,7 +51,7 @@ internal static CallTargetReturn OnMethodEnd<TTarget>(TTarget instance, Exceptio
                     DotnetCommon.Log.Information("MicrosoftCodeCoverage.Percentage: {Value}", percentage);
 
                     // Extract session variables (from out of process sessions)
-                    var context = SpanContextPropagator.Instance.Extract(
+                    var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(
                         EnvironmentHelpers.GetEnvironmentVariables(),
                         new DictionaryGetterAndSetter(DictionaryGetterAndSetter.EnvironmentVariableKeyProcessor));
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/WcfCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/WcfCommon.cs
index 5b70b706e1bc..e4ea79f0015f 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/WcfCommon.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/WcfCommon.cs
@@ -83,7 +83,7 @@ internal class WcfCommon
                         {
                             headers = webHeaderCollection.Wrap();
 
-                            extractedContext = SpanContextPropagator.Instance
+                            extractedContext = tracer.TracerManager.SpanContextPropagator
                                                                     .Extract(headers.Value)
                                                                     .MergeBaggageInto(Baggage.Current);
                         }
@@ -99,7 +99,7 @@ internal class WcfCommon
                     Log.Debug("Extracting from WCF headers if any as http headers hadn't been found.");
                     try
                     {
-                        extractedContext = SpanContextPropagator.Instance
+                        extractedContext = tracer.TracerManager.SpanContextPropagator
                                                                 .Extract(messageHeaders, GetHeaderValues)
                                                                 .MergeBaggageInto(Baggage.Current);
 
@@ -173,7 +173,7 @@ internal class WcfCommon
                 if (headers is not null)
                 {
                     var headerTagsProcessor = new SpanContextPropagator.SpanTagHeaderTagProcessor(span);
-                    SpanContextPropagator.Instance.ExtractHeaderTags(ref headerTagsProcessor, headers.Value, tracer.Settings.HeaderTags!, SpanContextPropagator.HttpRequestHeadersTagPrefix);
+                    tracer.TracerManager.SpanContextPropagator.ExtractHeaderTags(ref headerTagsProcessor, headers.Value, tracer.Settings.HeaderTags!, SpanContextPropagator.HttpRequestHeadersTagPrefix);
                 }
 
                 tags.SetAnalyticsSampleRate(IntegrationId, tracer.Settings, enabledWithGlobalSetting: true);
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutomaticTracer.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutomaticTracer.cs
index a21f7fa03001..39c804cbd0d3 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/AutomaticTracer.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/AutomaticTracer.cs
@@ -54,7 +54,7 @@ SpanContext IDistributedTracer.GetSpanContext()
                 return spanContext;
             }
 
-            var context = SpanContextPropagator.Instance.Extract(value);
+            var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(value);
             return context.SpanContext;
         }
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/IValueTaskDuckType.cs b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/IValueTaskDuckType.cs
new file mode 100644
index 000000000000..9b2a890dc293
--- /dev/null
+++ b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/IValueTaskDuckType.cs
@@ -0,0 +1,18 @@
+// <copyright file="IValueTaskDuckType.cs" company="Datadog">
+// 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.
+// </copyright>
+
+#if !NETCOREAPP3_1_OR_GREATER
+#nullable enable
+using System.Threading.Tasks;
+
+namespace Datadog.Trace.ClrProfiler.CallTarget.Handlers.Continuations;
+
+internal interface IValueTaskDuckType
+{
+    bool IsCompletedSuccessfully { get; }
+
+    Task AsTask();
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator.cs b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator.cs
new file mode 100644
index 000000000000..5f2d0b3772ab
--- /dev/null
+++ b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator.cs
@@ -0,0 +1,65 @@
+// <copyright file="ValueTaskActivator.cs" company="Datadog">
+// 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.
+// </copyright>
+
+#if !NETCOREAPP3_1_OR_GREATER
+#nullable enable
+
+using System;
+using System.Reflection.Emit;
+using System.Threading.Tasks;
+using Datadog.Trace.DuckTyping;
+using Datadog.Trace.Logging;
+using Datadog.Trace.Util;
+
+namespace Datadog.Trace.ClrProfiler.CallTarget.Handlers.Continuations;
+
+internal static class ValueTaskActivator<TValueTask>
+{
+    private static readonly Func<Task, TValueTask> Activator;
+
+    static ValueTaskActivator()
+    {
+        try
+        {
+            Activator = CreateActivator();
+        }
+        catch (Exception ex)
+        {
+            DatadogLogging.GetLoggerFor<ActivatorHelper>()
+                          .Error(ex, "Error creating the custom activator for: {Type}", typeof(TValueTask).FullName);
+
+            // Unfortunately this will box the ValueTask, but I think it's still the best we can do in this scenario
+            Activator = FallbackActivator;
+        }
+    }
+
+    // Internal for testing
+    internal static Func<Task, TValueTask> CreateActivator()
+    {
+        var valueTaskType = typeof(TValueTask);
+        var ctor = valueTaskType.GetConstructor([typeof(Task)])!;
+
+        var createValueTaskMethod = new DynamicMethod(
+            $"TypeActivator" + valueTaskType.Name,
+            returnType: valueTaskType,
+            parameterTypes: [typeof(Task)],
+            typeof(DuckType).Module,
+            true);
+
+        var il = createValueTaskMethod.GetILGenerator();
+        il.Emit(OpCodes.Ldarg_0);
+        il.Emit(OpCodes.Newobj, ctor);
+        il.Emit(OpCodes.Ret);
+
+        return (Func<Task, TValueTask>)createValueTaskMethod.CreateDelegate(typeof(Func<Task, TValueTask>));
+    }
+
+    // Internal for testing
+    internal static TValueTask FallbackActivator(Task task)
+        => (TValueTask)System.Activator.CreateInstance(typeof(TValueTask), task)!;
+
+    public static TValueTask CreateInstance(Task task) => Activator(task);
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator`1.cs b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator`1.cs
new file mode 100644
index 000000000000..fdb9c2cd503a
--- /dev/null
+++ b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator`1.cs
@@ -0,0 +1,96 @@
+// <copyright file="ValueTaskActivator`1.cs" company="Datadog">
+// 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.
+// </copyright>
+
+#if !NETCOREAPP3_1_OR_GREATER
+#nullable enable
+
+using System;
+using System.Reflection.Emit;
+using System.Threading.Tasks;
+using Datadog.Trace.DuckTyping;
+using Datadog.Trace.Logging;
+using Datadog.Trace.Util;
+
+#pragma warning disable SA1649 // File name must match first type name
+
+namespace Datadog.Trace.ClrProfiler.CallTarget.Handlers.Continuations;
+
+internal static class ValueTaskActivator<TValueTask, TResult>
+{
+    private static readonly Func<Task<TResult>, TValueTask> TaskActivator;
+    private static readonly Func<TResult, TValueTask> ResultActivator;
+
+    static ValueTaskActivator()
+    {
+        try
+        {
+            TaskActivator = CreateTaskActivator();
+            ResultActivator = CreateResultActivator();
+        }
+        catch (Exception ex)
+        {
+            DatadogLogging.GetLoggerFor<ActivatorHelper>()
+                          .Error(ex, "Error creating the custom activator for: {Type}", typeof(TValueTask).FullName);
+
+            // Unfortunately this will box the ValueTask, but I think it's still the best we can do in this scenario
+            TaskActivator = FallbackTaskActivator;
+            ResultActivator = FallbackResultActivator;
+        }
+    }
+
+    // Internal for testing
+    internal static Func<Task<TResult>, TValueTask> CreateTaskActivator()
+    {
+        var valueTaskType = typeof(TValueTask);
+        var ctor = valueTaskType.GetConstructor([typeof(Task<TResult>)])!;
+
+        var createValueTaskMethod = new DynamicMethod(
+            $"TypeActivatorTask" + valueTaskType.Name,
+            returnType: valueTaskType,
+            parameterTypes: [typeof(Task<TResult>)],
+            typeof(DuckType).Module,
+            true);
+
+        var il = createValueTaskMethod.GetILGenerator();
+        il.Emit(OpCodes.Ldarg_0);
+        il.Emit(OpCodes.Newobj, ctor);
+        il.Emit(OpCodes.Ret);
+
+        return (Func<Task<TResult>, TValueTask>)createValueTaskMethod.CreateDelegate(typeof(Func<Task<TResult>, TValueTask>));
+    }
+
+    // Internal for testing
+    internal static Func<TResult, TValueTask> CreateResultActivator()
+    {
+        var valueTaskType = typeof(TValueTask);
+        var ctor = valueTaskType.GetConstructor([typeof(TResult)])!;
+
+        var createValueTaskMethod = new DynamicMethod(
+            $"TypeActivatorResult" + valueTaskType.Name,
+            returnType: valueTaskType,
+            parameterTypes: [typeof(TResult)],
+            typeof(DuckType).Module,
+            true);
+
+        var il = createValueTaskMethod.GetILGenerator();
+        il.Emit(OpCodes.Ldarg_0);
+        il.Emit(OpCodes.Newobj, ctor);
+        il.Emit(OpCodes.Ret);
+
+        return (Func<TResult, TValueTask>)createValueTaskMethod.CreateDelegate(typeof(Func<TResult, TValueTask>));
+    }
+
+    // Internal for testing
+    internal static TValueTask FallbackTaskActivator(Task<TResult> task)
+        => (TValueTask)Activator.CreateInstance(typeof(TValueTask), task)!;
+
+    internal static TValueTask FallbackResultActivator(TResult task)
+        => (TValueTask)Activator.CreateInstance(typeof(TValueTask), task)!;
+
+    public static TValueTask CreateInstance(Task<TResult> task) => TaskActivator(task);
+
+    public static TValueTask CreateInstance(TResult result) => ResultActivator(result);
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.NetFx.cs b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.NetFx.cs
new file mode 100644
index 000000000000..a2fc19bf2ef3
--- /dev/null
+++ b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.NetFx.cs
@@ -0,0 +1,221 @@
+// <copyright file="ValueTaskContinuationGenerator.NetFx.cs" company="Datadog">
+// 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.
+// </copyright>
+#nullable enable
+
+#if !NETCOREAPP3_1_OR_GREATER
+using System;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Datadog.Trace.DuckTyping;
+using Datadog.Trace.Vendors.Serilog.Events;
+
+namespace Datadog.Trace.ClrProfiler.CallTarget.Handlers.Continuations;
+
+internal class ValueTaskContinuationGenerator<TIntegration, TTarget, TReturn> : ContinuationGenerator<TTarget, TReturn>
+{
+    private static readonly CallbackHandler Resolver;
+
+    static ValueTaskContinuationGenerator()
+    {
+        var result = IntegrationMapper.CreateAsyncEndMethodDelegate(typeof(TIntegration), typeof(TTarget), typeof(object));
+        if (result.Method is not null)
+        {
+            if (result.Method.ReturnType == typeof(Task) ||
+                (result.Method.ReturnType.IsGenericType && typeof(Task).IsAssignableFrom(result.Method.ReturnType)))
+            {
+                var asyncContinuation = (AsyncObjectContinuationMethodDelegate)result.Method.CreateDelegate(typeof(AsyncObjectContinuationMethodDelegate));
+                Resolver = new AsyncCallbackHandler(asyncContinuation, result.PreserveContext);
+            }
+            else
+            {
+                var continuation = (ObjectContinuationMethodDelegate)result.Method.CreateDelegate(typeof(ObjectContinuationMethodDelegate));
+                Resolver = new SyncCallbackHandler(continuation, result.PreserveContext);
+            }
+        }
+        else
+        {
+            Resolver = new NoOpCallbackHandler();
+        }
+
+        if (Log.IsEnabled(LogEventLevel.Debug))
+        {
+            Log.Debug(
+                "== {TaskContinuationGenerator} using Resolver: {Resolver}",
+                $"TaskContinuationGenerator<{typeof(TIntegration).FullName}, {typeof(TTarget).FullName}, {typeof(TReturn).FullName}>",
+                Resolver.GetType().FullName);
+        }
+    }
+
+    public override TReturn? SetContinuation(TTarget? instance, TReturn? returnValue, Exception? exception, in CallTargetState state)
+    {
+        return Resolver.ExecuteCallback(instance, returnValue, exception, in state);
+    }
+
+    private class SyncCallbackHandler : CallbackHandler
+    {
+        private readonly ObjectContinuationMethodDelegate _continuation;
+        private readonly bool _preserveContext;
+
+        public SyncCallbackHandler(ObjectContinuationMethodDelegate continuation, bool preserveContext)
+        {
+            _continuation = continuation;
+            _preserveContext = preserveContext;
+        }
+
+        public override TReturn? ExecuteCallback(TTarget? instance, TReturn? returnValue, Exception? exception, in CallTargetState state)
+        {
+            if (exception != null || returnValue == null)
+            {
+                _continuation(instance, default, exception, in state);
+                return returnValue;
+            }
+
+            var previousValueTask = returnValue.DuckCast<IValueTaskDuckType>();
+            if (previousValueTask.IsCompletedSuccessfully)
+            {
+                // ok all good, just run synchronously
+                _continuation(instance, returnValue, exception, in state);
+                return returnValue;
+            }
+
+            // uh oh, need to extract the task, await it, run the continuation
+            var task = previousValueTask.AsTask();
+            var secondTask = ContinuationAction(task, instance, state);
+            // need to wrap the secondTask in a ValueTask to return it
+            return ValueTaskActivator<TReturn>.CreateInstance(secondTask);
+        }
+
+        private async Task ContinuationAction(Task previousTask, TTarget? target, CallTargetState state)
+        {
+            if (!previousTask.IsCompleted)
+            {
+                await new NoThrowAwaiter(previousTask, _preserveContext);
+            }
+
+            Exception? exception = null;
+
+            if (previousTask.Status == TaskStatus.Faulted)
+            {
+                exception = previousTask.Exception?.GetBaseException();
+            }
+            else if (previousTask.Status == TaskStatus.Canceled)
+            {
+                try
+                {
+                    // The only supported way to extract the cancellation exception is to await the task
+                    await previousTask.ConfigureAwait(_preserveContext);
+                }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                }
+            }
+
+            try
+            {
+                // *
+                // Calls the CallTarget integration continuation, exceptions here should never bubble up to the application
+                // *
+                _continuation(target, null, exception, in state);
+            }
+            catch (Exception ex)
+            {
+                IntegrationOptions<TIntegration, TTarget>.LogException(ex);
+            }
+
+            // *
+            // If the original task throws an exception we rethrow it here.
+            // *
+            if (exception != null)
+            {
+                ExceptionDispatchInfo.Capture(exception).Throw();
+            }
+        }
+    }
+
+    private class AsyncCallbackHandler : CallbackHandler
+    {
+        private readonly AsyncObjectContinuationMethodDelegate _asyncContinuation;
+        private readonly bool _preserveContext;
+
+        public AsyncCallbackHandler(AsyncObjectContinuationMethodDelegate asyncContinuation, bool preserveContext)
+        {
+            _asyncContinuation = asyncContinuation;
+            _preserveContext = preserveContext;
+        }
+
+        public override TReturn ExecuteCallback(TTarget? instance, TReturn? returnValue, Exception? exception, in CallTargetState state)
+        {
+            Task task;
+            if (returnValue == null)
+            {
+                task = Task.CompletedTask;
+            }
+            else
+            {
+                var previousValueTask = returnValue.DuckCast<IValueTaskDuckType>();
+                if (previousValueTask.IsCompletedSuccessfully)
+                {
+                    // ok all good, just run synchronously
+                    task = Task.CompletedTask;
+                }
+                else
+                {
+                    task = previousValueTask.AsTask();
+                }
+            }
+
+            var secondTask = ContinuationAction(task, instance, state, exception);
+            // need to wrap the secondTask in a ValueTask to return it
+            return ValueTaskActivator<TReturn>.CreateInstance(secondTask);
+        }
+
+        private async Task ContinuationAction(Task previousTask, TTarget? target, CallTargetState state, Exception? exception)
+        {
+            if (!previousTask.IsCompleted)
+            {
+                await new NoThrowAwaiter(previousTask, _preserveContext);
+            }
+
+            if (previousTask.Status == TaskStatus.Faulted)
+            {
+                exception ??= previousTask.Exception?.GetBaseException();
+            }
+            else if (previousTask.Status == TaskStatus.Canceled)
+            {
+                try
+                {
+                    // The only supported way to extract the cancellation exception is to await the task
+                    await previousTask.ConfigureAwait(_preserveContext);
+                }
+                catch (Exception ex)
+                {
+                    exception ??= ex;
+                }
+            }
+
+            try
+            {
+                // *
+                // Calls the CallTarget integration continuation, exceptions here should never bubble up to the application
+                // *
+                await _asyncContinuation(target, null, exception, in state).ConfigureAwait(_preserveContext);
+            }
+            catch (Exception ex)
+            {
+                IntegrationOptions<TIntegration, TTarget>.LogException(ex);
+            }
+
+            // *
+            // If the original task throws an exception we rethrow it here.
+            // *
+            if (exception != null)
+            {
+                ExceptionDispatchInfo.Capture(exception).Throw();
+            }
+        }
+    }
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.NetFx.cs b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.NetFx.cs
new file mode 100644
index 000000000000..063c6dd86770
--- /dev/null
+++ b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.NetFx.cs
@@ -0,0 +1,250 @@
+// <copyright file="ValueTaskContinuationGenerator`1.NetFx.cs" company="Datadog">
+// 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.
+// </copyright>
+#nullable enable
+
+#if !NETCOREAPP3_1_OR_GREATER
+using System;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Datadog.Trace.DuckTyping;
+using Datadog.Trace.Vendors.Serilog.Events;
+
+#pragma warning disable SA1649 // File name must match first type name
+
+namespace Datadog.Trace.ClrProfiler.CallTarget.Handlers.Continuations;
+
+internal class ValueTaskContinuationGenerator<TIntegration, TTarget, TReturn, TResult> : ContinuationGenerator<TTarget, TReturn, TResult>
+{
+    private static readonly CallbackHandler Resolver;
+
+    static ValueTaskContinuationGenerator()
+    {
+        var result = IntegrationMapper.CreateAsyncEndMethodDelegate(typeof(TIntegration), typeof(TTarget), typeof(TResult));
+        if (result.Method is not null)
+        {
+            if (result.Method.ReturnType == typeof(Task) ||
+                (result.Method.ReturnType.IsGenericType && typeof(Task).IsAssignableFrom(result.Method.ReturnType)))
+            {
+                var asyncContinuation = (AsyncContinuationMethodDelegate)result.Method.CreateDelegate(typeof(AsyncContinuationMethodDelegate));
+                Resolver = new AsyncCallbackHandler(asyncContinuation, result.PreserveContext);
+            }
+            else
+            {
+                var continuation = (ContinuationMethodDelegate)result.Method.CreateDelegate(typeof(ContinuationMethodDelegate));
+                Resolver = new SyncCallbackHandler(continuation, result.PreserveContext);
+            }
+        }
+        else
+        {
+            Resolver = new NoOpCallbackHandler();
+        }
+
+        if (Log.IsEnabled(LogEventLevel.Debug))
+        {
+            Log.Debug(
+                "== {TaskContinuationGenerator} using Resolver: {Resolver}",
+                $"TaskContinuationGenerator<{typeof(TIntegration).FullName}, {typeof(TTarget).FullName}, {typeof(TReturn).FullName}>",
+                Resolver.GetType().FullName);
+        }
+    }
+
+    public override TReturn? SetContinuation(TTarget? instance, TReturn? returnValue, Exception? exception, in CallTargetState state)
+    {
+        return Resolver.ExecuteCallback(instance, returnValue, exception, in state);
+    }
+
+    private class SyncCallbackHandler : CallbackHandler
+    {
+        private readonly ContinuationMethodDelegate _continuation;
+        private readonly bool _preserveContext;
+
+        public SyncCallbackHandler(ContinuationMethodDelegate continuation, bool preserveContext)
+        {
+            _continuation = continuation;
+            _preserveContext = preserveContext;
+        }
+
+        public override TReturn? ExecuteCallback(TTarget? instance, TReturn? returnValue, Exception? exception, in CallTargetState state)
+        {
+            if (exception != null || returnValue == null)
+            {
+                _continuation(instance, default, exception, in state);
+                return returnValue;
+            }
+
+            var previousValueTask = returnValue.DuckCast<IValueTaskOfTResultDuckType>();
+            if (previousValueTask.IsCompletedSuccessfully)
+            {
+                // ok all good, just run synchronously
+                var unwrappedResult = previousValueTask.Result;
+                _continuation(instance, unwrappedResult, exception, in state);
+                return ValueTaskActivator<TReturn, TResult?>.CreateInstance(unwrappedResult);
+            }
+
+            // uh oh, need to extract the task, await it, run the continuation
+            var task = previousValueTask.AsTask();
+            var secondTask = ContinuationAction(task, instance, state);
+            // need to wrap the Task<TResult?> in a ValueTask to return it
+            return ValueTaskActivator<TReturn, TResult?>.CreateInstance(secondTask);
+        }
+
+        private async Task<TResult?> ContinuationAction(Task<TResult?> previousTask, TTarget? target, CallTargetState state)
+        {
+            if (!previousTask.IsCompleted)
+            {
+                await new NoThrowAwaiter(previousTask, _preserveContext);
+            }
+
+            TResult? taskResult = default;
+            Exception? exception = null;
+            TResult? continuationResult = default;
+
+            if (previousTask.Status == TaskStatus.RanToCompletion)
+            {
+                taskResult = previousTask.Result;
+            }
+            else if (previousTask.Status == TaskStatus.Faulted)
+            {
+                exception = previousTask.Exception?.GetBaseException();
+            }
+            else if (previousTask.Status == TaskStatus.Canceled)
+            {
+                try
+                {
+                    // The only supported way to extract the cancellation exception is to await the task
+                    await previousTask.ConfigureAwait(_preserveContext);
+                }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                }
+            }
+
+            try
+            {
+                // *
+                // Calls the CallTarget integration continuation, exceptions here should never bubble up to the application
+                // *
+                continuationResult = _continuation(target, taskResult, exception, in state);
+            }
+            catch (Exception ex)
+            {
+                IntegrationOptions<TIntegration, TTarget>.LogException(ex);
+            }
+
+            // *
+            // If the original task throws an exception we rethrow it here.
+            // *
+            if (exception != null)
+            {
+                ExceptionDispatchInfo.Capture(exception).Throw();
+            }
+
+            return continuationResult;
+        }
+    }
+
+    private class AsyncCallbackHandler : CallbackHandler
+    {
+        private readonly AsyncContinuationMethodDelegate _asyncContinuation;
+        private readonly bool _preserveContext;
+
+        public AsyncCallbackHandler(AsyncContinuationMethodDelegate asyncContinuation, bool preserveContext)
+        {
+            _asyncContinuation = asyncContinuation;
+            _preserveContext = preserveContext;
+        }
+
+        public override TReturn ExecuteCallback(TTarget? instance, TReturn? returnValue, Exception? exception, in CallTargetState state)
+        {
+            Task<TResult?> task;
+            if (returnValue == null)
+            {
+                task = Task.FromResult<TResult?>(default);
+            }
+            else
+            {
+                var previousValueTask = returnValue.DuckCast<IValueTaskOfTResultDuckType>();
+                if (previousValueTask.IsCompletedSuccessfully)
+                {
+                    // ok all good, just run synchronously
+                    task = Task.FromResult(previousValueTask.Result);
+                }
+                else
+                {
+                    task = previousValueTask.AsTask();
+                }
+            }
+
+            var secondTask = ContinuationAction(task, instance, state, exception);
+            // need to wrap the Task<TResult?> in a ValueTask to return it
+            return ValueTaskActivator<TReturn, TResult?>.CreateInstance(secondTask);
+        }
+
+        private async Task<TResult?> ContinuationAction(Task<TResult?> previousTask, TTarget? target, CallTargetState state, Exception? exception)
+        {
+            TResult? taskResult = default;
+            if (!previousTask.IsCompleted)
+            {
+                await new NoThrowAwaiter(previousTask, _preserveContext);
+            }
+
+            if (previousTask.Status == TaskStatus.RanToCompletion)
+            {
+                taskResult = previousTask.Result;
+            }
+            else if (previousTask.Status == TaskStatus.Faulted)
+            {
+                exception ??= previousTask.Exception?.GetBaseException();
+            }
+            else if (previousTask.Status == TaskStatus.Canceled)
+            {
+                try
+                {
+                    // The only supported way to extract the cancellation exception is to await the task
+                    await previousTask.ConfigureAwait(_preserveContext);
+                }
+                catch (Exception ex)
+                {
+                    exception ??= ex;
+                }
+            }
+
+            TResult? continuationResult = default;
+            try
+            {
+                // *
+                // Calls the CallTarget integration continuation, exceptions here should never bubble up to the application
+                // *
+                continuationResult = await _asyncContinuation(target, taskResult, exception, in state).ConfigureAwait(_preserveContext);
+            }
+            catch (Exception ex)
+            {
+                IntegrationOptions<TIntegration, TTarget>.LogException(ex);
+            }
+
+            // *
+            // If the original task throws an exception we rethrow it here.
+            // *
+            if (exception != null)
+            {
+                ExceptionDispatchInfo.Capture(exception).Throw();
+            }
+
+            return continuationResult;
+        }
+    }
+
+#pragma warning disable SA1201 // An interface should not follow a class
+    private interface IValueTaskOfTResultDuckType
+    {
+        bool IsCompletedSuccessfully { get; }
+
+        TResult? Result { get; }
+
+        Task<TResult?> AsTask();
+    }
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/EndMethodHandler`1.cs b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/EndMethodHandler`1.cs
index 891d3debd5d2..aec7e454b14c 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/EndMethodHandler`1.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/EndMethodHandler`1.cs
@@ -35,19 +35,16 @@ static EndMethodHandler()
 
         if (returnType.IsGenericType)
         {
-            var genericReturnType = returnType.GetGenericTypeDefinition();
             if (typeof(Task).IsAssignableFrom(returnType))
             {
                 // The type is a Task<>
                 _continuationGenerator = (ContinuationGenerator<TTarget, TReturn>?)Activator.CreateInstance(typeof(TaskContinuationGenerator<,,,>).MakeGenericType(typeof(TIntegration), typeof(TTarget), returnType, ContinuationsHelper.GetResultType(returnType)));
             }
-#if NETCOREAPP3_1_OR_GREATER
-            else if (genericReturnType == typeof(ValueTask<>))
+            else if (ValueTaskHelper.IsGenericValueTask(returnType))
             {
                 // The type is a ValueTask<>
                 _continuationGenerator = (ContinuationGenerator<TTarget, TReturn>?)Activator.CreateInstance(typeof(ValueTaskContinuationGenerator<,,,>).MakeGenericType(typeof(TIntegration), typeof(TTarget), returnType, ContinuationsHelper.GetResultType(returnType)));
             }
-#endif
         }
         else
         {
@@ -56,13 +53,11 @@ static EndMethodHandler()
                 // The type is a Task
                 _continuationGenerator = new TaskContinuationGenerator<TIntegration, TTarget, TReturn>();
             }
-#if NETCOREAPP3_1_OR_GREATER
-            else if (returnType == typeof(ValueTask))
+            else if (ValueTaskHelper.IsValueTask(returnType))
             {
                 // The type is a ValueTask
                 _continuationGenerator = new ValueTaskContinuationGenerator<TIntegration, TTarget, TReturn>();
             }
-#endif
         }
     }
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/ValueTaskHelper.cs b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/ValueTaskHelper.cs
new file mode 100644
index 000000000000..bc958ab2e592
--- /dev/null
+++ b/tracer/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/ValueTaskHelper.cs
@@ -0,0 +1,44 @@
+// <copyright file="ValueTaskHelper.cs" company="Datadog">
+// 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.
+// </copyright>
+
+#nullable enable
+
+using System;
+
+namespace Datadog.Trace.ClrProfiler.CallTarget.Handlers;
+
+internal static class ValueTaskHelper
+{
+#if NETCOREAPP3_1_OR_GREATER
+    public static bool IsValueTask(Type? returnValue)
+        => returnValue == typeof(System.Threading.Tasks.ValueTask);
+
+    public static bool IsGenericValueTask(Type? returnValue)
+        => returnValue?.GetGenericTypeDefinition() == typeof(System.Threading.Tasks.ValueTask<>);
+#else
+    // ValueTask isn't part of the BCL for .NET FX or .NET Standard, and is instead
+    // provided by the System.Threading.Tasks.Extensions package. In .NET Core 2.1, ValueTask is available
+    // the core lib, even though we can't directly reference it, so we don't need to worry about assembly
+    // qualified references. In .NET FX (and .NET Standard generally) the type comes from a package.
+    // In that case we can't rely on Type.GetType() because, we need to provide the fully qualified assembly names,
+    // butt we also need support multiple versions of the package. So we fallback on the somewhat simple name check.
+    private static readonly Type? ValueTaskType = Type.GetType("System.Threading.Tasks.ValueTask");
+    private static readonly Type? GenericValueTaskType = Type.GetType("System.Threading.Tasks.ValueTask`1");
+
+    public static bool IsValueTask(Type? returnValue)
+        => ValueTaskType is not null
+               ? returnValue == ValueTaskType
+               : returnValue?.FullName == "System.Threading.Tasks.ValueTask";
+
+    public static bool IsGenericValueTask(Type? returnValue)
+    {
+        var genericDefinition = returnValue?.GetGenericTypeDefinition();
+        return GenericValueTaskType is not null
+                   ? genericDefinition == GenericValueTaskType
+                   : genericDefinition?.FullName == "System.Threading.Tasks.ValueTask`1";
+    }
+#endif
+
+}
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/ManualTracer.cs b/tracer/src/Datadog.Trace/ClrProfiler/ManualTracer.cs
index 56b6940b73bf..998d18e71178 100644
--- a/tracer/src/Datadog.Trace/ClrProfiler/ManualTracer.cs
+++ b/tracer/src/Datadog.Trace/ClrProfiler/ManualTracer.cs
@@ -72,7 +72,7 @@ SpanContext IDistributedTracer.GetSpanContext()
             }
             else
             {
-                var context = SpanContextPropagator.Instance.Extract(values);
+                var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(values);
                 return context.SpanContext;
             }
         }
diff --git a/tracer/src/Datadog.Trace/Datadog.Trace.csproj b/tracer/src/Datadog.Trace/Datadog.Trace.csproj
index 5ea13405ed2d..8ee7e971fa7b 100644
--- a/tracer/src/Datadog.Trace/Datadog.Trace.csproj
+++ b/tracer/src/Datadog.Trace/Datadog.Trace.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- NuGet -->
-    <Version>3.8.0</Version>
+    <Version>3.9.0</Version>
     <Title>Datadog APM</Title>
     <Description>Instrumentation library for Datadog APM.</Description>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -29,6 +29,18 @@
     <Compile Remove="$(GeneratedFolder)/*/**/*.cs" />
     <None Include="$(GeneratedFolder)/*/**/*.cs" />
     <Compile Update="Configuration\ConfigurationKeys.*.cs" DependentUpon="ConfigurationKeys.cs" />
+    <Compile Update="AppSec\Coordinator\SecurityCoordinator.Core.cs">
+      <DependentUpon>SecurityCoordinator.cs</DependentUpon>
+    </Compile>
+    <Compile Update="AppSec\Coordinator\SecurityCoordinator.Framework.cs">
+      <DependentUpon>SecurityCoordinator.cs</DependentUpon>
+    </Compile>
+    <Compile Update="AppSec\Coordinator\SecurityReporter.Core.cs">
+      <DependentUpon>SecurityReporter.cs</DependentUpon>
+    </Compile>
+    <Compile Update="AppSec\Coordinator\SecurityReporter.Framework.cs">
+      <DependentUpon>SecurityReporter.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tracer/src/Datadog.Trace/DiagnosticListeners/AspNetCoreDiagnosticObserver.cs b/tracer/src/Datadog.Trace/DiagnosticListeners/AspNetCoreDiagnosticObserver.cs
index 139295f025a0..46764eef12d0 100644
--- a/tracer/src/Datadog.Trace/DiagnosticListeners/AspNetCoreDiagnosticObserver.cs
+++ b/tracer/src/Datadog.Trace/DiagnosticListeners/AspNetCoreDiagnosticObserver.cs
@@ -432,7 +432,8 @@ private void OnHostingHttpRequestInStart(object arg)
                     if (shouldSecure)
                     {
                         CoreHttpContextStore.Instance.Set(httpContext);
-                        SecurityCoordinator.ReportWafInitInfoOnce(security, scope.Span);
+                        var securityReporter = new SecurityReporter(scope.Span, new SecurityCoordinator.HttpTransport(httpContext));
+                        securityReporter.ReportWafInitInfoOnce(security.WafInitResult);
                     }
                 }
             }
diff --git a/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs b/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs
index 468bbd802d49..5bf955089b1d 100644
--- a/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs
+++ b/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs
@@ -79,7 +79,7 @@ internal static void SetHeaderTags<T>(this ISpan span, T headers, IReadOnlyDicti
             {
                 try
                 {
-                    SpanContextPropagator.Instance.AddHeadersToSpanAsTags(span, headers, headerTags, defaultTagPrefix);
+                    Tracer.Instance.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(span, headers, headerTags, defaultTagPrefix);
                 }
                 catch (Exception ex)
                 {
diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
index 2766115d192b..eb26f45d2c8d 100644
--- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
@@ -11,7 +11,7 @@
 namespace Datadog.Trace.Telemetry;
 internal partial class CiVisibilityMetricsTelemetryCollector
 {
-    private const int CountCIVisibilityLength = 343;
+    private const int CountCIVisibilityLength = 371;
 
     /// <summary>
     /// Creates the buffer for the <see cref="Datadog.Trace.Telemetry.Metrics.CountCIVisibility" /> values.
@@ -69,6 +69,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:xunit", "event_type:test", "browser_driver:selenium" }),
@@ -85,6 +89,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:nunit", "event_type:test", "browser_driver:selenium" }),
@@ -101,6 +109,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:mstest", "event_type:test", "browser_driver:selenium" }),
@@ -117,6 +129,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "browser_driver:selenium" }),
@@ -133,6 +149,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium" }),
@@ -141,7 +161,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow", "browser_driver:selenium", "is_rum:true" }),
-            // code_coverage_started, index = 120
+            // code_coverage_started, index = 140
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -152,7 +172,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // code_coverage_finished, index = 130
+            // code_coverage_finished, index = 150
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -163,19 +183,19 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // manual_api_events, index = 140
+            // manual_api_events, index = 160
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // events_enqueued_for_serialization, index = 144
+            // events_enqueued_for_serialization, index = 164
             new(null),
-            // endpoint_payload.requests, index = 145
+            // endpoint_payload.requests, index = 165
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:test_cycle", "rq_compressed:true" }),
             new(new[] { "endpoint:code_coverage" }),
             new(new[] { "endpoint:code_coverage", "rq_compressed:true" }),
-            // endpoint_payload.requests_errors, index = 149
+            // endpoint_payload.requests_errors, index = 169
             new(new[] { "endpoint:test_cycle", "error_type:timeout" }),
             new(new[] { "endpoint:test_cycle", "error_type:network" }),
             new(new[] { "endpoint:test_cycle", "error_type:status_code" }),
@@ -198,10 +218,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:429" }),
-            // endpoint_payload.dropped, index = 171
+            // endpoint_payload.dropped, index = 191
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:code_coverage" }),
-            // git.command, index = 173
+            // git.command, index = 193
             new(new[] { "command:get_repository" }),
             new(new[] { "command:get_branch" }),
             new(new[] { "command:get_remote" }),
@@ -211,7 +231,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:get_local_commits" }),
             new(new[] { "command:get_objects" }),
             new(new[] { "command:pack_objects" }),
-            // git.command_errors, index = 182
+            // git.command_errors, index = 202
             new(new[] { "command:get_repository", "exit_code:missing" }),
             new(new[] { "command:get_repository", "exit_code:unknown" }),
             new(new[] { "command:get_repository", "exit_code:-1" }),
@@ -284,10 +304,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:pack_objects", "exit_code:127" }),
             new(new[] { "command:pack_objects", "exit_code:128" }),
             new(new[] { "command:pack_objects", "exit_code:129" }),
-            // git_requests.search_commits, index = 254
+            // git_requests.search_commits, index = 274
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.search_commits_errors, index = 256
+            // git_requests.search_commits_errors, index = 276
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -299,10 +319,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.objects_pack, index = 267
+            // git_requests.objects_pack, index = 287
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.objects_pack_errors, index = 269
+            // git_requests.objects_pack_errors, index = 289
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -314,10 +334,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings, index = 280
+            // git_requests.settings, index = 300
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.settings_errors, index = 282
+            // git_requests.settings_errors, index = 302
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -329,7 +349,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings_response, index = 293
+            // git_requests.settings_response, index = 313
             new(null),
             new(new[] { "coverage_enabled" }),
             new(new[] { "itrskip_enabled" }),
@@ -338,10 +358,18 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "coverage_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true" }),
-            // itr_skippable_tests.request, index = 301
+            new(new[] { "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            // itr_skippable_tests.request, index = 329
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // itr_skippable_tests.request_errors, index = 303
+            // itr_skippable_tests.request_errors, index = 331
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -353,33 +381,33 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // itr_skippable_tests.response_tests, index = 314
+            // itr_skippable_tests.response_tests, index = 342
             new(null),
-            // itr_skippable_tests.response_suites, index = 315
+            // itr_skippable_tests.response_suites, index = 343
             new(null),
-            // itr_skipped, index = 316
+            // itr_skipped, index = 344
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_unskippable, index = 320
+            // itr_unskippable, index = 348
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_forced_run, index = 324
+            // itr_forced_run, index = 352
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // code_coverage.is_empty, index = 328
+            // code_coverage.is_empty, index = 356
             new(null),
-            // code_coverage.errors, index = 329
+            // code_coverage.errors, index = 357
             new(null),
-            // early_flake_detection.request, index = 330
+            // early_flake_detection.request, index = 358
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // early_flake_detection.request_errors, index = 332
+            // early_flake_detection.request_errors, index = 360
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -399,7 +427,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
     /// It is equal to the cardinality of the tag combinations (or 1 if there are no tags)
     /// </summary>
     private static int[] CountCIVisibilityEntryCounts { get; }
-        = new int[]{ 40, 80, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 8, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
+        = new int[]{ 40, 100, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 16, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
 
     public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmark tag2, int increment = 1)
     {
@@ -409,164 +437,164 @@ public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.
 
     public void RecordCountCIVisibilityEventFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum tag2, int increment = 1)
     {
-        var index = 40 + ((int)tag1 * 16) + (int)tag2;
+        var index = 40 + ((int)tag1 * 20) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageStarted(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 120 + ((int)tag1 * 2) + (int)tag2;
+        var index = 140 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 130 + ((int)tag1 * 2) + (int)tag2;
+        var index = 150 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityManualApiEvent(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 140 + (int)tag;
+        var index = 160 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEventsEnqueueForSerialization(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[144], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[164], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequests(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpointAndCompression tag, int increment = 1)
     {
-        var index = 145 + (int)tag;
+        var index = 165 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequestsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag2, int increment = 1)
     {
-        var index = 149 + ((int)tag1 * 11) + (int)tag2;
+        var index = 169 + ((int)tag1 * 11) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadDropped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag, int increment = 1)
     {
-        var index = 171 + (int)tag;
+        var index = 191 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommand(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag, int increment = 1)
     {
-        var index = 173 + (int)tag;
+        var index = 193 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommandErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityExitCodes tag2, int increment = 1)
     {
-        var index = 182 + ((int)tag1 * 8) + (int)tag2;
+        var index = 202 + ((int)tag1 * 8) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommits(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 254 + (int)tag;
+        var index = 274 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommitsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 256 + (int)tag;
+        var index = 276 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPack(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 267 + (int)tag;
+        var index = 287 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPackErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 269 + (int)tag;
+        var index = 289 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettings(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 280 + (int)tag;
+        var index = 300 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 282 + (int)tag;
+        var index = 302 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsResponse(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityITRSettingsResponse tag, int increment = 1)
     {
-        var index = 293 + (int)tag;
+        var index = 313 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 301 + (int)tag;
+        var index = 329 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 303 + (int)tag;
+        var index = 331 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseTests(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[314], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[342], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseSuites(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[315], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[343], increment);
     }
 
     public void RecordCountCIVisibilityITRSkipped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 316 + (int)tag;
+        var index = 344 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRUnskippable(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 320 + (int)tag;
+        var index = 348 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRForcedRun(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 324 + (int)tag;
+        var index = 352 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageIsEmpty(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[328], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[356], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageErrors(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[329], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[357], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 330 + (int)tag;
+        var index = 358 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 332 + (int)tag;
+        var index = 360 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
index fcfd1e38ed4a..a34c9bfd512b 100644
--- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
index b91aebc832be..7b20fa050a1d 100644
--- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
@@ -77,7 +77,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
@@ -498,7 +498,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
index 2a54bea2390a..e94fcb451a68 100644
--- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
index e7f48e2b15c6..586d54aba6dd 100644
--- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
@@ -118,7 +118,7 @@ public TelemetryMetricAttribute(string metricName)
 /// which has a single tag
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag> : System.Attribute
+internal class TelemetryMetricAttribute<TTag> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag : System.Enum
 {
     /// <summary>
@@ -128,10 +128,8 @@ internal class TelemetryMetricAttribute<TTag> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -141,34 +139,62 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
 
 /// <summary>
@@ -177,9 +203,10 @@ public TelemetryMetricAttribute(string metricName)
 /// which has two tags
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag1 : System.Enum
     where TTag2 : System.Enum
+    where TTag3 : System.Enum
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
@@ -188,10 +215,8 @@ internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -201,32 +226,155 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5, TTag6> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+    where TTag6 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
index 2766115d192b..eb26f45d2c8d 100644
--- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
@@ -11,7 +11,7 @@
 namespace Datadog.Trace.Telemetry;
 internal partial class CiVisibilityMetricsTelemetryCollector
 {
-    private const int CountCIVisibilityLength = 343;
+    private const int CountCIVisibilityLength = 371;
 
     /// <summary>
     /// Creates the buffer for the <see cref="Datadog.Trace.Telemetry.Metrics.CountCIVisibility" /> values.
@@ -69,6 +69,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:xunit", "event_type:test", "browser_driver:selenium" }),
@@ -85,6 +89,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:nunit", "event_type:test", "browser_driver:selenium" }),
@@ -101,6 +109,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:mstest", "event_type:test", "browser_driver:selenium" }),
@@ -117,6 +129,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "browser_driver:selenium" }),
@@ -133,6 +149,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium" }),
@@ -141,7 +161,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow", "browser_driver:selenium", "is_rum:true" }),
-            // code_coverage_started, index = 120
+            // code_coverage_started, index = 140
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -152,7 +172,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // code_coverage_finished, index = 130
+            // code_coverage_finished, index = 150
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -163,19 +183,19 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // manual_api_events, index = 140
+            // manual_api_events, index = 160
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // events_enqueued_for_serialization, index = 144
+            // events_enqueued_for_serialization, index = 164
             new(null),
-            // endpoint_payload.requests, index = 145
+            // endpoint_payload.requests, index = 165
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:test_cycle", "rq_compressed:true" }),
             new(new[] { "endpoint:code_coverage" }),
             new(new[] { "endpoint:code_coverage", "rq_compressed:true" }),
-            // endpoint_payload.requests_errors, index = 149
+            // endpoint_payload.requests_errors, index = 169
             new(new[] { "endpoint:test_cycle", "error_type:timeout" }),
             new(new[] { "endpoint:test_cycle", "error_type:network" }),
             new(new[] { "endpoint:test_cycle", "error_type:status_code" }),
@@ -198,10 +218,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:429" }),
-            // endpoint_payload.dropped, index = 171
+            // endpoint_payload.dropped, index = 191
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:code_coverage" }),
-            // git.command, index = 173
+            // git.command, index = 193
             new(new[] { "command:get_repository" }),
             new(new[] { "command:get_branch" }),
             new(new[] { "command:get_remote" }),
@@ -211,7 +231,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:get_local_commits" }),
             new(new[] { "command:get_objects" }),
             new(new[] { "command:pack_objects" }),
-            // git.command_errors, index = 182
+            // git.command_errors, index = 202
             new(new[] { "command:get_repository", "exit_code:missing" }),
             new(new[] { "command:get_repository", "exit_code:unknown" }),
             new(new[] { "command:get_repository", "exit_code:-1" }),
@@ -284,10 +304,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:pack_objects", "exit_code:127" }),
             new(new[] { "command:pack_objects", "exit_code:128" }),
             new(new[] { "command:pack_objects", "exit_code:129" }),
-            // git_requests.search_commits, index = 254
+            // git_requests.search_commits, index = 274
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.search_commits_errors, index = 256
+            // git_requests.search_commits_errors, index = 276
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -299,10 +319,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.objects_pack, index = 267
+            // git_requests.objects_pack, index = 287
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.objects_pack_errors, index = 269
+            // git_requests.objects_pack_errors, index = 289
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -314,10 +334,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings, index = 280
+            // git_requests.settings, index = 300
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.settings_errors, index = 282
+            // git_requests.settings_errors, index = 302
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -329,7 +349,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings_response, index = 293
+            // git_requests.settings_response, index = 313
             new(null),
             new(new[] { "coverage_enabled" }),
             new(new[] { "itrskip_enabled" }),
@@ -338,10 +358,18 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "coverage_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true" }),
-            // itr_skippable_tests.request, index = 301
+            new(new[] { "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            // itr_skippable_tests.request, index = 329
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // itr_skippable_tests.request_errors, index = 303
+            // itr_skippable_tests.request_errors, index = 331
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -353,33 +381,33 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // itr_skippable_tests.response_tests, index = 314
+            // itr_skippable_tests.response_tests, index = 342
             new(null),
-            // itr_skippable_tests.response_suites, index = 315
+            // itr_skippable_tests.response_suites, index = 343
             new(null),
-            // itr_skipped, index = 316
+            // itr_skipped, index = 344
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_unskippable, index = 320
+            // itr_unskippable, index = 348
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_forced_run, index = 324
+            // itr_forced_run, index = 352
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // code_coverage.is_empty, index = 328
+            // code_coverage.is_empty, index = 356
             new(null),
-            // code_coverage.errors, index = 329
+            // code_coverage.errors, index = 357
             new(null),
-            // early_flake_detection.request, index = 330
+            // early_flake_detection.request, index = 358
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // early_flake_detection.request_errors, index = 332
+            // early_flake_detection.request_errors, index = 360
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -399,7 +427,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
     /// It is equal to the cardinality of the tag combinations (or 1 if there are no tags)
     /// </summary>
     private static int[] CountCIVisibilityEntryCounts { get; }
-        = new int[]{ 40, 80, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 8, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
+        = new int[]{ 40, 100, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 16, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
 
     public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmark tag2, int increment = 1)
     {
@@ -409,164 +437,164 @@ public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.
 
     public void RecordCountCIVisibilityEventFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum tag2, int increment = 1)
     {
-        var index = 40 + ((int)tag1 * 16) + (int)tag2;
+        var index = 40 + ((int)tag1 * 20) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageStarted(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 120 + ((int)tag1 * 2) + (int)tag2;
+        var index = 140 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 130 + ((int)tag1 * 2) + (int)tag2;
+        var index = 150 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityManualApiEvent(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 140 + (int)tag;
+        var index = 160 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEventsEnqueueForSerialization(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[144], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[164], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequests(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpointAndCompression tag, int increment = 1)
     {
-        var index = 145 + (int)tag;
+        var index = 165 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequestsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag2, int increment = 1)
     {
-        var index = 149 + ((int)tag1 * 11) + (int)tag2;
+        var index = 169 + ((int)tag1 * 11) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadDropped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag, int increment = 1)
     {
-        var index = 171 + (int)tag;
+        var index = 191 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommand(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag, int increment = 1)
     {
-        var index = 173 + (int)tag;
+        var index = 193 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommandErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityExitCodes tag2, int increment = 1)
     {
-        var index = 182 + ((int)tag1 * 8) + (int)tag2;
+        var index = 202 + ((int)tag1 * 8) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommits(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 254 + (int)tag;
+        var index = 274 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommitsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 256 + (int)tag;
+        var index = 276 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPack(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 267 + (int)tag;
+        var index = 287 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPackErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 269 + (int)tag;
+        var index = 289 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettings(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 280 + (int)tag;
+        var index = 300 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 282 + (int)tag;
+        var index = 302 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsResponse(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityITRSettingsResponse tag, int increment = 1)
     {
-        var index = 293 + (int)tag;
+        var index = 313 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 301 + (int)tag;
+        var index = 329 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 303 + (int)tag;
+        var index = 331 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseTests(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[314], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[342], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseSuites(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[315], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[343], increment);
     }
 
     public void RecordCountCIVisibilityITRSkipped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 316 + (int)tag;
+        var index = 344 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRUnskippable(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 320 + (int)tag;
+        var index = 348 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRForcedRun(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 324 + (int)tag;
+        var index = 352 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageIsEmpty(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[328], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[356], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageErrors(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[329], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[357], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 330 + (int)tag;
+        var index = 358 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 332 + (int)tag;
+        var index = 360 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
index fcfd1e38ed4a..a34c9bfd512b 100644
--- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
index b91aebc832be..7b20fa050a1d 100644
--- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
@@ -77,7 +77,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
@@ -498,7 +498,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
index 2a54bea2390a..e94fcb451a68 100644
--- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
index e7f48e2b15c6..586d54aba6dd 100644
--- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
@@ -118,7 +118,7 @@ public TelemetryMetricAttribute(string metricName)
 /// which has a single tag
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag> : System.Attribute
+internal class TelemetryMetricAttribute<TTag> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag : System.Enum
 {
     /// <summary>
@@ -128,10 +128,8 @@ internal class TelemetryMetricAttribute<TTag> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -141,34 +139,62 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
 
 /// <summary>
@@ -177,9 +203,10 @@ public TelemetryMetricAttribute(string metricName)
 /// which has two tags
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag1 : System.Enum
     where TTag2 : System.Enum
+    where TTag3 : System.Enum
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
@@ -188,10 +215,8 @@ internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -201,32 +226,155 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5, TTag6> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+    where TTag6 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
index 2766115d192b..eb26f45d2c8d 100644
--- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
@@ -11,7 +11,7 @@
 namespace Datadog.Trace.Telemetry;
 internal partial class CiVisibilityMetricsTelemetryCollector
 {
-    private const int CountCIVisibilityLength = 343;
+    private const int CountCIVisibilityLength = 371;
 
     /// <summary>
     /// Creates the buffer for the <see cref="Datadog.Trace.Telemetry.Metrics.CountCIVisibility" /> values.
@@ -69,6 +69,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:xunit", "event_type:test", "browser_driver:selenium" }),
@@ -85,6 +89,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:nunit", "event_type:test", "browser_driver:selenium" }),
@@ -101,6 +109,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:mstest", "event_type:test", "browser_driver:selenium" }),
@@ -117,6 +129,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "browser_driver:selenium" }),
@@ -133,6 +149,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium" }),
@@ -141,7 +161,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow", "browser_driver:selenium", "is_rum:true" }),
-            // code_coverage_started, index = 120
+            // code_coverage_started, index = 140
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -152,7 +172,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // code_coverage_finished, index = 130
+            // code_coverage_finished, index = 150
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -163,19 +183,19 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // manual_api_events, index = 140
+            // manual_api_events, index = 160
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // events_enqueued_for_serialization, index = 144
+            // events_enqueued_for_serialization, index = 164
             new(null),
-            // endpoint_payload.requests, index = 145
+            // endpoint_payload.requests, index = 165
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:test_cycle", "rq_compressed:true" }),
             new(new[] { "endpoint:code_coverage" }),
             new(new[] { "endpoint:code_coverage", "rq_compressed:true" }),
-            // endpoint_payload.requests_errors, index = 149
+            // endpoint_payload.requests_errors, index = 169
             new(new[] { "endpoint:test_cycle", "error_type:timeout" }),
             new(new[] { "endpoint:test_cycle", "error_type:network" }),
             new(new[] { "endpoint:test_cycle", "error_type:status_code" }),
@@ -198,10 +218,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:429" }),
-            // endpoint_payload.dropped, index = 171
+            // endpoint_payload.dropped, index = 191
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:code_coverage" }),
-            // git.command, index = 173
+            // git.command, index = 193
             new(new[] { "command:get_repository" }),
             new(new[] { "command:get_branch" }),
             new(new[] { "command:get_remote" }),
@@ -211,7 +231,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:get_local_commits" }),
             new(new[] { "command:get_objects" }),
             new(new[] { "command:pack_objects" }),
-            // git.command_errors, index = 182
+            // git.command_errors, index = 202
             new(new[] { "command:get_repository", "exit_code:missing" }),
             new(new[] { "command:get_repository", "exit_code:unknown" }),
             new(new[] { "command:get_repository", "exit_code:-1" }),
@@ -284,10 +304,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:pack_objects", "exit_code:127" }),
             new(new[] { "command:pack_objects", "exit_code:128" }),
             new(new[] { "command:pack_objects", "exit_code:129" }),
-            // git_requests.search_commits, index = 254
+            // git_requests.search_commits, index = 274
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.search_commits_errors, index = 256
+            // git_requests.search_commits_errors, index = 276
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -299,10 +319,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.objects_pack, index = 267
+            // git_requests.objects_pack, index = 287
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.objects_pack_errors, index = 269
+            // git_requests.objects_pack_errors, index = 289
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -314,10 +334,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings, index = 280
+            // git_requests.settings, index = 300
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.settings_errors, index = 282
+            // git_requests.settings_errors, index = 302
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -329,7 +349,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings_response, index = 293
+            // git_requests.settings_response, index = 313
             new(null),
             new(new[] { "coverage_enabled" }),
             new(new[] { "itrskip_enabled" }),
@@ -338,10 +358,18 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "coverage_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true" }),
-            // itr_skippable_tests.request, index = 301
+            new(new[] { "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            // itr_skippable_tests.request, index = 329
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // itr_skippable_tests.request_errors, index = 303
+            // itr_skippable_tests.request_errors, index = 331
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -353,33 +381,33 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // itr_skippable_tests.response_tests, index = 314
+            // itr_skippable_tests.response_tests, index = 342
             new(null),
-            // itr_skippable_tests.response_suites, index = 315
+            // itr_skippable_tests.response_suites, index = 343
             new(null),
-            // itr_skipped, index = 316
+            // itr_skipped, index = 344
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_unskippable, index = 320
+            // itr_unskippable, index = 348
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_forced_run, index = 324
+            // itr_forced_run, index = 352
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // code_coverage.is_empty, index = 328
+            // code_coverage.is_empty, index = 356
             new(null),
-            // code_coverage.errors, index = 329
+            // code_coverage.errors, index = 357
             new(null),
-            // early_flake_detection.request, index = 330
+            // early_flake_detection.request, index = 358
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // early_flake_detection.request_errors, index = 332
+            // early_flake_detection.request_errors, index = 360
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -399,7 +427,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
     /// It is equal to the cardinality of the tag combinations (or 1 if there are no tags)
     /// </summary>
     private static int[] CountCIVisibilityEntryCounts { get; }
-        = new int[]{ 40, 80, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 8, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
+        = new int[]{ 40, 100, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 16, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
 
     public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmark tag2, int increment = 1)
     {
@@ -409,164 +437,164 @@ public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.
 
     public void RecordCountCIVisibilityEventFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum tag2, int increment = 1)
     {
-        var index = 40 + ((int)tag1 * 16) + (int)tag2;
+        var index = 40 + ((int)tag1 * 20) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageStarted(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 120 + ((int)tag1 * 2) + (int)tag2;
+        var index = 140 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 130 + ((int)tag1 * 2) + (int)tag2;
+        var index = 150 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityManualApiEvent(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 140 + (int)tag;
+        var index = 160 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEventsEnqueueForSerialization(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[144], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[164], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequests(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpointAndCompression tag, int increment = 1)
     {
-        var index = 145 + (int)tag;
+        var index = 165 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequestsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag2, int increment = 1)
     {
-        var index = 149 + ((int)tag1 * 11) + (int)tag2;
+        var index = 169 + ((int)tag1 * 11) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadDropped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag, int increment = 1)
     {
-        var index = 171 + (int)tag;
+        var index = 191 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommand(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag, int increment = 1)
     {
-        var index = 173 + (int)tag;
+        var index = 193 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommandErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityExitCodes tag2, int increment = 1)
     {
-        var index = 182 + ((int)tag1 * 8) + (int)tag2;
+        var index = 202 + ((int)tag1 * 8) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommits(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 254 + (int)tag;
+        var index = 274 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommitsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 256 + (int)tag;
+        var index = 276 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPack(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 267 + (int)tag;
+        var index = 287 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPackErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 269 + (int)tag;
+        var index = 289 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettings(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 280 + (int)tag;
+        var index = 300 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 282 + (int)tag;
+        var index = 302 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsResponse(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityITRSettingsResponse tag, int increment = 1)
     {
-        var index = 293 + (int)tag;
+        var index = 313 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 301 + (int)tag;
+        var index = 329 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 303 + (int)tag;
+        var index = 331 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseTests(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[314], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[342], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseSuites(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[315], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[343], increment);
     }
 
     public void RecordCountCIVisibilityITRSkipped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 316 + (int)tag;
+        var index = 344 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRUnskippable(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 320 + (int)tag;
+        var index = 348 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRForcedRun(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 324 + (int)tag;
+        var index = 352 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageIsEmpty(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[328], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[356], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageErrors(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[329], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[357], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 330 + (int)tag;
+        var index = 358 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 332 + (int)tag;
+        var index = 360 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
index fcfd1e38ed4a..a34c9bfd512b 100644
--- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
index b91aebc832be..7b20fa050a1d 100644
--- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
@@ -77,7 +77,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
@@ -498,7 +498,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
index 2a54bea2390a..e94fcb451a68 100644
--- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
index e7f48e2b15c6..586d54aba6dd 100644
--- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
@@ -118,7 +118,7 @@ public TelemetryMetricAttribute(string metricName)
 /// which has a single tag
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag> : System.Attribute
+internal class TelemetryMetricAttribute<TTag> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag : System.Enum
 {
     /// <summary>
@@ -128,10 +128,8 @@ internal class TelemetryMetricAttribute<TTag> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -141,34 +139,62 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
 
 /// <summary>
@@ -177,9 +203,10 @@ public TelemetryMetricAttribute(string metricName)
 /// which has two tags
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag1 : System.Enum
     where TTag2 : System.Enum
+    where TTag3 : System.Enum
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
@@ -188,10 +215,8 @@ internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -201,32 +226,155 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5, TTag6> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+    where TTag6 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
index 2766115d192b..eb26f45d2c8d 100644
--- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountCIVisibility.g.cs
@@ -11,7 +11,7 @@
 namespace Datadog.Trace.Telemetry;
 internal partial class CiVisibilityMetricsTelemetryCollector
 {
-    private const int CountCIVisibilityLength = 343;
+    private const int CountCIVisibilityLength = 371;
 
     /// <summary>
     /// Creates the buffer for the <see cref="Datadog.Trace.Telemetry.Metrics.CountCIVisibility" /> values.
@@ -69,6 +69,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:xunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:xunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:xunit", "event_type:test", "browser_driver:selenium" }),
@@ -85,6 +89,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:nunit", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:nunit", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:nunit", "event_type:test", "browser_driver:selenium" }),
@@ -101,6 +109,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:mstest", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:mstest", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:mstest", "event_type:test", "browser_driver:selenium" }),
@@ -117,6 +129,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:benchmarkdotnet", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:benchmarkdotnet", "event_type:test", "browser_driver:selenium" }),
@@ -133,6 +149,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci" }),
             new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "is_unsupported_ci", "agentless_log_submission_enabled" }),
+            new(new[] { "test_framework:unknown", "event_type:session", "has_codeowner", "agentless_log_submission_enabled" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow" }),
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium" }),
@@ -141,7 +161,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:unknown", "event_type:test", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "browser_driver:selenium", "is_rum:true" }),
             new(new[] { "test_framework:unknown", "event_type:test", "is_new:true", "early_flake_detection_abort_reason:slow", "browser_driver:selenium", "is_rum:true" }),
-            // code_coverage_started, index = 120
+            // code_coverage_started, index = 140
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -152,7 +172,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // code_coverage_finished, index = 130
+            // code_coverage_finished, index = 150
             new(new[] { "test_framework:xunit", "library:custom" }),
             new(new[] { "test_framework:xunit", "library:unknown" }),
             new(new[] { "test_framework:nunit", "library:custom" }),
@@ -163,19 +183,19 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "test_framework:benchmarkdotnet", "library:unknown" }),
             new(new[] { "test_framework:unknown", "library:custom" }),
             new(new[] { "test_framework:unknown", "library:unknown" }),
-            // manual_api_events, index = 140
+            // manual_api_events, index = 160
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // events_enqueued_for_serialization, index = 144
+            // events_enqueued_for_serialization, index = 164
             new(null),
-            // endpoint_payload.requests, index = 145
+            // endpoint_payload.requests, index = 165
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:test_cycle", "rq_compressed:true" }),
             new(new[] { "endpoint:code_coverage" }),
             new(new[] { "endpoint:code_coverage", "rq_compressed:true" }),
-            // endpoint_payload.requests_errors, index = 149
+            // endpoint_payload.requests_errors, index = 169
             new(new[] { "endpoint:test_cycle", "error_type:timeout" }),
             new(new[] { "endpoint:test_cycle", "error_type:network" }),
             new(new[] { "endpoint:test_cycle", "error_type:status_code" }),
@@ -198,10 +218,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "endpoint:code_coverage", "error_type:status_code_4xx_response", "status_code:429" }),
-            // endpoint_payload.dropped, index = 171
+            // endpoint_payload.dropped, index = 191
             new(new[] { "endpoint:test_cycle" }),
             new(new[] { "endpoint:code_coverage" }),
-            // git.command, index = 173
+            // git.command, index = 193
             new(new[] { "command:get_repository" }),
             new(new[] { "command:get_branch" }),
             new(new[] { "command:get_remote" }),
@@ -211,7 +231,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:get_local_commits" }),
             new(new[] { "command:get_objects" }),
             new(new[] { "command:pack_objects" }),
-            // git.command_errors, index = 182
+            // git.command_errors, index = 202
             new(new[] { "command:get_repository", "exit_code:missing" }),
             new(new[] { "command:get_repository", "exit_code:unknown" }),
             new(new[] { "command:get_repository", "exit_code:-1" }),
@@ -284,10 +304,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "command:pack_objects", "exit_code:127" }),
             new(new[] { "command:pack_objects", "exit_code:128" }),
             new(new[] { "command:pack_objects", "exit_code:129" }),
-            // git_requests.search_commits, index = 254
+            // git_requests.search_commits, index = 274
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.search_commits_errors, index = 256
+            // git_requests.search_commits_errors, index = 276
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -299,10 +319,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.objects_pack, index = 267
+            // git_requests.objects_pack, index = 287
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.objects_pack_errors, index = 269
+            // git_requests.objects_pack_errors, index = 289
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -314,10 +334,10 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings, index = 280
+            // git_requests.settings, index = 300
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // git_requests.settings_errors, index = 282
+            // git_requests.settings_errors, index = 302
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -329,7 +349,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // git_requests.settings_response, index = 293
+            // git_requests.settings_response, index = 313
             new(null),
             new(new[] { "coverage_enabled" }),
             new(new[] { "itrskip_enabled" }),
@@ -338,10 +358,18 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "coverage_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true" }),
             new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true" }),
-            // itr_skippable_tests.request, index = 301
+            new(new[] { "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "flaky_test_retries_enabled:true" }),
+            new(new[] { "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            new(new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled:true", "flaky_test_retries_enabled:true" }),
+            // itr_skippable_tests.request, index = 329
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // itr_skippable_tests.request_errors, index = 303
+            // itr_skippable_tests.request_errors, index = 331
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -353,33 +381,33 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
             new(new[] { "error_type:status_code_4xx_response", "status_code:404" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:408" }),
             new(new[] { "error_type:status_code_4xx_response", "status_code:429" }),
-            // itr_skippable_tests.response_tests, index = 314
+            // itr_skippable_tests.response_tests, index = 342
             new(null),
-            // itr_skippable_tests.response_suites, index = 315
+            // itr_skippable_tests.response_suites, index = 343
             new(null),
-            // itr_skipped, index = 316
+            // itr_skipped, index = 344
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_unskippable, index = 320
+            // itr_unskippable, index = 348
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // itr_forced_run, index = 324
+            // itr_forced_run, index = 352
             new(new[] { "event_type:test" }),
             new(new[] { "event_type:suite" }),
             new(new[] { "event_type:module" }),
             new(new[] { "event_type:session" }),
-            // code_coverage.is_empty, index = 328
+            // code_coverage.is_empty, index = 356
             new(null),
-            // code_coverage.errors, index = 329
+            // code_coverage.errors, index = 357
             new(null),
-            // early_flake_detection.request, index = 330
+            // early_flake_detection.request, index = 358
             new(null),
             new(new[] { "rq_compressed:true" }),
-            // early_flake_detection.request_errors, index = 332
+            // early_flake_detection.request_errors, index = 360
             new(new[] { "error_type:timeout" }),
             new(new[] { "error_type:network" }),
             new(new[] { "error_type:status_code" }),
@@ -399,7 +427,7 @@ private static AggregatedMetric[] GetCountCIVisibilityBuffer()
     /// It is equal to the cardinality of the tag combinations (or 1 if there are no tags)
     /// </summary>
     private static int[] CountCIVisibilityEntryCounts { get; }
-        = new int[]{ 40, 80, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 8, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
+        = new int[]{ 40, 100, 10, 10, 4, 1, 4, 22, 2, 9, 72, 2, 11, 2, 11, 2, 11, 16, 2, 11, 1, 1, 4, 4, 4, 1, 1, 2, 11, };
 
     public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmark tag2, int increment = 1)
     {
@@ -409,164 +437,164 @@ public void RecordCountCIVisibilityEventCreated(Datadog.Trace.Telemetry.Metrics.
 
     public void RecordCountCIVisibilityEventFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkAndEarlyFlakeDetectionAndRum tag2, int increment = 1)
     {
-        var index = 40 + ((int)tag1 * 16) + (int)tag2;
+        var index = 40 + ((int)tag1 * 20) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageStarted(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 120 + ((int)tag1 * 2) + (int)tag2;
+        var index = 140 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageFinished(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestFramework tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCoverageLibrary tag2, int increment = 1)
     {
-        var index = 130 + ((int)tag1 * 2) + (int)tag2;
+        var index = 150 + ((int)tag1 * 2) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityManualApiEvent(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 140 + (int)tag;
+        var index = 160 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEventsEnqueueForSerialization(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[144], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[164], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequests(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpointAndCompression tag, int increment = 1)
     {
-        var index = 145 + (int)tag;
+        var index = 165 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadRequestsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag2, int increment = 1)
     {
-        var index = 149 + ((int)tag1 * 11) + (int)tag2;
+        var index = 169 + ((int)tag1 * 11) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEndpointPayloadDropped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityEndpoints tag, int increment = 1)
     {
-        var index = 171 + (int)tag;
+        var index = 191 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommand(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag, int increment = 1)
     {
-        var index = 173 + (int)tag;
+        var index = 193 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitCommandErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityCommands tag1, Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityExitCodes tag2, int increment = 1)
     {
-        var index = 182 + ((int)tag1 * 8) + (int)tag2;
+        var index = 202 + ((int)tag1 * 8) + (int)tag2;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommits(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 254 + (int)tag;
+        var index = 274 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSearchCommitsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 256 + (int)tag;
+        var index = 276 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPack(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 267 + (int)tag;
+        var index = 287 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsObjectsPackErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 269 + (int)tag;
+        var index = 289 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettings(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 280 + (int)tag;
+        var index = 300 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 282 + (int)tag;
+        var index = 302 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityGitRequestsSettingsResponse(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityITRSettingsResponse tag, int increment = 1)
     {
-        var index = 293 + (int)tag;
+        var index = 313 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 301 + (int)tag;
+        var index = 329 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 303 + (int)tag;
+        var index = 331 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseTests(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[314], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[342], increment);
     }
 
     public void RecordCountCIVisibilityITRSkippableTestsResponseSuites(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[315], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[343], increment);
     }
 
     public void RecordCountCIVisibilityITRSkipped(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 316 + (int)tag;
+        var index = 344 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRUnskippable(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 320 + (int)tag;
+        var index = 348 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityITRForcedRun(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityTestingEventType tag, int increment = 1)
     {
-        var index = 324 + (int)tag;
+        var index = 352 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageIsEmpty(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[328], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[356], increment);
     }
 
     public void RecordCountCIVisibilityCodeCoverageErrors(int increment = 1)
     {
-        Interlocked.Add(ref _buffer.CountCIVisibility[329], increment);
+        Interlocked.Add(ref _buffer.CountCIVisibility[357], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequest(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityRequestCompressed tag, int increment = 1)
     {
-        var index = 330 + (int)tag;
+        var index = 358 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 
     public void RecordCountCIVisibilityEarlyFlakeDetectionRequestErrors(Datadog.Trace.Telemetry.Metrics.MetricTags.CIVisibilityErrorType tag, int increment = 1)
     {
-        var index = 332 + (int)tag;
+        var index = 360 + (int)tag;
         Interlocked.Add(ref _buffer.CountCIVisibility[index], increment);
     }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
index fcfd1e38ed4a..a34c9bfd512b 100644
--- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/CiVisibilityMetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
index b91aebc832be..7b20fa050a1d 100644
--- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_Count.g.cs
@@ -77,7 +77,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
@@ -498,7 +498,7 @@ private static AggregatedMetric[] GetCountBuffer()
             new(new[] { "integration_name:process" }),
             new(new[] { "integration_name:hashalgorithm" }),
             new(new[] { "integration_name:symmetricalgorithm" }),
-            new(new[] { "integration_name:opentelemetry" }),
+            new(new[] { "integration_name:otel" }),
             new(new[] { "integration_name:pathtraversal" }),
             new(new[] { "integration_name:ssrf" }),
             new(new[] { "integration_name:ldap" }),
diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
index 2a54bea2390a..e94fcb451a68 100644
--- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/MetricsTelemetryCollector_CountShared.g.cs
@@ -176,9 +176,9 @@ private static AggregatedMetric[] GetCountSharedBuffer()
             new(new[] { "integration_name:symmetricalgorithm", "error_type:duck_typing" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:invoker" }),
             new(new[] { "integration_name:symmetricalgorithm", "error_type:execution" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:duck_typing" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:invoker" }),
-            new(new[] { "integration_name:opentelemetry", "error_type:execution" }),
+            new(new[] { "integration_name:otel", "error_type:duck_typing" }),
+            new(new[] { "integration_name:otel", "error_type:invoker" }),
+            new(new[] { "integration_name:otel", "error_type:execution" }),
             new(new[] { "integration_name:pathtraversal", "error_type:duck_typing" }),
             new(new[] { "integration_name:pathtraversal", "error_type:invoker" }),
             new(new[] { "integration_name:pathtraversal", "error_type:execution" }),
diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
index e7f48e2b15c6..586d54aba6dd 100644
--- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
+++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TelemetryMetricGenerator/TelemetryMetricAttribute.g.cs
@@ -118,7 +118,7 @@ public TelemetryMetricAttribute(string metricName)
 /// which has a single tag
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag> : System.Attribute
+internal class TelemetryMetricAttribute<TTag> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag : System.Enum
 {
     /// <summary>
@@ -128,10 +128,8 @@ internal class TelemetryMetricAttribute<TTag> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -141,34 +139,62 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
 
 /// <summary>
@@ -177,9 +203,10 @@ public TelemetryMetricAttribute(string metricName)
 /// which has two tags
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
-internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
     where TTag1 : System.Enum
     where TTag2 : System.Enum
+    where TTag3 : System.Enum
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
@@ -188,10 +215,8 @@ internal class TelemetryMetricAttribute<TTag1, TTag2> : System.Attribute
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
     {
-        MetricName = metricName;
-        IsCommon = isCommon;
-        NameSpace = nameSpace;
     }
 
     /// <summary>
@@ -201,32 +226,155 @@ public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpa
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
     public TelemetryMetricAttribute(string metricName, bool isCommon)
-        : this(metricName, isCommon, null!)
+        : base(metricName, isCommon, null!)
     {
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
-    /// Uses the default namespace and sets <see cref="IsCommon"/> to <c>true</c>
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
     /// <param name="metricName">The name of the metric, as reported to Datadog</param>
     public TelemetryMetricAttribute(string metricName)
-        : this(metricName, isCommon: true, null!)
+        : base(metricName, isCommon: true, null!)
     {
     }
+}
 
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+{
     /// <summary>
-    /// Gets the name of the metric, as reported to Datadog
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
     /// </summary>
-    public string MetricName { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
 
     /// <summary>
-    /// Gets a value indicating whether the metric a "common" metric, shared across languages?
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
     /// </summary>
-    public bool IsCommon { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
 
     /// <summary>
-    /// Gets the namespace of the metric, if not the default (Tracer)
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
     /// </summary>
-    public string? NameSpace { get; }
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
+}
+
+/// <summary>
+/// Used to describe a specific metric defined as a field
+/// inside an enum decorated with <see cref="TelemetryMetricTypeAttribute"/>
+/// which has two tags
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Field, AllowMultiple = false)]
+internal class TelemetryMetricAttribute<TTag1, TTag2, TTag3, TTag4, TTag5, TTag6> : Datadog.Trace.SourceGenerators.TelemetryMetricAttribute
+    where TTag1 : System.Enum
+    where TTag2 : System.Enum
+    where TTag3 : System.Enum
+    where TTag4 : System.Enum
+    where TTag5 : System.Enum
+    where TTag6 : System.Enum
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    /// <param name="nameSpace">The namespace of the metric, if not the default (Tracer)</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon, string nameSpace)
+        : base(metricName, isCommon, nameSpace)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    /// <param name="isCommon">Is the metric a "common" metric, shared across languages?</param>
+    public TelemetryMetricAttribute(string metricName, bool isCommon)
+        : base(metricName, isCommon, null!)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TelemetryMetricAttribute"/> class.
+    /// Uses the default namespace and sets <see cref="TelemetryMetricAttribute.IsCommon"/> to <c>true</c>
+    /// </summary>
+    /// <param name="metricName">The name of the metric, as reported to Datadog</param>
+    public TelemetryMetricAttribute(string metricName)
+        : base(metricName, isCommon: true, null!)
+    {
+    }
 }
\ No newline at end of file
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Http/HttpResponseAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Http/HttpResponseAspect.cs
index f9a2335876da..2e391a37a98a 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Http/HttpResponseAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Http/HttpResponseAspect.cs
@@ -31,7 +31,7 @@ public class HttpResponseAspect
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpResponseAspect)}.{nameof(Redirect)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpResponseAspect)}.{nameof(Redirect)}");
             return url;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Mvc/ControllerBaseAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Mvc/ControllerBaseAspect.cs
index 7bde8a0e9394..b7a95118c910 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Mvc/ControllerBaseAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/AspNetCore.Mvc/ControllerBaseAspect.cs
@@ -37,7 +37,7 @@ public class ControllerBaseAspect
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(ControllerBaseAspect)}.{nameof(Redirect)}");
+            IastModule.LogAspectException(ex, $"{nameof(ControllerBaseAspect)}.{nameof(Redirect)}");
             return url;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/EntityFramework/EntityCommandAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/EntityFramework/EntityCommandAspect.cs
index 90f839601b7b..f79c1f61e9a3 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/EntityFramework/EntityCommandAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/EntityFramework/EntityCommandAspect.cs
@@ -42,7 +42,7 @@ public static object ReviewSqlCommand(object command)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(EntityCommandAspect)}.{nameof(ReviewSqlCommand)}");
+            IastModule.LogAspectException(ex, $"{nameof(EntityCommandAspect)}.{nameof(ReviewSqlCommand)}");
             return command;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/EntityFrameworkCore/EntityFrameworkCoreAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/EntityFrameworkCore/EntityFrameworkCoreAspect.cs
index a29b9564d291..da910057dea8 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/EntityFrameworkCore/EntityFrameworkCoreAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/EntityFrameworkCore/EntityFrameworkCoreAspect.cs
@@ -40,7 +40,7 @@ public static object ReviewSqlString(string sqlAsString)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(EntityFrameworkCoreAspect)}.{nameof(ReviewSqlString)}");
+            IastModule.LogAspectException(ex, $"{nameof(EntityFrameworkCoreAspect)}.{nameof(ReviewSqlString)}");
             return sqlAsString;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/BsonAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/BsonAspect.cs
index d5028257a698..087c3b91b2b9 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/BsonAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/BsonAspect.cs
@@ -35,7 +35,7 @@ public static object AnalyzeJsonString(string json)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(BsonAspect)}.{nameof(AnalyzeJsonString)}");
+            IastModule.LogAspectException(ex, $"{nameof(BsonAspect)}.{nameof(AnalyzeJsonString)}");
             return json;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/MongoDatabaseAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/MongoDatabaseAspect.cs
index 76510f3c2447..1064b1ac1895 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/MongoDatabaseAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/MongoDB/MongoDatabaseAspect.cs
@@ -51,9 +51,9 @@ public class MongoDatabaseAspect
 
             return command;
         }
-        catch (global::System.Exception ex)
+        catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(MongoDatabaseAspect)}.{nameof(AnalyzeCommand)}");
+            IastModule.LogAspectException(ex, $"{nameof(MongoDatabaseAspect)}.{nameof(AnalyzeCommand)}");
             return command;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/NHibernate/ISessionAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/NHibernate/ISessionAspect.cs
index 3bd0f1ca5867..ecf34c095b52 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/NHibernate/ISessionAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/NHibernate/ISessionAspect.cs
@@ -35,7 +35,7 @@ public static object AnalyzeQuery(string query)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(ISessionAspect)}.{nameof(AnalyzeQuery)}");
+            IastModule.LogAspectException(ex, $"{nameof(ISessionAspect)}.{nameof(AnalyzeQuery)}");
             return query;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/Newtonsoft.Json/NewtonsoftJsonAspects.cs b/tracer/src/Datadog.Trace/Iast/Aspects/Newtonsoft.Json/NewtonsoftJsonAspects.cs
index 9d14c262b534..cf6ed6bc2ae8 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/Newtonsoft.Json/NewtonsoftJsonAspects.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/Newtonsoft.Json/NewtonsoftJsonAspects.cs
@@ -63,7 +63,7 @@ static NewtonsoftJsonAspects()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, "Error while initializing NewtonsoftJsonAspects");
+            IastModule.LogAspectException(ex, $"{nameof(NewtonsoftJsonAspects)}.Ctor");
         }
     }
 
@@ -85,7 +85,7 @@ static NewtonsoftJsonAspects()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error while tainting the JObject");
+            IastModule.LogAspectException(ex, $"{nameof(NewtonsoftJsonAspects)}.{nameof(ParseObject)}");
         }
 
         return result;
@@ -113,7 +113,7 @@ static NewtonsoftJsonAspects()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error while tainting the JArray");
+            IastModule.LogAspectException(ex, $"{nameof(NewtonsoftJsonAspects)}.{nameof(ParseArray)}");
         }
 
         return result;
@@ -136,7 +136,7 @@ static NewtonsoftJsonAspects()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error while tainting the JToken");
+            IastModule.LogAspectException(ex, $"{nameof(NewtonsoftJsonAspects)}.{nameof(ParseToken)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Data.Common/DbCommandAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Data.Common/DbCommandAspect.cs
index 8ec4ab537350..30cb45184e0b 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Data.Common/DbCommandAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Data.Common/DbCommandAspect.cs
@@ -41,7 +41,7 @@ public static object ReviewExecuteNonQuery(object command)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(DbCommandAspect)}.{nameof(ReviewExecuteNonQuery)}");
+            IastModule.LogAspectException(ex, $"{nameof(DbCommandAspect)}.{nameof(ReviewExecuteNonQuery)}");
             return command;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectoryEntryAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectoryEntryAspect.cs
index 283a865d5508..66d5597a6b7d 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectoryEntryAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectoryEntryAspect.cs
@@ -37,7 +37,7 @@ public static object Init(string path)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(DirectoryEntryAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(DirectoryEntryAspect)}.{nameof(Init)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectorySearcherAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectorySearcherAspect.cs
index 2b986fe9c205..81b167c6b57d 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectorySearcherAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/DirectorySearcherAspect.cs
@@ -37,7 +37,7 @@ public static object Init(string path)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(DirectorySearcherAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(DirectorySearcherAspect)}.{nameof(Init)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/PrincipalContextAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/PrincipalContextAspect.cs
index 49ee14e9f981..8702c3284b09 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/PrincipalContextAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/PrincipalContextAspect.cs
@@ -35,7 +35,7 @@ public static object Init(string path)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(PrincipalContextAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(PrincipalContextAspect)}.{nameof(Init)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/SearchRequestAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/SearchRequestAspect.cs
index b146e11c2535..5cb17213b9c3 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/SearchRequestAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.DirectoryServices/SearchRequestAspect.cs
@@ -34,7 +34,7 @@ public static object Init(object path)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SearchRequestAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(SearchRequestAspect)}.{nameof(Init)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryAspect.cs
index 3d2d6dd31d01..dacac1f331b5 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryAspect.cs
@@ -83,7 +83,7 @@ public static string ReviewPath(string path)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(DirectoryAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(DirectoryAspect)}.{nameof(ReviewPath)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryInfoAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryInfoAspect.cs
index 0235035587f6..5dd02f9d1884 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryInfoAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/DirectoryInfoAspect.cs
@@ -68,7 +68,7 @@ public static string ReviewPath(string path)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(DirectoryInfoAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(DirectoryInfoAspect)}.{nameof(ReviewPath)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileAspect.cs
index dfb390532bb5..344fc6dcca01 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileAspect.cs
@@ -101,7 +101,7 @@ public static string ReviewPath(string path)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(FileAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(FileAspect)}.{nameof(ReviewPath)}");
             return path;
         }
     }
@@ -152,7 +152,7 @@ public static string ReviewPathRead(string path)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(FileAspect)}.{nameof(ReviewPathRead)}");
+            IastModule.LogAspectException(ex, $"{nameof(FileAspect)}.{nameof(ReviewPathRead)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileInfoAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileInfoAspect.cs
index 65e4dff1b885..f63c78203f01 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileInfoAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileInfoAspect.cs
@@ -41,7 +41,7 @@ public static string ReviewPath(string path)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(FileInfoAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(FileInfoAspect)}.{nameof(ReviewPath)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileStreamAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileStreamAspect.cs
index cc8a67d8dd6b..9b96a0be8cb2 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileStreamAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/FileStreamAspect.cs
@@ -45,7 +45,7 @@ public static string ReviewPath(string path)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(FileStreamAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(FileStreamAspect)}.{nameof(ReviewPath)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamReaderAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamReaderAspect.cs
index 7a2a175deb0f..f9037dfffef1 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamReaderAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamReaderAspect.cs
@@ -41,7 +41,7 @@ public static string ReviewPath(string path)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StreamReaderAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(StreamReaderAspect)}.{nameof(ReviewPath)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamWriterAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamWriterAspect.cs
index b9ffc399df2c..616ab9d06e4e 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamWriterAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.IO/StreamWriterAspect.cs
@@ -40,7 +40,7 @@ public static string ReviewPath(string path)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StreamWriterAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(StreamWriterAspect)}.{nameof(ReviewPath)}");
             return path;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net.Mail/SmtpClientAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net.Mail/SmtpClientAspect.cs
index a2abe40b5606..2e558441a7ed 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net.Mail/SmtpClientAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net.Mail/SmtpClientAspect.cs
@@ -38,7 +38,7 @@ public class SmtpClientAspect
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SmtpClientAspect)}.{nameof(Send)}");
+            IastModule.LogAspectException(ex, $"{nameof(SmtpClientAspect)}.{nameof(Send)}");
             return message;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/HttpClientAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/HttpClientAspect.cs
index cf5d89f73590..917f9485c0b0 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/HttpClientAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/HttpClientAspect.cs
@@ -62,7 +62,7 @@ public static string Review(string parameter)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpClientAspect)}.{nameof(Review)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpClientAspect)}.{nameof(Review)}");
             return parameter;
         }
     }
@@ -108,7 +108,7 @@ public static Uri ReviewUri(Uri parameter)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpClientAspect)}.{nameof(ReviewUri)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpClientAspect)}.{nameof(ReviewUri)}");
             return parameter;
         }
     }
@@ -143,7 +143,7 @@ public static HttpRequestMessage ReviewHttpRequestMessage(HttpRequestMessage par
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpClientAspect)}.{nameof(ReviewHttpRequestMessage)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpClientAspect)}.{nameof(ReviewHttpRequestMessage)}");
             return parameter;
         }
     }
@@ -166,7 +166,7 @@ public static object ReviewHttpRequestMessage(object parameter)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpClientAspect)}.{nameof(ReviewHttpRequestMessage)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpClientAspect)}.{nameof(ReviewHttpRequestMessage)}");
             return parameter;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebClientAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebClientAspect.cs
index 61cf81869da5..f4fb9132a579 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebClientAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebClientAspect.cs
@@ -65,7 +65,7 @@ public static string Review(string parameter)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(WebClientAspect)}.{nameof(Review)}");
+            IastModule.LogAspectException(ex, $"{nameof(WebClientAspect)}.{nameof(Review)}");
             return parameter;
         }
     }
@@ -139,7 +139,7 @@ public static Uri ReviewUri(Uri parameter)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(WebClientAspect)}.{nameof(ReviewUri)}");
+            IastModule.LogAspectException(ex, $"{nameof(WebClientAspect)}.{nameof(ReviewUri)}");
             return parameter;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebRequestAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebRequestAspect.cs
index bae99b46457e..f1d41d3e999c 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebRequestAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebRequestAspect.cs
@@ -34,7 +34,7 @@ public static string Review(string parameter)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(WebRequestAspect)}.{nameof(Review)}");
+            IastModule.LogAspectException(ex, $"{nameof(WebRequestAspect)}.{nameof(Review)}");
             return parameter;
         }
     }
@@ -56,7 +56,7 @@ public static Uri Review(Uri parameter)
         }
         catch (Exception ex) when (ex is not BlockException)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(WebRequestAspect)}.{nameof(Review)}");
+            IastModule.LogAspectException(ex, $"{nameof(WebRequestAspect)}.{nameof(Review)}");
             return parameter;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebUtilityAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebUtilityAspect.cs
index 8c334eb2c65b..3f06f5d0c04b 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebUtilityAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Net/WebUtilityAspect.cs
@@ -36,7 +36,7 @@ public class WebUtilityAspect
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(WebUtilityAspect)}.{nameof(XssEscape)}");
+            IastModule.LogAspectException(ex, $"{nameof(WebUtilityAspect)}.{nameof(XssEscape)}");
         }
 
         return result;
@@ -60,7 +60,7 @@ public class WebUtilityAspect
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(WebUtilityAspect)}.{nameof(SsrfEscape)}");
+            IastModule.LogAspectException(ex, $"{nameof(WebUtilityAspect)}.{nameof(SsrfEscape)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/ActivatorAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/ActivatorAspect.cs
index b83c8dab5b5a..2ebab2f49600 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/ActivatorAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/ActivatorAspect.cs
@@ -45,7 +45,7 @@ public static string ReflectionInjectionParam(string param)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(ActivatorAspect)}.{nameof(ReflectionInjectionParam)}");
+            IastModule.LogAspectException(ex, $"{nameof(ActivatorAspect)}.{nameof(ReflectionInjectionParam)}");
             return param;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/AssemblyAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/AssemblyAspect.cs
index b5fe6aa8c3ac..7b2daa698ef8 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/AssemblyAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/AssemblyAspect.cs
@@ -37,7 +37,7 @@ public static string ReflectionAssemblyInjection(string assemblyString)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(AssemblyAspect)}.{nameof(ReflectionAssemblyInjection)}");
+            IastModule.LogAspectException(ex, $"{nameof(AssemblyAspect)}.{nameof(ReflectionAssemblyInjection)}");
             return assemblyString;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/TypeAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/TypeAspect.cs
index d5ae7ca2eda6..d367b886491b 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/TypeAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Reflection/TypeAspect.cs
@@ -51,7 +51,7 @@ public static string ReflectionInjectionParam(string param)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(TypeAspect)}.{nameof(ReflectionInjectionParam)}");
+            IastModule.LogAspectException(ex, $"{nameof(TypeAspect)}.{nameof(ReflectionInjectionParam)}");
             return param;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Runtime/DefaultInterpolatedStringHandlerAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Runtime/DefaultInterpolatedStringHandlerAspect.cs
index 9f38177b8c49..82550b1ec971 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Runtime/DefaultInterpolatedStringHandlerAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Runtime/DefaultInterpolatedStringHandlerAspect.cs
@@ -38,7 +38,7 @@ public static void AppendFormatted1(ref DefaultInterpolatedStringHandler target,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted1)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted1)}");
         }
     }
 
@@ -59,7 +59,7 @@ public static void AppendFormatted2(ref DefaultInterpolatedStringHandler target,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted2)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted2)}");
         }
     }
 
@@ -83,7 +83,7 @@ public static void AppendFormatted3(ref DefaultInterpolatedStringHandler target,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted3)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted3)}");
         }
     }
 
@@ -106,7 +106,7 @@ public static void AppendFormatted4<T>(ref DefaultInterpolatedStringHandler targ
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted4)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted4)}");
         }
     }
 
@@ -130,7 +130,7 @@ public static void AppendFormatted5<T>(ref DefaultInterpolatedStringHandler targ
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted5)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted5)}");
         }
     }
 
@@ -154,7 +154,7 @@ public static void AppendFormatted6<T>(ref DefaultInterpolatedStringHandler targ
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted6)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted6)}");
         }
     }
 
@@ -179,7 +179,7 @@ public static void AppendFormatted7<T>(ref DefaultInterpolatedStringHandler targ
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted7)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendFormatted7)}");
         }
     }
 
@@ -198,7 +198,7 @@ public static void AppendLiteral(ref DefaultInterpolatedStringHandler target, st
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendLiteral)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(AppendLiteral)}");
         }
     }
 
@@ -217,7 +217,7 @@ public static string ToStringAndClear(ref DefaultInterpolatedStringHandler targe
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, $"Error invoking {nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(ToStringAndClear)}");
+            IastModule.LogAspectException(ex, $"{nameof(DefaultInterpolatedStringHandlerAspect)}.{nameof(ToStringAndClear)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/HashAlgorithmAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/HashAlgorithmAspect.cs
index 0167ecabbe2e..a9935175e43c 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/HashAlgorithmAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/HashAlgorithmAspect.cs
@@ -40,7 +40,7 @@ public static HashAlgorithm ComputeHash(HashAlgorithm target)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HashAlgorithmAspect)}.{nameof(ComputeHash)}");
+            IastModule.LogAspectException(ex, $"{nameof(HashAlgorithmAspect)}.{nameof(ComputeHash)}");
             return target;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/SymmetricAlgorithmAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/SymmetricAlgorithmAspect.cs
index a5cc70aa3348..b579e220b037 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/SymmetricAlgorithmAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Security.Cryptography/SymmetricAlgorithmAspect.cs
@@ -29,7 +29,7 @@ private static void ProcessCipherClassCreation(SymmetricAlgorithm target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, "Error in SymmetricAlgorithmAspect.");
+            IastModule.LogAspectException(ex, $"{nameof(SymmetricAlgorithmAspect)}.{nameof(ProcessCipherClassCreation)}");
         }
     }
 
@@ -47,7 +47,7 @@ public static DESCryptoServiceProvider InitDES()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SymmetricAlgorithmAspect)}.{nameof(InitDES)}");
+            IastModule.LogAspectException(ex, $"{nameof(SymmetricAlgorithmAspect)}.{nameof(InitDES)}");
         }
 
         return target;
@@ -67,7 +67,7 @@ public static RC2CryptoServiceProvider InitRC2()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SymmetricAlgorithmAspect)}.{nameof(InitRC2)}");
+            IastModule.LogAspectException(ex, $"{nameof(SymmetricAlgorithmAspect)}.{nameof(InitRC2)}");
         }
 
         return target;
@@ -87,7 +87,7 @@ public static TripleDESCryptoServiceProvider InitTripleDES()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SymmetricAlgorithmAspect)}.{nameof(InitTripleDES)}");
+            IastModule.LogAspectException(ex, $"{nameof(SymmetricAlgorithmAspect)}.{nameof(InitTripleDES)}");
         }
 
         return target;
@@ -107,7 +107,7 @@ public static RijndaelManaged InitRijndaelManaged()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SymmetricAlgorithmAspect)}.{nameof(InitRijndaelManaged)}");
+            IastModule.LogAspectException(ex, $"{nameof(SymmetricAlgorithmAspect)}.{nameof(InitRijndaelManaged)}");
         }
 
         return target;
@@ -127,7 +127,7 @@ public static AesCryptoServiceProvider InitAesCryptoServiceProvider()
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SymmetricAlgorithmAspect)}.{nameof(InitAesCryptoServiceProvider)}");
+            IastModule.LogAspectException(ex, $"{nameof(SymmetricAlgorithmAspect)}.{nameof(InitAesCryptoServiceProvider)}");
         }
 
         return target;
@@ -157,7 +157,7 @@ public static SymmetricAlgorithm Create(SymmetricAlgorithm target)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SymmetricAlgorithmAspect)}.{nameof(Create)}");
+            IastModule.LogAspectException(ex, $"{nameof(SymmetricAlgorithmAspect)}.{nameof(Create)}");
             return target;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Text.Json/JsonDocumentAspects.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Text.Json/JsonDocumentAspects.cs
index fef66b38692f..85b1ecddeee2 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Text.Json/JsonDocumentAspects.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Text.Json/JsonDocumentAspects.cs
@@ -37,7 +37,7 @@ public static object Parse(string json, JsonDocumentOptions options)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error tainting JsonDocument.Parse result");
+            IastModule.LogAspectException(ex, $"{nameof(JsonDocumentAspects)}.{nameof(Parse)}");
         }
 
         return doc;
@@ -60,7 +60,7 @@ public static object Parse(string json, JsonDocumentOptions options)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error casting to IJsonElement");
+            IastModule.LogAspectException(ex, $"{nameof(JsonDocumentAspects)}.{nameof(GetString)} (DuckCast)");
             return null;
         }
 
@@ -77,7 +77,7 @@ public static object Parse(string json, JsonDocumentOptions options)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error tainting JsonElement.GetString result");
+            IastModule.LogAspectException(ex, $"{nameof(JsonDocumentAspects)}.{nameof(GetString)}");
         }
 
         return str;
@@ -101,7 +101,7 @@ public static object Parse(string json, JsonDocumentOptions options)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error casting to IJsonElement");
+            IastModule.LogAspectException(ex, $"{nameof(JsonDocumentAspects)}.{nameof(GetRawText)} (DuckCast)");
             return null;
         }
 
@@ -118,7 +118,7 @@ public static object Parse(string json, JsonDocumentOptions options)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error tainting JsonElement.GetRawText result");
+            IastModule.LogAspectException(ex, $"{nameof(JsonDocumentAspects)}.{nameof(GetRawText)}");
         }
 
         return str;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Text/StringBuilderAspects.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Text/StringBuilderAspects.cs
index dd1278578056..09dfd7aeec54 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Text/StringBuilderAspects.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Text/StringBuilderAspects.cs
@@ -34,7 +34,7 @@ public static StringBuilder Init(string? value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Init)}");
         }
 
         return result;
@@ -54,7 +54,7 @@ public static StringBuilder Init(string? value, int capacity)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Init)}");
         }
 
         return result;
@@ -76,7 +76,7 @@ public static StringBuilder Init(string? value, int startIndex, int length, int
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Init)}");
         }
 
         return result;
@@ -99,7 +99,7 @@ public static StringBuilder Init(string? value, int startIndex, int length, int
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(ToString)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(ToString)}");
         }
 
         return result;
@@ -121,7 +121,7 @@ public static string ToString(StringBuilder? target, int startIndex, int length)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(ToString)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(ToString)}");
         }
 
         return result;
@@ -146,7 +146,7 @@ public static StringBuilder Append(StringBuilder? target, string? value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Append)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Append)}");
         }
 
         return result;
@@ -172,7 +172,7 @@ public static StringBuilder Append(StringBuilder? target, StringBuilder? value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Append)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Append)}");
         }
 
         return result;
@@ -199,7 +199,7 @@ public static StringBuilder Append(StringBuilder? target, string? value, int sta
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Append)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Append)}");
         }
 
         return result;
@@ -226,7 +226,7 @@ public static StringBuilder Append(StringBuilder? target, StringBuilder? value,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Append)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Append)}");
         }
 
         return result;
@@ -253,7 +253,7 @@ public static StringBuilder Append(StringBuilder? target, char[]? value, int sta
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Append)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Append)}");
         }
 
         return result;
@@ -290,7 +290,7 @@ public static StringBuilder Append(StringBuilder? target, object? value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Append)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Append)}");
         }
 
         return result;
@@ -315,7 +315,7 @@ public static StringBuilder Append(StringBuilder? target, char[]? value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Append)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Append)}");
         }
 
         return result;
@@ -341,7 +341,7 @@ public static StringBuilder AppendLine(StringBuilder? target, string? value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendLine)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendLine)}");
         }
 
         return result;
@@ -362,7 +362,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, string? format,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -384,7 +384,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, string? format,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -407,7 +407,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, string? format,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -428,7 +428,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, string? format,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -450,7 +450,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, IFormatProvider?
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -473,7 +473,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, IFormatProvider?
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -497,7 +497,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, IFormatProvider?
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -519,7 +519,7 @@ public static StringBuilder AppendFormat(StringBuilder? target, IFormatProvider?
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendFormat)}");
         }
 
         return result;
@@ -541,7 +541,7 @@ public static void CopyTo(StringBuilder? target, int sourceIndex, char[]? destin
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(CopyTo)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(CopyTo)}");
         }
     }
 
@@ -564,7 +564,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, string? val
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -590,7 +590,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, string? val
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -615,7 +615,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, char value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -640,7 +640,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, char[]? val
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -667,7 +667,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, char[]? val
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -693,7 +693,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, int value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -719,7 +719,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, long value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -745,7 +745,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, float value
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -771,7 +771,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, double valu
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -797,7 +797,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, decimal val
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -823,7 +823,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, ushort valu
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -849,7 +849,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, uint value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -875,7 +875,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, ulong value
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -901,7 +901,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, bool value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -927,7 +927,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, sbyte value
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -953,7 +953,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, byte value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -979,7 +979,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, short value
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -1005,7 +1005,7 @@ public static StringBuilder Insert(StringBuilder? target, int index, object? val
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -1026,7 +1026,7 @@ public static StringBuilder Remove(StringBuilder? target, int startIndex, int le
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Remove)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Remove)}");
         }
 
         return result;
@@ -1047,7 +1047,7 @@ public static StringBuilder Replace(StringBuilder? target, string? oldValue, str
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1070,7 +1070,7 @@ public static StringBuilder Replace(StringBuilder? target, string? oldValue, str
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1091,7 +1091,7 @@ public static StringBuilder Replace(StringBuilder? target, char oldChar, char ne
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1114,7 +1114,7 @@ public static StringBuilder Replace(StringBuilder? target, char oldChar, char ne
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1133,7 +1133,7 @@ public static void SetLength(StringBuilder? target, int length)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(SetLength)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(SetLength)}");
         }
     }
 
@@ -1153,7 +1153,7 @@ public static StringBuilder AppendJoin(StringBuilder? target, string? separator,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
         }
 
         return result;
@@ -1174,7 +1174,7 @@ public static StringBuilder AppendJoin(StringBuilder? target, string? separator,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
         }
 
         return result;
@@ -1195,7 +1195,7 @@ public static StringBuilder AppendJoin(StringBuilder? target, char separator, st
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
         }
 
         return result;
@@ -1216,7 +1216,7 @@ public static StringBuilder AppendJoin(StringBuilder? target, char separator, ob
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
         }
 
         return result;
@@ -1238,7 +1238,7 @@ public static StringBuilder AppendJoin<T>(StringBuilder? target, char separator,
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
         }
 
         return result;
@@ -1260,7 +1260,7 @@ public static StringBuilder AppendJoin<T>(StringBuilder? target, string separato
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringBuilderAspects)}.{nameof(AppendJoin)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Extensions/JavaScriptSerializerAspects.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Extensions/JavaScriptSerializerAspects.cs
index 3aaee1ba3683..d12375bf35dc 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Extensions/JavaScriptSerializerAspects.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Extensions/JavaScriptSerializerAspects.cs
@@ -38,7 +38,7 @@ public class JavaScriptSerializerAspects
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, "Error while casting JavaScriptSerializer");
+            IastModule.LogAspectException(ex, $"{nameof(JavaScriptSerializerAspects)}.{nameof(DeserializeObject)} (DuckCast)");
             return null;
         }
 
@@ -57,7 +57,7 @@ public class JavaScriptSerializerAspects
         }
         catch (Exception ex)
         {
-            IastModule.Log.Warning(ex, "Error while tainting json in DeserializeObject");
+            IastModule.LogAspectException(ex, $"{nameof(JavaScriptSerializerAspects)}.{nameof(DeserializeObject)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Mvc/HttpControllerAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Mvc/HttpControllerAspect.cs
index 7b8b333f3510..835945314bf2 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Mvc/HttpControllerAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.Mvc/HttpControllerAspect.cs
@@ -31,7 +31,7 @@ public class HttpControllerAspect
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpControllerAspect)}.{nameof(Redirect)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpControllerAspect)}.{nameof(Redirect)}");
             return url;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/HttpSessionStateBaseAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/HttpSessionStateBaseAspect.cs
index 0e2af73643c6..9c601a146868 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/HttpSessionStateBaseAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/HttpSessionStateBaseAspect.cs
@@ -40,7 +40,7 @@ public static object Add(object value)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpSessionStateBaseAspect)}.{nameof(Add)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpSessionStateBaseAspect)}.{nameof(Add)}");
             return value;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/SessionExtensionsAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/SessionExtensionsAspect.cs
index df9c2fb6eb32..347d621ebf1a 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/SessionExtensionsAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web.SessionState/SessionExtensionsAspect.cs
@@ -43,7 +43,7 @@ public static string ReviewTbv(string value)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SessionExtensionsAspect)}.{nameof(ReviewTbv)}");
+            IastModule.LogAspectException(ex, $"{nameof(SessionExtensionsAspect)}.{nameof(ReviewTbv)}");
             return value;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpCookieAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpCookieAspect.cs
index f0c94566a455..9b636e3a3df2 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpCookieAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpCookieAspect.cs
@@ -39,7 +39,7 @@ public static string GetValue(HttpCookie cookie)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpCookieAspect)}.{nameof(GetValue)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpCookieAspect)}.{nameof(GetValue)}");
         }
 
         return value;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpResponseAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpResponseAspect.cs
index b0b8cddfe246..765d3f42d783 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpResponseAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpResponseAspect.cs
@@ -32,7 +32,7 @@ public class HttpResponseAspect
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpResponseAspect)}.{nameof(Redirect)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpResponseAspect)}.{nameof(Redirect)}");
             return url;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpUtilityAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpUtilityAspect.cs
index aff78e6cd9c5..e238d10ba4dd 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpUtilityAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Web/HttpUtilityAspect.cs
@@ -34,7 +34,7 @@ public class HttpUtilityAspect
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpUtilityAspect)}.{nameof(XssEscape)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpUtilityAspect)}.{nameof(XssEscape)}");
         }
 
         return result;
@@ -58,7 +58,7 @@ public class HttpUtilityAspect
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpUtilityAspect)}.{nameof(SsrfEscape)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpUtilityAspect)}.{nameof(SsrfEscape)}");
         }
 
         return result;
@@ -83,7 +83,7 @@ public class HttpUtilityAspect
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(HttpUtilityAspect)}.{nameof(SsrfEscape)}");
+            IastModule.LogAspectException(ex, $"{nameof(HttpUtilityAspect)}.{nameof(SsrfEscape)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/SystemXmlAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/SystemXmlAspect.cs
index 79d3f6858037..6211e2b2206f 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/SystemXmlAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/SystemXmlAspect.cs
@@ -40,7 +40,7 @@ public static string ReviewPath(string xpath)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(SystemXmlAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(SystemXmlAspect)}.{nameof(ReviewPath)}");
             return xpath;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/XPathExtensionAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/XPathExtensionAspect.cs
index ccdad0ad53e0..a5353111b957 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/XPathExtensionAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System.Xml/XPathExtensionAspect.cs
@@ -35,7 +35,7 @@ public static string ReviewPath(string xpath)
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(XPathExtensionAspect)}.{nameof(ReviewPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(XPathExtensionAspect)}.{nameof(ReviewPath)}");
             return xpath;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System/RandomAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System/RandomAspect.cs
index 70f3bb93fce4..0b627060256e 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System/RandomAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System/RandomAspect.cs
@@ -30,7 +30,7 @@ public static void Init()
         }
         catch (global::System.Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(RandomAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(RandomAspect)}.{nameof(Init)}");
             return;
         }
     }
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System/StringAspects.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System/StringAspects.cs
index 6e74711f4a95..1c1294b0c6da 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System/StringAspects.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System/StringAspects.cs
@@ -36,7 +36,7 @@ public static string Trim(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Trim)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Trim)}");
         }
 
         return result;
@@ -65,7 +65,7 @@ public static string Trim(string target, char[] trimChars)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Trim)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Trim)}");
         }
 
         return result;
@@ -88,7 +88,7 @@ public static string Trim(string target, char trimChar)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Trim)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Trim)}");
         }
 
         return result;
@@ -118,7 +118,7 @@ public static string TrimStart(string target, char[] trimChars)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(TrimStart)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(TrimStart)}");
         }
 
         return result;
@@ -141,7 +141,7 @@ public static string TrimStart(string target, char trimChar)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(TrimStart)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(TrimStart)}");
         }
 
         return result;
@@ -162,7 +162,7 @@ public static string TrimStart(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(TrimStart)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(TrimStart)}");
         }
 
         return result;
@@ -192,7 +192,7 @@ public static string TrimEnd(string target, char[] trimChars)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(TrimEnd)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(TrimEnd)}");
         }
 
         return result;
@@ -215,7 +215,7 @@ public static string TrimEnd(string target, char trimChar)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(TrimEnd)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(TrimEnd)}");
         }
 
         return result;
@@ -236,7 +236,7 @@ public static string TrimEnd(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(TrimEnd)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(TrimEnd)}");
         }
 
         return result;
@@ -259,7 +259,7 @@ public static string Concat(string param1, string param2)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -281,7 +281,7 @@ public static string Concat_0(string param1, string param2)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat_0)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat_0)}");
         }
 
         return result;
@@ -303,7 +303,7 @@ public static string Concat_1(string param1, string param2)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat_1)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat_1)}");
         }
 
         return result;
@@ -325,7 +325,7 @@ public static string Concat(object param1, object param2)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -348,7 +348,7 @@ public static string Concat(string param1, string param2, string param3)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -371,7 +371,7 @@ public static string Concat(object param1, object param2, object param3)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -395,7 +395,7 @@ public static string Concat(string param1, string param2, string param3, string
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -420,7 +420,7 @@ public static string Concat(object param1, object param2, object param3, object
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -442,7 +442,7 @@ public static string Concat(string[] values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -463,7 +463,7 @@ public static string Concat(object[] values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -484,7 +484,7 @@ public static string Concat(IEnumerable<string> values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -506,7 +506,7 @@ public static string Concat<T>(IEnumerable<T> values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Concat)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Concat)}");
         }
 
         return result;
@@ -528,7 +528,7 @@ public static string Substring(string target, int startIndex)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Substring)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Substring)}");
         }
 
         return result;
@@ -551,7 +551,7 @@ public static string Substring(string target, int startIndex, int length)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Substring)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Substring)}");
         }
 
         return result;
@@ -572,7 +572,7 @@ public static char[] ToCharArray(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToCharArray)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToCharArray)}");
         }
 
         return result;
@@ -595,7 +595,7 @@ public static char[] ToCharArray(string target, int startIndex, int length)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToCharArray)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToCharArray)}");
         }
 
         return result;
@@ -619,7 +619,7 @@ public static string Join(string separator, string[] values, int startIndex, int
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -642,7 +642,7 @@ public static string Join(char separator, string[] values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -664,7 +664,7 @@ public static string Join(char separator, object[] values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -688,7 +688,7 @@ public static string Join(char separator, string[] values, int startIndex, int c
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -711,7 +711,7 @@ public static string Join<T>(char separator, IEnumerable<T> values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -735,7 +735,7 @@ public static string Join<T>(string separator, IEnumerable<T> values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -757,7 +757,7 @@ public static string Join(string separator, object[] values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -779,7 +779,7 @@ public static string Join(string separator, string[] values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -801,7 +801,7 @@ public static string JoinString(string separator, IEnumerable<string> values)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Join)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Join)}");
         }
 
         return result;
@@ -822,7 +822,7 @@ public static string ToUpper(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToUpper)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToUpper)}");
         }
 
         return result;
@@ -844,7 +844,7 @@ public static string ToUpper(string target, global::System.Globalization.Culture
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToUpper)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToUpper)}");
         }
 
         return result;
@@ -865,7 +865,7 @@ public static string ToUpperInvariant(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToUpperInvariant)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToUpperInvariant)}");
         }
 
         return result;
@@ -886,7 +886,7 @@ public static string ToLower(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToLower)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToLower)}");
         }
 
         return result;
@@ -908,7 +908,7 @@ public static string ToLower(string target, global::System.Globalization.Culture
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToLower)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToLower)}");
         }
 
         return result;
@@ -929,7 +929,7 @@ public static string ToLowerInvariant(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(ToLowerInvariant)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(ToLowerInvariant)}");
         }
 
         return result;
@@ -951,7 +951,7 @@ public static string Remove(string target, int startIndex)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Remove)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Remove)}");
         }
 
         return result;
@@ -974,7 +974,7 @@ public static string Remove(string target, int startIndex, int count)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Remove)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Remove)}");
         }
 
         return result;
@@ -997,7 +997,7 @@ public static string Insert(string target, int startIndex, string value)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Insert)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Insert)}");
         }
 
         return result;
@@ -1019,7 +1019,7 @@ public static string PadLeft(string target, int totalWidth)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(PadLeft)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(PadLeft)}");
         }
 
         return result;
@@ -1042,7 +1042,7 @@ public static string PadLeft(string target, int totalWidth, char paddingChar)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(PadLeft)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(PadLeft)}");
         }
 
         return result;
@@ -1064,7 +1064,7 @@ public static string PadRight(string target, int totalWidth)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(PadRight)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(PadRight)}");
         }
 
         return result;
@@ -1087,7 +1087,7 @@ public static string PadRight(string target, int totalWidth, char paddingChar)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(PadRight)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(PadRight)}");
         }
 
         return result;
@@ -1109,7 +1109,7 @@ public static string Format(string format, object arg0)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1132,7 +1132,7 @@ public static string Format(string format, object arg0, object arg1)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1156,7 +1156,7 @@ public static string Format(string format, object arg0, object arg1, object arg2
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1178,7 +1178,7 @@ public static string Format(string format, object[] args)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1201,7 +1201,7 @@ public static string Format(IFormatProvider provider, string format, object arg0
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1225,7 +1225,7 @@ public static string Format(IFormatProvider provider, string format, object arg0
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1250,7 +1250,7 @@ public static string Format(IFormatProvider provider, string format, object arg0
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1273,7 +1273,7 @@ public static string Format(IFormatProvider provider, string format, object[] ar
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Format)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Format)}");
         }
 
         return result;
@@ -1299,7 +1299,7 @@ public static string Replace(string target, string oldValue, string newValue, bo
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1323,7 +1323,7 @@ public static string Replace(string target, string oldValue, string newValue, St
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1347,7 +1347,7 @@ public static string Replace(string target, char oldChar, char newChar)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1370,7 +1370,7 @@ public static string Replace(string target, string oldValue, string newValue)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Replace)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Replace)}");
         }
 
         return result;
@@ -1392,7 +1392,7 @@ public static string[] Split(string target, char[] separator)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1415,7 +1415,7 @@ public static string[] Split(string target, char[] separator, int count)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"{nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1438,7 +1438,7 @@ public static string[] Split(string target, char[] separator, StringSplitOptions
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1462,7 +1462,7 @@ public static string[] Split(string target, char[] separator, int count, StringS
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1485,7 +1485,7 @@ public static string[] Split(string target, string[] separator, StringSplitOptio
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1509,7 +1509,7 @@ public static string[] Split(string target, string[] separator, int count, Strin
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1535,7 +1535,7 @@ public static string[] Split(string target, string separator, int count, StringS
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1558,7 +1558,7 @@ public static string[] Split(string target, string separator, StringSplitOptions
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1581,7 +1581,7 @@ public static string[] Split(string target, char separator, StringSplitOptions o
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1605,7 +1605,7 @@ public static string[] Split(string target, char separator, int count, StringSpl
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Split)}");
         }
 
         return result;
@@ -1628,7 +1628,7 @@ public static string Copy(string target)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Copy)}");
+            IastModule.LogAspectException(ex, $"Error invoking {nameof(StringAspects)}.{nameof(Copy)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System/UriAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System/UriAspect.cs
index 878de9d7cd4f..adc9d15166dc 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System/UriAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System/UriAspect.cs
@@ -32,7 +32,7 @@ public static Uri Init(string uriBase)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -57,7 +57,7 @@ public static Uri Init(Uri uriBase, string uriText, bool escape)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -79,7 +79,7 @@ public static Uri Init(Uri uriBase, string relativeUri)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -101,7 +101,7 @@ public static Uri Init(Uri uriBase, Uri relativeUri)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -128,7 +128,7 @@ public static Uri Init(string uriBase, bool dontEscape)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -150,7 +150,7 @@ public static Uri Init(string uriBase, UriKind uriKind)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -173,7 +173,7 @@ public static Uri Init(string uriBase, in UriCreationOptions options)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -200,7 +200,7 @@ public static bool TryCreate(string uri, UriKind kind, out Uri? uriCreated)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(TryCreate)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(TryCreate)}");
         }
 
         return result;
@@ -227,7 +227,7 @@ public static bool TryCreate(string uri, in UriCreationOptions options, out Uri?
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(TryCreate)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(TryCreate)}");
         }
 
         return result;
@@ -254,7 +254,7 @@ public static bool TryCreate(Uri? baseUri, string? relativeUri, out Uri? uriCrea
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(TryCreate)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(TryCreate)}");
         }
 
         return result;
@@ -280,7 +280,7 @@ public static bool TryCreate(Uri? baseUri, Uri? relativeUri, out Uri? uriCreated
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(TryCreate)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(TryCreate)}");
         }
 
         return result;
@@ -301,7 +301,7 @@ public static string UnescapeDataString(string uri)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(UnescapeDataString)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(UnescapeDataString)}");
         }
 
         return result;
@@ -324,7 +324,7 @@ public static string EscapeUriString(string uri)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(EscapeUriString)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(EscapeUriString)}");
         }
 
         return result;
@@ -345,7 +345,7 @@ public static string EscapeDataString(string uri)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(EscapeDataString)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(EscapeDataString)}");
         }
 
         return result;
@@ -366,7 +366,7 @@ public static string GetAbsoluteUri(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(GetAbsoluteUri)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(GetAbsoluteUri)}");
         }
 
         return result;
@@ -387,7 +387,7 @@ public static string GetAbsolutePath(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(GetAbsolutePath)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(GetAbsolutePath)}");
         }
 
         return result;
@@ -408,7 +408,7 @@ public static string GetLocalPath(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(GetLocalPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(GetLocalPath)}");
         }
 
         return result;
@@ -435,7 +435,7 @@ public static string GetLocalPath(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(MakeRelative)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(MakeRelative)}");
         }
 
         return result;
@@ -460,7 +460,7 @@ public static string GetLocalPath(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(MakeRelativeUri)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(MakeRelativeUri)}");
         }
 
         return result;
@@ -481,7 +481,7 @@ public static string GetHost(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(GetHost)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(GetHost)}");
         }
 
         return result;
@@ -502,7 +502,7 @@ public static string GetPathAndQuery(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(GetPathAndQuery)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(GetPathAndQuery)}");
         }
 
         return result;
@@ -523,7 +523,7 @@ public static string GetAuthority(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(GetAuthority)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(GetAuthority)}");
         }
 
         return result;
@@ -544,7 +544,7 @@ public static string GetQuery(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(GetQuery)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(GetQuery)}");
         }
 
         return result;
@@ -566,7 +566,7 @@ public static string GetQuery(Uri instance)
         }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriAspect)}.{nameof(ToString)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriAspect)}.{nameof(ToString)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/Aspects/System/UriBuilderAspect.cs b/tracer/src/Datadog.Trace/Iast/Aspects/System/UriBuilderAspect.cs
index 2beca3d35c41..78fb2d3afa01 100644
--- a/tracer/src/Datadog.Trace/Iast/Aspects/System/UriBuilderAspect.cs
+++ b/tracer/src/Datadog.Trace/Iast/Aspects/System/UriBuilderAspect.cs
@@ -30,9 +30,13 @@ public static UriBuilder Init(string uriText)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result.Uri.OriginalString, uriText);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -51,9 +55,13 @@ public static UriBuilder Init(Uri uri)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result.Uri.OriginalString, uri.OriginalString);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -73,9 +81,13 @@ public static UriBuilder Init(string scheme, string host)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result.Uri.OriginalString, host);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -96,9 +108,13 @@ public static UriBuilder Init(string scheme, string host, int port)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result.Uri.OriginalString, host);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -120,9 +136,13 @@ public static UriBuilder Init(string scheme, string host, int port, string path)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result.Uri.OriginalString, host, path);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -145,9 +165,13 @@ public static UriBuilder Init(string scheme, string host, int port, string path,
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result.Uri.OriginalString, host, path, extra);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(Init)}");
         }
 
         return result;
@@ -166,9 +190,13 @@ public static void SetHost(UriBuilder instance, string parameter)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(instance.Uri.OriginalString, parameter);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(Init)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(Init)}");
         }
     }
 
@@ -185,9 +213,13 @@ public static void SetQuery(UriBuilder instance, string parameter)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(instance.Uri.OriginalString, parameter);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
         }
     }
 
@@ -204,9 +236,13 @@ public static void SetPath(UriBuilder instance, string parameter)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(instance.Uri.OriginalString, parameter);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(SetPath)}");
         }
     }
 
@@ -223,9 +259,13 @@ public static string GetHost(UriBuilder instance)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result, instance.Uri.OriginalString);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(GetHost)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(GetHost)}");
         }
 
         return result;
@@ -244,9 +284,13 @@ public static string GetQuery(UriBuilder instance)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result, instance.Uri.OriginalString);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(GetQuery)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(GetQuery)}");
         }
 
         return result;
@@ -265,9 +309,13 @@ public static string GetPath(UriBuilder instance)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result, instance.Uri.OriginalString);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(GetPath)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(GetPath)}");
         }
 
         return result;
@@ -287,9 +335,13 @@ public static string GetPath(UriBuilder instance)
         {
             PropagationModuleImpl.PropagateWholeResultWhenInputTainted(result, (instance as UriBuilder)?.Uri?.OriginalString);
         }
+        catch (FormatException ex)
+        {
+            IastModule.Log.Debug(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(SetQuery)}");
+        }
         catch (Exception ex)
         {
-            IastModule.Log.Error(ex, $"Error invoking {nameof(UriBuilderAspect)}.{nameof(ToString)}");
+            IastModule.LogAspectException(ex, $"{nameof(UriBuilderAspect)}.{nameof(ToString)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/Iast/IastModule.cs b/tracer/src/Datadog.Trace/Iast/IastModule.cs
index 3cee13a71071..94e5dfcab34b 100644
--- a/tracer/src/Datadog.Trace/Iast/IastModule.cs
+++ b/tracer/src/Datadog.Trace/Iast/IastModule.cs
@@ -61,6 +61,7 @@ internal static partial class IastModule
     private static readonly Func<TaintedObject, bool> Always = (x) => true;
     private static readonly DbRecordManager DbRecords = new DbRecordManager(IastSettings);
     private static readonly SourceType[] _dbSources = [SourceType.SqlRowValue];
+    private static readonly HashSet<int> LoggedAspectExceptionMessages = [];
     private static bool _showTimeoutExceptionError = true;
 
     internal static void LogTimeoutError(RegexMatchTimeoutException err)
@@ -865,6 +866,35 @@ internal static void OnEmailHtmlInjection(object? message)
         GetScope(messageDuck.Body, IntegrationId.EmailHtmlInjection, VulnerabilityTypeName.EmailHtmlInjection, OperationNameEmailHtmlInjection, taintValidator: Always, safeSources: _dbSources, exclusionSecureMarks: SecureMarks.Xss);
     }
 
+    public static void LogAspectException(Exception ex, string aspectInfo)
+    {
+        try
+        {
+            var hashCode = aspectInfo.GetHashCode();
+            bool alreadyLogged;
+            lock (LoggedAspectExceptionMessages)
+            {
+                alreadyLogged = !LoggedAspectExceptionMessages.Add(hashCode);
+            }
+
+// intentionally using string interpolation in logging, as the resulting string is actually a constant, and contains the important aspect information
+#pragma warning disable DDLOG004 // Message templates should be constant
+            if (alreadyLogged)
+            {
+                Log.Debug(ex, $"Error invoking {aspectInfo}");
+            }
+            else
+            {
+                Log.Error(ex, $"Error invoking {aspectInfo}");
+            }
+#pragma warning restore DDLOG004 // Message templates should be constant
+        }
+        catch (Exception e)
+        {
+            Log.Debug(e, "Error while logging aspect exception.");
+        }
+    }
+
     internal static void RegisterDbRecord(object instance)
     {
         DbRecords.RegisterDbRecord(instance);
diff --git a/tracer/src/Datadog.Trace/Iast/Propagation/DefaultInterpolatedStringHandlerModuleImpl.cs b/tracer/src/Datadog.Trace/Iast/Propagation/DefaultInterpolatedStringHandlerModuleImpl.cs
index b24a09c8d7b9..e73a341fa630 100644
--- a/tracer/src/Datadog.Trace/Iast/Propagation/DefaultInterpolatedStringHandlerModuleImpl.cs
+++ b/tracer/src/Datadog.Trace/Iast/Propagation/DefaultInterpolatedStringHandlerModuleImpl.cs
@@ -60,7 +60,7 @@ public static unsafe void FullTaintIfAnyTainted(IntPtr target, string? input)
         }
         catch (Exception error)
         {
-            IastModule.Log.Error(error, $"{nameof(DefaultInterpolatedStringHandlerModuleImpl)}.{nameof(FullTaintIfAnyTainted)} exception");
+            IastModule.LogAspectException(error, $"{nameof(DefaultInterpolatedStringHandlerModuleImpl)}.{nameof(FullTaintIfAnyTainted)}");
         }
     }
 
@@ -94,7 +94,7 @@ public static unsafe void FullTaintIfAnyTainted(IntPtr target, string? input)
         }
         catch (Exception err)
         {
-            IastModule.Log.Error(err, $"{nameof(DefaultInterpolatedStringHandlerModuleImpl)}.{nameof(PropagateTaint)} exception");
+            IastModule.LogAspectException(err, $"{nameof(DefaultInterpolatedStringHandlerModuleImpl)}.{nameof(PropagateTaint)}");
         }
 
         return result;
diff --git a/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs b/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs
index 4225cbf3520e..c5c87e13ac62 100644
--- a/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs
+++ b/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs
@@ -54,14 +54,14 @@ public string GetDefaultResourceName(HttpRequest request)
             return $"{httpMethod} {resourceUrl}";
         }
 
-        private PropagationContext ExtractPropagatedContext(HttpRequest request)
+        private PropagationContext ExtractPropagatedContext(Tracer tracer, HttpRequest request)
         {
             try
             {
                 // extract propagation details from http headers
                 if (request.Headers is { } headers)
                 {
-                    return SpanContextPropagator.Instance.Extract(new HeadersCollectionAdapter(headers));
+                    return tracer.TracerManager.SpanContextPropagator.Extract(new HeadersCollectionAdapter(headers));
                 }
             }
             catch (Exception ex)
@@ -83,7 +83,7 @@ private void AddHeaderTagsToSpan(ISpan span, HttpRequest request, Tracer tracer)
                     // extract propagation details from http headers
                     if (request.Headers is { } requestHeaders)
                     {
-                        SpanContextPropagator.Instance.AddHeadersToSpanAsTags(
+                        tracer.TracerManager.SpanContextPropagator.AddHeadersToSpanAsTags(
                             span,
                             new HeadersCollectionAdapter(requestHeaders),
                             headerTagsInternal,
@@ -107,7 +107,7 @@ public Scope StartAspNetCorePipelineScope(Tracer tracer, Security security, Http
             var userAgent = request.Headers[HttpHeaderNames.UserAgent];
             resourceName ??= GetDefaultResourceName(request);
 
-            var extractedContext = ExtractPropagatedContext(request).MergeBaggageInto(Baggage.Current);
+            var extractedContext = ExtractPropagatedContext(tracer, request).MergeBaggageInto(Baggage.Current);
 
             var routeTemplateResourceNames = tracer.Settings.RouteTemplateResourceNamesEnabled;
             var tags = routeTemplateResourceNames ? new AspNetCoreEndpointTags() : new AspNetCoreTags();
@@ -122,8 +122,8 @@ public Scope StartAspNetCorePipelineScope(Tracer tracer, Security security, Http
             if (tracer.Settings.IpHeaderEnabled || security.AppsecEnabled)
             {
                 var peerIp = new Headers.Ip.IpInfo(httpContext.Connection.RemoteIpAddress?.ToString(), httpContext.Connection.RemotePort);
-                Func<string, string> getRequestHeaderFromKey = key => request.Headers.TryGetValue(key, out var value) ? value : string.Empty;
-                Headers.Ip.RequestIpExtractor.AddIpToTags(peerIp, request.IsHttps, getRequestHeaderFromKey, tracer.Settings.IpHeader, tags);
+                string GetRequestHeaderFromKey(string key) => request.Headers.TryGetValue(key, out var value) ? value : string.Empty;
+                Headers.Ip.RequestIpExtractor.AddIpToTags(peerIp, request.IsHttps, GetRequestHeaderFromKey, tracer.Settings.IpHeader, tags);
             }
 
             var iastInstance = Iast.Iast.Instance;
@@ -170,8 +170,8 @@ public void StopAspNetCorePipelineScope(Tracer tracer, Security security, Scope
                 span.SetHeaderTags(new HeadersCollectionAdapter(httpContext.Response.Headers), tracer.Settings.HeaderTags, defaultTagPrefix: SpanContextPropagator.HttpResponseHeadersTagPrefix);
                 if (security.AppsecEnabled)
                 {
-                    var transport = SecurityCoordinator.Get(security, span, new SecurityCoordinator.HttpTransport(httpContext));
-                    transport.AddResponseHeadersToSpanAndCleanup();
+                    var securityCoordinator = SecurityCoordinator.Get(security, span, new SecurityCoordinator.HttpTransport(httpContext));
+                    securityCoordinator.Reporter.AddResponseHeadersToSpanAndCleanup();
                 }
                 else
                 {
diff --git a/tracer/src/Datadog.Trace/Propagators/DistributedContextExtractor.cs b/tracer/src/Datadog.Trace/Propagators/DistributedContextExtractor.cs
deleted file mode 100644
index 792b7845f53a..000000000000
--- a/tracer/src/Datadog.Trace/Propagators/DistributedContextExtractor.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// <copyright file="DistributedContextExtractor.cs" company="Datadog">
-// 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.
-// </copyright>
-
-#nullable enable
-
-using System.Collections.Generic;
-using Datadog.Trace.Tagging;
-using Datadog.Trace.Util;
-
-namespace Datadog.Trace.Propagators
-{
-    internal class DistributedContextExtractor : IContextExtractor
-    {
-        public static readonly DistributedContextExtractor Instance = new();
-
-        private DistributedContextExtractor()
-        {
-        }
-
-        public PropagatorType PropagatorType => PropagatorType.TraceContext;
-
-        public bool TryExtract<TCarrier, TCarrierGetter>(TCarrier carrier, TCarrierGetter carrierGetter, out PropagationContext context)
-            where TCarrierGetter : struct, ICarrierGetter<TCarrier>
-        {
-            context = default;
-
-            if (carrier is not IReadOnlyDictionary<string, string?>)
-            {
-                return false;
-            }
-
-            var traceIdLower = ParseUtility.ParseUInt64(carrier, carrierGetter, SpanContext.Keys.TraceId);
-
-            if (traceIdLower is null or 0)
-            {
-                // a valid traceId is required to use distributed tracing
-                return false;
-            }
-
-            var rawTraceId = ParseUtility.ParseString(carrier, carrierGetter, SpanContext.Keys.RawTraceId);
-            TraceId traceId = default;
-
-            if (!string.IsNullOrEmpty(rawTraceId))
-            {
-                _ = HexString.TryParseTraceId(rawTraceId!, out traceId);
-            }
-
-            var parentId = ParseUtility.ParseUInt64(carrier, carrierGetter, SpanContext.Keys.ParentId) ?? 0;
-            var samplingPriority = ParseUtility.ParseInt32(carrier, carrierGetter, SpanContext.Keys.SamplingPriority);
-            var origin = ParseUtility.ParseString(carrier, carrierGetter, SpanContext.Keys.Origin);
-            var rawSpanId = ParseUtility.ParseString(carrier, carrierGetter, SpanContext.Keys.RawSpanId);
-            var propagatedTraceTags = ParseUtility.ParseString(carrier, carrierGetter, SpanContext.Keys.PropagatedTags);
-            var w3CTraceState = ParseUtility.ParseString(carrier, carrierGetter, SpanContext.Keys.AdditionalW3CTraceState);
-            var traceTags = TagPropagation.ParseHeader(propagatedTraceTags);
-
-            if (traceId == TraceId.Zero)
-            {
-                traceId = GetFullTraceId((ulong)traceIdLower, traceTags);
-            }
-
-            // we don't consider contexts coming from this as "remote" as it could be from a version conflict scenario
-            var spanContext = new SpanContext(traceId, parentId, samplingPriority, serviceName: null, origin, rawTraceId, rawSpanId, isRemote: false)
-                              {
-                                  PropagatedTags = traceTags,
-                                  AdditionalW3CTraceState = w3CTraceState,
-                              };
-
-            context = new PropagationContext(spanContext, baggage: null);
-            return true;
-        }
-
-        // combine the lower 64 bits from "x-datadog-trace-id" with the
-        // upper 64 bits from "_dd.p.tid" into a 128-bit trace id
-        private static TraceId GetFullTraceId(ulong lower, TraceTagCollection tags)
-        {
-            var upperHex = tags.GetTag(Tags.Propagated.TraceIdUpper);
-
-            if (!string.IsNullOrEmpty(upperHex) && HexString.TryParseUInt64(upperHex!, out var upper))
-            {
-                return new TraceId(upper, lower);
-            }
-
-            return (TraceId)lower;
-        }
-    }
-}
diff --git a/tracer/src/Datadog.Trace/Propagators/SpanContextPropagator.cs b/tracer/src/Datadog.Trace/Propagators/SpanContextPropagator.cs
index 2310ed6f8458..c92916870670 100644
--- a/tracer/src/Datadog.Trace/Propagators/SpanContextPropagator.cs
+++ b/tracer/src/Datadog.Trace/Propagators/SpanContextPropagator.cs
@@ -20,9 +20,6 @@ internal class SpanContextPropagator
         internal const string HttpRequestHeadersTagPrefix = "http.request.headers";
         internal const string HttpResponseHeadersTagPrefix = "http.response.headers";
 
-        private static readonly object GlobalLock = new();
-        private static SpanContextPropagator? _instance;
-
         private readonly ConcurrentDictionary<Key, string?> _defaultTagMappingCache = new();
         private readonly IContextInjector[] _injectors;
         private readonly IContextExtractor[] _extractors;
@@ -38,45 +35,6 @@ internal SpanContextPropagator(
             _extractors = extractors?.ToArray() ?? [];
         }
 
-        public static SpanContextPropagator Instance
-        {
-            get
-            {
-                if (_instance is not null)
-                {
-                    return _instance;
-                }
-
-                lock (GlobalLock)
-                {
-                    if (_instance is not null)
-                    {
-                        return _instance;
-                    }
-
-                    _instance = new SpanContextPropagator(
-                        [DatadogContextPropagator.Instance],
-                        [DistributedContextExtractor.Instance, DatadogContextPropagator.Instance],
-                        propagationExtractFirstValue: false);
-
-                    return _instance;
-                }
-            }
-
-            internal set
-            {
-                if (value == null!)
-                {
-                    ThrowHelper.ThrowArgumentNullException(nameof(value));
-                }
-
-                lock (GlobalLock)
-                {
-                    _instance = value;
-                }
-            }
-        }
-
         /// <summary>
         /// Propagates the specified context by adding new headers to a <see cref="IHeadersCollection"/>.
         /// This locks the sampling priority for <paramref name="context"/>.
diff --git a/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingClient.cs b/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingClient.cs
index d2c9a30fa1dd..36b8c7ed0831 100644
--- a/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingClient.cs
+++ b/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingClient.cs
@@ -69,7 +69,7 @@ private static void ServiceRemotingClientEvents_SendRequest(object? sender, Even
                     {
                         var context = new PropagationContext(span.Context, Baggage.Current);
 
-                        SpanContextPropagator.Instance.Inject(
+                        tracer.TracerManager.SpanContextPropagator.Inject(
                             context,
                             messageHeaders,
                             default(ServiceRemotingRequestMessageHeaderSetter));
diff --git a/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingService.cs b/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingService.cs
index 0f1faec8965b..06e0b1b7c80f 100644
--- a/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingService.cs
+++ b/tracer/src/Datadog.Trace/ServiceFabric/ServiceRemotingService.cs
@@ -63,7 +63,7 @@ private static void ServiceRemotingServiceEvents_ReceiveRequest(object? sender,
                 // extract propagation context from message headers for distributed tracing
                 if (messageHeaders != null)
                 {
-                    extractedContext = SpanContextPropagator.Instance
+                    extractedContext = tracer.TracerManager.SpanContextPropagator
                                                             .Extract(messageHeaders, default(ServiceRemotingRequestMessageHeaderGetter))
                                                             .MergeBaggageInto(Baggage.Current);
                 }
diff --git a/tracer/src/Datadog.Trace/Span.cs b/tracer/src/Datadog.Trace/Span.cs
index a1ec204a9d64..941a62bf0310 100644
--- a/tracer/src/Datadog.Trace/Span.cs
+++ b/tracer/src/Datadog.Trace/Span.cs
@@ -538,21 +538,19 @@ private void WriteCloseDebugMessage()
         /// <summary>
         /// Adds a SpanLink to the current Span if the Span is active.
         /// </summary>
-        /// <param name="spanLinkToAdd">The Span to add as a SpanLink</param>
-        /// <param name="attributes">List of KeyValue pairings of attributes to add to the SpanLink. Defaults to null</param>
-        /// <returns>returns the SpanLink on success or null on failure (span is closed already)</returns>
-        internal SpanLink AddSpanLink(Span spanLinkToAdd, List<KeyValuePair<string, string>> attributes = null)
+        /// <param name="spanLink">The SpanLink to add</param>
+        /// <returns>This span to allow method chaining.</returns>
+        internal Span AddLink(SpanLink spanLink)
         {
             if (IsFinished)
             {
-                Log.Warning("AddSpanLink should not be called after the span was closed");
-                return null;
+                Log.Warning("AddLink should not be called after the span was closed");
+                return this;
             }
 
             SpanLinks ??= new List<SpanLink>();
-            var spanLink = new SpanLink(spanLinkToAdd, this, attributes);
             SpanLinks.Add(spanLink);
-            return spanLink;
+            return this;
         }
     }
 }
diff --git a/tracer/src/Datadog.Trace/SpanContextExtractor.cs b/tracer/src/Datadog.Trace/SpanContextExtractor.cs
index 23febc4a6702..b257ed914b99 100644
--- a/tracer/src/Datadog.Trace/SpanContextExtractor.cs
+++ b/tracer/src/Datadog.Trace/SpanContextExtractor.cs
@@ -80,11 +80,12 @@ internal SpanContextExtractor(bool unusedParamNotToUsePublicApi)
             if (messageType != null && source == null) { ThrowHelper.ThrowArgumentNullException(nameof(source)); }
             else if (messageType == null && source != null) { ThrowHelper.ThrowArgumentNullException(nameof(messageType)); }
 
-            var context = SpanContextPropagator.Instance.Extract(carrier, getter);
+            var tracer = Tracer.Instance;
+            var context = tracer.TracerManager.SpanContextPropagator.Extract(carrier, getter);
 
             // DSM
             if (context.SpanContext is { } spanContext
-                && Tracer.Instance.TracerManager.DataStreamsManager is { IsEnabled: true } dsm)
+                && tracer.TracerManager.DataStreamsManager is { IsEnabled: true } dsm)
             {
                 if (getter(carrier, DataStreamsPropagationHeaders.TemporaryBase64PathwayContext).FirstOrDefault() is { Length: > 0 } base64PathwayContext)
                 {
diff --git a/tracer/src/Datadog.Trace/SpanContextInjector.cs b/tracer/src/Datadog.Trace/SpanContextInjector.cs
index 76a43622b55b..3e034a93d0ee 100644
--- a/tracer/src/Datadog.Trace/SpanContextInjector.cs
+++ b/tracer/src/Datadog.Trace/SpanContextInjector.cs
@@ -75,7 +75,8 @@ internal static void InjectInternal<TCarrier>(TCarrier carrier, Action<TCarrier,
                 return;
             }
 
-            SpanContextPropagator.Instance.Inject(
+            var tracer = Tracer.Instance;
+            tracer.TracerManager.SpanContextPropagator.Inject(
                 new PropagationContext(spanContext, baggage: null),
                 carrier,
                 setter);
@@ -83,7 +84,7 @@ internal static void InjectInternal<TCarrier>(TCarrier carrier, Action<TCarrier,
             // DSM
             if (!string.IsNullOrEmpty(messageType) &&
                 !string.IsNullOrEmpty(target) &&
-                Tracer.Instance.TracerManager.DataStreamsManager is { IsEnabled: true } dsm)
+                tracer.TracerManager.DataStreamsManager is { IsEnabled: true } dsm)
             {
                 var edgeTags = new[] { "direction:out", $"topic:{target}", $"type:{messageType}" };
                 spanContext.SetCheckpoint(dsm, CheckpointKind.Produce, edgeTags, payloadSizeBytes: 0, timeInQueueMs: 0, parent: null);
diff --git a/tracer/src/Datadog.Trace/SpanLink.cs b/tracer/src/Datadog.Trace/SpanLink.cs
index 627536e90693..393d3bc944d8 100644
--- a/tracer/src/Datadog.Trace/SpanLink.cs
+++ b/tracer/src/Datadog.Trace/SpanLink.cs
@@ -25,42 +25,14 @@ internal class SpanLink
     /// in OpenTelemetry that's called a Span Context, which may also include tracestate and trace flags.
     /// </summary>
     /// <param name="spanLinkContext">The context of the spanlink to extract attributes from</param>
-    /// <param name="decoratedSpan">Reference to the span you're adding SpanLinks to</param>
     /// <param name="attributes">Optional dictionary of attributes to take for the spanlink.</param>
-    public SpanLink(SpanContext spanLinkContext, Span decoratedSpan, List<KeyValuePair<string, string>>? attributes = null)
+    public SpanLink(SpanContext spanLinkContext, List<KeyValuePair<string, string>>? attributes = null)
     {
         Context = spanLinkContext;
-        DecoratedSpan = decoratedSpan;
         Attributes = attributes;
     }
 
-    public SpanLink(Span spanToLink, Span decoratedSpan, List<KeyValuePair<string, string>>? attributes = null)
-        : this(spanToLink.Context, decoratedSpan, attributes)
-    {
-    }
-
     public List<KeyValuePair<string, string>>? Attributes { get; private set; }
 
-    public SpanContext Context { get;  }
-
-    public Span DecoratedSpan { get; }
-
-    /// <summary>
-    /// Adds an Attribute to the SpanLink.
-    /// </summary>
-    /// <param name="name">name of attribute</param>
-    /// <param name="value">value of attribute</param>
-    public void AddAttribute(string name, string value)
-    {
-        if (DecoratedSpan.IsFinished)
-        {
-            Log.Warning("AddAttribute should not be called after the decorated span was closed");
-            return;
-        }
-
-        var newAttribute = new KeyValuePair<string, string>(name, value);
-        Attributes ??= [];
-
-        Attributes.Add(newAttribute);
-    }
+    public SpanContext Context { get; }
 }
diff --git a/tracer/src/Datadog.Trace/Telemetry/Collectors/RedactedErrorLogCollector.cs b/tracer/src/Datadog.Trace/Telemetry/Collectors/RedactedErrorLogCollector.cs
index d783c1fce840..e28424c2716c 100644
--- a/tracer/src/Datadog.Trace/Telemetry/Collectors/RedactedErrorLogCollector.cs
+++ b/tracer/src/Datadog.Trace/Telemetry/Collectors/RedactedErrorLogCollector.cs
@@ -29,10 +29,10 @@ internal class RedactedErrorLogCollector
     private TaskCompletionSource<bool> _tcs = new(TaskOptions);
     private bool _isEnabled = true;
 
-    private ConcurrentDictionary<uint, int> _logCounts = new();
-    private ConcurrentDictionary<uint, int> _logCountsReserve = new();
+    private ConcurrentDictionary<LogKey, int> _logCounts = new();
+    private ConcurrentDictionary<LogKey, int> _logCountsReserve = new();
 
-    public List<List<LogMessageData>>? GetLogs()
+    public List<List<LogMessageData>>? GetLogs(string? tags = null)
     {
         // This method should only be called in a single-threaded loop
         List<List<LogMessageData>>? batches = null;
@@ -42,9 +42,10 @@ internal class RedactedErrorLogCollector
 
         while (_queue.TryDequeue(out var log))
         {
+            log.Tags = tags;
             var logSize = log.GetApproximateSerializationSize();
             // modify the message to add the final log count
-            var eventId = EventIdHash.Compute(log.Message, log.StackTrace);
+            var eventId = new LogKey(log.Message, log.StackTrace);
             if (logCounts.TryGetValue(eventId, out var count) && count > 1)
             {
                 log.Count = count;
@@ -91,9 +92,9 @@ public void EnqueueLog(string message, TelemetryLogLevel logLevel, DateTimeOffse
     {
         if (Volatile.Read(ref _isEnabled))
         {
-            var eventId = EventIdHash.Compute(message, stackTrace);
+            var logKey = new LogKey(message, stackTrace);
             var logCounts = _logCounts;
-            var newCount = logCounts.AddOrUpdate(eventId, addValue: 1, updateValueFactory: static (_, prev) => prev + 1);
+            var newCount = logCounts.AddOrUpdate(logKey, addValue: 1, updateValueFactory: static (_, prev) => prev + 1);
             if (newCount != 1)
             {
                 // already have this log, so don't enqueue it again
@@ -143,4 +144,10 @@ public void DisableCollector()
         {
         }
     }
+
+    private readonly record struct LogKey(string Message, string? StackTrace)
+    {
+        public readonly string Message = Message;
+        public readonly string? StackTrace = StackTrace;
+    }
 }
diff --git a/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs b/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs
index 7ae4273d4c56..f21c033a3a9c 100644
--- a/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs
+++ b/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Threading.Tasks;
 using Datadog.Trace.AppSec;
+using Datadog.Trace.Ci.Configuration;
 using Datadog.Trace.Configuration;
 using Datadog.Trace.ContinuousProfiler;
 using Datadog.Trace.Iast.Settings;
@@ -40,6 +41,11 @@ internal interface ITelemetryController
         /// </summary>
         public void RecordProfilerSettings(Profiler profiler);
 
+        /// <summary>
+        /// Called to record ci-vis-related telemetry
+        /// </summary>
+        public void RecordCiVisibilitySettings(CIVisibilitySettings settings);
+
         /// <summary>
         /// Dispose resources for sending telemetry
         /// </summary>
diff --git a/tracer/src/Datadog.Trace/Telemetry/Metrics/MetricTags.cs b/tracer/src/Datadog.Trace/Telemetry/Metrics/MetricTags.cs
index 0139c2b254ee..1fd06be40a38 100644
--- a/tracer/src/Datadog.Trace/Telemetry/Metrics/MetricTags.cs
+++ b/tracer/src/Datadog.Trace/Telemetry/Metrics/MetricTags.cs
@@ -239,7 +239,7 @@ internal enum IntegrationName
         [Description("integration_name:process")]Process,
         [Description("integration_name:hashalgorithm")]HashAlgorithm,
         [Description("integration_name:symmetricalgorithm")]SymmetricAlgorithm,
-        [Description("integration_name:opentelemetry")]OpenTelemetry,
+        [Description("integration_name:otel")]OpenTelemetry, // Note: The naming of this tag value breaks the convention of using the integration name to use a standardized value
         [Description("integration_name:pathtraversal")]PathTraversal,
         [Description("integration_name:ssrf")]Ssrf,
         [Description("integration_name:ldap")]Ldap,
@@ -389,10 +389,17 @@ public enum CIVisibilityTestingEventTypeWithCodeOwnerAndSupportedCiAndBenchmarkA
         [Description("event_type:test;is_benchmark")] Test_IsBenchmark,
         [Description("event_type:suite")] Suite,
         [Description("event_type:module")] Module,
-        [Description("event_type:session")] Session_NoCodeOwner_IsSupportedCi,
-        [Description("event_type:session;is_unsupported_ci")] Session_NoCodeOwner_UnsupportedCi,
-        [Description("event_type:session;has_codeowner;is_unsupported_ci")] Session_HasCodeOwner_UnsupportedCi,
-        [Description("event_type:session;has_codeowner")] Session_HasCodeOwner_IsSupportedCi,
+        // ...
+        [Description("event_type:session")] Session_NoCodeOwner_IsSupportedCi_WithoutAgentlessLog,
+        [Description("event_type:session;is_unsupported_ci")] Session_NoCodeOwner_UnsupportedCi_WithoutAgentlessLog,
+        [Description("event_type:session;has_codeowner;is_unsupported_ci")] Session_HasCodeOwner_UnsupportedCi_WithoutAgentlessLog,
+        [Description("event_type:session;has_codeowner")] Session_HasCodeOwner_IsSupportedCi_WithoutAgentlessLog,
+        // ...
+        [Description("event_type:session;agentless_log_submission_enabled")] Session_NoCodeOwner_IsSupportedCi_WithAgentlessLog,
+        [Description("event_type:session;is_unsupported_ci;agentless_log_submission_enabled")] Session_NoCodeOwner_UnsupportedCi_WithAgentlessLog,
+        [Description("event_type:session;has_codeowner;is_unsupported_ci;agentless_log_submission_enabled")] Session_HasCodeOwner_UnsupportedCi_WithAgentlessLog,
+        [Description("event_type:session;has_codeowner;agentless_log_submission_enabled")] Session_HasCodeOwner_IsSupportedCi_WithAgentlessLog,
+        // ...
         [Description("event_type:test;is_new:true")] Test_EFDTestIsNew,
         [Description("event_type:test;is_new:true;early_flake_detection_abort_reason:slow")] Test_EFDTestIsNew_EFDTestAbortSlow,
         [Description("event_type:test;browser_driver:selenium")] Test_BrowserDriverSelenium,
@@ -473,14 +480,23 @@ public enum CIVisibilityExitCodes
 
     public enum CIVisibilityITRSettingsResponse
     {
-        [Description("")] CoverageDisabled_ItrSkipDisabled,
-        [Description("coverage_enabled")] CoverageEnabled_ItrSkipDisabled,
-        [Description("itrskip_enabled")] CoverageDisabled_ItrSkipEnabled,
-        [Description("coverage_enabled;itrskip_enabled")] CoverageEnabled_ItrSkipEnabled,
-        [Description("early_flake_detection_enabled:true")] CoverageDisabled_ItrSkipDisabled_EFDEnabled,
-        [Description("coverage_enabled;early_flake_detection_enabled:true")] CoverageEnabled_ItrSkipDisabled_EFDEnabled,
-        [Description("itrskip_enabled;early_flake_detection_enabled:true")] CoverageDisabled_ItrSkipEnabled_EFDEnabled,
-        [Description("coverage_enabled;itrskip_enabled;early_flake_detection_enabled:true")] CoverageEnabled_ItrSkipEnabled_EFDEnabled,
+        [Description("")] CoverageDisabled_ItrSkipDisabled_AtrDisabled,
+        [Description("coverage_enabled")] CoverageEnabled_ItrSkipDisabled_AtrDisabled,
+        [Description("itrskip_enabled")] CoverageDisabled_ItrSkipEnabled_AtrDisabled,
+        [Description("coverage_enabled;itrskip_enabled")] CoverageEnabled_ItrSkipEnabled_AtrDisabled,
+        [Description("early_flake_detection_enabled:true")] CoverageDisabled_ItrSkipDisabled_EFDEnabled_AtrDisabled,
+        [Description("coverage_enabled;early_flake_detection_enabled:true")] CoverageEnabled_ItrSkipDisabled_EFDEnabled_AtrDisabled,
+        [Description("itrskip_enabled;early_flake_detection_enabled:true")] CoverageDisabled_ItrSkipEnabled_EFDEnabled_AtrDisabled,
+        [Description("coverage_enabled;itrskip_enabled;early_flake_detection_enabled:true")] CoverageEnabled_ItrSkipEnabled_EFDEnabled_AtrDisabled,
+        // ...
+        [Description("flaky_test_retries_enabled:true")] CoverageDisabled_ItrSkipDisabled_AtrEnabled,
+        [Description("coverage_enabled;flaky_test_retries_enabled:true")] CoverageEnabled_ItrSkipDisabled_AtrEnabled,
+        [Description("itrskip_enabled;flaky_test_retries_enabled:true")] CoverageDisabled_ItrSkipEnabled_AtrEnabled,
+        [Description("coverage_enabled;itrskip_enabled;flaky_test_retries_enabled:true")] CoverageEnabled_ItrSkipEnabled_AtrEnabled,
+        [Description("early_flake_detection_enabled:true;flaky_test_retries_enabled:true")] CoverageDisabled_ItrSkipDisabled_EFDEnabled_AtrEnabled,
+        [Description("coverage_enabled;early_flake_detection_enabled:true;flaky_test_retries_enabled:true")] CoverageEnabled_ItrSkipDisabled_EFDEnabled_AtrEnabled,
+        [Description("itrskip_enabled;early_flake_detection_enabled:true;flaky_test_retries_enabled:true")] CoverageDisabled_ItrSkipEnabled_EFDEnabled_AtrEnabled,
+        [Description("coverage_enabled;itrskip_enabled;early_flake_detection_enabled:true;flaky_test_retries_enabled:true")] CoverageEnabled_ItrSkipEnabled_EFDEnabled_AtrEnabled,
     }
 
     public enum CIVisibilityRequestCompressed
diff --git a/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs b/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs
index a1be3d6ee3bf..2a6c2187e418 100644
--- a/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs
+++ b/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs
@@ -4,6 +4,7 @@
 // </copyright>
 
 using System.Threading.Tasks;
+using Datadog.Trace.Ci.Configuration;
 using Datadog.Trace.Configuration;
 using Datadog.Trace.ContinuousProfiler;
 
@@ -33,6 +34,10 @@ public void RecordProfilerSettings(Profiler profiler)
         {
         }
 
+        public void RecordCiVisibilitySettings(CIVisibilitySettings settings)
+        {
+        }
+
         public void Start()
         {
         }
diff --git a/tracer/src/Datadog.Trace/Telemetry/TelemetryController.cs b/tracer/src/Datadog.Trace/Telemetry/TelemetryController.cs
index 44a5e5a201cf..a1e2f358a4bf 100644
--- a/tracer/src/Datadog.Trace/Telemetry/TelemetryController.cs
+++ b/tracer/src/Datadog.Trace/Telemetry/TelemetryController.cs
@@ -11,6 +11,8 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using Datadog.Trace.Ci;
+using Datadog.Trace.Ci.Configuration;
 using Datadog.Trace.Configuration;
 using Datadog.Trace.Configuration.Telemetry;
 using Datadog.Trace.ContinuousProfiler;
@@ -38,6 +40,7 @@ internal class TelemetryController : ITelemetryController
     private readonly IMetricsTelemetryCollector _metrics;
     private readonly RedactedErrorLogCollector? _redactedErrorLogs;
     private readonly TaskCompletionSource<bool> _processExit = new();
+    private readonly TagBuilder _logTagBuilder = new();
     private readonly Task _flushTask;
     private readonly Scheduler _scheduler;
     private TelemetryTransportManager _transportManager;
@@ -93,6 +96,7 @@ public void RecordTracerSettings(TracerSettings settings, string defaultServiceN
         settings.Telemetry.CopyTo(_configuration);
         _application.RecordTracerSettings(settings, defaultServiceName);
         _namingVersion = ((int)settings.MetadataSchemaVersion).ToString();
+        _logTagBuilder.Update(settings);
         _queue.Enqueue(new WorkItem(WorkItem.ItemType.EnableSending, null));
     }
 
@@ -111,7 +115,10 @@ public void Start()
     }
 
     public void ProductChanged(TelemetryProductType product, bool enabled, ErrorData? error)
-        => _products.ProductChanged(product, enabled, error);
+    {
+        _products.ProductChanged(product, enabled, error);
+        _logTagBuilder.Update(product, enabled);
+    }
 
     public void RecordProfilerSettings(Profiler profiler)
     {
@@ -119,6 +126,12 @@ public void RecordProfilerSettings(Profiler profiler)
         _configuration.Record(ConfigTelemetryData.CodeHotspotsEnabled, profiler.ContextTracker.IsEnabled, ConfigurationOrigins.Default);
     }
 
+    public void RecordCiVisibilitySettings(CIVisibilitySettings settings)
+    {
+        // CI Vis records the settings _directly_ in the global config so don't need to record them again here
+        _logTagBuilder.Update(settings, CIVisibility.Enabled);
+    }
+
     public void IntegrationRunning(IntegrationId integrationId)
         => _integrations.IntegrationRunning(integrationId);
 
@@ -298,7 +311,7 @@ private async Task PushTelemetry(bool includeLogs, bool sendAppClosing)
                 return;
             }
 
-            if (includeLogs && _redactedErrorLogs?.GetLogs() is { } batches)
+            if (includeLogs && _redactedErrorLogs?.GetLogs(_logTagBuilder.GetLogTags()) is { } batches)
             {
                 foreach (var batch in batches)
                 {
@@ -350,6 +363,74 @@ public enum ItemType
         public object? State { get; }
     }
 
+    internal class TagBuilder
+    {
+        private bool _isCiVisEnabled;
+        private bool _isAsmEnabled;
+        private bool _isProfilingEnabled;
+        private bool _isDynamicInstrumentationEnabled;
+        private string? _cloudEnv;
+        private bool _isUpdateRequired;
+        private string? _tags;
+
+        public void Update(TracerSettings settings)
+        {
+            _cloudEnv = settings switch
+            {
+                { IsRunningInGCPFunctions: true } => ",gcp",
+                { LambdaMetadata.IsRunningInLambda: true } => ",aws",
+                { IsRunningMiniAgentInAzureFunctions: true } => ",azf",
+                { IsRunningInAzureAppService: true } => ",aas",
+                _ => null,
+            };
+            _isUpdateRequired = true;
+        }
+
+        public void Update(CIVisibilitySettings settings, bool enabled)
+        {
+            // We don't actually need to record these, because they're added to the global config
+            // This isn't nice, as it calls the static property,
+            // but we don't have a better way of getting this info right now
+            _isCiVisEnabled = enabled;
+            _isUpdateRequired = true;
+        }
+
+        public void Update(TelemetryProductType product, bool enabled)
+        {
+            if (product == TelemetryProductType.Profiler)
+            {
+                _isProfilingEnabled = enabled;
+            }
+            else if (product == TelemetryProductType.AppSec)
+            {
+                _isAsmEnabled = enabled;
+            }
+            else if (product == TelemetryProductType.DynamicInstrumentation)
+            {
+                _isDynamicInstrumentationEnabled = enabled;
+            }
+
+            // unknown product, ignore
+            _isUpdateRequired = true;
+        }
+
+        public string GetLogTags()
+        {
+            if (_isUpdateRequired || _tags is null)
+            {
+                _isUpdateRequired = false;
+                // using 1/0 to save bytes!
+                _tags = $"ci:{(_isCiVisEnabled ? '1' : '0')}" +
+                        $",asm:{(_isAsmEnabled ? '1' : '0')}" +
+                        $",prof:{(_isProfilingEnabled ? '1' : '0')}" +
+                        $",dyn:{(_isDynamicInstrumentationEnabled ? '1' : '0')}" +
+                        $"{_cloudEnv}";
+            }
+
+            return _tags;
+        }
+    }
+
     /// <summary>
     /// Internal for testing
     /// </summary>
diff --git a/tracer/src/Datadog.Trace/TracerConstants.cs b/tracer/src/Datadog.Trace/TracerConstants.cs
index dc20941bbd44..f4706347c8cc 100644
--- a/tracer/src/Datadog.Trace/TracerConstants.cs
+++ b/tracer/src/Datadog.Trace/TracerConstants.cs
@@ -8,7 +8,7 @@ namespace Datadog.Trace
     internal static class TracerConstants
     {
         public const string Language = "dotnet";
-        public const string AssemblyVersion = "3.8.0.0";
-        public const string ThreePartVersion = "3.8.0";
+        public const string AssemblyVersion = "3.9.0.0";
+        public const string ThreePartVersion = "3.9.0";
     }
 }
diff --git a/tracer/src/Datadog.Trace/TracerManager.cs b/tracer/src/Datadog.Trace/TracerManager.cs
index b72d43b7ad35..286e972bcff0 100644
--- a/tracer/src/Datadog.Trace/TracerManager.cs
+++ b/tracer/src/Datadog.Trace/TracerManager.cs
@@ -24,6 +24,7 @@
 using Datadog.Trace.Logging.DirectSubmission;
 using Datadog.Trace.Logging.TracerFlare;
 using Datadog.Trace.Processors;
+using Datadog.Trace.Propagators;
 using Datadog.Trace.RemoteConfigurationManagement;
 using Datadog.Trace.RuntimeMetrics;
 using Datadog.Trace.Sampling;
@@ -101,6 +102,8 @@ public TracerManager(
 
             var schema = new NamingSchema(settings.MetadataSchemaVersion, settings.PeerServiceTagsEnabled, settings.RemoveClientServiceNamesEnabled, defaultServiceName, settings.ServiceNameMappings, settings.PeerServiceNameMappings);
             PerTraceSettings = new(traceSampler, spanSampler, settings.ServiceNameMappings, schema);
+
+            SpanContextPropagator = SpanContextPropagatorFactory.GetSpanContextPropagator(settings.PropagationStyleInject, settings.PropagationStyleExtract, settings.PropagationExtractFirstOnly);
         }
 
         /// <summary>
@@ -164,6 +167,8 @@ public static TracerManager Instance
 
         public PerTraceSettings PerTraceSettings { get; }
 
+        public SpanContextPropagator SpanContextPropagator { get; }
+
         /// <summary>
         /// Replaces the global <see cref="TracerManager"/> settings. This affects all <see cref="Tracer"/> instances
         /// which use the global <see cref="TracerManager"/>
diff --git a/tracer/src/Datadog.Trace/TracerManagerFactory.cs b/tracer/src/Datadog.Trace/TracerManagerFactory.cs
index 74cb7cbc0b5f..2d16e877521a 100644
--- a/tracer/src/Datadog.Trace/TracerManagerFactory.cs
+++ b/tracer/src/Datadog.Trace/TracerManagerFactory.cs
@@ -150,8 +150,6 @@ internal TracerManager CreateTracerManager(
             telemetry.RecordProfilerSettings(profiler);
             telemetry.ProductChanged(TelemetryProductType.Profiler, enabled: profiler.Status.IsProfilerReady, error: null);
 
-            SpanContextPropagator.Instance = SpanContextPropagatorFactory.GetSpanContextPropagator(settings.PropagationStyleInject, settings.PropagationStyleExtract, settings.PropagationExtractFirstOnly);
-
             dataStreamsManager ??= DataStreamsManager.Create(settings, discoveryService, defaultServiceName);
 
             if (ShouldEnableRemoteConfiguration(settings))
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/AnyType.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/AnyType.cs
new file mode 100644
index 000000000000..49c9b99b7bf3
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/AnyType.cs
@@ -0,0 +1,36 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Type of an <see cref="IOpenApiAny"/>
+    /// </summary>
+    internal enum AnyType
+    {
+        /// <summary>
+        /// Primitive.
+        /// </summary>
+        Primitive,
+
+        /// <summary>
+        /// Null.
+        /// </summary>
+        Null,
+
+        /// <summary>
+        /// Array.
+        /// </summary>
+        Array,
+
+        /// <summary>
+        /// Object.
+        /// </summary>
+        Object
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/IOpenApiAny.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/IOpenApiAny.cs
new file mode 100644
index 000000000000..8a68a3f5d875
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/IOpenApiAny.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Base interface for all the types that represent Open API Any.
+    /// </summary>
+    internal interface IOpenApiAny : IOpenApiElement, IOpenApiExtension
+    {
+        /// <summary>
+        /// Type of an <see cref="IOpenApiAny"/>.
+        /// </summary>
+        AnyType AnyType { get; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs
new file mode 100644
index 000000000000..cdeeab83dc04
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs
@@ -0,0 +1,82 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Primitive type.
+    /// </summary>
+    internal enum PrimitiveType
+    {
+        /// <summary>
+        /// Integer
+        /// </summary>
+        Integer,
+
+        /// <summary>
+        /// Long
+        /// </summary>
+        Long,
+
+        /// <summary>
+        /// Float
+        /// </summary>
+        Float,
+
+        /// <summary>
+        /// Double
+        /// </summary>
+        Double,
+
+        /// <summary>
+        /// String
+        /// </summary>
+        String,
+
+        /// <summary>
+        /// Byte
+        /// </summary>
+        Byte,
+
+        /// <summary>
+        /// Binary
+        /// </summary>
+        Binary,
+
+        /// <summary>
+        /// Boolean
+        /// </summary>
+        Boolean,
+
+        /// <summary>
+        /// Date
+        /// </summary>
+        Date,
+
+        /// <summary>
+        /// DateTime
+        /// </summary>
+        DateTime,
+
+        /// <summary>
+        /// Password
+        /// </summary>
+        Password
+    }
+
+    /// <summary>
+    /// Base interface for the Primitive type.
+    /// </summary>
+    internal interface IOpenApiPrimitive : IOpenApiAny
+    {
+        /// <summary>
+        /// Primitive type.
+        /// </summary>
+        PrimitiveType PrimitiveType { get; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs
new file mode 100644
index 000000000000..dc37f55728b8
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs
@@ -0,0 +1,66 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Contains logic for cloning objects through copy constructors.
+    /// </summary>
+    internal class OpenApiAnyCloneHelper
+    {
+        /// <summary>
+        /// Clones an instance of <see cref="IOpenApiAny"/> object from the copy constructor
+        /// </summary>
+        /// <param name="obj">The object instance.</param>
+        /// <returns>A clone copy or the object itself.</returns>
+        [Obsolete("Use native AoT-friendly generic overload of CloneFromCopyConstructor instead.")]
+        [RequiresUnreferencedCode("CloneFromCopyConstructor is not trim-compatible. Recommended to use native AoT-friendly type-specific overloads of CloneFromCopyConstructor instead.")]
+        public static IOpenApiAny CloneFromCopyConstructor(IOpenApiAny obj)
+        {
+            if (obj != null)
+            {
+                var t = obj.GetType();
+                foreach (var ci in t.GetConstructors())
+                {
+                    var pi = ci.GetParameters();
+                    if (pi.Length == 1 && pi[0].ParameterType == t)
+                    {
+                        return (IOpenApiAny)ci.Invoke(new object[] { obj });
+                    }
+                }
+            }
+
+            return obj;
+        }
+        
+        /// <summary>
+        /// Clones an instance of <see cref="IOpenApiAny"/> object from the copy constructor
+        /// </summary>
+        /// <param name="obj">The object instance.</param>
+        /// <returns>A clone copy or the object itself.</returns>
+        public static T CloneFromCopyConstructor<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(T obj) where T : IOpenApiAny
+        {
+            if (obj != null)
+            {
+                foreach (var ci in typeof(T).GetConstructors())
+                {
+                    var pi = ci.GetParameters();
+                    if (pi.Length == 1 && pi[0].ParameterType == typeof(T))
+                    {
+                        return (T)ci.Invoke([obj]);
+                    }
+                }
+            }
+
+            return obj;
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiArray.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiArray.cs
new file mode 100644
index 000000000000..8048a8de0373
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiArray.cs
@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+using System.Collections.Generic;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API array.
+    /// </summary>
+    internal class OpenApiArray : List<IOpenApiAny>, IOpenApiAny
+    {
+        /// <summary>
+        /// The type of <see cref="IOpenApiAny"/>
+        /// </summary>
+        public AnyType AnyType { get; } = AnyType.Array;
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiArray() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiArray"/> object
+        /// </summary>
+        public OpenApiArray(OpenApiArray array)
+        {
+            AnyType = array.AnyType;
+            foreach (var item in array)
+            {
+                Add(OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(item));
+            }
+        }
+
+        /// <summary>
+        /// Write out contents of OpenApiArray to passed writer
+        /// </summary>
+        /// <param name="writer">Instance of JSON or YAML writer.</param>
+        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
+        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteStartArray();
+
+            foreach (var item in this)
+            {
+                writer.WriteAny(item);
+            }
+
+            writer.WriteEndArray();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiBinary.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiBinary.cs
new file mode 100644
index 000000000000..9ce03de6c8c7
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiBinary.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API binary.
+    /// </summary>
+    internal class OpenApiBinary : OpenApiPrimitive<byte[]>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiBinary"/> class.
+        /// </summary>
+        /// <param name="value"></param>
+        public OpenApiBinary(byte[] value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Binary;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiBoolean.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiBoolean.cs
new file mode 100644
index 000000000000..a4ba9f7712e5
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiBoolean.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API boolean.
+    /// </summary>
+    internal class OpenApiBoolean : OpenApiPrimitive<bool>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiBoolean"/> class.
+        /// </summary>
+        /// <param name="value"></param>
+        public OpenApiBoolean(bool value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Boolean;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiByte.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiByte.cs
new file mode 100644
index 000000000000..293baf17cb81
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiByte.cs
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API Byte
+    /// </summary>
+    internal class OpenApiByte : OpenApiPrimitive<byte[]>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiByte"/> class.
+        /// </summary>
+        public OpenApiByte(byte value)
+            : this(new[] { value })
+        {
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiByte"/> class.
+        /// </summary>
+        public OpenApiByte(byte[] value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Byte;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDate.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDate.cs
new file mode 100644
index 000000000000..2a6f05c93d42
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDate.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API Date
+    /// </summary>
+    internal class OpenApiDate : OpenApiPrimitive<DateTime>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiDate"/> class.
+        /// </summary>
+        public OpenApiDate(DateTime value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Date;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDateTime.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDateTime.cs
new file mode 100644
index 000000000000..e620601f5277
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDateTime.cs
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API Datetime
+    /// </summary>
+    internal class OpenApiDateTime : OpenApiPrimitive<DateTimeOffset>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiDateTime"/> class.
+        /// </summary>
+        public OpenApiDateTime(DateTimeOffset value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.DateTime;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDouble.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDouble.cs
new file mode 100644
index 000000000000..1ceddc5dc009
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiDouble.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API Double
+    /// </summary>
+    internal class OpenApiDouble : OpenApiPrimitive<double>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiDouble"/> class.
+        /// </summary>
+        public OpenApiDouble(double value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Double;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiFloat.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiFloat.cs
new file mode 100644
index 000000000000..6d5a380f258b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiFloat.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API Float
+    /// </summary>
+    internal class OpenApiFloat : OpenApiPrimitive<float>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiFloat"/> class.
+        /// </summary>
+        public OpenApiFloat(float value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Float;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiInteger.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiInteger.cs
new file mode 100644
index 000000000000..f65e20a754d6
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiInteger.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API Integer
+    /// </summary>
+    internal class OpenApiInteger : OpenApiPrimitive<int>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiInteger"/> class.
+        /// </summary>
+        public OpenApiInteger(int value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Integer;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiLong.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiLong.cs
new file mode 100644
index 000000000000..deee698575a4
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiLong.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API long.
+    /// </summary>
+    internal class OpenApiLong : OpenApiPrimitive<long>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiLong"/> class.
+        /// </summary>
+        public OpenApiLong(long value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// Primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Long;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiNull.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiNull.cs
new file mode 100644
index 000000000000..03c2c58cbf70
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiNull.cs
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API null.
+    /// </summary>
+    internal class OpenApiNull : IOpenApiAny
+    {
+        /// <summary>
+        /// The type of <see cref="IOpenApiAny"/>
+        /// </summary>
+        public AnyType AnyType { get; } = AnyType.Null;
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiNull() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiNull"/> object
+        /// </summary>
+        public OpenApiNull(OpenApiNull openApiNull)
+        {
+            AnyType = openApiNull.AnyType;
+        }
+
+        /// <summary>
+        /// Write out null representation
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
+        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteAny(this);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiObject.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiObject.cs
new file mode 100644
index 000000000000..a9184c19f9f2
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiObject.cs
@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API object.
+    /// </summary>
+    internal class OpenApiObject : Dictionary<string, IOpenApiAny>, IOpenApiAny
+    {
+        /// <summary>
+        /// Type of <see cref="IOpenApiAny"/>.
+        /// </summary>
+        public AnyType AnyType { get; } = AnyType.Object;
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiObject() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiObject"/> object
+        /// </summary>
+        public OpenApiObject(OpenApiObject obj)
+        {
+            AnyType = obj.AnyType;
+            foreach (var key in obj.Keys)
+            {
+                this[key] = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(obj[key]);
+            }
+        }
+
+        /// <summary>
+        /// Serialize OpenApiObject to writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
+        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteStartObject();
+
+            foreach (var item in this)
+            {
+                writer.WritePropertyName(item.Key);
+                writer.WriteAny(item.Value);
+            }
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiPassword.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiPassword.cs
new file mode 100644
index 000000000000..aa8d9e0e912d
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiPassword.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API password.
+    /// </summary>
+    internal class OpenApiPassword : OpenApiPrimitive<string>
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiPassword"/> class.
+        /// </summary>
+        public OpenApiPassword(string value)
+            : base(value)
+        {
+        }
+
+        /// <summary>
+        /// The primitive type this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.Password;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiPrimitive.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiPrimitive.cs
new file mode 100644
index 000000000000..16028451c061
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiPrimitive.cs
@@ -0,0 +1,160 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Globalization;
+using System.Text;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API primitive class.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal abstract class OpenApiPrimitive<T> : IOpenApiPrimitive
+    {
+        /// <summary>
+        /// Initializes the <see cref="IOpenApiPrimitive"/> class with the given value.
+        /// </summary>
+        /// <param name="value"></param>
+        public OpenApiPrimitive(T value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="IOpenApiPrimitive"/> object
+        /// </summary>
+        /// <param name="openApiPrimitive"></param>
+        public OpenApiPrimitive(OpenApiPrimitive<T> openApiPrimitive)
+        {
+            Value = openApiPrimitive.Value;
+        }
+
+        /// <summary>
+        /// The kind of <see cref="IOpenApiAny"/>.
+        /// </summary>
+        public AnyType AnyType => AnyType.Primitive;
+
+        /// <summary>
+        /// The primitive class this object represents.
+        /// </summary>
+        public abstract PrimitiveType PrimitiveType { get; }
+
+        /// <summary>
+        /// Value of this <see cref="IOpenApiPrimitive"/>
+        /// </summary>
+        public T Value { get; }
+
+        /// <summary>
+        /// Write out content of primitive element
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="specVersion"></param>
+        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            switch (this.PrimitiveType)
+            {
+                case PrimitiveType.Integer:
+                    var intValue = (OpenApiInteger)(IOpenApiPrimitive)this;
+                    writer.WriteValue(intValue.Value);
+                    break;
+
+                case PrimitiveType.Long:
+                    var longValue = (OpenApiLong)(IOpenApiPrimitive)this;
+                    writer.WriteValue(longValue.Value);
+                    break;
+
+                case PrimitiveType.Float:
+                    var floatValue = (OpenApiFloat)(IOpenApiPrimitive)this;
+                    writer.WriteValue(floatValue.Value);
+                    break;
+
+                case PrimitiveType.Double:
+                    var doubleValue = (OpenApiDouble)(IOpenApiPrimitive)this;
+                    var actualValue = doubleValue.Value;
+                    if (actualValue.Equals(double.NaN)
+                        || actualValue.Equals(double.NegativeInfinity)
+                        || actualValue.Equals(double.PositiveInfinity))
+                    {
+                        // Write out NaN, -Infinity, Infinity as strings
+                        writer.WriteValue(actualValue.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    }
+                    else
+                    {
+                        writer.WriteValue(actualValue);
+                    }
+                    break;
+
+                case PrimitiveType.String:
+                    var stringValue = (OpenApiString)(IOpenApiPrimitive)this;
+                    if (stringValue.IsRawString())
+                        writer.WriteRaw(stringValue.Value);
+                    else
+                        writer.WriteValue(stringValue.Value);
+                    break;
+
+                case PrimitiveType.Byte:
+                    var byteValue = (OpenApiByte)(IOpenApiPrimitive)this;
+                    if (byteValue.Value == null)
+                    {
+                        writer.WriteNull();
+                    }
+                    else
+                    {
+                        writer.WriteValue(Convert.ToBase64String(byteValue.Value));
+                    }
+
+                    break;
+
+                case PrimitiveType.Binary:
+                    var binaryValue = (OpenApiBinary)(IOpenApiPrimitive)this;
+                    if (binaryValue.Value == null)
+                    {
+                        writer.WriteNull();
+                    }
+                    else
+                    {
+                        writer.WriteValue(Encoding.UTF8.GetString(binaryValue.Value));
+                    }
+
+                    break;
+
+                case PrimitiveType.Boolean:
+                    var boolValue = (OpenApiBoolean)(IOpenApiPrimitive)this;
+                    writer.WriteValue(boolValue.Value);
+                    break;
+
+                case PrimitiveType.Date:
+                    var dateValue = (OpenApiDate)(IOpenApiPrimitive)this;
+                    writer.WriteValue(dateValue.Value.ToString("o").Substring(0, 10));
+                    break;
+
+                case PrimitiveType.DateTime:
+                    var dateTimeValue = (OpenApiDateTime)(IOpenApiPrimitive)this;
+                    writer.WriteValue(dateTimeValue.Value);
+                    break;
+
+                case PrimitiveType.Password:
+                    var passwordValue = (OpenApiPassword)(IOpenApiPrimitive)this;
+                    writer.WriteValue(passwordValue.Value);
+                    break;
+
+                default:
+                    throw new OpenApiWriterException(
+                        string.Format(
+                            SRResource.PrimitiveTypeNotSupported,
+                            this.PrimitiveType));
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiString.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiString.cs
new file mode 100644
index 000000000000..20c7000f2186
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Any/OpenApiString.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Open API string type.
+    /// </summary>
+    internal class OpenApiString : OpenApiPrimitive<string>
+    {
+        private bool isExplicit;
+        private bool isRawString;
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiString"/> class.
+        /// </summary>
+        /// <param name="value"></param>
+        public OpenApiString(string value)
+            : this(value, false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiString"/> class.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="isExplicit">Used to indicate if a string is quoted.</param>
+        public OpenApiString(string value, bool isExplicit)
+            : base(value)
+        {
+            this.isExplicit = isExplicit;
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiString"/> class.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="isExplicit">Used to indicate if a string is quoted.</param>
+        /// <param name="isRawString">Used to indicate to the writer that the value should be written without encoding.</param>
+        public OpenApiString(string value, bool isExplicit, bool isRawString)
+            : base(value)
+        {
+            this.isExplicit = isExplicit;
+            this.isRawString = isRawString;
+        }
+
+        /// <summary>
+        /// The primitive class this object represents.
+        /// </summary>
+        public override PrimitiveType PrimitiveType => PrimitiveType.String;
+
+        /// <summary>
+        /// True if string was specified explicitly by the means of double quotes, single quotes, or literal or folded style.
+        /// </summary>
+        public bool IsExplicit()
+        {
+            return this.isExplicit;
+        }
+
+        /// <summary>
+        /// True if the writer should process the value as supplied without encoding.
+        /// </summary>
+        public bool IsRawString()
+        {
+            return this.isRawString;
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Attributes/DisplayAttribute.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Attributes/DisplayAttribute.cs
new file mode 100644
index 000000000000..195dd7d35df2
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Attributes/DisplayAttribute.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes
+{
+    /// <summary>
+    /// Represents the Open Api Data type metadata attribute.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+    internal class DisplayAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DisplayAttribute"/> class.
+        /// </summary>
+        /// <param name="name">The display name.</param>
+        public DisplayAttribute(string name)
+        {
+            Name = Utils.CheckArgumentNullOrEmpty(name);
+        }
+
+        /// <summary>
+        /// The display Name.
+        /// </summary>
+        public string Name { get; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs
new file mode 100644
index 000000000000..8a17bab8c31b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs
@@ -0,0 +1,430 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+#nullable enable
+
+// This collection of attribute definitions are helpers for accessing trim-related attributes in
+// projects targeting .NET 6 or lower. Since the trimmer queries for these attributes by name, having
+// these attributes source included is sufficient for the trimmer to recognize them. For more information
+// on this approach, see https://devblogs.microsoft.com/dotnet/creating-aot-compatible-libraries/#approach-2-define-the-attributes-internally.
+namespace System.Diagnostics.CodeAnalysis
+{
+#if !NET7_0_OR_GREATER
+    /// <summary>
+    /// Indicates that the specified method requires the ability to generate new code at runtime,
+    /// for example through <see cref="System.Reflection"/>.
+    /// </summary>
+    /// <remarks>
+    /// This allows tools to understand which methods are unsafe to call when compiling ahead of time.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class, Inherited = false)]
+    internal sealed class RequiresDynamicCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequiresDynamicCodeAttribute"/> class
+        /// with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message that contains information about the usage of dynamic code.
+        /// </param>
+        public RequiresDynamicCodeAttribute(string message)
+        {
+            Message = message;
+        }
+
+        /// <summary>
+        /// Gets a message that contains information about the usage of dynamic code.
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// Gets or sets an optional URL that contains more information about the method,
+        /// why it requires dynamic code, and what options a consumer has to deal with it.
+        /// </summary>
+        public string? Url { get; set; }
+    }
+#endif
+
+#if !NET5_0_OR_GREATER
+    /// <summary>
+    /// Indicates that the specified method requires dynamic access to code that is not referenced
+    /// statically, for example through <see cref="System.Reflection"/>.
+    /// </summary>
+    /// <remarks>
+    /// This allows tools to understand which methods are unsafe to call when removing unreferenced
+    /// code from an application.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class, Inherited = false)]
+    internal sealed class RequiresUnreferencedCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequiresUnreferencedCodeAttribute"/> class
+        /// with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message that contains information about the usage of unreferenced code.
+        /// </param>
+        public RequiresUnreferencedCodeAttribute(string message)
+        {
+            Message = message;
+        }
+
+        /// <summary>
+        /// Gets a message that contains information about the usage of unreferenced code.
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// Gets or sets an optional URL that contains more information about the method,
+        /// why it requires unreferenced code, and what options a consumer has to deal with it.
+        /// </summary>
+        public string? Url { get; set; }
+    }
+
+    /// <summary>
+    /// Suppresses reporting of a specific rule violation, allowing multiple suppressions on a
+    /// single code artifact.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="UnconditionalSuppressMessageAttribute"/> is different than
+    /// <see cref="SuppressMessageAttribute"/> in that it doesn't have a
+    /// <see cref="ConditionalAttribute"/>. So it is always preserved in the compiled assembly.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = true)]
+    internal sealed class UnconditionalSuppressMessageAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnconditionalSuppressMessageAttribute"/>
+        /// class, specifying the category of the tool and the identifier for an analysis rule.
+        /// </summary>
+        /// <param name="category">The category for the attribute.</param>
+        /// <param name="checkId">The identifier of the analysis rule the attribute applies to.</param>
+        public UnconditionalSuppressMessageAttribute(string category, string checkId)
+        {
+            Category = category;
+            CheckId = checkId;
+        }
+
+        /// <summary>
+        /// Gets the category identifying the classification of the attribute.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="Category"/> property describes the tool or tool analysis category
+        /// for which a message suppression attribute applies.
+        /// </remarks>
+        public string Category { get; }
+
+        /// <summary>
+        /// Gets the identifier of the analysis tool rule to be suppressed.
+        /// </summary>
+        /// <remarks>
+        /// Concatenated together, the <see cref="Category"/> and <see cref="CheckId"/>
+        /// properties form a unique check identifier.
+        /// </remarks>
+        public string CheckId { get; }
+
+        /// <summary>
+        /// Gets or sets the scope of the code that is relevant for the attribute.
+        /// </summary>
+        /// <remarks>
+        /// The Scope property is an optional argument that specifies the metadata scope for which
+        /// the attribute is relevant.
+        /// </remarks>
+        public string? Scope { get; set; }
+
+        /// <summary>
+        /// Gets or sets a fully qualified path that represents the target of the attribute.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="Target"/> property is an optional argument identifying the analysis target
+        /// of the attribute. An example value is "System.IO.Stream.ctor():System.Void".
+        /// Because it is fully qualified, it can be long, particularly for targets such as parameters.
+        /// The analysis tool user interface should be capable of automatically formatting the parameter.
+        /// </remarks>
+        public string? Target { get; set; }
+
+        /// <summary>
+        /// Gets or sets an optional argument expanding on exclusion criteria.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="MessageId "/> property is an optional argument that specifies additional
+        /// exclusion where the literal metadata target is not sufficiently precise. For example,
+        /// the <see cref="UnconditionalSuppressMessageAttribute"/> cannot be applied within a method,
+        /// and it may be desirable to suppress a violation against a statement in the method that will
+        /// give a rule violation, but not against all statements in the method.
+        /// </remarks>
+        public string? MessageId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the justification for suppressing the code analysis message.
+        /// </summary>
+        public string? Justification { get; set; }
+    }
+
+    /// <summary>
+    /// States a dependency that one member has on another.
+    /// </summary>
+    /// <remarks>
+    /// This can be used to inform tooling of a dependency that is otherwise not evident purely from
+    /// metadata and IL, for example a member relied on via reflection.
+    /// </remarks>
+    [AttributeUsage(
+        AttributeTargets.Constructor | AttributeTargets.Field | AttributeTargets.Method,
+        AllowMultiple = true, Inherited = false)]
+    internal sealed class DynamicDependencyAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified signature of a member on the same type as the consumer.
+        /// </summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        public DynamicDependencyAttribute(string memberSignature)
+        {
+            MemberSignature = memberSignature;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified signature of a member on a <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        /// <param name="type">The <see cref="System.Type"/> containing <paramref name="memberSignature"/>.</param>
+        public DynamicDependencyAttribute(string memberSignature, Type type)
+        {
+            MemberSignature = memberSignature;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified signature of a member on a type in an assembly.
+        /// </summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        /// <param name="typeName">The full name of the type containing the specified member.</param>
+        /// <param name="assemblyName">The assembly name of the type containing the specified member.</param>
+        public DynamicDependencyAttribute(string memberSignature, string typeName, string assemblyName)
+        {
+            MemberSignature = memberSignature;
+            TypeName = typeName;
+            AssemblyName = assemblyName;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified types of members on a <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="memberTypes">The types of members depended on.</param>
+        /// <param name="type">The <see cref="System.Type"/> containing the specified members.</param>
+        public DynamicDependencyAttribute(DynamicallyAccessedMemberTypes memberTypes, Type type)
+        {
+            MemberTypes = memberTypes;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified types of members on a type in an assembly.
+        /// </summary>
+        /// <param name="memberTypes">The types of members depended on.</param>
+        /// <param name="typeName">The full name of the type containing the specified members.</param>
+        /// <param name="assemblyName">The assembly name of the type containing the specified members.</param>
+        public DynamicDependencyAttribute(DynamicallyAccessedMemberTypes memberTypes, string typeName, string assemblyName)
+        {
+            MemberTypes = memberTypes;
+            TypeName = typeName;
+            AssemblyName = assemblyName;
+        }
+
+        /// <summary>
+        /// Gets the signature of the member depended on.
+        /// </summary>
+        /// <remarks>
+        /// Either <see cref="MemberSignature"/> must be a valid string or <see cref="MemberTypes"/>
+        /// must not equal <see cref="DynamicallyAccessedMemberTypes.None"/>, but not both.
+        /// </remarks>
+        public string? MemberSignature { get; }
+
+        /// <summary>
+        /// Gets the <see cref="DynamicallyAccessedMemberTypes"/> which specifies the type
+        /// of members depended on.
+        /// </summary>
+        /// <remarks>
+        /// Either <see cref="MemberSignature"/> must be a valid string or <see cref="MemberTypes"/>
+        /// must not equal <see cref="DynamicallyAccessedMemberTypes.None"/>, but not both.
+        /// </remarks>
+        public DynamicallyAccessedMemberTypes MemberTypes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="System.Type"/> containing the specified member.
+        /// </summary>
+        /// <remarks>
+        /// If neither <see cref="Type"/> nor <see cref="TypeName"/> are specified,
+        /// the type of the consumer is assumed.
+        /// </remarks>
+        public Type? Type { get; }
+
+        /// <summary>
+        /// Gets the full name of the type containing the specified member.
+        /// </summary>
+        /// <remarks>
+        /// If neither <see cref="Type"/> nor <see cref="TypeName"/> are specified,
+        /// the type of the consumer is assumed.
+        /// </remarks>
+        public string? TypeName { get; }
+
+        /// <summary>
+        /// Gets the assembly name of the specified type.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="AssemblyName"/> is only valid when <see cref="TypeName"/> is specified.
+        /// </remarks>
+        public string? AssemblyName { get; }
+
+        /// <summary>
+        /// Gets or sets the condition in which the dependency is applicable, e.g. "DEBUG".
+        /// </summary>
+        public string? Condition { get; set; }
+    }
+
+    /// <summary>
+    /// Indicates that certain members on a specified <see cref="Type"/> are accessed dynamically,
+    /// for example through <see cref="System.Reflection"/>.
+    /// </summary>
+    /// <remarks>
+    /// This allows tools to understand which members are being accessed during the execution
+    /// of a program.
+    ///
+    /// This attribute is valid on members whose type is <see cref="Type"/> or <see cref="string"/>.
+    ///
+    /// When this attribute is applied to a location of type <see cref="string"/>, the assumption is
+    /// that the string represents a fully qualified type name.
+    ///
+    /// When this attribute is applied to a class, interface, or struct, the members specified
+    /// can be accessed dynamically on <see cref="Type"/> instances returned from calling
+    /// <see cref="object.GetType"/> on instances of that class, interface, or struct.
+    ///
+    /// If the attribute is applied to a method it's treated as a special case and it implies
+    /// the attribute should be applied to the "this" parameter of the method. As such the attribute
+    /// should only be used on instance methods of types assignable to System.Type (or string, but no methods
+    /// will use it there).
+    /// </remarks>
+    [AttributeUsage(
+            AttributeTargets.Field | AttributeTargets.ReturnValue | AttributeTargets.GenericParameter |
+            AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Method |
+            AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct,
+            Inherited = false)]
+    internal sealed class DynamicallyAccessedMembersAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicallyAccessedMembersAttribute"/> class
+        /// with the specified member types.
+        /// </summary>
+        /// <param name="memberTypes">The types of members dynamically accessed.</param>
+        public DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes memberTypes)
+        {
+            MemberTypes = memberTypes;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="DynamicallyAccessedMemberTypes"/> which specifies the type
+        /// of members dynamically accessed.
+        /// </summary>
+        public DynamicallyAccessedMemberTypes MemberTypes { get; }
+    }
+
+    /// <summary>
+    /// Specifies the types of members that are dynamically accessed.
+    ///
+    /// This enumeration has a <see cref="FlagsAttribute"/> attribute that allows a
+    /// bitwise combination of its member values.
+    /// </summary>
+    [Flags]
+    internal enum DynamicallyAccessedMemberTypes
+    {
+        /// <summary>
+        /// Specifies no members.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Specifies the default, parameterless public constructor.
+        /// </summary>
+        PublicParameterlessConstructor = 0x0001,
+
+        /// <summary>
+        /// Specifies all public constructors.
+        /// </summary>
+        PublicConstructors = 0x0002 | PublicParameterlessConstructor,
+
+        /// <summary>
+        /// Specifies all non-public constructors.
+        /// </summary>
+        NonPublicConstructors = 0x0004,
+
+        /// <summary>
+        /// Specifies all public methods.
+        /// </summary>
+        PublicMethods = 0x0008,
+
+        /// <summary>
+        /// Specifies all non-public methods.
+        /// </summary>
+        NonPublicMethods = 0x0010,
+
+        /// <summary>
+        /// Specifies all public fields.
+        /// </summary>
+        PublicFields = 0x0020,
+
+        /// <summary>
+        /// Specifies all non-public fields.
+        /// </summary>
+        NonPublicFields = 0x0040,
+
+        /// <summary>
+        /// Specifies all public nested types.
+        /// </summary>
+        PublicNestedTypes = 0x0080,
+
+        /// <summary>
+        /// Specifies all non-public nested types.
+        /// </summary>
+        NonPublicNestedTypes = 0x0100,
+
+        /// <summary>
+        /// Specifies all public properties.
+        /// </summary>
+        PublicProperties = 0x0200,
+
+        /// <summary>
+        /// Specifies all non-public properties.
+        /// </summary>
+        NonPublicProperties = 0x0400,
+
+        /// <summary>
+        /// Specifies all public events.
+        /// </summary>
+        PublicEvents = 0x0800,
+
+        /// <summary>
+        /// Specifies all non-public events.
+        /// </summary>
+        NonPublicEvents = 0x1000,
+
+        /// <summary>
+        /// Specifies all interfaces implemented by the type.
+        /// </summary>
+        Interfaces = 0x2000,
+
+        /// <summary>
+        /// Specifies all members.
+        /// </summary>
+        All = ~None
+    }
+#endif
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/CallerArgumentExpressionAttribute.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/CallerArgumentExpressionAttribute.cs
new file mode 100644
index 000000000000..62ac70a05434
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/CallerArgumentExpressionAttribute.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+#if !NETCOREAPP3_1_OR_GREATER
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace System.Runtime.CompilerServices;
+
+[ExcludeFromCodeCoverage]
+[DebuggerNonUserCode]
+[AttributeUsage(AttributeTargets.Parameter)]
+sealed class CallerArgumentExpressionAttribute :
+    Attribute
+{
+    public CallerArgumentExpressionAttribute(string parameterName) =>
+        ParameterName = parameterName;
+
+    public string ParameterName { get; }
+}
+#endif
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Exceptions/OpenApiException.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Exceptions/OpenApiException.cs
new file mode 100644
index 000000000000..eb8d8d15cc72
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Exceptions/OpenApiException.cs
@@ -0,0 +1,56 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions
+{
+    /// <summary>
+    /// Exception type representing exceptions in the Open API library.
+    /// </summary>
+    internal class OpenApiException : Exception
+    {
+        /// <summary>
+        /// Creates a new instance of the <see cref="OpenApiException"/> class with default values.
+        /// </summary>
+        public OpenApiException()
+            : this(SRResource.OpenApiExceptionGenericError)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="OpenApiException"/> class with an error message.
+        /// </summary>
+        /// <param name="message">The plain text error message for this exception.</param>
+        public OpenApiException(string message)
+            : this(message, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="OpenApiException"/> class with an error message and an inner exception.
+        /// </summary>
+        /// <param name="message">The plain text error message for this exception.</param>
+        /// <param name="innerException">The inner exception that is the cause of this exception to be thrown.</param>
+        public OpenApiException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        /// <summary>
+        /// The reference pointer.  This is a fragment identifier used to point to where the error occurred in the document.
+        /// If the document has been parsed as JSON/YAML then the identifier will be a
+        /// JSON Pointer as per https://tools.ietf.org/html/rfc6901
+        /// If the document fails to parse as JSON/YAML then the fragment will be based on
+        /// a text/plain pointer as defined in https://tools.ietf.org/html/rfc5147
+        /// Currently only line= is provided because using char= causes tests to break due to CR/LF and LF differences
+        /// </summary>
+        public string Pointer { get; set; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs
new file mode 100644
index 000000000000..240f5438d788
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions
+{
+    /// <summary>
+    /// Exception type representing exceptions in the OpenAPI writer.
+    /// </summary>
+    internal class OpenApiWriterException : OpenApiException
+    {
+        /// <summary>
+        /// Creates a new instance of the <see cref="OpenApiWriterException"/> class with default values.
+        /// </summary>
+        public OpenApiWriterException()
+            : this(SRResource.OpenApiWriterExceptionGenericError)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="OpenApiWriterException"/> class with an error message.
+        /// </summary>
+        /// <param name="message">The plain text error message for this exception.</param>
+        public OpenApiWriterException(string message)
+            : this(message, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="OpenApiWriterException"/> class with an error message and an inner exception.
+        /// </summary>
+        /// <param name="message">The plain text error message for this exception.</param>
+        /// <param name="innerException">The inner exception that is the cause of this exception to be thrown.</param>
+        public OpenApiWriterException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/BodyExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/BodyExpression.cs
new file mode 100644
index 000000000000..c37e69880b65
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/BodyExpression.cs
@@ -0,0 +1,65 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Body expression.
+    /// </summary>
+    internal sealed class BodyExpression : SourceExpression
+    {
+        /// <summary>
+        /// body string
+        /// </summary>
+        public const string Body = "body";
+
+        /// <summary>
+        /// Prefix for a pointer
+        /// </summary>
+        public const string PointerPrefix = "#";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BodyExpression"/> class.
+        /// </summary>
+        public BodyExpression()
+            : base(null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BodyExpression"/> class.
+        /// </summary>
+        /// <param name="pointer">a JSON Pointer [RFC 6901](https://tools.ietf.org/html/rfc6901).</param>
+        public BodyExpression(JsonPointer pointer)
+            : base(pointer?.ToString())
+        {
+            Utils.CheckArgumentNull(pointer);
+        }
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(Value))
+                {
+                    return Body;
+                }
+
+                return Body + PointerPrefix + Value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the fragment string.
+        /// </summary>
+        public string Fragment { get => Value; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/CompositeExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/CompositeExpression.cs
new file mode 100644
index 000000000000..9dfd60bf2e33
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/CompositeExpression.cs
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// String literal with embedded expressions
+    /// </summary>
+    internal class CompositeExpression : RuntimeExpression
+    {
+        private readonly string template;
+        private Regex expressionPattern = new(@"{(?<exp>\$[^}]*)");
+
+        /// <summary>
+        /// Expressions embedded into string literal
+        /// </summary>
+        public List<RuntimeExpression> ContainedExpressions = new();
+
+        /// <summary>
+        /// Create a composite expression from a string literal with an embedded expression
+        /// </summary>
+        /// <param name="expression"></param>
+        public CompositeExpression(string expression)
+        {
+            template = expression;
+
+            // Extract subexpressions and convert to RuntimeExpressions
+            var matches = expressionPattern.Matches(expression);
+
+            foreach (var item in matches.Cast<Match>())
+            {
+                var value = item.Groups["exp"].Captures.Cast<Capture>().First().Value;
+                ContainedExpressions.Add(Build(value));
+            }
+        }
+
+        /// <summary>
+        /// Return original string literal with embedded expression
+        /// </summary>
+        public override string Expression => template;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/HeaderExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/HeaderExpression.cs
new file mode 100644
index 000000000000..f17380d8ebe6
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/HeaderExpression.cs
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Header expression, The token identifier in header is case-insensitive.
+    /// </summary>
+    internal class HeaderExpression : SourceExpression
+    {
+        /// <summary>
+        /// header. string
+        /// </summary>
+        public const string Header = "header.";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HeaderExpression"/> class.
+        /// </summary>
+        /// <param name="token">The token string, it's case-insensitive.</param>
+        public HeaderExpression(string token)
+            : base(token)
+        {
+            Utils.CheckArgumentNullOrEmpty(token);
+        }
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression { get => Header + Value; }
+
+        /// <summary>
+        /// Gets the token string.
+        /// </summary>
+        public string Token { get => Value; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/MethodExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/MethodExpression.cs
new file mode 100644
index 000000000000..265feaf26d50
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/MethodExpression.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Method expression.
+    /// </summary>
+    internal sealed class MethodExpression : RuntimeExpression
+    {
+        /// <summary>
+        /// $method. string
+        /// </summary>
+        public const string Method = "$method";
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression => Method;
+
+        /// <summary>
+        /// Private constructor.
+        /// </summary>
+        public MethodExpression()
+        {
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/PathExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/PathExpression.cs
new file mode 100644
index 000000000000..37210c817079
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/PathExpression.cs
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Path expression, the name in path is case-sensitive.
+    /// </summary>
+    internal sealed class PathExpression : SourceExpression
+    {
+        /// <summary>
+        /// path. string
+        /// </summary>
+        public const string Path = "path.";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PathExpression"/> class.
+        /// </summary>
+        /// <param name="name">The name string, it's case-insensitive.</param>
+        public PathExpression(string name)
+            : base(name)
+        {
+            Utils.CheckArgumentNullOrEmpty(name);
+        }
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression { get => Path + Value; }
+
+        /// <summary>
+        /// Gets the name string.
+        /// </summary>
+        public string Name { get => Value; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/QueryExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/QueryExpression.cs
new file mode 100644
index 000000000000..dc6d773b98bf
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/QueryExpression.cs
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Query expression, the name in query is case-sensitive.
+    /// </summary>
+    internal sealed class QueryExpression : SourceExpression
+    {
+        /// <summary>
+        /// query. string
+        /// </summary>
+        public const string Query = "query.";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueryExpression"/> class.
+        /// </summary>
+        /// <param name="name">The name string, it's case-insensitive.</param>
+        public QueryExpression(string name)
+            : base(name)
+        {
+            Utils.CheckArgumentNullOrEmpty(name);
+        }
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression { get => Query + Value; }
+
+        /// <summary>
+        /// Gets the name string.
+        /// </summary>
+        public string Name { get => Value; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/RequestExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/RequestExpression.cs
new file mode 100644
index 000000000000..fa5359eff9db
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/RequestExpression.cs
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// $request. expression.
+    /// </summary>
+    internal sealed class RequestExpression : RuntimeExpression
+    {
+        /// <summary>
+        /// $request. string
+        /// </summary>
+        public const string Request = "$request.";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestExpression"/> class.
+        /// </summary>
+        /// <param name="source">The source of the request.</param>
+        public RequestExpression(SourceExpression source)
+        {
+            Source = Utils.CheckArgumentNull(source);
+        }
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression => Request + Source.Expression;
+
+        /// <summary>
+        /// The <see cref="SourceExpression"/> expression.
+        /// </summary>
+        public SourceExpression Source { get; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/ResponseExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/ResponseExpression.cs
new file mode 100644
index 000000000000..533b78b76094
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/ResponseExpression.cs
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// $response. expression.
+    /// </summary>
+    internal sealed class ResponseExpression : RuntimeExpression
+    {
+        /// <summary>
+        /// $response. string
+        /// </summary>
+        public const string Response = "$response.";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResponseExpression"/> class.
+        /// </summary>
+        /// <param name="source">The source of the response.</param>
+        public ResponseExpression(SourceExpression source)
+        {
+            Source = Utils.CheckArgumentNull(source);
+        }
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression => Response + Source.Expression;
+
+        /// <summary>
+        /// The <see cref="SourceExpression"/> expression.
+        /// </summary>
+        public SourceExpression Source { get; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/RuntimeExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/RuntimeExpression.cs
new file mode 100644
index 000000000000..f0e60a3e4f34
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/RuntimeExpression.cs
@@ -0,0 +1,111 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Base class for the Open API runtime expression.
+    /// </summary>
+    internal abstract class RuntimeExpression : IEquatable<RuntimeExpression>
+    {
+        /// <summary>
+        /// The dollar sign prefix for a runtime expression.
+        /// </summary>
+        public const string Prefix = "$";
+
+        /// <summary>
+        /// The expression string.
+        /// </summary>
+        public abstract string Expression { get; }
+
+        /// <summary>
+        /// Build the runtime expression from input string.
+        /// </summary>
+        /// <param name="expression">The runtime expression.</param>
+        /// <returns>The built runtime expression object.</returns>
+        public static RuntimeExpression Build(string expression)
+        {
+            Utils.CheckArgumentNullOrEmpty(expression);
+
+            if (!expression.StartsWith(Prefix))
+            {
+                return new CompositeExpression(expression);
+            }
+
+            // $url
+            if (expression == UrlExpression.Url)
+            {
+                return new UrlExpression();
+            }
+
+            // $method
+            if (expression == MethodExpression.Method)
+            {
+                return new MethodExpression();
+            }
+
+            // $statusCode
+            if (expression == StatusCodeExpression.StatusCode)
+            {
+                return new StatusCodeExpression();
+            }
+
+            // $request.
+            if (expression.StartsWith(RequestExpression.Request))
+            {
+                var subString = expression.Substring(RequestExpression.Request.Length);
+                var source = SourceExpression.Build(subString);
+                return new RequestExpression(source);
+            }
+
+            // $response.
+            if (expression.StartsWith(ResponseExpression.Response))
+            {
+                var subString = expression.Substring(ResponseExpression.Response.Length);
+                var source = SourceExpression.Build(subString);
+                return new ResponseExpression(source);
+            }
+
+            throw new OpenApiException(string.Format(SRResource.RuntimeExpressionHasInvalidFormat, expression));
+        }
+
+        /// <summary>
+        /// GetHashCode implementation for IEquatable.
+        /// </summary>
+        public override int GetHashCode()
+        {
+            return Expression.GetHashCode();
+        }
+
+        /// <summary>
+        /// Equals implementation for IEquatable.
+        /// </summary>
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as RuntimeExpression);
+        }
+
+        /// <summary>
+        /// Equals implementation for object of the same type.
+        /// </summary>
+        public bool Equals(RuntimeExpression obj)
+        {
+            return obj != null && obj.Expression == Expression;
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Expression;
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/SourceExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/SourceExpression.cs
new file mode 100644
index 000000000000..00a9caa08d4b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/SourceExpression.cs
@@ -0,0 +1,80 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Source expression.
+    /// </summary>
+    internal abstract class SourceExpression : RuntimeExpression
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueryExpression"/> class.
+        /// </summary>
+        /// <param name="value">The value string.</param>
+        protected SourceExpression(string value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        protected string Value { get; }
+
+        /// <summary>
+        /// Build the source expression from input string.
+        /// </summary>
+        /// <param name="expression">The source expression.</param>
+        /// <returns>The built source expression.</returns>
+        public new static SourceExpression Build(string expression)
+        {
+            if (!string.IsNullOrWhiteSpace(expression))
+            {
+                var expressions = expression.Split('.');
+                if (expressions.Length == 2)
+                {
+                    if (expression.StartsWith(HeaderExpression.Header))
+                    {
+                        // header.
+                        return new HeaderExpression(expressions[1]);
+                    }
+
+                    if (expression.StartsWith(QueryExpression.Query))
+                    {
+                        // query.
+                        return new QueryExpression(expressions[1]);
+                    }
+
+                    if (expression.StartsWith(PathExpression.Path))
+                    {
+                        // path.
+                        return new PathExpression(expressions[1]);
+                    }
+                }
+
+                // body
+                if (expression.StartsWith(BodyExpression.Body))
+                {
+                    var subString = expression.Substring(BodyExpression.Body.Length);
+                    if (string.IsNullOrEmpty(subString))
+                    {
+                        return new BodyExpression();
+                    }
+
+                    return new BodyExpression(new(subString));
+                }
+            }
+
+            throw new OpenApiException(string.Format(SRResource.SourceExpressionHasInvalidFormat, expression));
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs
new file mode 100644
index 000000000000..1ad412ec36f7
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// StatusCode expression.
+    /// </summary>
+    internal sealed class StatusCodeExpression : RuntimeExpression
+    {
+        /// <summary>
+        /// $statusCode string.
+        /// </summary>
+        public const string StatusCode = "$statusCode";
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression => StatusCode;
+
+        /// <summary>
+        /// Private constructor.
+        /// </summary>
+        public StatusCodeExpression()
+        {
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/UrlExpression.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/UrlExpression.cs
new file mode 100644
index 000000000000..dcb9c66b1a7b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Expressions/UrlExpression.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions
+{
+    /// <summary>
+    /// Url expression.
+    /// </summary>
+    internal sealed class UrlExpression : RuntimeExpression
+    {
+        /// <summary>
+        /// $url string.
+        /// </summary>
+        public const string Url = "$url";
+
+        /// <summary>
+        /// Gets the expression string.
+        /// </summary>
+        public override string Expression => Url;
+
+        /// <summary>
+        /// Private constructor.
+        /// </summary>
+        public UrlExpression()
+        {
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/EnumExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/EnumExtensions.cs
new file mode 100644
index 000000000000..2f786986ab6a
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/EnumExtensions.cs
@@ -0,0 +1,70 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions
+{
+    /// <summary>
+    /// Enumeration type extension methods.
+    /// </summary>
+    internal static class EnumExtensions
+    {
+        // Cache to store display names of enum values
+        private static readonly ConcurrentDictionary<Enum, string> DisplayNameCache = new();
+
+        /// <summary>
+        /// Gets an attribute on an enum field value.
+        /// </summary>
+        /// <typeparam name="T">The type of the attribute to retrieve.</typeparam>
+        /// <param name="enumValue">The enum value.</param>
+        /// <returns>
+        /// The attribute of the specified type or null.
+        /// </returns>
+        [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Fields are never trimmed for enum types.")]
+        public static T GetAttributeOfType<T>(this Enum enumValue) where T : Attribute
+        {
+            var type = enumValue.GetType();
+            // Use GetField to get the field info for the enum value
+            var memInfo = type.GetField(enumValue.ToString(), BindingFlags.Public | BindingFlags.Static);
+
+            if (memInfo == null)
+                return null;
+
+            // Retrieve the custom attributes of type T
+            var attributes = memInfo.GetCustomAttributes<T>(false);
+            return attributes.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// Gets the enum display name.
+        /// </summary>
+        /// <param name="enumValue">The enum value.</param>
+        /// <returns>
+        /// Use <see cref="DisplayAttribute"/> if it exists.
+        /// Otherwise, use the standard string representation.
+        /// </returns>
+        public static string GetDisplayName(this Enum enumValue)
+        {
+            // Retrieve the display name from the cache if it exists
+            return DisplayNameCache.GetOrAdd(enumValue, e =>
+            {
+                // Get the DisplayAttribute
+                var attribute = e.GetAttributeOfType<DisplayAttribute>();
+
+                // Return the DisplayAttribute name if it exists, otherwise return the enum's string representation
+                return attribute == null ? e.ToString() : attribute.Name;
+            });
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenAPIWriterExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenAPIWriterExtensions.cs
new file mode 100644
index 000000000000..6224669355ed
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenAPIWriterExtensions.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi
+{
+    internal static class OpenAPIWriterExtensions
+    {
+        /// <summary>
+        /// Temporary extension method until we add Settings property to IOpenApiWriter in next major version
+        /// </summary>
+        /// <param name="openApiWriter"></param>
+        /// <returns></returns>
+        internal static OpenApiWriterSettings GetSettings(this IOpenApiWriter openApiWriter)
+        {
+            if (openApiWriter is OpenApiWriterBase @base)
+            {
+                return @base.Settings;
+            }
+            return new();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs
new file mode 100644
index 000000000000..6d0500d0cb14
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions
+{
+    /// <summary>
+    /// Extension methods to verify validity and add an extension to Extensions property.
+    /// </summary>
+    internal static class OpenApiExtensibleExtensions
+    {
+        /// <summary>
+        /// Add extension into the Extensions
+        /// </summary>
+        /// <typeparam name="T"><see cref="IOpenApiExtensible"/>.</typeparam>
+        /// <param name="element">The extensible Open API element. </param>
+        /// <param name="name">The extension name.</param>
+        /// <param name="any">The extension value.</param>
+        public static void AddExtension<T>(this T element, string name, IOpenApiExtension any)
+            where T : IOpenApiExtensible
+        {
+            Utils.CheckArgumentNull(element);
+            Utils.CheckArgumentNullOrEmpty(name);
+
+            if (!name.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix))
+            {
+                throw new OpenApiException(string.Format(SRResource.ExtensionFieldNameMustBeginWithXDash, name));
+            }
+
+            element.Extensions[name] = Utils.CheckArgumentNull(any);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiReferencableExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiReferencableExtensions.cs
new file mode 100644
index 000000000000..514b0b595bb5
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiReferencableExtensions.cs
@@ -0,0 +1,110 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions
+{
+    /// <summary>
+    /// Extension methods for resolving references on <see cref="IOpenApiReferenceable"/> elements.
+    /// </summary>
+    internal static class OpenApiReferencableExtensions
+    {
+        /// <summary>
+        /// Resolves a JSON Pointer with respect to an element, returning the referenced element.
+        /// </summary>
+        /// <param name="element">The referencable Open API element on which to apply the JSON pointer</param>
+        /// <param name="pointer">a JSON Pointer [RFC 6901](https://tools.ietf.org/html/rfc6901).</param>
+        /// <returns>The element pointed to by the JSON pointer.</returns>
+        public static IOpenApiReferenceable ResolveReference(this IOpenApiReferenceable element, JsonPointer pointer)
+        {
+            if (!pointer.Tokens.Any())
+            {
+                return element;
+            }
+            var propertyName = pointer.Tokens.FirstOrDefault();
+            var mapKey = pointer.Tokens.ElementAtOrDefault(1);
+            try
+            {
+                if (element is OpenApiHeader header)
+                {
+                    return ResolveReferenceOnHeaderElement(header, propertyName, mapKey, pointer);
+                }
+                if (element is OpenApiParameter parameter)
+                {
+                    return ResolveReferenceOnParameterElement(parameter, propertyName, mapKey, pointer);
+                }
+                if (element is OpenApiResponse response)
+                {
+                    return ResolveReferenceOnResponseElement(response, propertyName, mapKey, pointer);
+                }
+            }
+            catch (KeyNotFoundException)
+            {
+                throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+            }
+            throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+        }
+
+        private static IOpenApiReferenceable ResolveReferenceOnHeaderElement(
+            OpenApiHeader headerElement,
+            string propertyName,
+            string mapKey,
+            JsonPointer pointer)
+        {
+            switch (propertyName)
+            {
+                case OpenApiConstants.Schema:
+                    return headerElement.Schema;
+                case OpenApiConstants.Examples when mapKey != null:
+                    return headerElement.Examples[mapKey];
+                default:
+                    throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+            }
+        }
+
+        private static IOpenApiReferenceable ResolveReferenceOnParameterElement(
+            OpenApiParameter parameterElement,
+            string propertyName,
+            string mapKey,
+            JsonPointer pointer)
+        {
+            switch (propertyName)
+            {
+                case OpenApiConstants.Schema:
+                    return parameterElement.Schema;
+                case OpenApiConstants.Examples when mapKey != null:
+                    return parameterElement.Examples[mapKey];
+                default:
+                    throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+            }
+        }
+
+        private static IOpenApiReferenceable ResolveReferenceOnResponseElement(
+            OpenApiResponse responseElement,
+            string propertyName,
+            string mapKey,
+            JsonPointer pointer)
+        {
+            switch (propertyName)
+            {
+                case OpenApiConstants.Headers when mapKey != null:
+                    return responseElement.Headers[mapKey];
+                case OpenApiConstants.Links when mapKey != null:
+                    return responseElement.Links[mapKey];
+                default:
+                    throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiServerExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiServerExtensions.cs
new file mode 100644
index 000000000000..d62536d1c7c3
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/OpenApiServerExtensions.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+
+/// <summary>
+/// Extension methods for <see cref="OpenApiServer"/> serialization.
+/// </summary>
+internal static class OpenApiServerExtensions
+{
+    /// <summary>
+    /// Replaces URL variables in a server's URL
+    /// </summary>
+    /// <param name="server">The OpenAPI server object</param>
+    /// <param name="values">The server variable values that will be used to replace the default values.</param>
+    /// <returns>A URL with the provided variables substituted.</returns>
+    /// <exception cref="ArgumentException">
+    /// Thrown when:
+    ///   1. A substitution has no valid value in both the supplied dictionary and the default
+    ///   2. A substitution's value is not available in the enum provided
+    /// </exception>
+    public static string ReplaceServerUrlVariables(this OpenApiServer server, IDictionary<string, string> values = null)
+    {
+        var parsedUrl = server.Url;
+        foreach (var variable in server.Variables)
+        {
+            // Try to get the value from the provided values
+            if (values is not { } v || !v.TryGetValue(variable.Key, out var value) || string.IsNullOrEmpty(value))
+            {
+                // Fall back to the default value
+                value = variable.Value.Default;
+            }
+
+            // Validate value
+            if (string.IsNullOrEmpty(value))
+            {
+                // According to the spec, the variable's default value is required.
+                // This code path should be hit when a value isn't provided & a default value isn't available
+                throw new ArgumentException(
+                    string.Format(SRResource.ParseServerUrlDefaultValueNotAvailable, variable.Key), nameof(server));
+            }
+
+            // If an enum is provided, the array should not be empty & the value should exist in the enum
+            if (variable.Value.Enum is {} e && (e.Count == 0 || !e.Contains(value)))
+            {
+                throw new ArgumentException(
+                    string.Format(SRResource.ParseServerUrlValueNotValid, value, variable.Key), nameof(values));
+            }
+
+            parsedUrl = parsedUrl.Replace($"{{{variable.Key}}}", value);
+        }
+
+        return parsedUrl;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/StringExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/StringExtensions.cs
new file mode 100644
index 000000000000..31baf9bc2b67
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Extensions/StringExtensions.cs
@@ -0,0 +1,47 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions
+{
+    /// <summary>
+    /// String extension methods.
+    /// </summary>
+    internal static class StringExtensions
+    {
+        /// <summary>
+        /// Gets the enum value based on the given enum type and display name.
+        /// </summary>
+        /// <param name="displayName">The display name.</param>
+        public static T GetEnumFromDisplayName<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>(this string displayName)
+        {
+            var type = typeof(T);
+            if (!type.IsEnum)
+            {
+                return default;
+            }
+
+            foreach (var field in type.GetFields(BindingFlags.Public | BindingFlags.Static))
+            {
+                var displayAttribute = (DisplayAttribute)field.GetCustomAttribute(typeof(DisplayAttribute));
+                if (displayAttribute != null && displayAttribute.Name == displayName)
+                {
+                    return (T)field.GetValue(null);
+                }
+            }
+
+            return default;
+        }
+        internal static string ToFirstCharacterLowerCase(this string input)
+        => string.IsNullOrEmpty(input) ? string.Empty : char.ToLowerInvariant(input[0]) + input.Substring(1);
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IEffective.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IEffective.cs
new file mode 100644
index 000000000000..18f9db6a919b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IEffective.cs
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces
+{
+    /// <summary>
+    /// OpenApiElements that implement IEffective indicate that their description is not self-contained.
+    /// External elements affect the effective description.
+    /// </summary>
+    /// <remarks>Currently this will only be used for accessing external references.
+    /// In the next major version, this will be the approach accessing all referenced elements.
+    /// This will enable us to support merging properties that are peers of the $ref  </remarks>
+    /// <typeparam name="T">Type of OpenApi Element that is being referenced.</typeparam>
+    internal interface IEffective<T>  where T : class,IOpenApiElement
+    {
+        /// <summary>
+        /// Returns a calculated and cloned version of the element.
+        /// </summary>
+        T GetEffective(OpenApiDocument document);
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiAnnotatable.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiAnnotatable.cs
new file mode 100644
index 000000000000..4b4bf23cd5cf
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiAnnotatable.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces
+{
+    /// <summary>
+    /// Represents an Open API element that can be annotated with
+    /// non-serializable properties in a property bag. 
+    /// </summary>
+    internal interface IOpenApiAnnotatable
+    {
+        /// <summary>
+        /// A collection of properties associated with the current OpenAPI element.
+        /// </summary>
+        IDictionary<string, object> Annotations { get; set; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs
new file mode 100644
index 000000000000..c1d7c75a5a76
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs
@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces
+{
+    /// <summary>
+    /// Represents an Open API element.
+    /// </summary>
+    internal interface IOpenApiElement
+    {
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs
new file mode 100644
index 000000000000..b518aa751223
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces
+{
+    /// <summary>
+    /// Represents an Extensible Open API element.
+    /// </summary>
+    internal interface IOpenApiExtensible : IOpenApiElement
+    {
+        /// <summary>
+        /// Specification extensions.
+        /// </summary>
+        IDictionary<string, IOpenApiExtension> Extensions { get; set; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiExtension.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiExtension.cs
new file mode 100644
index 000000000000..217a75d2cd08
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiExtension.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces
+{
+    /// <summary>
+    /// Interface required for implementing any custom extension
+    /// </summary>
+    internal interface IOpenApiExtension
+    {
+        /// <summary>
+        /// Write out contents of custom extension
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
+        void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion);
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs
new file mode 100644
index 000000000000..2e14765c8769
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces
+{
+    /// <summary>
+    /// Represents an Open API element is referenceable.
+    /// </summary>
+    internal interface IOpenApiReferenceable : IOpenApiSerializable
+    {
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        void SerializeAsV3WithoutReference(IOpenApiWriter writer);
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        void SerializeAsV2WithoutReference(IOpenApiWriter writer);
+
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs
new file mode 100644
index 000000000000..e124bcbfae43
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces
+{
+    /// <summary>
+    /// Represents an Open API element that comes with serialization functionality.
+    /// </summary>
+    internal interface IOpenApiSerializable : IOpenApiElement
+    {
+        /// <summary>
+        /// Serialize Open API element to v3.0.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        void SerializeAsV3(IOpenApiWriter writer);
+
+        /// <summary>
+        /// Serialize Open API element to v2.0.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        void SerializeAsV2(IOpenApiWriter writer);
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/JsonPointer.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/JsonPointer.cs
new file mode 100644
index 000000000000..83647c18ff19
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/JsonPointer.cs
@@ -0,0 +1,76 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Linq;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi
+{
+    /// <summary>
+    /// JSON pointer.
+    /// </summary>
+    internal class JsonPointer
+    {
+        /// <summary>
+        /// Initializes the <see cref="JsonPointer"/> class.
+        /// </summary>
+        /// <param name="pointer">Pointer as string.</param>
+        public JsonPointer(string pointer)
+        {
+            Tokens = string.IsNullOrEmpty(pointer) || pointer == "/"
+                ? new string[0]
+                : pointer.Split('/').Skip(1).Select(Decode).ToArray();
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="JsonPointer"/> class.
+        /// </summary>
+        /// <param name="tokens">Pointer as tokenized string.</param>
+        private JsonPointer(string[] tokens)
+        {
+            Tokens = tokens;
+        }
+
+        /// <summary>
+        /// Tokens.
+        /// </summary>
+        public string[] Tokens { get; }
+
+        /// <summary>
+        /// Gets the parent pointer.
+        /// </summary>
+        public JsonPointer ParentPointer
+        {
+            get
+            {
+                if (Tokens.Length == 0)
+                {
+                    return null;
+                }
+
+                return new(Tokens.Take(Tokens.Length - 1).ToArray());
+            }
+        }
+
+        /// <summary>
+        /// Decode the string.
+        /// </summary>
+        private string Decode(string token)
+        {
+            return Uri.UnescapeDataString(token).Replace("~1", "/").Replace("~0", "~");
+        }
+
+        /// <summary>
+        /// Gets the string representation of this JSON pointer.
+        /// </summary>
+        public override string ToString()
+        {
+            return "/" + string.Join("/", Tokens);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Microsoft.OpenApi.csproj.txt b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Microsoft.OpenApi.csproj.txt
new file mode 100644
index 000000000000..9eacf3c170f6
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Microsoft.OpenApi.csproj.txt
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <LangVersion>Latest</LangVersion>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Version>1.6.23</Version>
+        <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
+        <SignAssembly>true</SignAssembly>
+        <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <NoWarn>NU5048</NoWarn>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.OpenApi.xml</DocumentationFile>
+        <AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Update="Properties\SRResource.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>SRResource.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Update="Properties\SRResource.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>SRResource.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="../../README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PrivateAssets>all</PrivateAssets>
+      </PackageReference>
+    </ItemGroup>
+</Project>
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiCallback.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiCallback.cs
new file mode 100644
index 000000000000..7fe319028a6f
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiCallback.cs
@@ -0,0 +1,154 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Callback Object: A map of possible out-of band callbacks related to the parent operation.
+    /// </summary>
+    internal class OpenApiCallback : IOpenApiReferenceable, IOpenApiExtensible, IEffective<OpenApiCallback>
+    {
+        /// <summary>
+        /// A Path Item Object used to define a callback request and expected responses.
+        /// </summary>
+        public Dictionary<RuntimeExpression, OpenApiPathItem> PathItems { get; set; }
+            = new();
+
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference pointer.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiCallback() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiCallback"/> object
+        /// </summary>
+        public OpenApiCallback(OpenApiCallback callback)
+        {
+            PathItems = callback?.PathItems != null ? new(callback?.PathItems) : null;
+            UnresolvedReference = callback?.UnresolvedReference ?? UnresolvedReference;
+            Reference = callback?.Reference != null ? new(callback?.Reference) : null;
+            Extensions = callback?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(callback.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Add a <see cref="OpenApiPathItem"/> into the <see cref="PathItems"/>.
+        /// </summary>
+        /// <param name="expression">The runtime expression.</param>
+        /// <param name="pathItem">The path item.</param>
+        public void AddPathItem(RuntimeExpression expression, OpenApiPathItem pathItem)
+        {
+            Utils.CheckArgumentNull(expression);
+            Utils.CheckArgumentNull(pathItem);
+
+            if (PathItems == null)
+            {
+                PathItems = new();
+            }
+
+            PathItems.Add(expression, pathItem);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiCallback"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiCallback object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiCallback</returns>
+        public OpenApiCallback GetEffective(OpenApiDocument doc)
+        {
+            if (this.Reference != null)
+            {
+                return doc.ResolveReferenceTo<OpenApiCallback>(this.Reference);
+            }
+            else
+            {
+                return this;
+            }
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // path items
+            foreach (var item in PathItems)
+            {
+                writer.WriteRequiredObject(item.Key.Expression, item.Value, (w, p) => p.SerializeAsV3(w));
+            }
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiCallback"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Callback object does not exist in V2.
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            // Callback object does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiComponents.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiComponents.cs
new file mode 100644
index 000000000000..ff74fa27beee
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiComponents.cs
@@ -0,0 +1,295 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Components Object.
+    /// </summary>
+    internal class OpenApiComponents : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiSchema"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiSchema> Schemas { get; set; } = new Dictionary<string, OpenApiSchema>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiResponse"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiResponse> Responses { get; set; } = new Dictionary<string, OpenApiResponse>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiParameter"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiParameter> Parameters { get; set; } =
+            new Dictionary<string, OpenApiParameter>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiExample"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiExample> Examples { get; set; } = new Dictionary<string, OpenApiExample>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiRequestBody"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiRequestBody> RequestBodies { get; set; } =
+            new Dictionary<string, OpenApiRequestBody>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiHeader"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiHeader> Headers { get; set; } = new Dictionary<string, OpenApiHeader>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiSecurityScheme"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiSecurityScheme> SecuritySchemes { get; set; } =
+            new Dictionary<string, OpenApiSecurityScheme>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiLink"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiLink> Links { get; set; } = new Dictionary<string, OpenApiLink>();
+
+        /// <summary>
+        /// An object to hold reusable <see cref="OpenApiCallback"/> Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiCallback> Callbacks { get; set; } = new Dictionary<string, OpenApiCallback>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiComponents() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiComponents"/> object
+        /// </summary>
+        public OpenApiComponents(OpenApiComponents components)
+        {
+            Schemas = components?.Schemas != null ? new Dictionary<string, OpenApiSchema>(components.Schemas) : null;
+            Responses = components?.Responses != null ? new Dictionary<string, OpenApiResponse>(components.Responses) : null;
+            Parameters = components?.Parameters != null ? new Dictionary<string, OpenApiParameter>(components.Parameters) : null;
+            Examples = components?.Examples != null ? new Dictionary<string, OpenApiExample>(components.Examples) : null;
+            RequestBodies = components?.RequestBodies != null ? new Dictionary<string, OpenApiRequestBody>(components.RequestBodies) : null;
+            Headers = components?.Headers != null ? new Dictionary<string, OpenApiHeader>(components.Headers) : null;
+            SecuritySchemes = components?.SecuritySchemes != null ? new Dictionary<string, OpenApiSecurityScheme>(components.SecuritySchemes) : null;
+            Links = components?.Links != null ? new Dictionary<string, OpenApiLink>(components.Links) : null;
+            Callbacks = components?.Callbacks != null ? new Dictionary<string, OpenApiCallback>(components.Callbacks) : null;
+            Extensions = components?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(components.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiComponents"/> to Open Api v3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            // If references have been inlined we don't need the to render the components section
+            // however if they have cycles, then we will need a component rendered
+            if (writer.GetSettings().InlineLocalReferences)
+            {
+                var loops = writer.GetSettings().LoopDetector.Loops;
+                writer.WriteStartObject();
+                if (loops.TryGetValue(typeof(OpenApiSchema), out var schemas))
+                {
+                    var openApiSchemas = schemas.Cast<OpenApiSchema>().Distinct().ToList()
+                        .ToDictionary<OpenApiSchema, string>(k => k.Reference.Id);
+
+                    writer.WriteOptionalMap(
+                       OpenApiConstants.Schemas,
+                       Schemas,
+                       (w, _, component) => component.SerializeAsV3WithoutReference(w));
+                }
+                writer.WriteEndObject();
+                return;
+            }
+
+            writer.WriteStartObject();
+
+            // Serialize each referenceable object as full object without reference if the reference in the object points to itself.
+            // If the reference exists but points to other objects, the object is serialized to just that reference.
+
+            // schemas
+            writer.WriteOptionalMap(
+                OpenApiConstants.Schemas,
+                Schemas,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Schema} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // responses
+            writer.WriteOptionalMap(
+                OpenApiConstants.Responses,
+                Responses,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Response} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // parameters
+            writer.WriteOptionalMap(
+                OpenApiConstants.Parameters,
+                Parameters,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Parameter} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // examples
+            writer.WriteOptionalMap(
+                OpenApiConstants.Examples,
+                Examples,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Example} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // requestBodies
+            writer.WriteOptionalMap(
+                OpenApiConstants.RequestBodies,
+                RequestBodies,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.RequestBody} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // headers
+            writer.WriteOptionalMap(
+                OpenApiConstants.Headers,
+                Headers,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Header} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // securitySchemes
+            writer.WriteOptionalMap(
+                OpenApiConstants.SecuritySchemes,
+                SecuritySchemes,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.SecurityScheme} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // links
+            writer.WriteOptionalMap(
+                OpenApiConstants.Links,
+                Links,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Link} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // callbacks
+            writer.WriteOptionalMap(
+                OpenApiConstants.Callbacks,
+                Callbacks,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Callback} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV3WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV3(w);
+                    }
+                });
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiComponents"/> to Open Api v2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Components object does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiConstants.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiConstants.cs
new file mode 100644
index 000000000000..d12c84d3d273
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiConstants.cs
@@ -0,0 +1,652 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Constants used in the Open API document.
+    /// </summary>
+    internal static class OpenApiConstants
+    {
+        /// <summary>
+        /// Field: OpenApi
+        /// </summary>
+        public const string OpenApi = "openapi";
+
+        /// <summary>
+        /// Field: Info
+        /// </summary>
+        public const string Info = "info";
+
+        /// <summary>
+        /// Field: Title
+        /// </summary>
+        public const string Title = "title";
+
+        /// <summary>
+        /// Field: Type
+        /// </summary>
+        public const string Type = "type";
+
+        /// <summary>
+        /// Field: Format
+        /// </summary>
+        public const string Format = "format";
+
+        /// <summary>
+        /// Field: Version
+        /// </summary>
+        public const string Version = "version";
+
+        /// <summary>
+        /// Field: Contact
+        /// </summary>
+        public const string Contact = "contact";
+
+        /// <summary>
+        /// Field: License
+        /// </summary>
+        public const string License = "license";
+
+        /// <summary>
+        /// Field: TermsOfService
+        /// </summary>
+        public const string TermsOfService = "termsOfService";
+
+        /// <summary>
+        /// Field: Servers
+        /// </summary>
+        public const string Servers = "servers";
+
+        /// <summary>
+        /// Field: Server
+        /// </summary>
+        public const string Server = "server";
+
+        /// <summary>
+        /// Field: Paths
+        /// </summary>
+        public const string Paths = "paths";
+
+        /// <summary>
+        /// Field: Components
+        /// </summary>
+        public const string Components = "components";
+
+        /// <summary>
+        /// Field: Security
+        /// </summary>
+        public const string Security = "security";
+
+        /// <summary>
+        /// Field: Tags
+        /// </summary>
+        public const string Tags = "tags";
+
+        /// <summary>
+        /// Field: ExternalDocs
+        /// </summary>
+        public const string ExternalDocs = "externalDocs";
+
+        /// <summary>
+        /// Field: OperationRef
+        /// </summary>
+        public const string OperationRef = "operationRef";
+
+        /// <summary>
+        /// Field: OperationId
+        /// </summary>
+        public const string OperationId = "operationId";
+
+        /// <summary>
+        /// Field: Parameters
+        /// </summary>
+        public const string Parameters = "parameters";
+
+        /// <summary>
+        /// Field: RequestBody
+        /// </summary>
+        public const string RequestBody = "requestBody";
+
+        /// <summary>
+        /// Field: ExtensionFieldNamePrefix
+        /// </summary>
+        public const string ExtensionFieldNamePrefix = "x-";
+
+        /// <summary>
+        /// Field: Name
+        /// </summary>
+        public const string Name = "name";
+
+        /// <summary>
+        /// Field: Namespace
+        /// </summary>
+        public const string Namespace = "namespace";
+
+        /// <summary>
+        /// Field: Prefix
+        /// </summary>
+        public const string Prefix = "prefix";
+
+        /// <summary>
+        /// Field: Attribute
+        /// </summary>
+        public const string Attribute = "attribute";
+
+        /// <summary>
+        /// Field: Wrapped
+        /// </summary>
+        public const string Wrapped = "wrapped";
+
+        /// <summary>
+        /// Field: In
+        /// </summary>
+        public const string In = "in";
+
+        /// <summary>
+        /// Field: Summary
+        /// </summary>
+        public const string Summary = "summary";
+
+        /// <summary>
+        /// Field: Variables
+        /// </summary>
+        public const string Variables = "variables";
+
+        /// <summary>
+        /// Field: Description
+        /// </summary>
+        public const string Description = "description";
+
+        /// <summary>
+        /// Field: Required
+        /// </summary>
+        public const string Required = "required";
+
+        /// <summary>
+        /// Field: Deprecated
+        /// </summary>
+        public const string Deprecated = "deprecated";
+
+        /// <summary>
+        /// Field: Style
+        /// </summary>
+        public const string Style = "style";
+
+        /// <summary>
+        /// Field: Explode
+        /// </summary>
+        public const string Explode = "explode";
+
+        /// <summary>
+        /// Field: AllowReserved
+        /// </summary>
+        public const string AllowReserved = "allowReserved";
+
+        /// <summary>
+        /// Field: Schema
+        /// </summary>
+        public const string Schema = "schema";
+
+        /// <summary>
+        /// Field: Schemas
+        /// </summary>
+        public const string Schemas = "schemas";
+
+        /// <summary>
+        /// Field: Responses
+        /// </summary>
+        public const string Responses = "responses";
+
+        /// <summary>
+        /// Field: Example
+        /// </summary>
+        public const string Example = "example";
+
+        /// <summary>
+        /// Field: Examples
+        /// </summary>
+        public const string Examples = "examples";
+
+        /// <summary>
+        /// Field: Encoding
+        /// </summary>
+        public const string Encoding = "encoding";
+
+        /// <summary>
+        /// Field: RequestBodies
+        /// </summary>
+        public const string RequestBodies = "requestBodies";
+
+        /// <summary>
+        /// Field: AllowEmptyValue
+        /// </summary>
+        public const string AllowEmptyValue = "allowEmptyValue";
+
+        /// <summary>
+        /// Field: Value
+        /// </summary>
+        public const string Value = "value";
+
+        /// <summary>
+        /// Field: ExternalValue
+        /// </summary>
+        public const string ExternalValue = "externalValue";
+
+        /// <summary>
+        /// Field: DollarRef
+        /// </summary>
+        public const string DollarRef = "$ref";
+
+        /// <summary>
+        /// Field: Headers
+        /// </summary>
+        public const string Headers = "headers";
+
+        /// <summary>
+        /// Field: SecuritySchemes
+        /// </summary>
+        public const string SecuritySchemes = "securitySchemes";
+
+        /// <summary>
+        /// Field: Content
+        /// </summary>
+        public const string Content = "content";
+
+        /// <summary>
+        /// Field: Links
+        /// </summary>
+        public const string Links = "links";
+
+        /// <summary>
+        /// Field: Callbacks
+        /// </summary>
+        public const string Callbacks = "callbacks";
+
+        /// <summary>
+        /// Field: Url
+        /// </summary>
+        public const string Url = "url";
+
+        /// <summary>
+        /// Field: Email
+        /// </summary>
+        public const string Email = "email";
+
+        /// <summary>
+        /// Field: Default
+        /// </summary>
+        public const string Default = "default";
+
+        /// <summary>
+        /// Field: Enum
+        /// </summary>
+        public const string Enum = "enum";
+
+        /// <summary>
+        /// Field: MultipleOf
+        /// </summary>
+        public const string MultipleOf = "multipleOf";
+
+        /// <summary>
+        /// Field: Maximum
+        /// </summary>
+        public const string Maximum = "maximum";
+
+        /// <summary>
+        /// Field: ExclusiveMaximum
+        /// </summary>
+        public const string ExclusiveMaximum = "exclusiveMaximum";
+
+        /// <summary>
+        /// Field: Minimum
+        /// </summary>
+        public const string Minimum = "minimum";
+
+        /// <summary>
+        /// Field: ExclusiveMinimum
+        /// </summary>
+        public const string ExclusiveMinimum = "exclusiveMinimum";
+
+        /// <summary>
+        /// Field: MaxLength
+        /// </summary>
+        public const string MaxLength = "maxLength";
+
+        /// <summary>
+        /// Field: MinLength
+        /// </summary>
+        public const string MinLength = "minLength";
+
+        /// <summary>
+        /// Field: Pattern
+        /// </summary>
+        public const string Pattern = "pattern";
+
+        /// <summary>
+        /// Field: MaxItems
+        /// </summary>
+        public const string MaxItems = "maxItems";
+
+        /// <summary>
+        /// Field: MinItems
+        /// </summary>
+        public const string MinItems = "minItems";
+
+        /// <summary>
+        /// Field: UniqueItems
+        /// </summary>
+        public const string UniqueItems = "uniqueItems";
+
+        /// <summary>
+        /// Field: MaxProperties
+        /// </summary>
+        public const string MaxProperties = "maxProperties";
+
+        /// <summary>
+        /// Field: MinProperties
+        /// </summary>
+        public const string MinProperties = "minProperties";
+
+        /// <summary>
+        /// Field: AllOf
+        /// </summary>
+        public const string AllOf = "allOf";
+
+        /// <summary>
+        /// Field: OneOf
+        /// </summary>
+        public const string OneOf = "oneOf";
+
+        /// <summary>
+        /// Field: AnyOf
+        /// </summary>
+        public const string AnyOf = "anyOf";
+
+        /// <summary>
+        /// Field: Not
+        /// </summary>
+        public const string Not = "not";
+
+        /// <summary>
+        /// Field: Items
+        /// </summary>
+        public const string Items = "items";
+
+        /// <summary>
+        /// Field: Properties
+        /// </summary>
+        public const string Properties = "properties";
+
+        /// <summary>
+        /// Field: AdditionalProperties
+        /// </summary>
+        public const string AdditionalProperties = "additionalProperties";
+
+        /// <summary>
+        /// Field: Nullable
+        /// </summary>
+        public const string Nullable = "nullable";
+
+        /// <summary>
+        /// Field: Discriminator
+        /// </summary>
+        public const string Discriminator = "discriminator";
+
+        /// <summary>
+        /// Field: ReadOnly
+        /// </summary>
+        public const string ReadOnly = "readOnly";
+
+        /// <summary>
+        /// Field: WriteOnly
+        /// </summary>
+        public const string WriteOnly = "writeOnly";
+
+        /// <summary>
+        /// Field: Xml
+        /// </summary>
+        public const string Xml = "xml";
+
+        /// <summary>
+        /// Field: Flow
+        /// </summary>
+        public const string Flow = "flow";
+
+        /// <summary>
+        /// Field: Application
+        /// </summary>
+        public const string Application = "application";
+
+        /// <summary>
+        /// Field: AccessCode
+        /// </summary>
+        public const string AccessCode = "accessCode";
+
+        /// <summary>
+        /// Field: Implicit
+        /// </summary>
+        public const string Implicit = "implicit";
+
+        /// <summary>
+        /// Field: Password
+        /// </summary>
+        public const string Password = "password";
+
+        /// <summary>
+        /// Field: ClientCredentials
+        /// </summary>
+        public const string ClientCredentials = "clientCredentials";
+
+        /// <summary>
+        /// Field: AuthorizationCode
+        /// </summary>
+        public const string AuthorizationCode = "authorizationCode";
+
+        /// <summary>
+        /// Field: AuthorizationUrl
+        /// </summary>
+        public const string AuthorizationUrl = "authorizationUrl";
+
+        /// <summary>
+        /// Field: TokenUrl
+        /// </summary>
+        public const string TokenUrl = "tokenUrl";
+
+        /// <summary>
+        /// Field: RefreshUrl
+        /// </summary>
+        public const string RefreshUrl = "refreshUrl";
+
+        /// <summary>
+        /// Field: Scopes
+        /// </summary>
+        public const string Scopes = "scopes";
+
+        /// <summary>
+        /// Field: ContentType
+        /// </summary>
+        public const string ContentType = "contentType";
+
+        /// <summary>
+        /// Field: Get
+        /// </summary>
+        public const string Get = "get";
+
+        /// <summary>
+        /// Field: Put
+        /// </summary>
+        public const string Put = "put";
+
+        /// <summary>
+        /// Field: Post
+        /// </summary>
+        public const string Post = "post";
+
+        /// <summary>
+        /// Field: Delete
+        /// </summary>
+        public const string Delete = "delete";
+
+        /// <summary>
+        /// Field: Options
+        /// </summary>
+        public const string Options = "options";
+
+        /// <summary>
+        /// Field: Head
+        /// </summary>
+        public const string Head = "head";
+
+        /// <summary>
+        /// Field: Patch
+        /// </summary>
+        public const string Patch = "patch";
+
+        /// <summary>
+        /// Field: Trace
+        /// </summary>
+        public const string Trace = "trace";
+
+        /// <summary>
+        /// Field: PropertyName
+        /// </summary>
+        public const string PropertyName = "propertyName";
+
+        /// <summary>
+        /// Field: Mapping
+        /// </summary>
+        public const string Mapping = "mapping";
+
+        /// <summary>
+        /// Field: Scheme
+        /// </summary>
+        public const string Scheme = "scheme";
+
+        /// <summary>
+        /// Field: BearerFormat
+        /// </summary>
+        public const string BearerFormat = "bearerFormat";
+
+        /// <summary>
+        /// Field: Flows
+        /// </summary>
+        public const string Flows = "flows";
+
+        /// <summary>
+        /// Field: OpenIdConnectUrl
+        /// </summary>
+        public const string OpenIdConnectUrl = "openIdConnectUrl";
+
+        /// <summary>
+        /// Field: DefaultName
+        /// </summary>
+        public const string DefaultName = "Default Name";
+
+        /// <summary>
+        /// Field: DefaultDefault
+        /// </summary>
+        public const string DefaultDefault = "Default Default";
+
+        /// <summary>
+        /// Field: DefaultTitle
+        /// </summary>
+        public const string DefaultTitle = "Default Title";
+
+        /// <summary>
+        /// Field: DefaultDescription
+        /// </summary>
+        public const string DefaultDescription = "Default Description";
+
+        /// <summary>
+        /// Field: BodyName extensions
+        /// </summary>
+        public const string BodyName = "x-bodyName";
+
+        /// <summary>
+        /// Field: Examples Extension
+        /// </summary>
+        public const string ExamplesExtension = "x-examples";
+
+        /// <summary>
+        /// Field: version3_0_0
+        /// </summary>
+        public static readonly Version version3_0_0 = new(3, 0, 0);
+
+        /// <summary>
+        /// Field: defaultUrl
+        /// </summary>
+        public static readonly Uri defaultUrl = new("http://localhost/");
+
+        #region V2.0
+
+        /// <summary>
+        /// Field: Host
+        /// </summary>
+        public const string Host = "host";
+
+        /// <summary>
+        /// Field: Swagger
+        /// </summary>
+        public const string Swagger = "swagger";
+
+        /// <summary>
+        /// Field: version2_0
+        /// </summary>
+        public static readonly Version version2_0 = new(2, 0);
+
+        /// <summary>
+        /// Field: BasePath
+        /// </summary>
+        public const string BasePath = "basePath";
+
+        /// <summary>
+        /// Field: Schemes
+        /// </summary>
+        public const string Schemes = "schemes";
+
+        /// <summary>
+        /// Field: SecurityDefinitions
+        /// </summary>
+        public const string SecurityDefinitions = "securityDefinitions";
+
+        /// <summary>
+        /// Field: Definitions
+        /// </summary>
+        public const string Definitions = "definitions";
+
+        /// <summary>
+        /// Field: Basic
+        /// </summary>
+        public const string Basic = "basic";
+
+        /// <summary>
+        /// Field: Bearer
+        /// </summary>
+        public const string Bearer = "bearer";
+
+        /// <summary>
+        /// Field: JWT
+        /// </summary>
+        public const string Jwt = "JWT";
+
+        /// <summary>
+        /// Field: Consumes
+        /// </summary>
+        public const string Consumes = "consumes";
+
+        /// <summary>
+        /// Field: Produces
+        /// </summary>
+        public const string Produces = "produces";
+
+        #endregion
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiContact.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiContact.cs
new file mode 100644
index 000000000000..911e8a87c86a
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiContact.cs
@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Contact Object.
+    /// </summary>
+    internal class OpenApiContact : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// The identifying name of the contact person/organization.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The URL pointing to the contact information. MUST be in the format of a URL.
+        /// </summary>
+        public Uri Url { get; set; }
+
+        /// <summary>
+        /// The email address of the contact person/organization.
+        /// MUST be in the format of an email address.
+        /// </summary>
+        public string Email { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiContact() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiContact"/> instance
+        /// </summary>
+        public OpenApiContact(OpenApiContact contact)
+        {
+            Name = contact?.Name ?? Name;
+            Url = contact?.Url != null ? new Uri(contact.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Email = contact?.Email ?? Email;
+            Extensions = contact?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(contact.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiContact"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiContact"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi2_0);
+        }
+
+        private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteStartObject();
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // url
+            writer.WriteProperty(OpenApiConstants.Url, Url?.OriginalString);
+
+            // email
+            writer.WriteProperty(OpenApiConstants.Email, Email);
+
+            // extensions
+            writer.WriteExtensions(Extensions, specVersion);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs
new file mode 100644
index 000000000000..f02d91457007
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs
@@ -0,0 +1,70 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Discriminator object.
+    /// </summary>
+    internal class OpenApiDiscriminator : IOpenApiSerializable
+    {
+        /// <summary>
+        /// REQUIRED. The name of the property in the payload that will hold the discriminator value.
+        /// </summary>
+        public string PropertyName { get; set; }
+
+        /// <summary>
+        /// An object to hold mappings between payload values and schema names or references.
+        /// </summary>
+        public IDictionary<string, string> Mapping { get; set; } = new Dictionary<string, string>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiDiscriminator() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiDiscriminator"/> instance
+        /// </summary>
+        public OpenApiDiscriminator(OpenApiDiscriminator discriminator)
+        {
+            PropertyName = discriminator?.PropertyName ?? PropertyName;
+            Mapping = discriminator?.Mapping != null ? new Dictionary<string, string>(discriminator.Mapping) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDiscriminator"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // propertyName
+            writer.WriteProperty(OpenApiConstants.PropertyName, PropertyName);
+
+            // mapping
+            writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, (w, s) => w.WriteValue(s));
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDiscriminator"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Discriminator object does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiDocument.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiDocument.cs
new file mode 100644
index 000000000000..a14d65ed3057
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -0,0 +1,564 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Services;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Describes an OpenAPI object (OpenAPI document). See: https://swagger.io/specification
+    /// </summary>
+    internal class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible, IOpenApiAnnotatable
+    {
+        /// <summary>
+        /// Related workspace containing OpenApiDocuments that are referenced in this document
+        /// </summary>
+        public OpenApiWorkspace Workspace { get; set; }
+
+        /// <summary>
+        /// REQUIRED. Provides metadata about the API. The metadata MAY be used by tooling as required.
+        /// </summary>
+        public OpenApiInfo Info { get; set; }
+
+        /// <summary>
+        /// An array of Server Objects, which provide connectivity information to a target server.
+        /// </summary>
+        public IList<OpenApiServer> Servers { get; set; } = new List<OpenApiServer>();
+
+        /// <summary>
+        /// REQUIRED. The available paths and operations for the API.
+        /// </summary>
+        public OpenApiPaths Paths { get; set; }
+
+        /// <summary>
+        /// An element to hold various schemas for the specification.
+        /// </summary>
+        public OpenApiComponents Components { get; set; }
+
+        /// <summary>
+        /// A declaration of which security mechanisms can be used across the API.
+        /// </summary>
+        public IList<OpenApiSecurityRequirement> SecurityRequirements { get; set; } = new List<OpenApiSecurityRequirement>();
+
+        /// <summary>
+        /// A list of tags used by the specification with additional metadata.
+        /// </summary>
+        public IList<OpenApiTag> Tags { get; set; } = new List<OpenApiTag>();
+
+        /// <summary>
+        /// Additional external documentation.
+        /// </summary>
+        public OpenApiExternalDocs ExternalDocs { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// The unique hash code of the generated OpenAPI document
+        /// </summary>
+        public string HashCode => GenerateHashValue(this);
+
+        /// <inheritdoc />
+        public IDictionary<string, object> Annotations { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiDocument() {}
+
+        /// <summary>
+        /// Initializes a copy of an an <see cref="OpenApiDocument"/> object
+        /// </summary>
+        public OpenApiDocument(OpenApiDocument document)
+        {
+            Workspace = document?.Workspace != null ? new(document?.Workspace) : null;
+            Info = document?.Info != null ? new(document?.Info) : null;
+            Servers = document?.Servers != null ? new List<OpenApiServer>(document.Servers) : null;
+            Paths = document?.Paths != null ? new(document?.Paths) : null;
+            Components = document?.Components != null ? new(document?.Components) : null;
+            SecurityRequirements = document?.SecurityRequirements != null ? new List<OpenApiSecurityRequirement>(document.SecurityRequirements) : null;
+            Tags = document?.Tags != null ? new List<OpenApiTag>(document.Tags) : null;
+            ExternalDocs = document?.ExternalDocs != null ? new(document?.ExternalDocs) : null;
+            Extensions = document?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(document.Extensions) : null;
+            Annotations = document?.Annotations != null ? new Dictionary<string, object>(document.Annotations) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDocument"/> to the latest patch of OpenAPI object V3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // openapi
+            writer.WriteProperty(OpenApiConstants.OpenApi, "3.0.4");
+
+            // info
+            writer.WriteRequiredObject(OpenApiConstants.Info, Info, (w, i) => i.SerializeAsV3(w));
+
+            // servers
+            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => s.SerializeAsV3(w));
+
+            // paths
+            writer.WriteRequiredObject(OpenApiConstants.Paths, Paths, (w, p) => p.SerializeAsV3(w));
+
+            // components
+            writer.WriteOptionalObject(OpenApiConstants.Components, Components, (w, c) => c.SerializeAsV3(w));
+
+            // security
+            writer.WriteOptionalCollection(
+                OpenApiConstants.Security,
+                SecurityRequirements,
+                (w, s) => s.SerializeAsV3(w));
+
+            // tags
+            writer.WriteOptionalCollection(OpenApiConstants.Tags, Tags, (w, t) => t.SerializeAsV3WithoutReference(w));
+
+            // external docs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV3(w));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDocument"/> to OpenAPI object V2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // swagger
+            writer.WriteProperty(OpenApiConstants.Swagger, "2.0");
+
+            // info
+            writer.WriteRequiredObject(OpenApiConstants.Info, Info, (w, i) => i.SerializeAsV2(w));
+
+            // host, basePath, schemes, consumes, produces
+            WriteHostInfoV2(writer, Servers);
+
+            // paths
+            writer.WriteRequiredObject(OpenApiConstants.Paths, Paths, (w, p) => p.SerializeAsV2(w));
+
+            // If references have been inlined we don't need to render the components section
+            // however if they have cycles, then we will need a component rendered
+            if (writer.GetSettings().InlineLocalReferences)
+            {
+                var loops = writer.GetSettings().LoopDetector.Loops;
+
+                if (loops.TryGetValue(typeof(OpenApiSchema), out var schemas))
+                {
+                    var openApiSchemas = schemas.Cast<OpenApiSchema>().Distinct().ToList()
+                        .ToDictionary<OpenApiSchema, string>(k => k.Reference.Id);
+
+                    foreach (var schema in openApiSchemas.Values.ToList())
+                    {
+                        FindSchemaReferences.ResolveSchemas(Components, openApiSchemas);
+                    }
+
+                    writer.WriteOptionalMap(
+                       OpenApiConstants.Definitions,
+                       openApiSchemas,
+                       (w, _, component) => component.SerializeAsV2WithoutReference(w));
+                }
+            }
+            else
+            {
+                // Serialize each referenceable object as full object without reference if the reference in the object points to itself.
+                // If the reference exists but points to other objects, the object is serialized to just that reference.
+                // definitions
+                writer.WriteOptionalMap(
+                    OpenApiConstants.Definitions,
+                    Components?.Schemas,
+                    (w, key, component) =>
+                    {
+                        if (component.Reference is {Type: ReferenceType.Schema} &&
+                            component.Reference.Id == key)
+                        {
+                            component.SerializeAsV2WithoutReference(w);
+                        }
+                        else
+                        {
+                            component.SerializeAsV2(w);
+                        }
+                    });
+            }
+            // parameters
+            var parameters = Components?.Parameters != null
+                ? new(Components.Parameters)
+                : new Dictionary<string, OpenApiParameter>();
+
+            if (Components?.RequestBodies != null)
+            {
+                foreach (var requestBody in Components.RequestBodies.Where(b => !parameters.ContainsKey(b.Key)))
+                {
+                    parameters.Add(requestBody.Key, requestBody.Value.ConvertToBodyParameter());
+                }
+            }
+            writer.WriteOptionalMap(
+                OpenApiConstants.Parameters,
+                parameters,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Parameter} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV2WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV2(w);
+                    }
+                });
+
+            // responses
+            writer.WriteOptionalMap(
+                OpenApiConstants.Responses,
+                Components?.Responses,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.Response} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV2WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV2(w);
+                    }
+                });
+
+            // securityDefinitions
+            writer.WriteOptionalMap(
+                OpenApiConstants.SecurityDefinitions,
+                Components?.SecuritySchemes,
+                (w, key, component) =>
+                {
+                    if (component.Reference is {Type: ReferenceType.SecurityScheme} &&
+                        component.Reference.Id == key)
+                    {
+                        component.SerializeAsV2WithoutReference(w);
+                    }
+                    else
+                    {
+                        component.SerializeAsV2(w);
+                    }
+                });
+
+            // security
+            writer.WriteOptionalCollection(
+                OpenApiConstants.Security,
+                SecurityRequirements,
+                (w, s) => s.SerializeAsV2(w));
+
+            // tags
+            writer.WriteOptionalCollection(OpenApiConstants.Tags, Tags, (w, t) => t.SerializeAsV2WithoutReference(w));
+
+            // externalDocs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV2(w));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+
+        private static string ParseServerUrl(OpenApiServer server)
+        {
+            return server.ReplaceServerUrlVariables(new Dictionary<string, string>(0));
+        }
+
+        private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer> servers)
+        {
+            if (servers == null || !servers.Any())
+            {
+                return;
+            }
+
+            // Arbitrarily choose the first server given that V2 only allows
+            // one host, port, and base path.
+            var serverUrl = ParseServerUrl(servers.First());
+
+            // Divide the URL in the Url property into host and basePath required in OpenAPI V2
+            // The Url property cannot contain path templating to be valid for V2 serialization.
+            var firstServerUrl = new Uri(serverUrl, UriKind.RelativeOrAbsolute);
+
+            // host
+            if (firstServerUrl.IsAbsoluteUri)
+            {
+                writer.WriteProperty(
+                    OpenApiConstants.Host,
+                    firstServerUrl.GetComponents(UriComponents.Host | UriComponents.Port, UriFormat.SafeUnescaped));
+
+                // basePath
+                if (firstServerUrl.AbsolutePath != "/")
+                {
+                    writer.WriteProperty(OpenApiConstants.BasePath, firstServerUrl.AbsolutePath);
+                }
+            } else
+            {
+                var relativeUrl = firstServerUrl.OriginalString;
+                if (relativeUrl.StartsWith("//"))
+                {
+                    var pathPosition = relativeUrl.IndexOf('/', 3);
+                    writer.WriteProperty(OpenApiConstants.Host, relativeUrl.Substring(0, pathPosition));
+                    relativeUrl = relativeUrl.Substring(pathPosition);
+                }
+                if (!String.IsNullOrEmpty(relativeUrl) && relativeUrl != "/")
+                {
+                    writer.WriteProperty(OpenApiConstants.BasePath, relativeUrl);
+                }
+            }
+
+            // Consider all schemes of the URLs in the server list that have the same
+            // host, port, and base path as the first server.
+            var schemes = servers.Select(
+                    s =>
+                    {
+                        Uri.TryCreate(ParseServerUrl(s), UriKind.RelativeOrAbsolute, out var url);
+                        return url;
+                    })
+                .Where(
+                    u => Uri.Compare(
+                            u,
+                            firstServerUrl,
+                            UriComponents.Host | UriComponents.Port | UriComponents.Path,
+                            UriFormat.SafeUnescaped,
+                            StringComparison.OrdinalIgnoreCase) ==
+                        0 && u.IsAbsoluteUri)
+                .Select(u => u.Scheme)
+                .Distinct()
+                .ToList();
+
+            // schemes
+            writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => w.WriteValue(s));
+        }
+
+        /// <summary>
+        /// Walk the OpenApiDocument and resolve unresolved references
+        /// </summary>
+        /// <remarks>
+        /// This method will be replaced by a LoadExternalReferences in the next major update to this library.
+        /// Resolving references at load time is going to go away.
+        /// </remarks>
+        public IEnumerable<OpenApiError> ResolveReferences()
+        {
+            var resolver = new OpenApiReferenceResolver(this, false);
+            var walker = new OpenApiWalker(resolver);
+            walker.Walk(this);
+            return resolver.Errors;
+        }
+
+        /// <summary>
+        /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="OpenApiReference"/> object
+        /// </summary>
+        internal T ResolveReferenceTo<T>(OpenApiReference reference) where T : class, IOpenApiReferenceable
+        {
+            if (reference.IsExternal)
+            {
+                return ResolveReference(reference, true) as T;
+            }
+            else
+            {
+                return ResolveReference(reference, false) as T;
+            }
+        }
+
+        /// <summary>
+        /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="OpenApiReference"/> object
+        /// </summary>
+        public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
+        {
+            return ResolveReference(reference, false);
+        }
+
+        /// <summary>
+        /// Takes in an OpenApi document instance and generates its hash value
+        /// </summary>
+        /// <param name="doc">The OpenAPI description to hash.</param>
+        /// <returns>The hash value.</returns>
+        public static string GenerateHashValue(OpenApiDocument doc)
+        {
+            using HashAlgorithm sha = SHA512.Create();
+            using var cryptoStream = new CryptoStream(Stream.Null, sha, CryptoStreamMode.Write);
+            using var streamWriter = new StreamWriter(cryptoStream);
+
+            var openApiJsonWriter = new OpenApiJsonWriter(streamWriter, new() { Terse = true });
+            doc.SerializeAsV3(openApiJsonWriter);
+            openApiJsonWriter.Flush();
+
+            cryptoStream.FlushFinalBlock();
+            var hash = sha.Hash;
+
+            return ConvertByteArrayToString(hash);
+        }
+
+        private static string ConvertByteArrayToString(byte[] hash)
+        {
+            // Build the final string by converting each byte
+            // into hex and appending it to a StringBuilder
+            var sb = new StringBuilder();
+            for (var i = 0; i < hash.Length; i++)
+            {
+                sb.Append(hash[i].ToString("X2"));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="OpenApiReference"/> object
+        /// </summary>
+        internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool useExternal)
+        {
+            if (reference == null)
+            {
+                return null;
+            }
+
+            // Todo: Verify if we need to check to see if this external reference is actually targeted at this document.
+            if (useExternal)
+            {
+                if (this.Workspace == null)
+                {
+                    throw new ArgumentException(Properties.SRResource.WorkspaceRequredForExternalReferenceResolution);
+                }
+                return this.Workspace.ResolveReference(reference);
+            } 
+
+            if (!reference.Type.HasValue)
+            {
+                throw new ArgumentException(Properties.SRResource.LocalReferenceRequiresType);
+            }
+
+            // Special case for Tag
+            if (reference.Type == ReferenceType.Tag)
+            {
+                foreach (var tag in this.Tags)
+                {
+                    if (tag.Name == reference.Id)
+                    {
+                        tag.Reference = reference;
+                        return tag;
+                    }
+                }
+
+                return null;
+            }
+
+            if (this.Components == null)
+            {
+                throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));
+            }
+
+            try
+            {
+                switch (reference.Type)
+                {
+                    case ReferenceType.Schema:
+                        return this.Components.Schemas[reference.Id];
+
+                    case ReferenceType.Response:
+                        return this.Components.Responses[reference.Id];
+
+                    case ReferenceType.Parameter:
+                        return this.Components.Parameters[reference.Id];
+
+                    case ReferenceType.Example:
+                        return this.Components.Examples[reference.Id];
+
+                    case ReferenceType.RequestBody:
+                        return this.Components.RequestBodies[reference.Id];
+
+                    case ReferenceType.Header:
+                        return this.Components.Headers[reference.Id];
+
+                    case ReferenceType.SecurityScheme:
+                        return this.Components.SecuritySchemes[reference.Id];
+
+                    case ReferenceType.Link:
+                        return this.Components.Links[reference.Id];
+
+                    case ReferenceType.Callback:
+                        return this.Components.Callbacks[reference.Id];
+
+                    case ReferenceType.Path:
+                        return this.Paths[reference.Id];
+
+                    default:
+                        throw new OpenApiException(Properties.SRResource.InvalidReferenceType);
+                }
+            }
+            catch (KeyNotFoundException)
+            {
+                throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));
+            }
+        }
+    }
+
+    internal class FindSchemaReferences : OpenApiVisitorBase
+    {
+        private Dictionary<string, OpenApiSchema> Schemas;
+
+        public static void ResolveSchemas(OpenApiComponents components, Dictionary<string, OpenApiSchema> schemas )
+        {
+            var visitor = new FindSchemaReferences();
+            visitor.Schemas = schemas;
+            var walker = new OpenApiWalker(visitor);
+            walker.Walk(components);
+        }
+
+        public override void Visit(IOpenApiReferenceable referenceable)
+        {
+            switch (referenceable)
+            {
+                case OpenApiSchema schema:
+                    if (!Schemas.ContainsKey(schema.Reference.Id))
+                    {
+                        Schemas.Add(schema.Reference.Id, schema);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+            base.Visit(referenceable);
+        }
+
+        public override void Visit(OpenApiSchema schema)
+        {
+            // This is needed to handle schemas used in Responses in components
+            if (schema.Reference != null)
+            {
+                if (!Schemas.ContainsKey(schema.Reference.Id))
+                {
+                    Schemas.Add(schema.Reference.Id, schema);
+                }
+            }
+            base.Visit(schema);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiEncoding.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiEncoding.cs
new file mode 100644
index 000000000000..5609e1f14a8e
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiEncoding.cs
@@ -0,0 +1,116 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// ExternalDocs object.
+    /// </summary>
+    internal class OpenApiEncoding : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// The Content-Type for encoding a specific property.
+        /// The value can be a specific media type (e.g. application/json),
+        /// a wildcard media type (e.g. image/*), or a comma-separated list of the two types.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <summary>
+        /// A map allowing additional information to be provided as headers.
+        /// </summary>
+        public IDictionary<string, OpenApiHeader> Headers { get; set; } = new Dictionary<string, OpenApiHeader>();
+
+        /// <summary>
+        /// Describes how a specific property value will be serialized depending on its type.
+        /// </summary>
+        public ParameterStyle? Style { get; set; }
+
+        /// <summary>
+        /// When this is true, property values of type array or object generate separate parameters
+        /// for each value of the array, or key-value-pair of the map. For other types of properties
+        /// this property has no effect. When style is form, the default value is true.
+        /// For all other styles, the default value is false.
+        /// This property SHALL be ignored if the request body media type is not application/x-www-form-urlencoded.
+        /// </summary>
+        public bool? Explode { get; set; }
+
+        /// <summary>
+        /// Determines whether the parameter value SHOULD allow reserved characters,
+        /// as defined by RFC3986 :/?#[]@!$&amp;'()*+,;= to be included without percent-encoding.
+        /// The default value is false. This property SHALL be ignored
+        /// if the request body media type is not application/x-www-form-urlencoded.
+        /// </summary>
+        public bool? AllowReserved { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiEncoding() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiEncoding"/> object
+        /// </summary>
+        public OpenApiEncoding(OpenApiEncoding encoding)
+        {
+            ContentType = encoding?.ContentType ?? ContentType;
+            Headers = encoding?.Headers != null ? new Dictionary<string, OpenApiHeader>(encoding.Headers) : null;
+            Style = encoding?.Style ?? Style;
+            Explode = encoding?.Explode ?? Explode;
+            AllowReserved = encoding?.AllowReserved ?? AllowReserved;
+            Extensions = encoding?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(encoding.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // contentType
+            writer.WriteProperty(OpenApiConstants.ContentType, ContentType);
+
+            // headers
+            writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.SerializeAsV3(w));
+
+            // style
+            writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
+
+            // explode
+            writer.WriteProperty(OpenApiConstants.Explode, Explode, false);
+
+            // allowReserved
+            writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // nothing here
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiError.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiError.cs
new file mode 100644
index 000000000000..781d1be21556
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiError.cs
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Error related to the Open API Document.
+    /// </summary>
+    internal class OpenApiError
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiError"/> class using the message and pointer from the given exception.
+        /// </summary>
+        public OpenApiError(OpenApiException exception) : this(exception.Pointer, exception.Message)
+        {
+        }
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiError"/> class.
+        /// </summary>
+        public OpenApiError(string pointer, string message)
+        {
+            Pointer = pointer;
+            Message = message;
+        }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiError"/> object
+        /// </summary>
+        public OpenApiError(OpenApiError error)
+        {
+            Pointer = error.Pointer;
+            Message = error.Message;
+        }
+
+        /// <summary>
+        /// Message explaining the error.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// Pointer to the location of the error.
+        /// </summary>
+        public string Pointer { get; set; }
+
+        /// <summary>
+        /// Gets the string representation of <see cref="OpenApiError"/>.
+        /// </summary>
+        public override string ToString()
+        {
+            return Message + (!string.IsNullOrEmpty(Pointer) ? " [" + Pointer + "]" : "");
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExample.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExample.cs
new file mode 100644
index 000000000000..55a158619607
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExample.cs
@@ -0,0 +1,177 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Example Object.
+    /// </summary>
+    internal class OpenApiExample : IOpenApiReferenceable, IOpenApiExtensible, IEffective<OpenApiExample>
+    {
+        /// <summary>
+        /// Short description for the example.
+        /// </summary>
+        public string Summary { get; set; }
+
+        /// <summary>
+        /// Long description for the example.
+        /// CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Embedded literal example. The value field and externalValue field are mutually
+        /// exclusive. To represent examples of media types that cannot naturally represented
+        /// in JSON or YAML, use a string value to contain the example, escaping where necessary.
+        /// </summary>
+        public IOpenApiAny Value { get; set; }
+
+        /// <summary>
+        /// A URL that points to the literal example.
+        /// This provides the capability to reference examples that cannot easily be
+        /// included in JSON or YAML documents.
+        /// The value field and externalValue field are mutually exclusive.
+        /// </summary>
+        public string ExternalValue { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// Indicates object is a placeholder reference to an actual object and does not contain valid data.
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiExample() {}
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiExample"/> object
+        /// </summary>
+        public OpenApiExample(OpenApiExample example)
+        {
+            Summary = example?.Summary ?? Summary;
+            Description = example?.Description ?? Description;
+            Value = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(example?.Value);
+            ExternalValue = example?.ExternalValue ?? ExternalValue;
+            Extensions = example?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(example.Extensions) : null;
+            Reference = example?.Reference != null ? new(example?.Reference) : null;
+            UnresolvedReference = example?.UnresolvedReference ?? UnresolvedReference;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExample"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiExample object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiExample</returns>
+        public OpenApiExample GetEffective(OpenApiDocument doc)
+        {
+            if (this.Reference != null)
+            {
+                return doc.ResolveReferenceTo<OpenApiExample>(this.Reference);
+            }
+            else
+            {
+                return this;
+            }
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            Serialize(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Writes out existing examples in a mediatype object
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="version"></param>
+        public void Serialize(IOpenApiWriter writer, OpenApiSpecVersion version)
+        {
+            writer.WriteStartObject();
+
+            // summary
+            writer.WriteProperty(OpenApiConstants.Summary, Summary);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // value
+            writer.WriteOptionalObject(OpenApiConstants.Value, Value, (w, v) => w.WriteAny(v));
+
+            // externalValue
+            writer.WriteProperty(OpenApiConstants.ExternalValue, ExternalValue);
+
+            // extensions
+            writer.WriteExtensions(Extensions, version);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExample"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Example object of this form does not exist in V2.
+            // V2 Example object requires knowledge of media type and exists only
+            // in Response object, so it will be serialized as a part of the Response object.
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            // Example object of this form does not exist in V2.
+            // V2 Example object requires knowledge of media type and exists only
+            // in Response object, so it will be serialized as a part of the Response object.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs
new file mode 100644
index 000000000000..0f6bacfc865a
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs
@@ -0,0 +1,84 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Generic dictionary type for Open API dictionary element.
+    /// </summary>
+    /// <typeparam name="T">The Open API element, <see cref="IOpenApiElement"/></typeparam>
+    internal abstract class OpenApiExtensibleDictionary<T> : Dictionary<string, T>,
+        IOpenApiSerializable,
+        IOpenApiExtensible
+        where T : IOpenApiSerializable
+    {
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        protected OpenApiExtensibleDictionary() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiExtensibleDictionary{T}"/> class.
+        /// </summary>
+        /// <param name="dictionary">The generic dictionary.</param>
+        /// <param name="extensions">The dictionary of <see cref="IOpenApiExtension"/>.</param>
+        protected OpenApiExtensibleDictionary(
+            Dictionary<string, T> dictionary = null,
+            IDictionary<string, IOpenApiExtension> extensions = null) : base (dictionary)
+        {
+            Extensions = extensions != null ? new Dictionary<string, IOpenApiExtension>(extensions) : null;
+        }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Serialize to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            foreach (var item in this)
+            {
+                writer.WriteRequiredObject(item.Key, item.Value, (w, p) => p.SerializeAsV3(w));
+            }
+
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            foreach (var item in this)
+            {
+                writer.WriteRequiredObject(item.Key, item.Value, (w, p) => p.SerializeAsV2(w));
+            }
+
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs
new file mode 100644
index 000000000000..bc33ec634c8b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs
@@ -0,0 +1,83 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// ExternalDocs object.
+    /// </summary>
+    internal class OpenApiExternalDocs : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// A short description of the target documentation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The URL for the target documentation. Value MUST be in the format of a URL.
+        /// </summary>
+        public Uri Url { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiExternalDocs() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiExternalDocs"/> object
+        /// </summary>
+        public OpenApiExternalDocs(OpenApiExternalDocs externalDocs)
+        {
+            Description = externalDocs?.Description ?? Description;
+            Url = externalDocs?.Url != null ? new Uri(externalDocs.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Extensions = externalDocs?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(externalDocs.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi2_0);
+        }
+
+        private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteStartObject();
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // url
+            writer.WriteProperty(OpenApiConstants.Url, Url?.OriginalString);
+
+            // extensions
+            writer.WriteExtensions(Extensions, specVersion);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiHeader.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiHeader.cs
new file mode 100644
index 000000000000..d878a0b63a07
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiHeader.cs
@@ -0,0 +1,271 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Header Object.
+    /// The Header Object follows the structure of the Parameter Object.
+    /// </summary>
+    internal class OpenApiHeader : IOpenApiReferenceable, IOpenApiExtensible, IEffective<OpenApiHeader>
+    {
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference pointer.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// A brief description of the header.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Determines whether this header is mandatory.
+        /// </summary>
+        public bool Required { get; set; }
+
+        /// <summary>
+        /// Specifies that a header is deprecated and SHOULD be transitioned out of usage.
+        /// </summary>
+        public bool Deprecated { get; set; }
+
+        /// <summary>
+        /// Sets the ability to pass empty-valued headers.
+        /// </summary>
+        public bool AllowEmptyValue { get; set; }
+
+        /// <summary>
+        /// Describes how the header value will be serialized depending on the type of the header value.
+        /// </summary>
+        public ParameterStyle? Style { get; set; }
+
+        /// <summary>
+        /// When this is true, header values of type array or object generate separate parameters
+        /// for each value of the array or key-value pair of the map.
+        /// </summary>
+        public bool Explode { get; set; }
+
+        /// <summary>
+        /// Determines whether the header value SHOULD allow reserved characters, as defined by RFC3986.
+        /// </summary>
+        public bool AllowReserved { get; set; }
+
+        /// <summary>
+        /// The schema defining the type used for the header.
+        /// </summary>
+        public OpenApiSchema Schema { get; set; }
+
+        /// <summary>
+        /// Example of the media type.
+        /// </summary>
+        public IOpenApiAny Example { get; set; }
+
+        /// <summary>
+        /// Examples of the media type.
+        /// </summary>
+        public IDictionary<string, OpenApiExample> Examples { get; set; } = new Dictionary<string, OpenApiExample>();
+
+        /// <summary>
+        /// A map containing the representations for the header.
+        /// </summary>
+        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiHeader() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiHeader"/> object
+        /// </summary>
+        public OpenApiHeader(OpenApiHeader header)
+        {
+            UnresolvedReference = header?.UnresolvedReference ?? UnresolvedReference;
+            Reference = header?.Reference != null ? new(header?.Reference) : null;
+            Description = header?.Description ?? Description;
+            Required = header?.Required ?? Required;
+            Deprecated = header?.Deprecated ?? Deprecated;
+            AllowEmptyValue = header?.AllowEmptyValue ?? AllowEmptyValue;
+            Style = header?.Style ?? Style;
+            Explode = header?.Explode ?? Explode;
+            AllowReserved = header?.AllowReserved ?? AllowReserved;
+            Schema = header?.Schema != null ? new(header?.Schema) : null;
+            Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(header?.Example);
+            Examples = header?.Examples != null ? new Dictionary<string, OpenApiExample>(header.Examples) : null;
+            Content = header?.Content != null ? new Dictionary<string, OpenApiMediaType>(header.Content) : null;
+            Extensions = header?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(header.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiHeader"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiHeader object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiHeader</returns>
+        public OpenApiHeader GetEffective(OpenApiDocument doc)
+        {
+            if (this.Reference != null)
+            {
+                return doc.ResolveReferenceTo<OpenApiHeader>(this.Reference);
+            }
+            else
+            {
+                return this;
+            }
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // required
+            writer.WriteProperty(OpenApiConstants.Required, Required, false);
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            // allowEmptyValue
+            writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
+
+            // style
+            writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
+
+            // explode
+            writer.WriteProperty(OpenApiConstants.Explode, Explode, false);
+
+            // allowReserved
+            writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
+
+            // schema
+            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV3(w));
+
+            // example
+            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
+
+            // examples
+            writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => e.SerializeAsV3(w));
+
+            // content
+            writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiHeader"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV2(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV2WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // required
+            writer.WriteProperty(OpenApiConstants.Required, Required, false);
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            // allowEmptyValue
+            writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
+
+            // style
+            writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
+
+            // explode
+            writer.WriteProperty(OpenApiConstants.Explode, Explode, false);
+
+            // allowReserved
+            writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
+
+            // schema
+            Schema?.WriteAsItemsProperties(writer);
+
+            // example
+            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiInfo.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiInfo.cs
new file mode 100644
index 000000000000..d0c740794e25
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiInfo.cs
@@ -0,0 +1,141 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Open API Info Object, it provides the metadata about the Open API.
+    /// </summary>
+    internal class OpenApiInfo : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// REQUIRED. The title of the application.
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// A short description of the application.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The version of the OpenAPI document.
+        /// </summary>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// A URL to the Terms of Service for the API. MUST be in the format of a URL.
+        /// </summary>
+        public Uri TermsOfService { get; set; }
+
+        /// <summary>
+        /// The contact information for the exposed API.
+        /// </summary>
+        public OpenApiContact Contact { get; set; }
+
+        /// <summary>
+        /// The license information for the exposed API.
+        /// </summary>
+        public OpenApiLicense License { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiInfo() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiInfo"/> object
+        /// </summary>
+        public OpenApiInfo(OpenApiInfo info)
+        {
+            Title = info?.Title ?? Title;
+            Description = info?.Description ?? Description;
+            Version = info?.Version ?? Version;
+            TermsOfService = info?.TermsOfService ?? TermsOfService;
+            Contact = info?.Contact != null ? new(info?.Contact) : null;
+            License = info?.License != null ? new(info?.License) : null;
+            Extensions = info?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(info.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiInfo"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // title
+            writer.WriteProperty(OpenApiConstants.Title, Title);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // termsOfService
+            writer.WriteProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
+
+            // contact object
+            writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, (w, c) => c.SerializeAsV3(w));
+
+            // license object
+            writer.WriteOptionalObject(OpenApiConstants.License, License, (w, l) => l.SerializeAsV3(w));
+
+            // version
+            writer.WriteProperty(OpenApiConstants.Version, Version);
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiInfo"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // title
+            writer.WriteProperty(OpenApiConstants.Title, Title);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // termsOfService
+            writer.WriteProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
+
+            // contact object
+            writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, (w, c) => c.SerializeAsV2(w));
+
+            // license object
+            writer.WriteOptionalObject(OpenApiConstants.License, License, (w, l) => l.SerializeAsV2(w));
+
+            // version
+            writer.WriteProperty(OpenApiConstants.Version, Version);
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiLicense.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiLicense.cs
new file mode 100644
index 000000000000..8d71d2a617fb
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiLicense.cs
@@ -0,0 +1,83 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// License Object.
+    /// </summary>
+    internal class OpenApiLicense : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// REQUIRED. The license name used for the API.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The URL pointing to the contact information. MUST be in the format of a URL.
+        /// </summary>
+        public Uri Url { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiLicense() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiLicense"/> object
+        /// </summary>
+        public OpenApiLicense(OpenApiLicense license)
+        {
+            Name = license?.Name ?? Name;
+            Url = license?.Url != null ? new Uri(license.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Extensions = license?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(license.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiLicense"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiLicense"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi2_0);
+        }
+
+        private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteStartObject();
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // url
+            writer.WriteProperty(OpenApiConstants.Url, Url?.OriginalString);
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, specVersion);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiLink.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiLink.cs
new file mode 100644
index 000000000000..ac2e9f349996
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiLink.cs
@@ -0,0 +1,177 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Link Object.
+    /// </summary>
+    internal class OpenApiLink : IOpenApiReferenceable, IOpenApiExtensible, IEffective<OpenApiLink>
+    {
+        /// <summary>
+        /// A relative or absolute reference to an OAS operation.
+        /// This field is mutually exclusive of the operationId field, and MUST point to an Operation Object.
+        /// </summary>
+        public string OperationRef { get; set; }
+
+        /// <summary>
+        /// The name of an existing, resolvable OAS operation, as defined with a unique operationId.
+        /// This field is mutually exclusive of the operationRef field.
+        /// </summary>
+        public string OperationId { get; set; }
+
+        /// <summary>
+        /// A map representing parameters to pass to an operation as specified with operationId or identified via operationRef.
+        /// </summary>
+        public Dictionary<string, RuntimeExpressionAnyWrapper> Parameters { get; set; } =
+            new();
+
+        /// <summary>
+        /// A literal value or {expression} to use as a request body when calling the target operation.
+        /// </summary>
+        public RuntimeExpressionAnyWrapper RequestBody { get; set; }
+
+        /// <summary>
+        /// A description of the link.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// A server object to be used by the target operation.
+        /// </summary>
+        public OpenApiServer Server { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference pointer.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiLink() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiLink"/> object
+        /// </summary>
+        public OpenApiLink(OpenApiLink link)
+        {
+            OperationRef = link?.OperationRef ?? OperationRef;
+            OperationId = link?.OperationId ?? OperationId;
+            Parameters = link?.Parameters != null ? new(link?.Parameters) : null;
+            RequestBody = link?.RequestBody != null ? new(link?.RequestBody) : null;
+            Description = link?.Description ?? Description;
+            Server = link?.Server != null ? new(link?.Server) : null;
+            Extensions = link?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(link.Extensions) : null;
+            UnresolvedReference = link?.UnresolvedReference ?? UnresolvedReference;
+            Reference = link?.Reference != null ? new(link?.Reference) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiLink"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiLink object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiLink</returns>
+        public OpenApiLink GetEffective(OpenApiDocument doc)
+        {
+            if (this.Reference != null)
+            {
+                return doc.ResolveReferenceTo<OpenApiLink>(this.Reference);
+            }
+            else
+            {
+                return this;
+            }
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // operationRef
+            writer.WriteProperty(OpenApiConstants.OperationRef, OperationRef);
+
+            // operationId
+            writer.WriteProperty(OpenApiConstants.OperationId, OperationId);
+
+            // parameters
+            writer.WriteOptionalMap(OpenApiConstants.Parameters, Parameters, (w, p) => p.WriteValue(w));
+
+            // requestBody
+            writer.WriteOptionalObject(OpenApiConstants.RequestBody, RequestBody, (w, r) => r.WriteValue(w));
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // server
+            writer.WriteOptionalObject(OpenApiConstants.Server, Server, (w, s) => s.SerializeAsV3(w));
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiLink"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Link object does not exist in V2.
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            // Link object does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiMediaType.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiMediaType.cs
new file mode 100644
index 000000000000..f8b97ff1504b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiMediaType.cs
@@ -0,0 +1,135 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Media Type Object.
+    /// </summary>
+    internal class OpenApiMediaType : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// The schema defining the type used for the request body.
+        /// </summary>
+        public OpenApiSchema Schema { get; set; }
+
+        /// <summary>
+        /// Example of the media type.
+        /// The example object SHOULD be in the correct format as specified by the media type.
+        /// </summary>
+        public IOpenApiAny Example { get; set; }
+
+        /// <summary>
+        /// Examples of the media type.
+        /// Each example object SHOULD match the media type and specified schema if present.
+        /// </summary>
+        public IDictionary<string, OpenApiExample> Examples { get; set; } = new Dictionary<string, OpenApiExample>();
+
+        /// <summary>
+        /// A map between a property name and its encoding information.
+        /// The key, being the property name, MUST exist in the schema as a property.
+        /// The encoding object SHALL only apply to requestBody objects
+        /// when the media type is multipart or application/x-www-form-urlencoded.
+        /// </summary>
+        public IDictionary<string, OpenApiEncoding> Encoding { get; set; } = new Dictionary<string, OpenApiEncoding>();
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.0.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiMediaType() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiMediaType"/> object
+        /// </summary>
+        public OpenApiMediaType(OpenApiMediaType mediaType)
+        {
+            Schema = mediaType?.Schema != null ? new(mediaType?.Schema) : null;
+            Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(mediaType?.Example);
+            Examples = mediaType?.Examples != null ? new Dictionary<string, OpenApiExample>(mediaType.Examples) : null;
+            Encoding = mediaType?.Encoding != null ? new Dictionary<string, OpenApiEncoding>(mediaType.Encoding) : null;
+            Extensions = mediaType?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(mediaType.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiMediaType"/> to Open Api v3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // schema
+            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV3(w));
+
+            // example
+            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
+
+            // examples
+            if (Examples != null && Examples.Any())
+            {
+                SerializeExamples(writer, Examples);
+            }
+
+            // encoding
+            writer.WriteOptionalMap(OpenApiConstants.Encoding, Encoding, (w, e) => e.SerializeAsV3(w));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiMediaType"/> to Open Api v2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Media type does not exist in V2.
+        }
+
+        private static void SerializeExamples(IOpenApiWriter writer, IDictionary<string, OpenApiExample> examples)
+        {
+            /* Special case for writing out empty arrays as valid response examples
+            * Check if there is any example with an empty array as its value and set the flag `hasEmptyArray` to true
+            * */
+            var hasEmptyArray = examples.Values.Any( static example =>
+                example.Value is OpenApiArray arr && arr.Count == 0
+            );
+
+            if (hasEmptyArray)
+            {
+                writer.WritePropertyName(OpenApiConstants.Examples);
+                writer.WriteStartObject();
+                foreach (var kvp in examples.Where(static kvp => kvp.Value.Value is OpenApiArray arr && arr.Count == 0))
+                {
+                    writer.WritePropertyName(kvp.Key);
+                    writer.WriteStartObject();
+                    writer.WriteRequiredObject(OpenApiConstants.Value, kvp.Value.Value, (w, v) => w.WriteAny(v));
+                    writer.WriteEndObject();
+                }
+                writer.WriteEndObject();
+            }
+            else
+            {
+                writer.WriteOptionalMap(OpenApiConstants.Examples, examples, (w, e) => e.SerializeAsV3(w));
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs
new file mode 100644
index 000000000000..7b68d1f05e06
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs
@@ -0,0 +1,100 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// OAuth Flow Object.
+    /// </summary>
+    internal class OpenApiOAuthFlow : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// REQUIRED. The authorization URL to be used for this flow.
+        /// Applies to implicit and authorizationCode OAuthFlow.
+        /// </summary>
+        public Uri AuthorizationUrl { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The token URL to be used for this flow.
+        /// Applies to password, clientCredentials, and authorizationCode OAuthFlow.
+        /// </summary>
+        public Uri TokenUrl { get; set; }
+
+        /// <summary>
+        /// The URL to be used for obtaining refresh tokens.
+        /// </summary>
+        public Uri RefreshUrl { get; set; }
+
+        /// <summary>
+        /// REQUIRED. A map between the scope name and a short description for it.
+        /// </summary>
+        public IDictionary<string, string> Scopes { get; set; } = new Dictionary<string, string>();
+
+        /// <summary>
+        /// Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiOAuthFlow() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiOAuthFlow"/> object
+        /// </summary>
+        public OpenApiOAuthFlow(OpenApiOAuthFlow oAuthFlow)
+        {
+            AuthorizationUrl = oAuthFlow?.AuthorizationUrl != null ? new Uri(oAuthFlow.AuthorizationUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            TokenUrl = oAuthFlow?.TokenUrl != null ? new Uri(oAuthFlow.TokenUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            RefreshUrl = oAuthFlow?.RefreshUrl != null ? new Uri(oAuthFlow.RefreshUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Scopes = oAuthFlow?.Scopes != null ? new Dictionary<string, string>(oAuthFlow.Scopes) : null;
+            Extensions = oAuthFlow?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(oAuthFlow.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlow"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // authorizationUrl
+            writer.WriteProperty(OpenApiConstants.AuthorizationUrl, AuthorizationUrl?.ToString());
+
+            // tokenUrl
+            writer.WriteProperty(OpenApiConstants.TokenUrl, TokenUrl?.ToString());
+
+            // refreshUrl
+            writer.WriteProperty(OpenApiConstants.RefreshUrl, RefreshUrl?.ToString());
+
+            // scopes
+            writer.WriteRequiredMap(OpenApiConstants.Scopes, Scopes, (w, s) => w.WriteValue(s));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlow"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // OAuthFlow object does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs
new file mode 100644
index 000000000000..ef73ad56dd59
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs
@@ -0,0 +1,104 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// OAuth Flows Object.
+    /// </summary>
+    internal class OpenApiOAuthFlows : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// Configuration for the OAuth Implicit flow
+        /// </summary>
+        public OpenApiOAuthFlow Implicit { get; set; }
+
+        /// <summary>
+        /// Configuration for the OAuth Resource Owner Password flow.
+        /// </summary>
+        public OpenApiOAuthFlow Password { get; set; }
+
+        /// <summary>
+        /// Configuration for the OAuth Client Credentials flow.
+        /// </summary>
+        public OpenApiOAuthFlow ClientCredentials { get; set; }
+
+        /// <summary>
+        /// Configuration for the OAuth Authorization Code flow.
+        /// </summary>
+        public OpenApiOAuthFlow AuthorizationCode { get; set; }
+
+        /// <summary>
+        /// Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiOAuthFlows() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiOAuthFlows"/> object
+        /// </summary>
+        /// <param name="oAuthFlows"></param>
+        public OpenApiOAuthFlows(OpenApiOAuthFlows oAuthFlows)
+        {
+            Implicit = oAuthFlows?.Implicit != null ? new(oAuthFlows?.Implicit) : null;
+            Password = oAuthFlows?.Password != null ? new(oAuthFlows?.Password) : null;
+            ClientCredentials = oAuthFlows?.ClientCredentials != null ? new(oAuthFlows?.ClientCredentials) : null;
+            AuthorizationCode = oAuthFlows?.AuthorizationCode != null ? new(oAuthFlows?.AuthorizationCode) : null;
+            Extensions = oAuthFlows?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(oAuthFlows.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlows"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // implicit
+            writer.WriteOptionalObject(OpenApiConstants.Implicit, Implicit, (w, o) => o.SerializeAsV3(w));
+
+            // password
+            writer.WriteOptionalObject(OpenApiConstants.Password, Password, (w, o) => o.SerializeAsV3(w));
+
+            // clientCredentials
+            writer.WriteOptionalObject(
+                OpenApiConstants.ClientCredentials,
+                ClientCredentials,
+                (w, o) => o.SerializeAsV3(w));
+
+            // authorizationCode
+            writer.WriteOptionalObject(
+                OpenApiConstants.AuthorizationCode,
+                AuthorizationCode,
+                (w, o) => o.SerializeAsV3(w));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlows"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // OAuthFlows object does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOperation.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOperation.cs
new file mode 100644
index 000000000000..c0d96c21a197
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiOperation.cs
@@ -0,0 +1,343 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Operation Object.
+    /// </summary>
+    internal class OpenApiOperation : IOpenApiSerializable, IOpenApiExtensible, IOpenApiAnnotatable
+    {
+        /// <summary>
+        /// Default value for <see cref="Deprecated"/>.
+        /// </summary>
+        public const bool DeprecatedDefault = false;
+
+        /// <summary>
+        /// A list of tags for API documentation control.
+        /// Tags can be used for logical grouping of operations by resources or any other qualifier.
+        /// </summary>
+        public IList<OpenApiTag> Tags { get; set; } = new List<OpenApiTag>();
+
+        /// <summary>
+        /// A short summary of what the operation does.
+        /// </summary>
+        public string Summary { get; set; }
+
+        /// <summary>
+        /// A verbose explanation of the operation behavior.
+        /// CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Additional external documentation for this operation.
+        /// </summary>
+        public OpenApiExternalDocs ExternalDocs { get; set; }
+
+        /// <summary>
+        /// Unique string used to identify the operation. The id MUST be unique among all operations described in the API.
+        /// Tools and libraries MAY use the operationId to uniquely identify an operation, therefore,
+        /// it is RECOMMENDED to follow common programming naming conventions.
+        /// </summary>
+        public string OperationId { get; set; }
+
+        /// <summary>
+        /// A list of parameters that are applicable for this operation.
+        /// If a parameter is already defined at the Path Item, the new definition will override it but can never remove it.
+        /// The list MUST NOT include duplicated parameters. A unique parameter is defined by a combination of a name and location.
+        /// The list can use the Reference Object to link to parameters that are defined at the OpenAPI Object's components/parameters.
+        /// </summary>
+        public IList<OpenApiParameter> Parameters { get; set; } = new List<OpenApiParameter>();
+
+        /// <summary>
+        /// The request body applicable for this operation.
+        /// The requestBody is only supported in HTTP methods where the HTTP 1.1 specification RFC7231
+        /// has explicitly defined semantics for request bodies.
+        /// In other cases where the HTTP spec is vague, requestBody SHALL be ignored by consumers.
+        /// </summary>
+        public OpenApiRequestBody RequestBody { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The list of possible responses as they are returned from executing this operation.
+        /// </summary>
+        public OpenApiResponses Responses { get; set; } = new();
+
+        /// <summary>
+        /// A map of possible out-of band callbacks related to the parent operation.
+        /// The key is a unique identifier for the Callback Object.
+        /// Each value in the map is a Callback Object that describes a request
+        /// that may be initiated by the API provider and the expected responses.
+        /// The key value used to identify the callback object is an expression, evaluated at runtime,
+        /// that identifies a URL to use for the callback operation.
+        /// </summary>
+        public IDictionary<string, OpenApiCallback> Callbacks { get; set; } = new Dictionary<string, OpenApiCallback>();
+
+        /// <summary>
+        /// Declares this operation to be deprecated. Consumers SHOULD refrain from usage of the declared operation.
+        /// </summary>
+        public bool Deprecated { get; set; } = DeprecatedDefault;
+
+        /// <summary>
+        /// A declaration of which security mechanisms can be used for this operation.
+        /// The list of values includes alternative security requirement objects that can be used.
+        /// Only one of the security requirement objects need to be satisfied to authorize a request.
+        /// This definition overrides any declared top-level security.
+        /// To remove a top-level security declaration, an empty array can be used.
+        /// </summary>
+        public IList<OpenApiSecurityRequirement> Security { get; set; } = new List<OpenApiSecurityRequirement>();
+
+        /// <summary>
+        /// An alternative server array to service this operation.
+        /// If an alternative server object is specified at the Path Item Object or Root level,
+        /// it will be overridden by this value.
+        /// </summary>
+        public IList<OpenApiServer> Servers { get; set; } = new List<OpenApiServer>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <inheritdoc />
+        public IDictionary<string, object> Annotations { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiOperation() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiOperation"/> object
+        /// </summary>
+        public OpenApiOperation(OpenApiOperation operation)
+        {
+            Tags = operation?.Tags != null ? new List<OpenApiTag>(operation?.Tags) : null;
+            Summary = operation?.Summary ?? Summary;
+            Description = operation?.Description ?? Description;
+            ExternalDocs = operation?.ExternalDocs != null ? new(operation?.ExternalDocs) : null;
+            OperationId = operation?.OperationId ?? OperationId;
+            Parameters = operation?.Parameters != null ? new List<OpenApiParameter>(operation.Parameters) : null;
+            RequestBody = operation?.RequestBody != null ? new(operation?.RequestBody) : null;
+            Responses = operation?.Responses != null ? new(operation?.Responses) : null;
+            Callbacks = operation?.Callbacks != null ? new Dictionary<string, OpenApiCallback>(operation.Callbacks) : null;
+            Deprecated = operation?.Deprecated ?? Deprecated;
+            Security = operation?.Security != null ? new List<OpenApiSecurityRequirement>(operation.Security) : null;
+            Servers = operation?.Servers != null ? new List<OpenApiServer>(operation.Servers) : null;
+            Extensions = operation?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(operation.Extensions) : null;
+            Annotations = operation?.Annotations != null ? new Dictionary<string, object>(operation.Annotations) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOperation"/> to Open Api v3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // tags
+            writer.WriteOptionalCollection(
+                OpenApiConstants.Tags,
+                Tags,
+                (w, t) => t.SerializeAsV3(w));
+
+            // summary
+            writer.WriteProperty(OpenApiConstants.Summary, Summary);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // externalDocs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV3(w));
+
+            // operationId
+            writer.WriteProperty(OpenApiConstants.OperationId, OperationId);
+
+            // parameters
+            writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, (w, p) => p.SerializeAsV3(w));
+
+            // requestBody
+            writer.WriteOptionalObject(OpenApiConstants.RequestBody, RequestBody, (w, r) => r.SerializeAsV3(w));
+
+            // responses
+            writer.WriteRequiredObject(OpenApiConstants.Responses, Responses, (w, r) => r.SerializeAsV3(w));
+
+            // callbacks
+            writer.WriteOptionalMap(OpenApiConstants.Callbacks, Callbacks, (w, c) => c.SerializeAsV3(w));
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            // security
+            writer.WriteOptionalCollection(OpenApiConstants.Security, Security, (w, s) => s.SerializeAsV3(w));
+
+            // servers
+            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => s.SerializeAsV3(w));
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOperation"/> to Open Api v2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // tags
+            writer.WriteOptionalCollection(
+                OpenApiConstants.Tags,
+                Tags,
+                (w, t) => t.SerializeAsV2(w));
+
+            // summary
+            writer.WriteProperty(OpenApiConstants.Summary, Summary);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // externalDocs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV2(w));
+
+            // operationId
+            writer.WriteProperty(OpenApiConstants.OperationId, OperationId);
+
+            List<OpenApiParameter> parameters;
+            if (Parameters == null)
+            {
+                parameters = new();
+            }
+            else
+            {
+                parameters = new(Parameters);
+            }
+
+            if (RequestBody != null)
+            {
+                // consumes
+                var consumes = RequestBody.Content.Keys.Distinct().ToList();
+                if (consumes.Any())
+                {
+                    // This is form data. We need to split the request body into multiple parameters.
+                    if (consumes.Contains("application/x-www-form-urlencoded") ||
+                        consumes.Contains("multipart/form-data"))
+                    {
+                        parameters.AddRange(RequestBody.ConvertToFormDataParameters());
+                    }
+                    else
+                    {
+                        parameters.Add(RequestBody.ConvertToBodyParameter());
+                    }
+                }
+                else if (RequestBody.Reference != null)
+                {
+                    parameters.Add(
+                        new()
+                        {
+                            UnresolvedReference = true,
+                            Reference = RequestBody.Reference
+                        });
+
+                    if (RequestBody.Reference.HostDocument != null)
+                    {
+                        var effectiveRequestBody = RequestBody.GetEffective(RequestBody.Reference.HostDocument);
+                        if (effectiveRequestBody != null)
+                            consumes = effectiveRequestBody.Content.Keys.Distinct().ToList();
+                    }
+                }
+
+                if (consumes.Any())
+                {
+                    writer.WritePropertyName(OpenApiConstants.Consumes);
+                    writer.WriteStartArray();
+                    foreach (var mediaType in consumes)
+                    {
+                        writer.WriteValue(mediaType);
+                    }
+                    writer.WriteEndArray();
+                }
+            }
+
+            if (Responses != null)
+            {
+                var produces = Responses
+                    .Where(static r => r.Value.Content != null)
+                    .SelectMany(static r => r.Value.Content?.Keys)
+                    .Concat(
+                        Responses
+                        .Where(static r => r.Value.Reference is {HostDocument: not null})
+                        .SelectMany(static r => r.Value.GetEffective(r.Value.Reference.HostDocument)?.Content?.Keys))
+                    .Distinct()
+                    .ToList();
+
+                if (produces.Any())
+                {
+                    // produces
+                    writer.WritePropertyName(OpenApiConstants.Produces);
+                    writer.WriteStartArray();
+                    foreach (var mediaType in produces)
+                    {
+                        writer.WriteValue(mediaType);
+                    }
+
+                    writer.WriteEndArray();
+                }
+            }
+
+            // parameters
+            // Use the parameters created locally to include request body if exists.
+            writer.WriteOptionalCollection(OpenApiConstants.Parameters, parameters, (w, p) => p.SerializeAsV2(w));
+
+            // responses
+            writer.WriteRequiredObject(OpenApiConstants.Responses, Responses, (w, r) => r.SerializeAsV2(w));
+
+            // schemes
+            // All schemes in the Servers are extracted, regardless of whether the host matches
+            // the host defined in the outermost Swagger object. This is due to the
+            // inaccessibility of information for that host in the context of an inner object like this Operation.
+            if (Servers != null)
+            {
+                var schemes = Servers.Select(
+                        s =>
+                        {
+                            Uri.TryCreate(s.Url, UriKind.RelativeOrAbsolute, out var url);
+                            return url?.Scheme;
+                        })
+                    .Where(s => s != null)
+                    .Distinct()
+                    .ToList();
+
+                writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => w.WriteValue(s));
+            }
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            // security
+            writer.WriteOptionalCollection(OpenApiConstants.Security, Security, (w, s) => s.SerializeAsV2(w));
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiParameter.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiParameter.cs
new file mode 100644
index 000000000000..d6f5033b6122
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiParameter.cs
@@ -0,0 +1,444 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Parameter Object.
+    /// </summary>
+    internal class OpenApiParameter : IOpenApiReferenceable, IEffective<OpenApiParameter>, IOpenApiExtensible
+    {
+        private bool? _explode;
+        /// <summary>
+        /// The style of the parameter.
+        /// </summary>
+        public ParameterStyle? _style;
+
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The name of the parameter. Parameter names are case sensitive.
+        /// If in is "path", the name field MUST correspond to the associated path segment from the path field in the Paths Object.
+        /// If in is "header" and the name field is "Accept", "Content-Type" or "Authorization", the parameter definition SHALL be ignored.
+        /// For all other cases, the name corresponds to the parameter name used by the in property.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The location of the parameter.
+        /// Possible values are "query", "header", "path" or "cookie".
+        /// </summary>
+        public ParameterLocation? In { get; set; }
+
+        /// <summary>
+        /// A brief description of the parameter. This could contain examples of use.
+        /// CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Determines whether this parameter is mandatory.
+        /// If the parameter location is "path", this property is REQUIRED and its value MUST be true.
+        /// Otherwise, the property MAY be included and its default value is false.
+        /// </summary>
+        public bool Required { get; set; }
+
+        /// <summary>
+        /// Specifies that a parameter is deprecated and SHOULD be transitioned out of usage.
+        /// </summary>
+        public bool Deprecated { get; set; }
+
+        /// <summary>
+        /// Sets the ability to pass empty-valued parameters.
+        /// This is valid only for query parameters and allows sending a parameter with an empty value.
+        /// Default value is false.
+        /// If style is used, and if behavior is n/a (cannot be serialized),
+        /// the value of allowEmptyValue SHALL be ignored.
+        /// </summary>
+        public bool AllowEmptyValue { get; set; }
+
+        /// <summary>
+        /// Describes how the parameter value will be serialized depending on the type of the parameter value.
+        /// Default values (based on value of in): for query - form; for path - simple; for header - simple;
+        /// for cookie - form.
+        /// </summary>
+        public ParameterStyle? Style
+        {
+            get => _style ?? SetDefaultStyleValue();
+            set => _style = value;
+        }
+
+        /// <summary>
+        /// When this is true, parameter values of type array or object generate separate parameters
+        /// for each value of the array or key-value pair of the map.
+        /// For other types of parameters this property has no effect.
+        /// When style is form, the default value is true.
+        /// For all other styles, the default value is false.
+        /// </summary>
+        public bool Explode
+        {
+            get => _explode ?? Style == ParameterStyle.Form;
+            set => _explode = value;
+        }
+
+        /// <summary>
+        /// Determines whether the parameter value SHOULD allow reserved characters,
+        /// as defined by RFC3986 :/?#[]@!$&amp;'()*+,;= to be included without percent-encoding.
+        /// This property only applies to parameters with an in value of query.
+        /// The default value is false.
+        /// </summary>
+        public bool AllowReserved { get; set; }
+
+        /// <summary>
+        /// The schema defining the type used for the parameter.
+        /// </summary>
+        public OpenApiSchema Schema { get; set; }
+
+        /// <summary>
+        /// Examples of the media type. Each example SHOULD contain a value
+        /// in the correct format as specified in the parameter encoding.
+        /// The examples object is mutually exclusive of the example object.
+        /// Furthermore, if referencing a schema which contains an example,
+        /// the examples value SHALL override the example provided by the schema.
+        /// </summary>
+        public IDictionary<string, OpenApiExample> Examples { get; set; } = new Dictionary<string, OpenApiExample>();
+
+        /// <summary>
+        /// Example of the media type. The example SHOULD match the specified schema and encoding properties
+        /// if present. The example object is mutually exclusive of the examples object.
+        /// Furthermore, if referencing a schema which contains an example,
+        /// the example value SHALL override the example provided by the schema.
+        /// To represent examples of media types that cannot naturally be represented in JSON or YAML,
+        /// a string value can contain the example with escaping where necessary.
+        /// </summary>
+        public IOpenApiAny Example { get; set; }
+
+        /// <summary>
+        /// A map containing the representations for the parameter.
+        /// The key is the media type and the value describes it.
+        /// The map MUST only contain one entry.
+        /// For more complex scenarios, the content property can define the media type and schema of the parameter.
+        /// A parameter MUST contain either a schema property, or a content property, but not both.
+        /// When example or examples are provided in conjunction with the schema object,
+        /// the example MUST follow the prescribed serialization strategy for the parameter.
+        /// </summary>
+        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// A parameterless constructor
+        /// </summary>
+        public OpenApiParameter() {}
+
+        /// <summary>
+        /// Initializes a clone instance of <see cref="OpenApiParameter"/> object
+        /// </summary>
+        public OpenApiParameter(OpenApiParameter parameter)
+        {
+            UnresolvedReference = parameter?.UnresolvedReference ?? UnresolvedReference;
+            Reference = parameter?.Reference != null ? new(parameter?.Reference) : null;
+            Name = parameter?.Name ?? Name;
+            In = parameter?.In ?? In;
+            Description = parameter?.Description ?? Description;
+            Required = parameter?.Required ?? Required;
+            Style = parameter?.Style ?? Style;
+            Explode = parameter?.Explode ?? Explode;
+            AllowReserved = parameter?.AllowReserved ?? AllowReserved;
+            Schema = parameter?.Schema != null ? new(parameter?.Schema) : null;
+            Examples = parameter?.Examples != null ? new Dictionary<string, OpenApiExample>(parameter.Examples) : null;
+            Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(parameter?.Example);
+            Content = parameter?.Content != null ? new Dictionary<string, OpenApiMediaType>(parameter.Content) : null;
+            Extensions = parameter?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(parameter.Extensions) : null;
+            AllowEmptyValue = parameter?.AllowEmptyValue ?? AllowEmptyValue;
+            Deprecated = parameter?.Deprecated ?? Deprecated;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiParameter"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = this.GetEffective(Reference.HostDocument);
+                }
+            }
+
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiParameter object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiParameter</returns>
+        public OpenApiParameter GetEffective(OpenApiDocument doc)
+        {
+            return Reference != null ? doc.ResolveReferenceTo<OpenApiParameter>(Reference) : this;
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // in
+            writer.WriteProperty(OpenApiConstants.In, In?.GetDisplayName());
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // required
+            writer.WriteProperty(OpenApiConstants.Required, Required, false);
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            // allowEmptyValue
+            writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
+
+            // style
+            if (_style.HasValue)
+            {
+                writer.WriteProperty(OpenApiConstants.Style, _style.Value.GetDisplayName());
+            }
+
+            // explode
+            writer.WriteProperty(OpenApiConstants.Explode, _explode, _style is ParameterStyle.Form);
+
+            // allowReserved
+            writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
+
+            // schema
+            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV3(w));
+
+            // example
+            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
+
+            // examples
+            writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => e.SerializeAsV3(w));
+
+            // content
+            writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiParameter"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV2(writer);
+                    return;
+                }
+                else
+                {
+                    target = this.GetEffective(Reference.HostDocument);
+                }
+            }
+
+            target.SerializeAsV2WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // in
+            if (this is OpenApiFormDataParameter)
+            {
+                writer.WriteProperty(OpenApiConstants.In, "formData");
+            }
+            else if (this is OpenApiBodyParameter)
+            {
+                writer.WriteProperty(OpenApiConstants.In, "body");
+            }
+            else
+            {
+                writer.WriteProperty(OpenApiConstants.In, In?.GetDisplayName());
+            }
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // required
+            writer.WriteProperty(OpenApiConstants.Required, Required, false);
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            var extensionsClone = new Dictionary<string, IOpenApiExtension>(Extensions);
+
+            // schema
+            if (this is OpenApiBodyParameter)
+            {
+                writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV2(w));
+            }
+            // In V2 parameter's type can't be a reference to a custom object schema or can't be of type object
+            // So in that case map the type as string.
+            else
+            if (Schema?.UnresolvedReference == true || "object".Equals(Schema?.Type, StringComparison.OrdinalIgnoreCase))
+            {
+                writer.WriteProperty(OpenApiConstants.Type, "string");
+            }
+            else
+            {
+                // type
+                // format
+                // items
+                // collectionFormat
+                // default
+                // maximum
+                // exclusiveMaximum
+                // minimum
+                // exclusiveMinimum
+                // maxLength
+                // minLength
+                // pattern
+                // maxItems
+                // minItems
+                // uniqueItems
+                // enum
+                // multipleOf
+                if (Schema != null)
+                {
+                    Schema.WriteAsItemsProperties(writer);
+
+                    if (Schema.Extensions != null)
+                    {
+                        foreach (var key in Schema.Extensions.Keys)
+                        {
+                            // The extension will already have been serialized as part of the call to WriteAsItemsProperties above,
+                            // so remove it from the cloned collection so we don't write it again.
+                            extensionsClone.Remove(key);
+                        }
+                    }
+                }
+
+                // allowEmptyValue
+                writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
+
+                if (this.In == ParameterLocation.Query && "array".Equals(Schema?.Type, StringComparison.OrdinalIgnoreCase))
+                {
+                    if (this.Style == ParameterStyle.Form && this.Explode == true)
+                    {
+                        writer.WriteProperty("collectionFormat", "multi");
+                    }
+                    else if (this.Style == ParameterStyle.PipeDelimited)
+                    {
+                        writer.WriteProperty("collectionFormat", "pipes");
+                    }
+                    else if (this.Style == ParameterStyle.SpaceDelimited)
+                    {
+                        writer.WriteProperty("collectionFormat", "ssv");
+                    }
+                }
+            }
+
+            //examples
+            if (Examples != null && Examples.Any())
+            {
+                writer.WritePropertyName(OpenApiConstants.ExamplesExtension);
+                writer.WriteStartObject();
+
+                foreach (var example in Examples)
+                {
+                    writer.WritePropertyName(example.Key);
+                    example.Value.Serialize(writer, OpenApiSpecVersion.OpenApi2_0);
+                }
+                writer.WriteEndObject();
+            }
+
+            // extensions
+            writer.WriteExtensions(extensionsClone, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+
+        private ParameterStyle? SetDefaultStyleValue()
+        {
+            Style = In switch
+            {
+                ParameterLocation.Query => ParameterStyle.Form,
+                ParameterLocation.Header => ParameterStyle.Simple,
+                ParameterLocation.Path => ParameterStyle.Simple,
+                ParameterLocation.Cookie => ParameterStyle.Form,
+                _ => (ParameterStyle?)ParameterStyle.Simple,
+            };
+
+            return Style;
+        }
+    }
+
+    /// <summary>
+    /// Body parameter class to propagate information needed for <see cref="OpenApiParameter.SerializeAsV2"/>
+    /// </summary>
+    internal class OpenApiBodyParameter : OpenApiParameter
+    {
+    }
+
+    /// <summary>
+    /// Form parameter class to propagate information needed for <see cref="OpenApiParameter.SerializeAsV2"/>
+    /// </summary>
+    internal class OpenApiFormDataParameter : OpenApiParameter
+    {
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiPathItem.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiPathItem.cs
new file mode 100644
index 000000000000..71dd4c8d0efe
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiPathItem.cs
@@ -0,0 +1,230 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Path Item Object: to describe the operations available on a single path.
+    /// </summary>
+    internal class OpenApiPathItem : IOpenApiExtensible, IOpenApiReferenceable, IEffective<OpenApiPathItem>
+    {
+        /// <summary>
+        /// An optional, string summary, intended to apply to all operations in this path.
+        /// </summary>
+        public string Summary { get; set; }
+
+        /// <summary>
+        /// An optional, string description, intended to apply to all operations in this path.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Gets the definition of operations on this path.
+        /// </summary>
+        public IDictionary<OperationType, OpenApiOperation> Operations { get; set; }
+            = new Dictionary<OperationType, OpenApiOperation>();
+
+        /// <summary>
+        /// An alternative server array to service all operations in this path.
+        /// </summary>
+        public IList<OpenApiServer> Servers { get; set; } = new List<OpenApiServer>();
+
+        /// <summary>
+        /// A list of parameters that are applicable for all the operations described under this path.
+        /// These parameters can be overridden at the operation level, but cannot be removed there.
+        /// </summary>
+        public IList<OpenApiParameter> Parameters { get; set; } = new List<OpenApiParameter>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// Add one operation into this path item.
+        /// </summary>
+        /// <param name="operationType">The operation type kind.</param>
+        /// <param name="operation">The operation item.</param>
+        public void AddOperation(OperationType operationType, OpenApiOperation operation)
+        {
+            Operations[operationType] = operation;
+        }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiPathItem() {}
+
+        /// <summary>
+        /// Initializes a clone of an <see cref="OpenApiPathItem"/> object
+        /// </summary>
+        public OpenApiPathItem(OpenApiPathItem pathItem)
+        {
+            Summary = pathItem?.Summary ?? Summary;
+            Description = pathItem?.Description ?? Description;
+            Operations = pathItem?.Operations != null ? new Dictionary<OperationType, OpenApiOperation>(pathItem.Operations) : null;
+            Servers = pathItem?.Servers != null ? new List<OpenApiServer>(pathItem.Servers) : null;
+            Parameters = pathItem?.Parameters != null ? new List<OpenApiParameter>(pathItem.Parameters) : null;
+            Extensions = pathItem?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(pathItem.Extensions) : null;
+            UnresolvedReference = pathItem?.UnresolvedReference ?? UnresolvedReference;
+            Reference = pathItem?.Reference != null ? new(pathItem?.Reference) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiPathItem"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiPathItem object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiPathItem</returns>
+        public OpenApiPathItem GetEffective(OpenApiDocument doc)
+        {
+            if (this.Reference != null)
+            {
+                return doc.ResolveReferenceTo<OpenApiPathItem>(this.Reference);
+            }
+            else
+            {
+                return this;
+            }
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiPathItem"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV2(writer);
+                    return;
+                }
+                else
+                {
+                    target = this.GetEffective(Reference.HostDocument);
+                }
+            }
+
+            target.SerializeAsV2WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Serialize inline PathItem in OpenAPI V2
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // operations except "trace"
+            foreach (var operation in Operations)
+            {
+                if (operation.Key != OperationType.Trace)
+                {
+                    writer.WriteOptionalObject(
+                        operation.Key.GetDisplayName(),
+                        operation.Value,
+                        (w, o) => o.SerializeAsV2(w));
+                }
+            }
+
+            // parameters
+            writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, (w, p) => p.SerializeAsV2(w));
+
+            // write "summary" as extensions
+            writer.WriteProperty(OpenApiConstants.ExtensionFieldNamePrefix + OpenApiConstants.Summary, Summary);
+
+            // write "description" as extensions
+            writer.WriteProperty(
+                OpenApiConstants.ExtensionFieldNamePrefix + OpenApiConstants.Description,
+                Description);
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize inline PathItem in OpenAPI V3
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // summary
+            writer.WriteProperty(OpenApiConstants.Summary, Summary);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // operations
+            foreach (var operation in Operations)
+            {
+                writer.WriteOptionalObject(
+                    operation.Key.GetDisplayName(),
+                    operation.Value,
+                    (w, o) => o.SerializeAsV3(w));
+            }
+
+            // servers
+            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => s.SerializeAsV3(w));
+
+            // parameters
+            writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, (w, p) => p.SerializeAsV3(w));
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiPaths.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiPaths.cs
new file mode 100644
index 000000000000..20dd6adf832e
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiPaths.cs
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Paths object.
+    /// </summary>
+    internal class OpenApiPaths : OpenApiExtensibleDictionary<OpenApiPathItem>
+    {
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiPaths() {}
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiPaths"/> object
+        /// </summary>
+        /// <param name="paths">The <see cref="OpenApiPaths"/>.</param>
+        public OpenApiPaths(OpenApiPaths paths) : base(dictionary: paths) { }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiReference.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiReference.cs
new file mode 100644
index 000000000000..d4431b3995e0
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiReference.cs
@@ -0,0 +1,236 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// A simple object to allow referencing other components in the specification, internally and externally.
+    /// </summary>
+    internal class OpenApiReference : IOpenApiSerializable
+    {
+        /// <summary>
+        /// External resource in the reference.
+        /// It maybe:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </summary>
+        public string ExternalResource { get; set; }
+
+        /// <summary>
+        /// The element type referenced.
+        /// </summary>
+        /// <remarks>This must be present if <see cref="ExternalResource"/> is not present.</remarks>
+        public ReferenceType? Type { get; set; }
+
+        /// <summary>
+        /// The identifier of the reusable component of one particular ReferenceType.
+        /// If ExternalResource is present, this is the path to the component after the '#/'.
+        /// For example, if the reference is 'example.json#/path/to/component', the Id is 'path/to/component'.
+        /// If ExternalResource is not present, this is the name of the component without the reference type name.
+        /// For example, if the reference is '#/components/schemas/componentName', the Id is 'componentName'.
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets a flag indicating whether this reference is an external reference.
+        /// </summary>
+        public bool IsExternal => ExternalResource != null;
+
+        /// <summary>
+        /// Gets a flag indicating whether this reference is a local reference.
+        /// </summary>
+        public bool IsLocal => ExternalResource == null;
+
+        /// <summary>
+        /// Gets a flag indicating whether a file is a valid OpenAPI document or a fragment
+        /// </summary>
+        public bool IsFragrament = false;
+
+        /// <summary>
+        /// The OpenApiDocument that is hosting the OpenApiReference instance. This is used to enable dereferencing the reference.
+        /// </summary>
+        public OpenApiDocument HostDocument { get; set; }
+
+        /// <summary>
+        /// Gets the full reference string for v3.0.
+        /// </summary>
+        public string ReferenceV3
+        {
+            get
+            {
+                if (IsExternal)
+                {
+                    return GetExternalReferenceV3();
+                }
+
+                if (!Type.HasValue)
+                {
+                    throw new ArgumentNullException(nameof(Type));
+                }
+
+                if (Type == ReferenceType.Tag)
+                {
+                    return Id;
+                }
+
+                if (Type == ReferenceType.SecurityScheme)
+                {
+                    return Id;
+                }
+
+                return "#/components/" + Type.Value.GetDisplayName() + "/" + Id;
+            }
+        }
+
+        /// <summary>
+        /// Gets the full reference string for V2.0
+        /// </summary>
+        public string ReferenceV2
+        {
+            get
+            {
+                if (IsExternal)
+                {
+                    return GetExternalReferenceV2();
+                }
+
+                if (!Type.HasValue)
+                {
+                    throw new ArgumentNullException(nameof(Type));
+                }
+
+                if (Type == ReferenceType.Tag)
+                {
+                    return Id;
+                }
+
+                if (Type == ReferenceType.SecurityScheme)
+                {
+                    return Id;
+                }
+
+                return "#/" + GetReferenceTypeNameAsV2(Type.Value) + "/" + Id;
+            }
+        }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiReference() {}
+
+        /// <summary>
+        /// Initializes a copy instance of the <see cref="OpenApiReference"/> object
+        /// </summary>
+        public OpenApiReference(OpenApiReference reference)
+        {
+            ExternalResource = reference?.ExternalResource;
+            Type = reference?.Type;
+            Id = reference?.Id;
+            HostDocument = new(reference?.HostDocument);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiReference"/> to Open Api v3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Type == ReferenceType.Tag)
+            {
+                // Write the string value only
+                writer.WriteValue(ReferenceV3);
+                return;
+            }
+
+            writer.WriteStartObject();
+
+            // $ref
+            writer.WriteProperty(OpenApiConstants.DollarRef, ReferenceV3);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiReference"/> to Open Api v2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Type == ReferenceType.Tag)
+            {
+                // Write the string value only
+                writer.WriteValue(ReferenceV2);
+                return;
+            }
+
+            if (Type == ReferenceType.SecurityScheme)
+            {
+                // Write the string as property name
+                writer.WritePropertyName(ReferenceV2);
+                return;
+            }
+
+            writer.WriteStartObject();
+
+            // $ref
+            writer.WriteProperty(OpenApiConstants.DollarRef, ReferenceV2);
+
+            writer.WriteEndObject();
+        }
+
+        private string GetExternalReferenceV3()
+        {
+            if (Id != null)
+            {
+                if (IsFragrament)
+                {
+                    return ExternalResource + "#" + Id;
+                }
+                
+                if (Type.HasValue)
+                {
+                    return ExternalResource + "#/components/" + Type.Value.GetDisplayName() + "/"+ Id; 
+                }
+            }
+
+            return ExternalResource;
+        }
+
+        private string GetExternalReferenceV2()
+        {
+            if (Id != null)
+            {
+                return ExternalResource + "#/" + GetReferenceTypeNameAsV2((ReferenceType)Type) + "/" + Id;
+            }
+
+            return ExternalResource;
+        }
+
+        private string GetReferenceTypeNameAsV2(ReferenceType type)
+        {
+            return type switch
+            {
+                ReferenceType.Schema => OpenApiConstants.Definitions,
+                ReferenceType.Parameter or ReferenceType.RequestBody => OpenApiConstants.Parameters,
+                ReferenceType.Response => OpenApiConstants.Responses,
+                ReferenceType.Header => OpenApiConstants.Headers,
+                ReferenceType.Tag => OpenApiConstants.Tags,
+                ReferenceType.SecurityScheme => OpenApiConstants.SecurityDefinitions,
+                _ => null,// If the reference type is not supported in V2, simply return null
+                          // to indicate that the reference is not pointing to any object.
+            };
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiRequestBody.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
new file mode 100644
index 000000000000..d841f83d9fef
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
@@ -0,0 +1,192 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Request Body Object
+    /// </summary>
+    internal class OpenApiRequestBody : IOpenApiReferenceable, IOpenApiExtensible, IEffective<OpenApiRequestBody>
+    {
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// A brief description of the request body. This could contain examples of use.
+        /// CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Determines if the request body is required in the request. Defaults to false.
+        /// </summary>
+        public bool Required { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The content of the request body. The key is a media type or media type range and the value describes it.
+        /// For requests that match multiple keys, only the most specific key is applicable. e.g. text/plain overrides text/*
+        /// </summary>
+        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiRequestBody() { }
+
+        /// <summary>
+        /// Initializes a copy instance of an <see cref="OpenApiRequestBody"/> object
+        /// </summary>
+        public OpenApiRequestBody(OpenApiRequestBody requestBody)
+        {
+            UnresolvedReference = requestBody?.UnresolvedReference ?? UnresolvedReference;
+            Reference = requestBody?.Reference != null ? new(requestBody?.Reference) : null;
+            Description = requestBody?.Description ?? Description;
+            Required = requestBody?.Required ?? Required;
+            Content = requestBody?.Content != null ? new Dictionary<string, OpenApiMediaType>(requestBody.Content) : null;
+            Extensions = requestBody?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(requestBody.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiRequestBody"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiRequestBody object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiRequestBody</returns>
+        public OpenApiRequestBody GetEffective(OpenApiDocument doc)
+        {
+            return Reference != null ? doc.ResolveReferenceTo<OpenApiRequestBody>(Reference) : this;
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // content
+            writer.WriteRequiredMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+
+            // required
+            writer.WriteProperty(OpenApiConstants.Required, Required, false);
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiRequestBody"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // RequestBody object does not exist in V2.
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            // RequestBody object does not exist in V2.
+        }
+
+        internal OpenApiBodyParameter ConvertToBodyParameter()
+        {
+            var bodyParameter = new OpenApiBodyParameter
+            {
+                Description = Description,
+                // V2 spec actually allows the body to have custom name.
+                // To allow round-tripping we use an extension to hold the name
+                Name = "body",
+                Schema = Content.Values.FirstOrDefault()?.Schema ?? new OpenApiSchema(),
+                Examples = Content.Values.FirstOrDefault()?.Examples,
+                Required = Required,
+                Extensions = Extensions.ToDictionary(static k => k.Key, static v => v.Value)  // Clone extensions so we can remove the x-bodyName extensions from the output V2 model.
+            };
+            if (bodyParameter.Extensions.ContainsKey(OpenApiConstants.BodyName))
+            {
+                bodyParameter.Name = (Extensions[OpenApiConstants.BodyName] as OpenApiString)?.Value ?? "body";
+                bodyParameter.Extensions.Remove(OpenApiConstants.BodyName);
+            }
+            return bodyParameter;
+        }
+
+        internal IEnumerable<OpenApiFormDataParameter> ConvertToFormDataParameters()
+        {
+            if (Content == null || !Content.Any())
+                yield break;
+
+            foreach (var property in Content.First().Value.Schema.Properties)
+            {
+                var paramSchema = property.Value;
+                if ("string".Equals(paramSchema.Type, StringComparison.OrdinalIgnoreCase)
+                    && ("binary".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)
+                    || "base64".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)))
+                {
+                    paramSchema.Type = "file";
+                    paramSchema.Format = null;
+                }
+                yield return new()
+                {
+                    Description = property.Value.Description,
+                    Name = property.Key,
+                    Schema = property.Value,
+                    Examples = Content.Values.FirstOrDefault()?.Examples,
+                    Required = Content.First().Value.Schema.Required?.Contains(property.Key) ?? false
+                };
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiResponse.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiResponse.cs
new file mode 100644
index 000000000000..cbbfef21d312
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiResponse.cs
@@ -0,0 +1,238 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Response object.
+    /// </summary>
+    internal class OpenApiResponse : IOpenApiReferenceable, IOpenApiExtensible, IEffective<OpenApiResponse>
+    {
+        /// <summary>
+        /// REQUIRED. A short description of the response.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Maps a header name to its definition.
+        /// </summary>
+        public IDictionary<string, OpenApiHeader> Headers { get; set; } = new Dictionary<string, OpenApiHeader>();
+
+        /// <summary>
+        /// A map containing descriptions of potential response payloads.
+        /// The key is a media type or media type range and the value describes it.
+        /// </summary>
+        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+
+        /// <summary>
+        /// A map of operations links that can be followed from the response.
+        /// The key of the map is a short name for the link,
+        /// following the naming constraints of the names for Component Objects.
+        /// </summary>
+        public IDictionary<string, OpenApiLink> Links { get; set; } = new Dictionary<string, OpenApiLink>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference pointer.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiResponse() {}
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiResponse"/> object
+        /// </summary>
+        public OpenApiResponse(OpenApiResponse response)
+        {
+            Description = response?.Description ?? Description;
+            Headers = response?.Headers != null ? new Dictionary<string, OpenApiHeader>(response.Headers) : null;
+            Content = response?.Content != null ? new Dictionary<string, OpenApiMediaType>(response.Content) : null;
+            Links = response?.Links != null ? new Dictionary<string, OpenApiLink>(response.Links) : null;
+            Extensions = response?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(response.Extensions) : null;
+            UnresolvedReference = response?.UnresolvedReference ?? UnresolvedReference;
+            Reference = response?.Reference != null ? new(response?.Reference) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiResponse"/> to Open Api v3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiRequestBody object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiResponse</returns>
+        public OpenApiResponse GetEffective(OpenApiDocument doc)
+        {
+            return Reference != null ? doc.ResolveReferenceTo<OpenApiResponse>(Reference) : this;
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // description
+            writer.WriteRequiredProperty(OpenApiConstants.Description, Description);
+
+            // headers
+            writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.SerializeAsV3(w));
+
+            // content
+            writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+
+            // links
+            writer.WriteOptionalMap(OpenApiConstants.Links, Links, (w, l) => l.SerializeAsV3(w));
+
+            // extension
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiResponse"/> to Open Api v2.0.
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!writer.GetSettings().ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV2(writer);
+                    return;
+                }
+                else
+                {
+                    target = GetEffective(Reference.HostDocument);
+                }
+            }
+            target.SerializeAsV2WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // description
+            writer.WriteRequiredProperty(OpenApiConstants.Description, Description);
+
+            var extensionsClone = new Dictionary<string, IOpenApiExtension>(Extensions);
+
+            if (Content != null)
+            {
+                var mediatype = Content.FirstOrDefault();
+                if (mediatype.Value != null)
+                {
+                    // schema
+                    writer.WriteOptionalObject(
+                        OpenApiConstants.Schema,
+                        mediatype.Value.Schema,
+                        (w, s) => s.SerializeAsV2(w));
+
+                    // examples
+                    if (Content.Values.Any(m => m.Example != null))
+                    {
+                        writer.WritePropertyName(OpenApiConstants.Examples);
+                        writer.WriteStartObject();
+
+                        foreach (var mediaTypePair in Content)
+                        {
+                            if (mediaTypePair.Value.Example != null)
+                            {
+                                writer.WritePropertyName(mediaTypePair.Key);
+                                writer.WriteAny(mediaTypePair.Value.Example);
+                            }
+                        }
+
+                        writer.WriteEndObject();
+                    }
+
+                    if (Content.Values.Any(m => m.Examples != null && m.Examples.Any()))
+                    {
+                        writer.WritePropertyName(OpenApiConstants.ExamplesExtension);
+                        writer.WriteStartObject();
+
+                        foreach (var example in Content
+                            .Where(mediaTypePair => mediaTypePair.Value.Examples != null && mediaTypePair.Value.Examples.Any())
+                            .SelectMany(mediaTypePair => mediaTypePair.Value.Examples))
+                        {
+                            writer.WritePropertyName(example.Key);
+                            example.Value.Serialize(writer, OpenApiSpecVersion.OpenApi2_0);
+                        }
+
+                        writer.WriteEndObject();
+                    }
+
+                    writer.WriteExtensions(mediatype.Value.Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+                    foreach (var key in mediatype.Value.Extensions.Keys)
+                    {
+                        // The extension will already have been serialized as part of the call above,
+                        // so remove it from the cloned collection so we don't write it again.
+                        extensionsClone.Remove(key);
+                    }
+                }
+            }
+
+            // headers
+            writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.SerializeAsV2(w));
+
+            // extension
+            writer.WriteExtensions(extensionsClone, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiResponses.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiResponses.cs
new file mode 100644
index 000000000000..950ad57fed4f
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiResponses.cs
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Responses object.
+    /// </summary>
+    internal class OpenApiResponses : OpenApiExtensibleDictionary<OpenApiResponse>
+    {
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiResponses() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiResponses"/> object
+        /// </summary>
+        /// <param name="openApiResponses">The <see cref="OpenApiResponses"/></param>
+        public OpenApiResponses(OpenApiResponses openApiResponses) : base(dictionary: openApiResponses) {}
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSchema.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSchema.cs
new file mode 100644
index 000000000000..cb43738d08be
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -0,0 +1,777 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Schema Object.
+    /// </summary>
+    internal class OpenApiSchema : IOpenApiReferenceable, IEffective<OpenApiSchema>, IOpenApiExtensible, IOpenApiAnnotatable
+    {
+        /// <summary>
+        /// Follow JSON Schema definition. Short text providing information about the data.
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Value MUST be a string. Multiple types via an array are not supported.
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// While relying on JSON Schema's defined formats,
+        /// the OAS offers a few additional predefined formats.
+        /// </summary>
+        public string Format { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public decimal? Maximum { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public bool? ExclusiveMaximum { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public decimal? Minimum { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public bool? ExclusiveMinimum { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public int? MaxLength { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public int? MinLength { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// This string SHOULD be a valid regular expression, according to the ECMA 262 regular expression dialect
+        /// </summary>
+        public string Pattern { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public decimal? MultipleOf { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// The default value represents what would be assumed by the consumer of the input as the value of the schema if one is not provided.
+        /// Unlike JSON Schema, the value MUST conform to the defined type for the Schema Object defined at the same level.
+        /// For example, if type is string, then default can be "foo" but cannot be 1.
+        /// </summary>
+        public IOpenApiAny Default { get; set; }
+
+        /// <summary>
+        /// Relevant only for Schema "properties" definitions. Declares the property as "read only".
+        /// This means that it MAY be sent as part of a response but SHOULD NOT be sent as part of the request.
+        /// If the property is marked as readOnly being true and is in the required list,
+        /// the required will take effect on the response only.
+        /// A property MUST NOT be marked as both readOnly and writeOnly being true.
+        /// Default value is false.
+        /// </summary>
+        public bool ReadOnly { get; set; }
+
+        /// <summary>
+        /// Relevant only for Schema "properties" definitions. Declares the property as "write only".
+        /// Therefore, it MAY be sent as part of a request but SHOULD NOT be sent as part of the response.
+        /// If the property is marked as writeOnly being true and is in the required list,
+        /// the required will take effect on the request only.
+        /// A property MUST NOT be marked as both readOnly and writeOnly being true.
+        /// Default value is false.
+        /// </summary>
+        public bool WriteOnly { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+        /// </summary>
+        public IList<OpenApiSchema> AllOf { get; set; } = new List<OpenApiSchema>();
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+        /// </summary>
+        public IList<OpenApiSchema> OneOf { get; set; } = new List<OpenApiSchema>();
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+        /// </summary>
+        public IList<OpenApiSchema> AnyOf { get; set; } = new List<OpenApiSchema>();
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+        /// </summary>
+        public OpenApiSchema Not { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public ISet<string> Required { get; set; } = new HashSet<string>();
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Value MUST be an object and not an array. Inline or referenced schema MUST be of a Schema Object
+        /// and not a standard JSON Schema. items MUST be present if the type is array.
+        /// </summary>
+        public OpenApiSchema Items { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public int? MaxItems { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public int? MinItems { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public bool? UniqueItems { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Property definitions MUST be a Schema Object and not a standard JSON Schema (inline or referenced).
+        /// </summary>
+        public IDictionary<string, OpenApiSchema> Properties { get; set; } = new Dictionary<string, OpenApiSchema>();
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public int? MaxProperties { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public int? MinProperties { get; set; }
+
+        /// <summary>
+        /// Indicates if the schema can contain properties other than those defined by the properties map.
+        /// </summary>
+        public bool AdditionalPropertiesAllowed { get; set; } = true;
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Value can be boolean or object. Inline or referenced schema
+        /// MUST be of a Schema Object and not a standard JSON Schema.
+        /// </summary>
+        public OpenApiSchema AdditionalProperties { get; set; }
+
+        /// <summary>
+        /// Adds support for polymorphism. The discriminator is an object name that is used to differentiate
+        /// between other schemas which may satisfy the payload description.
+        /// </summary>
+        public OpenApiDiscriminator Discriminator { get; set; }
+
+        /// <summary>
+        /// A free-form property to include an example of an instance for this schema.
+        /// To represent examples that cannot be naturally represented in JSON or YAML,
+        /// a string value can be used to contain the example with escaping where necessary.
+        /// </summary>
+        public IOpenApiAny Example { get; set; }
+
+        /// <summary>
+        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// </summary>
+        public IList<IOpenApiAny> Enum { get; set; } = new List<IOpenApiAny>();
+
+        /// <summary>
+        /// Allows sending a null value for the defined schema. Default value is false.
+        /// </summary>
+        public bool Nullable { get; set; }
+
+        /// <summary>
+        /// Additional external documentation for this schema.
+        /// </summary>
+        public OpenApiExternalDocs ExternalDocs { get; set; }
+
+        /// <summary>
+        /// Specifies that a schema is deprecated and SHOULD be transitioned out of usage.
+        /// Default value is false.
+        /// </summary>
+        public bool Deprecated { get; set; }
+
+        /// <summary>
+        /// This MAY be used only on properties schemas. It has no effect on root schemas.
+        /// Adds additional metadata to describe the XML representation of this property.
+        /// </summary>
+        public OpenApiXml Xml { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Indicates object is a placeholder reference to an actual object and does not contain valid data.
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, object> Annotations { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiSchema() {}
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiSchema"/> object
+        /// </summary>
+        public OpenApiSchema(OpenApiSchema schema)
+        {
+            Title = schema?.Title ?? Title;
+            Type = schema?.Type ?? Type;
+            Format = schema?.Format ?? Format;
+            Description = schema?.Description ?? Description;
+            Maximum = schema?.Maximum ?? Maximum;
+            ExclusiveMaximum = schema?.ExclusiveMaximum ?? ExclusiveMaximum;
+            Minimum = schema?.Minimum ?? Minimum;
+            ExclusiveMinimum = schema?.ExclusiveMinimum ?? ExclusiveMinimum;
+            MaxLength = schema?.MaxLength ?? MaxLength;
+            MinLength = schema?.MinLength ?? MinLength;
+            Pattern = schema?.Pattern ?? Pattern;
+            MultipleOf = schema?.MultipleOf ?? MultipleOf;
+            Default = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(schema?.Default);
+            ReadOnly = schema?.ReadOnly ?? ReadOnly;
+            WriteOnly = schema?.WriteOnly ?? WriteOnly;
+            AllOf = schema?.AllOf != null ? new List<OpenApiSchema>(schema.AllOf) : null;
+            OneOf = schema?.OneOf != null ? new List<OpenApiSchema>(schema.OneOf) : null;
+            AnyOf = schema?.AnyOf != null ? new List<OpenApiSchema>(schema.AnyOf) : null;
+            Not = schema?.Not != null ? new(schema?.Not) : null;
+            Required = schema?.Required != null ? new HashSet<string>(schema.Required) : null;
+            Items = schema?.Items != null ? new(schema?.Items) : null;
+            MaxItems = schema?.MaxItems ?? MaxItems;
+            MinItems = schema?.MinItems ?? MinItems;
+            UniqueItems = schema?.UniqueItems ?? UniqueItems;
+            Properties = schema?.Properties != null ? new Dictionary<string, OpenApiSchema>(schema.Properties) : null;
+            MaxProperties = schema?.MaxProperties ?? MaxProperties;
+            MinProperties = schema?.MinProperties ?? MinProperties;
+            AdditionalPropertiesAllowed = schema?.AdditionalPropertiesAllowed ?? AdditionalPropertiesAllowed;
+            AdditionalProperties = schema?.AdditionalProperties != null ? new(schema?.AdditionalProperties) : null;
+            Discriminator = schema?.Discriminator != null ? new(schema?.Discriminator) : null;
+            Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(schema?.Example);
+            Enum = schema?.Enum != null ? new List<IOpenApiAny>(schema.Enum) : null;
+            Nullable = schema?.Nullable ?? Nullable;
+            ExternalDocs = schema?.ExternalDocs != null ? new(schema?.ExternalDocs) : null;
+            Deprecated = schema?.Deprecated ?? Deprecated;
+            Xml = schema?.Xml != null ? new(schema?.Xml) : null;
+            Extensions = schema?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(schema.Extensions) : null;
+            UnresolvedReference = schema?.UnresolvedReference ?? UnresolvedReference;
+            Reference = schema?.Reference != null ? new(schema?.Reference) : null;
+            Annotations = schema?.Annotations != null ? new Dictionary<string, object>(schema?.Annotations) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSchema"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            var settings = writer.GetSettings();
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!settings.ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+                else
+                {
+                    if (Reference.IsExternal)  // Temporary until v2
+                    {
+                        target = this.GetEffective(Reference.HostDocument);
+                    }
+                }
+
+                // If Loop is detected then just Serialize as a reference.
+                if (!settings.LoopDetector.PushLoop<OpenApiSchema>(this))
+                {
+                    settings.LoopDetector.SaveLoop(this);
+                    Reference.SerializeAsV3(writer);
+                    return;
+                }
+            }
+
+            target.SerializeAsV3WithoutReference(writer);
+
+            if (Reference != null)
+            {
+                settings.LoopDetector.PopLoop<OpenApiSchema>();
+            }
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // title
+            writer.WriteProperty(OpenApiConstants.Title, Title);
+
+            // multipleOf
+            writer.WriteProperty(OpenApiConstants.MultipleOf, MultipleOf);
+
+            // maximum
+            writer.WriteProperty(OpenApiConstants.Maximum, Maximum);
+
+            // exclusiveMaximum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+
+            // minimum
+            writer.WriteProperty(OpenApiConstants.Minimum, Minimum);
+
+            // exclusiveMinimum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+
+            // maxLength
+            writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
+
+            // minLength
+            writer.WriteProperty(OpenApiConstants.MinLength, MinLength);
+
+            // pattern
+            writer.WriteProperty(OpenApiConstants.Pattern, Pattern);
+
+            // maxItems
+            writer.WriteProperty(OpenApiConstants.MaxItems, MaxItems);
+
+            // minItems
+            writer.WriteProperty(OpenApiConstants.MinItems, MinItems);
+
+            // uniqueItems
+            writer.WriteProperty(OpenApiConstants.UniqueItems, UniqueItems);
+
+            // maxProperties
+            writer.WriteProperty(OpenApiConstants.MaxProperties, MaxProperties);
+
+            // minProperties
+            writer.WriteProperty(OpenApiConstants.MinProperties, MinProperties);
+
+            // required
+            writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) => w.WriteValue(s));
+
+            // enum
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (nodeWriter, s) => nodeWriter.WriteAny(s));
+
+            // type
+            writer.WriteProperty(OpenApiConstants.Type, Type);
+
+            // allOf
+            writer.WriteOptionalCollection(OpenApiConstants.AllOf, AllOf, (w, s) => s.SerializeAsV3(w));
+
+            // anyOf
+            writer.WriteOptionalCollection(OpenApiConstants.AnyOf, AnyOf, (w, s) => s.SerializeAsV3(w));
+
+            // oneOf
+            writer.WriteOptionalCollection(OpenApiConstants.OneOf, OneOf, (w, s) => s.SerializeAsV3(w));
+
+            // not
+            writer.WriteOptionalObject(OpenApiConstants.Not, Not, (w, s) => s.SerializeAsV3(w));
+
+            // items
+            writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV3(w));
+
+            // properties
+            writer.WriteOptionalMap(OpenApiConstants.Properties, Properties, (w, s) => s.SerializeAsV3(w));
+
+            // additionalProperties
+            if (AdditionalPropertiesAllowed)
+            {
+                writer.WriteOptionalObject(
+                    OpenApiConstants.AdditionalProperties,
+                    AdditionalProperties,
+                    (w, s) => s.SerializeAsV3(w));
+            }
+            else
+            {
+                writer.WriteProperty(OpenApiConstants.AdditionalProperties, AdditionalPropertiesAllowed);
+            }
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // format
+            writer.WriteProperty(OpenApiConstants.Format, Format);
+
+            // default
+            writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
+
+            // nullable
+            writer.WriteProperty(OpenApiConstants.Nullable, Nullable, false);
+
+            // discriminator
+            writer.WriteOptionalObject(OpenApiConstants.Discriminator, Discriminator, (w, s) => s.SerializeAsV3(w));
+
+            // readOnly
+            writer.WriteProperty(OpenApiConstants.ReadOnly, ReadOnly, false);
+
+            // writeOnly
+            writer.WriteProperty(OpenApiConstants.WriteOnly, WriteOnly, false);
+
+            // xml
+            writer.WriteOptionalObject(OpenApiConstants.Xml, Xml, (w, s) => s.SerializeAsV2(w));
+
+            // externalDocs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, s) => s.SerializeAsV3(w));
+
+            // example
+            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSchema"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            SerializeAsV2(writer: writer, parentRequiredProperties: new HashSet<string>(), propertyName: null);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            SerializeAsV2WithoutReference(
+                writer: writer,
+                parentRequiredProperties: new HashSet<string>(),
+                propertyName: null);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSchema"/> to Open Api v2.0 and handles not marking the provided property
+        /// as readonly if its included in the provided list of required properties of parent schema.
+        /// </summary>
+        /// <param name="writer">The open api writer.</param>
+        /// <param name="parentRequiredProperties">The list of required properties in parent schema.</param>
+        /// <param name="propertyName">The property name that will be serialized.</param>
+        internal void SerializeAsV2(
+            IOpenApiWriter writer,
+            ISet<string> parentRequiredProperties,
+            string propertyName)
+        {
+            var settings = writer.GetSettings();
+            var target = this;
+
+            if (Reference != null)
+            {
+                if (!settings.ShouldInlineReference(Reference))
+                {
+                    Reference.SerializeAsV2(writer);
+                    return;
+                }
+                else
+                {
+                    if (Reference.IsExternal)  // Temporary until v2
+                    {
+                        target = this.GetEffective(Reference.HostDocument);
+                    }
+                }
+
+                // If Loop is detected then just Serialize as a reference.
+                if (!settings.LoopDetector.PushLoop<OpenApiSchema>(this))
+                {
+                    settings.LoopDetector.SaveLoop(this);
+                    Reference.SerializeAsV2(writer);
+                    return;
+                }
+            }
+
+            if (parentRequiredProperties == null)
+            {
+                parentRequiredProperties = new HashSet<string>();
+            }
+
+            target.SerializeAsV2WithoutReference(writer, parentRequiredProperties, propertyName);
+
+            if (Reference != null)
+            {
+                settings.LoopDetector.PopLoop<OpenApiSchema>();
+            }
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference and handles not marking the provided property
+        /// as readonly if its included in the provided list of required properties of parent schema.
+        /// </summary>
+        /// <param name="writer">The open api writer.</param>
+        /// <param name="parentRequiredProperties">The list of required properties in parent schema.</param>
+        /// <param name="propertyName">The property name that will be serialized.</param>
+        internal void SerializeAsV2WithoutReference(
+            IOpenApiWriter writer,
+            ISet<string> parentRequiredProperties,
+            string propertyName)
+        {
+            writer.WriteStartObject();
+            WriteAsSchemaProperties(writer, parentRequiredProperties, propertyName);
+            writer.WriteEndObject();
+        }
+
+        internal void WriteAsItemsProperties(IOpenApiWriter writer)
+        {
+            // type
+            writer.WriteProperty(OpenApiConstants.Type, Type);
+
+            // format
+            if (string.IsNullOrEmpty(Format))
+            {
+                Format = AllOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    AnyOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    OneOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format;
+            }
+
+            writer.WriteProperty(OpenApiConstants.Format, Format);
+
+            // items
+            writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV2(w));
+
+            // collectionFormat
+            // We need information from style in parameter to populate this.
+            // The best effort we can make is to pull this information from the first parameter
+            // that leverages this schema. However, that in itself may not be as simple
+            // as the schema directly under parameter might be referencing one in the Components,
+            // so we will need to do a full scan of the object before we can write the value for
+            // this property. This is not supported yet, so we will skip this property at the moment.
+
+            // default
+            writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
+
+            // maximum
+            writer.WriteProperty(OpenApiConstants.Maximum, Maximum);
+
+            // exclusiveMaximum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+
+            // minimum
+            writer.WriteProperty(OpenApiConstants.Minimum, Minimum);
+
+            // exclusiveMinimum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+
+            // maxLength
+            writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
+
+            // minLength
+            writer.WriteProperty(OpenApiConstants.MinLength, MinLength);
+
+            // pattern
+            writer.WriteProperty(OpenApiConstants.Pattern, Pattern);
+
+            // maxItems
+            writer.WriteProperty(OpenApiConstants.MaxItems, MaxItems);
+
+            // minItems
+            writer.WriteProperty(OpenApiConstants.MinItems, MinItems);
+
+            // enum
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteAny(s));
+
+            // multipleOf
+            writer.WriteProperty(OpenApiConstants.MultipleOf, MultipleOf);
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+        }
+
+        internal void WriteAsSchemaProperties(
+            IOpenApiWriter writer,
+            ISet<string> parentRequiredProperties,
+            string propertyName)
+        {
+            // format
+            if (string.IsNullOrEmpty(Format))
+            {
+                Format = AllOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    AnyOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    OneOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format;
+            }
+
+            writer.WriteProperty(OpenApiConstants.Format, Format);
+
+            // title
+            writer.WriteProperty(OpenApiConstants.Title, Title);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // default
+            writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
+
+            // multipleOf
+            writer.WriteProperty(OpenApiConstants.MultipleOf, MultipleOf);
+
+            // maximum
+            writer.WriteProperty(OpenApiConstants.Maximum, Maximum);
+
+            // exclusiveMaximum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+
+            // minimum
+            writer.WriteProperty(OpenApiConstants.Minimum, Minimum);
+
+            // exclusiveMinimum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+
+            // maxLength
+            writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
+
+            // minLength
+            writer.WriteProperty(OpenApiConstants.MinLength, MinLength);
+
+            // pattern
+            writer.WriteProperty(OpenApiConstants.Pattern, Pattern);
+
+            // maxItems
+            writer.WriteProperty(OpenApiConstants.MaxItems, MaxItems);
+
+            // minItems
+            writer.WriteProperty(OpenApiConstants.MinItems, MinItems);
+
+            // uniqueItems
+            writer.WriteProperty(OpenApiConstants.UniqueItems, UniqueItems);
+
+            // maxProperties
+            writer.WriteProperty(OpenApiConstants.MaxProperties, MaxProperties);
+
+            // minProperties
+            writer.WriteProperty(OpenApiConstants.MinProperties, MinProperties);
+
+            // required
+            writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) => w.WriteValue(s));
+
+            // enum
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteAny(s));
+
+            // type
+            writer.WriteProperty(OpenApiConstants.Type, Type);
+
+            // items
+            writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV2(w));
+
+            // allOf
+            writer.WriteOptionalCollection(OpenApiConstants.AllOf, AllOf, (w, s) => s.SerializeAsV2(w));
+
+            // If there isn't already an allOf, and the schema contains a oneOf or anyOf write an allOf with the first
+            // schema in the list as an attempt to guess at a graceful downgrade situation.
+            if (AllOf == null || AllOf.Count == 0)
+            {
+                // anyOf (Not Supported in V2)  - Write the first schema only as an allOf.
+                writer.WriteOptionalCollection(OpenApiConstants.AllOf, AnyOf?.Take(1), (w, s) => s.SerializeAsV2(w));
+
+                if (AnyOf == null || AnyOf.Count == 0)
+                {
+                    // oneOf (Not Supported in V2) - Write the first schema only as an allOf.
+                    writer.WriteOptionalCollection(OpenApiConstants.AllOf, OneOf?.Take(1), (w, s) => s.SerializeAsV2(w));
+                }
+            }
+
+            // properties
+            writer.WriteOptionalMap(OpenApiConstants.Properties, Properties, (w, key, s) =>
+                s.SerializeAsV2(w, Required, key));
+
+            // additionalProperties
+            if (AdditionalPropertiesAllowed)
+            {
+                writer.WriteOptionalObject(
+                    OpenApiConstants.AdditionalProperties,
+                    AdditionalProperties,
+                    (w, s) => s.SerializeAsV2(w));
+            }
+            else
+            {
+                writer.WriteProperty(OpenApiConstants.AdditionalProperties, AdditionalPropertiesAllowed);
+            }
+
+            // discriminator
+            writer.WriteProperty(OpenApiConstants.Discriminator, Discriminator?.PropertyName);
+
+            // readOnly
+            // In V2 schema if a property is part of required properties of parent schema,
+            // it cannot be marked as readonly.
+            if (!parentRequiredProperties.Contains(propertyName))
+            {
+                writer.WriteProperty(name: OpenApiConstants.ReadOnly, value: ReadOnly, defaultValue: false);
+            }
+
+            // xml
+            writer.WriteOptionalObject(OpenApiConstants.Xml, Xml, (w, s) => s.SerializeAsV2(w));
+
+            // externalDocs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, s) => s.SerializeAsV2(w));
+
+            // example
+            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+        }
+
+        /// <summary>
+        /// Returns an effective OpenApiSchema object based on the presence of a $ref
+        /// </summary>
+        /// <param name="doc">The host OpenApiDocument that contains the reference.</param>
+        /// <returns>OpenApiSchema</returns>
+        public OpenApiSchema GetEffective(OpenApiDocument doc)
+        {
+            if (this.Reference != null)
+            {
+                return doc.ResolveReferenceTo<OpenApiSchema>(this.Reference);
+            } else
+            {
+                return this;
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs
new file mode 100644
index 000000000000..62756d7e9e24
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs
@@ -0,0 +1,148 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Security Requirement Object.
+    /// Each name MUST correspond to a security scheme which is declared in
+    /// the Security Schemes under the Components Object.
+    /// If the security scheme is of type "oauth2" or "openIdConnect",
+    /// then the value is a list of scope names required for the execution.
+    /// For other security scheme types, the array MUST be empty.
+    /// </summary>
+    internal class OpenApiSecurityRequirement : Dictionary<OpenApiSecurityScheme, IList<string>>,
+        IOpenApiSerializable
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiSecurityRequirement"/> class.
+        /// This constructor ensures that only Reference.Id is considered when two dictionary keys
+        /// of type <see cref="OpenApiSecurityScheme"/> are compared.
+        /// </summary>
+        public OpenApiSecurityRequirement()
+            : base(new OpenApiSecuritySchemeReferenceEqualityComparer())
+        {
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            foreach (var securitySchemeAndScopesValuePair in this)
+            {
+                var securityScheme = securitySchemeAndScopesValuePair.Key;
+                var scopes = securitySchemeAndScopesValuePair.Value;
+
+                if (securityScheme.Reference == null)
+                {
+                    // Reaching this point means the reference to a specific OpenApiSecurityScheme fails.
+                    // We are not able to serialize this SecurityScheme/Scopes key value pair since we do not know what
+                    // string to output.
+                    continue;
+                }
+
+                writer.WritePropertyName(securityScheme.Reference.ReferenceV3);
+
+                writer.WriteStartArray();
+
+                foreach (var scope in scopes)
+                {
+                    writer.WriteValue(scope);
+                }
+
+                writer.WriteEndArray();
+            }
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            foreach (var securitySchemeAndScopesValuePair in this)
+            {
+                var securityScheme = securitySchemeAndScopesValuePair.Key;
+                var scopes = securitySchemeAndScopesValuePair.Value;
+
+                if (securityScheme.Reference == null)
+                {
+                    // Reaching this point means the reference to a specific OpenApiSecurityScheme fails.
+                    // We are not able to serialize this SecurityScheme/Scopes key value pair since we do not know what
+                    // string to output.
+                    continue;
+                }
+
+                securityScheme.SerializeAsV2(writer);
+
+                writer.WriteStartArray();
+
+                foreach (var scope in scopes)
+                {
+                    writer.WriteValue(scope);
+                }
+
+                writer.WriteEndArray();
+            }
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Comparer for OpenApiSecurityScheme that only considers the Id in the Reference
+        /// (i.e. the string that will actually be displayed in the written document)
+        /// </summary>
+        private class OpenApiSecuritySchemeReferenceEqualityComparer : IEqualityComparer<OpenApiSecurityScheme>
+        {
+            /// <summary>
+            /// Determines whether the specified objects are equal.
+            /// </summary>
+            public bool Equals(OpenApiSecurityScheme x, OpenApiSecurityScheme y)
+            {
+                if (x == null && y == null)
+                {
+                    return true;
+                }
+
+                if (x == null || y == null)
+                {
+                    return false;
+                }
+
+                if (x.Reference == null || y.Reference == null)
+                {
+                    return false;
+                }
+
+                return x.Reference.Id == y.Reference.Id;
+            }
+
+            /// <summary>
+            /// Returns a hash code for the specified object.
+            /// </summary>
+            public int GetHashCode(OpenApiSecurityScheme obj)
+            {
+                return obj?.Reference?.Id == null ? 0 : obj.Reference.Id.GetHashCode();
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
new file mode 100644
index 000000000000..21a4dd7524fe
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
@@ -0,0 +1,283 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Security Scheme Object.
+    /// </summary>
+    internal class OpenApiSecurityScheme : IOpenApiReferenceable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// REQUIRED. The type of the security scheme. Valid values are "apiKey", "http", "oauth2", "openIdConnect".
+        /// </summary>
+        public SecuritySchemeType Type { get; set; }
+
+        /// <summary>
+        /// A short description for security scheme. CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The name of the header, query or cookie parameter to be used.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The location of the API key. Valid values are "query", "header" or "cookie".
+        /// </summary>
+        public ParameterLocation In { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The name of the HTTP Authorization scheme to be used
+        /// in the Authorization header as defined in RFC7235.
+        /// </summary>
+        public string Scheme { get; set; }
+
+        /// <summary>
+        /// A hint to the client to identify how the bearer token is formatted.
+        /// Bearer tokens are usually generated by an authorization server,
+        /// so this information is primarily for documentation purposes.
+        /// </summary>
+        public string BearerFormat { get; set; }
+
+        /// <summary>
+        /// REQUIRED. An object containing configuration information for the flow types supported.
+        /// </summary>
+        public OpenApiOAuthFlows Flows { get; set; }
+
+        /// <summary>
+        /// REQUIRED. OpenId Connect URL to discover OAuth2 configuration values.
+        /// </summary>
+        public Uri OpenIdConnectUrl { get; set; }
+
+        /// <summary>
+        /// Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiSecurityScheme() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiSecurityScheme"/> object
+        /// </summary>
+        public OpenApiSecurityScheme(OpenApiSecurityScheme securityScheme)
+        {
+            Type = securityScheme?.Type ?? Type;
+            Description = securityScheme?.Description ?? Description;
+            Name = securityScheme?.Name ?? Name;
+            In = securityScheme?.In ?? In;
+            Scheme = securityScheme?.Scheme ?? Scheme;
+            BearerFormat = securityScheme?.BearerFormat ?? BearerFormat;
+            Flows = securityScheme?.Flows != null ? new(securityScheme?.Flows) : null;
+            OpenIdConnectUrl = securityScheme?.OpenIdConnectUrl != null ? new Uri(securityScheme.OpenIdConnectUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Extensions = securityScheme?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(securityScheme.Extensions) : null;
+            UnresolvedReference = securityScheme?.UnresolvedReference ?? UnresolvedReference;
+            Reference = securityScheme?.Reference != null ? new(securityScheme?.Reference) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSecurityScheme"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Reference != null)
+            {
+                Reference.SerializeAsV3(writer);
+                return;
+            }
+
+            SerializeAsV3WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // type
+            writer.WriteProperty(OpenApiConstants.Type, Type.GetDisplayName());
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            switch (Type)
+            {
+                case SecuritySchemeType.ApiKey:
+                    // These properties apply to apiKey type only.
+                    // name
+                    // in
+                    writer.WriteProperty(OpenApiConstants.Name, Name);
+                    writer.WriteProperty(OpenApiConstants.In, In.GetDisplayName());
+                    break;
+                case SecuritySchemeType.Http:
+                    // These properties apply to http type only.
+                    // scheme
+                    // bearerFormat
+                    writer.WriteProperty(OpenApiConstants.Scheme, Scheme);
+                    writer.WriteProperty(OpenApiConstants.BearerFormat, BearerFormat);
+                    break;
+                case SecuritySchemeType.OAuth2:
+                    // This property apply to oauth2 type only.
+                    // flows
+                    writer.WriteOptionalObject(OpenApiConstants.Flows, Flows, (w, o) => o.SerializeAsV3(w));
+                    break;
+                case SecuritySchemeType.OpenIdConnect:
+                    // This property apply to openIdConnect only.
+                    // openIdConnectUrl
+                    writer.WriteProperty(OpenApiConstants.OpenIdConnectUrl, OpenIdConnectUrl?.ToString());
+                    break;
+            }
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSecurityScheme"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Reference != null)
+            {
+                Reference.SerializeAsV2(writer);
+                return;
+            }
+
+            SerializeAsV2WithoutReference(writer);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            if (Type == SecuritySchemeType.Http && Scheme != OpenApiConstants.Basic)
+            {
+                // Bail because V2 does not support non-basic HTTP scheme
+                writer.WriteStartObject();
+                writer.WriteEndObject();
+                return;
+            }
+
+            if (Type == SecuritySchemeType.OpenIdConnect)
+            {
+                // Bail because V2 does not support OpenIdConnect
+                writer.WriteStartObject();
+                writer.WriteEndObject();
+                return;
+            }
+
+            writer.WriteStartObject();
+
+            // type
+            switch (Type)
+            {
+                case SecuritySchemeType.Http:
+                    writer.WriteProperty(OpenApiConstants.Type, OpenApiConstants.Basic);
+                    break;
+
+                case SecuritySchemeType.OAuth2:
+                    // These properties apply to oauth2 type only.
+                    // flow
+                    // authorizationUrl
+                    // tokenUrl
+                    // scopes
+                    writer.WriteProperty(OpenApiConstants.Type, Type.GetDisplayName());
+                    WriteOAuthFlowForV2(writer, Flows);
+                    break;
+
+                case SecuritySchemeType.ApiKey:
+                    // These properties apply to apiKey type only.
+                    // name
+                    // in
+                    writer.WriteProperty(OpenApiConstants.Type, Type.GetDisplayName());
+                    writer.WriteProperty(OpenApiConstants.Name, Name);
+                    writer.WriteProperty(OpenApiConstants.In, In.GetDisplayName());
+                    break;
+            }
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Arbitrarily chooses one <see cref="OpenApiOAuthFlow"/> object from the <see cref="OpenApiOAuthFlows"/>
+        /// to populate in V2 security scheme.
+        /// </summary>
+        private static void WriteOAuthFlowForV2(IOpenApiWriter writer, OpenApiOAuthFlows flows)
+        {
+            if (flows != null)
+            {
+                if (flows.Implicit != null)
+                {
+                    WriteOAuthFlowForV2(writer, OpenApiConstants.Implicit, flows.Implicit);
+                }
+                else if (flows.Password != null)
+                {
+                    WriteOAuthFlowForV2(writer, OpenApiConstants.Password, flows.Password);
+                }
+                else if (flows.ClientCredentials != null)
+                {
+                    WriteOAuthFlowForV2(writer, OpenApiConstants.Application, flows.ClientCredentials);
+                }
+                else if (flows.AuthorizationCode != null)
+                {
+                    WriteOAuthFlowForV2(writer, OpenApiConstants.AccessCode, flows.AuthorizationCode);
+                }
+            }
+        }
+
+        private static void WriteOAuthFlowForV2(IOpenApiWriter writer, string flowValue, OpenApiOAuthFlow flow)
+        {
+            // flow
+            writer.WriteProperty(OpenApiConstants.Flow, flowValue);
+
+            // authorizationUrl
+            writer.WriteProperty(OpenApiConstants.AuthorizationUrl, flow.AuthorizationUrl?.ToString());
+
+            // tokenUrl
+            writer.WriteProperty(OpenApiConstants.TokenUrl, flow.TokenUrl?.ToString());
+
+            // scopes
+            writer.WriteOptionalMap(OpenApiConstants.Scopes, flow.Scopes, (w, s) => w.WriteValue(s));
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiServer.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiServer.cs
new file mode 100644
index 000000000000..72f973363f31
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiServer.cs
@@ -0,0 +1,91 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Server Object: an object representing a Server.
+    /// </summary>
+    internal class OpenApiServer : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// An optional string describing the host designated by the URL. CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// REQUIRED. A URL to the target host. This URL supports Server Variables and MAY be relative,
+        /// to indicate that the host location is relative to the location where the OpenAPI document is being served.
+        /// Variable substitutions will be made when a variable is named in {brackets}.
+        /// </summary>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// A map between a variable name and its value. The value is used for substitution in the server's URL template.
+        /// </summary>
+        public IDictionary<string, OpenApiServerVariable> Variables { get; set; } =
+            new Dictionary<string, OpenApiServerVariable>();
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiServer() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiServer"/> object
+        /// </summary>
+        public OpenApiServer(OpenApiServer server)
+        {
+            Description = server?.Description ?? Description;
+            Url = server?.Url ?? Url;
+            Variables = server?.Variables != null ? new Dictionary<string, OpenApiServerVariable>(server.Variables) : null;
+            Extensions = server?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(server.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServer"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // url
+            writer.WriteProperty(OpenApiConstants.Url, Url);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // variables
+            writer.WriteOptionalMap(OpenApiConstants.Variables, Variables, (w, v) => v.SerializeAsV3(w));
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServer"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Server object does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiServerVariable.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiServerVariable.cs
new file mode 100644
index 000000000000..fc7d68a1d1b3
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiServerVariable.cs
@@ -0,0 +1,92 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Server Variable Object.
+    /// </summary>
+    internal class OpenApiServerVariable : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// An optional description for the server variable. CommonMark syntax MAY be used for rich text representation.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// REQUIRED. The default value to use for substitution, and to send, if an alternate value is not supplied.
+        /// Unlike the Schema Object's default, this value MUST be provided by the consumer.
+        /// </summary>
+        public string Default { get; set; }
+
+        /// <summary>
+        /// An enumeration of string values to be used if the substitution options are from a limited set.
+        /// </summary>
+        /// <remarks>
+        /// If the server variable in the OpenAPI document has no <code>enum</code> member, this property will be null.
+        /// </remarks>
+        public List<string> Enum { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiServerVariable() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiServerVariable"/> object
+        /// </summary>
+        public OpenApiServerVariable(OpenApiServerVariable serverVariable)
+        {
+            Description = serverVariable?.Description;
+            Default = serverVariable?.Default;
+            Enum = serverVariable?.Enum != null ? new(serverVariable?.Enum) : serverVariable?.Enum;
+            Extensions = serverVariable?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(serverVariable?.Extensions) : serverVariable?.Extensions;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServerVariable"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // default
+            writer.WriteProperty(OpenApiConstants.Default, Default);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // enums
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteValue(s));
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServerVariable"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // ServerVariable does not exist in V2.
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiTag.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiTag.cs
new file mode 100644
index 000000000000..3b5e6f11a5e1
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiTag.cs
@@ -0,0 +1,144 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Tag Object.
+    /// </summary>
+    internal class OpenApiTag : IOpenApiReferenceable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// The name of the tag.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// A short description for the tag.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Additional external documentation for this tag.
+        /// </summary>
+        public OpenApiExternalDocs ExternalDocs { get; set; }
+
+        /// <summary>
+        /// This object MAY be extended with Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        public bool UnresolvedReference { get; set; }
+
+        /// <summary>
+        /// Reference.
+        /// </summary>
+        public OpenApiReference Reference { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiTag() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiTag"/> object
+        /// </summary>
+        public OpenApiTag(OpenApiTag tag)
+        {
+            Name = tag?.Name ?? Name;
+            Description = tag?.Description ?? Description;
+            ExternalDocs = tag?.ExternalDocs != null ? new(tag?.ExternalDocs) : null;
+            Extensions = tag?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(tag.Extensions) : null;
+            UnresolvedReference = tag?.UnresolvedReference ?? UnresolvedReference;
+            Reference = tag?.Reference != null ? new(tag?.Reference) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiTag"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Reference != null)
+            {
+                Reference.SerializeAsV3(writer);
+                return;
+            }
+
+            writer.WriteValue(Name);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V3 document without using reference.
+        /// </summary>
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // external docs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV3(w));
+
+            // extensions.
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiTag"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Reference != null)
+            {
+                Reference.SerializeAsV2(writer);
+                return;
+            }
+
+            writer.WriteValue(Name);
+        }
+
+        /// <summary>
+        /// Serialize to OpenAPI V2 document without using reference.
+        /// </summary>
+        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        {
+            writer.WriteStartObject();
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            // external docs
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV2(w));
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiXml.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiXml.cs
new file mode 100644
index 000000000000..efab3890eb56
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OpenApiXml.cs
@@ -0,0 +1,112 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// XML Object.
+    /// </summary>
+    internal class OpenApiXml : IOpenApiSerializable, IOpenApiExtensible
+    {
+        /// <summary>
+        /// Replaces the name of the element/attribute used for the described schema property.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The URI of the namespace definition. Value MUST be in the form of an absolute URI.
+        /// </summary>
+        public Uri Namespace { get; set; }
+
+        /// <summary>
+        /// The prefix to be used for the name
+        /// </summary>
+        public string Prefix { get; set; }
+
+        /// <summary>
+        /// Declares whether the property definition translates to an attribute instead of an element.
+        /// Default value is false.
+        /// </summary>
+        public bool Attribute { get; set; }
+
+        /// <summary>
+        /// Signifies whether the array is wrapped.
+        /// Default value is false.
+        /// </summary>
+        public bool Wrapped { get; set; }
+
+        /// <summary>
+        /// Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiXml() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiXml"/> object
+        /// </summary>
+        public OpenApiXml(OpenApiXml xml)
+        {
+            Name = xml?.Name ?? Name;
+            Namespace = xml?.Namespace ?? Namespace;
+            Prefix = xml?.Prefix ?? Prefix;
+            Attribute = xml?.Attribute ?? Attribute;
+            Wrapped = xml?.Wrapped ?? Wrapped;
+            Extensions = xml?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(xml.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiXml"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiXml"/> to Open Api v2.0
+        /// </summary>
+        public void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Write(writer, OpenApiSpecVersion.OpenApi2_0);
+        }
+
+        private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteStartObject();
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // namespace
+            writer.WriteProperty(OpenApiConstants.Namespace, Namespace?.AbsoluteUri);
+
+            // prefix
+            writer.WriteProperty(OpenApiConstants.Prefix, Prefix);
+
+            // attribute
+            writer.WriteProperty(OpenApiConstants.Attribute, Attribute, false);
+
+            // wrapped
+            writer.WriteProperty(OpenApiConstants.Wrapped, Wrapped, false);
+
+            // extensions
+            writer.WriteExtensions(Extensions, specVersion);
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OperationType.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OperationType.cs
new file mode 100644
index 000000000000..0672a4016bbe
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/OperationType.cs
@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// Operation type.
+    /// </summary>
+    internal enum OperationType
+    {
+        /// <summary>
+        /// A definition of a GET operation on this path.
+        /// </summary>
+        [Display("get")] Get,
+
+        /// <summary>
+        /// A definition of a PUT operation on this path.
+        /// </summary>
+        [Display("put")] Put,
+
+        /// <summary>
+        /// A definition of a POST operation on this path.
+        /// </summary>
+        [Display("post")] Post,
+
+        /// <summary>
+        /// A definition of a DELETE operation on this path.
+        /// </summary>
+        [Display("delete")] Delete,
+
+        /// <summary>
+        /// A definition of a OPTIONS operation on this path.
+        /// </summary>
+        [Display("options")] Options,
+
+        /// <summary>
+        /// A definition of a HEAD operation on this path.
+        /// </summary>
+        [Display("head")] Head,
+
+        /// <summary>
+        /// A definition of a PATCH operation on this path.
+        /// </summary>
+        [Display("patch")] Patch,
+
+        /// <summary>
+        /// A definition of a TRACE operation on this path.
+        /// </summary>
+        [Display("trace")] Trace
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ParameterLocation.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ParameterLocation.cs
new file mode 100644
index 000000000000..4d517a1e35db
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ParameterLocation.cs
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// The location of the parameter.
+    /// </summary>
+    internal enum ParameterLocation
+    {
+        /// <summary>
+        /// Parameters that are appended to the URL.
+        /// </summary>
+        [Display("query")] Query,
+
+        /// <summary>
+        /// Custom headers that are expected as part of the request.
+        /// </summary>
+        [Display("header")] Header,
+
+        /// <summary>
+        /// Used together with Path Templating,
+        /// where the parameter value is actually part of the operation's URL
+        /// </summary>
+        [Display("path")] Path,
+
+        /// <summary>
+        /// Used to pass a specific cookie value to the API.
+        /// </summary>
+        [Display("cookie")] Cookie
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ParameterStyle.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ParameterStyle.cs
new file mode 100644
index 000000000000..e9cd35c670c7
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ParameterStyle.cs
@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// The style of the parameter.
+    /// </summary>
+    internal enum ParameterStyle
+    {
+        /// <summary>
+        /// Path-style parameters.
+        /// </summary>
+        [Display("matrix")] Matrix,
+
+        /// <summary>
+        /// Label style parameters.
+        /// </summary>
+        [Display("label")] Label,
+
+        /// <summary>
+        /// Form style parameters.
+        /// </summary>
+        [Display("form")] Form,
+
+        /// <summary>
+        /// Simple style parameters.
+        /// </summary>
+        [Display("simple")] Simple,
+
+        /// <summary>
+        /// Space separated array values.
+        /// </summary>
+        [Display("spaceDelimited")] SpaceDelimited,
+
+        /// <summary>
+        /// Pipe separated array values.
+        /// </summary>
+        [Display("pipeDelimited")] PipeDelimited,
+
+        /// <summary>
+        /// Provides a simple way of rendering nested objects using form parameters.
+        /// </summary>
+        [Display("deepObject")] DeepObject
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ReferenceType.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ReferenceType.cs
new file mode 100644
index 000000000000..e7f63fa9655b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/ReferenceType.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// The reference type.
+    /// </summary>
+    internal enum ReferenceType
+    {
+        /// <summary>
+        /// Schema item.
+        /// </summary>
+        [Display("schemas")] Schema,
+
+        /// <summary>
+        /// Responses item.
+        /// </summary>
+        [Display("responses")] Response,
+
+        /// <summary>
+        /// Parameters item.
+        /// </summary>
+        [Display("parameters")] Parameter,
+
+        /// <summary>
+        /// Examples item.
+        /// </summary>
+        [Display("examples")] Example,
+
+        /// <summary>
+        /// RequestBodies item.
+        /// </summary>
+        [Display("requestBodies")] RequestBody,
+
+        /// <summary>
+        /// Headers item.
+        /// </summary>
+        [Display("headers")] Header,
+
+        /// <summary>
+        /// SecuritySchemes item.
+        /// </summary>
+        [Display("securitySchemes")] SecurityScheme,
+
+        /// <summary>
+        /// Links item.
+        /// </summary>
+        [Display("links")] Link,
+
+        /// <summary>
+        /// Callbacks item.
+        /// </summary>
+        [Display("callbacks")] Callback,
+
+        /// <summary>
+        /// Tags item.
+        /// </summary>
+        [Display("tags")] Tag,
+
+        /// <summary>
+        /// Paths item.
+        /// </summary>
+        [Display("paths")] Path
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs
new file mode 100644
index 000000000000..c713f9f2665b
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs
@@ -0,0 +1,87 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Expressions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Writers;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// The wrapper either for <see cref="IOpenApiAny"/> or <see cref="RuntimeExpression"/>
+    /// </summary>
+    internal class RuntimeExpressionAnyWrapper : IOpenApiElement
+    {
+        private IOpenApiAny _any;
+        private RuntimeExpression _expression;
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public RuntimeExpressionAnyWrapper() {}
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="RuntimeExpressionAnyWrapper"/> object
+        /// </summary>
+        public RuntimeExpressionAnyWrapper(RuntimeExpressionAnyWrapper runtimeExpressionAnyWrapper)
+        {
+            Any = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(runtimeExpressionAnyWrapper?.Any);
+            Expression = runtimeExpressionAnyWrapper?.Expression;
+        }
+
+        /// <summary>
+        /// Gets/Sets the <see cref="IOpenApiAny"/>
+        /// </summary>
+        public IOpenApiAny Any
+        {
+            get
+            {
+                return _any;
+            }
+            set
+            {
+                _expression = null;
+                _any = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Set the <see cref="RuntimeExpression"/>
+        /// </summary>
+        public RuntimeExpression Expression
+        {
+            get
+            {
+                return _expression;
+            }
+            set
+            {
+                _any = null;
+                _expression = value;
+            }
+        }
+
+        /// <summary>
+        /// Write <see cref="RuntimeExpressionAnyWrapper"/>
+        /// </summary>
+        public void WriteValue(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (_any != null)
+            {
+                writer.WriteAny(_any);
+            }
+            else if (_expression != null)
+            {
+                writer.WriteValue(_expression.Expression);
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/SecuritySchemeType.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/SecuritySchemeType.cs
new file mode 100644
index 000000000000..2cea9aec6676
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Models/SecuritySchemeType.cs
@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Attributes;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Models
+{
+    /// <summary>
+    /// The type of the security scheme
+    /// </summary>
+    internal enum SecuritySchemeType
+    {
+        /// <summary>
+        /// Use API key
+        /// </summary>
+        [Display("apiKey")] ApiKey,
+
+        /// <summary>
+        /// Use basic or bearer token authorization header.
+        /// </summary>
+        [Display("http")] Http,
+
+        /// <summary>
+        /// Use OAuth2
+        /// </summary>
+        [Display("oauth2")] OAuth2,
+
+        /// <summary>
+        /// Use OAuth2 with OpenId Connect URL to discover OAuth2 configuration value.
+        /// </summary>
+        [Display("openIdConnect")] OpenIdConnect
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/OpenApiFormat.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/OpenApiFormat.cs
new file mode 100644
index 000000000000..b7e6ba05ca60
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/OpenApiFormat.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi
+{
+    /// <summary>
+    /// Represents the Open Api document format.
+    /// </summary>
+    internal enum OpenApiFormat
+    {
+        /// <summary>
+        /// JSON format.
+        /// </summary>
+        Json,
+
+        /// <summary>
+        /// Yaml format.
+        /// </summary>
+        Yaml
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/OpenApiSpecVersion.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/OpenApiSpecVersion.cs
new file mode 100644
index 000000000000..a4704f872253
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/OpenApiSpecVersion.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi
+{
+    /// <summary>
+    /// Represents versions of OpenAPI specification.
+    /// </summary>
+    internal enum OpenApiSpecVersion
+    {
+        /// <summary>
+        /// Represents OpenAPI V2.0 spec
+        /// </summary>
+        OpenApi2_0,
+
+        /// <summary>
+        /// Represents all patches of OpenAPI V3.0 spec (e.g. 3.0.0, 3.0.1)
+        /// </summary>
+        OpenApi3_0
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Properties/SRResource.Designer.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Properties/SRResource.Designer.cs
new file mode 100644
index 000000000000..2d448485e913
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Properties/SRResource.Designer.cs
@@ -0,0 +1,410 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class SRResource {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal SRResource() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.OpenApi.Properties.SRResource", typeof(SRResource).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to There must be an active scope for name &apos;{0}&apos; to be written..
+        /// </summary>
+        internal static string ActiveScopeNeededForPropertyNameWriting {
+            get {
+                return ResourceManager.GetString("ActiveScopeNeededForPropertyNameWriting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The argument &apos;{0}&apos; is null, empty or consists only of white-space..
+        /// </summary>
+        internal static string ArgumentNullOrWhiteSpace {
+            get {
+                return ResourceManager.GetString("ArgumentNullOrWhiteSpace", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to http://localhost/.
+        /// </summary>
+        internal static string DefaultBaseUri {
+            get {
+                return ResourceManager.GetString("DefaultBaseUri", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The filed name &apos;{0}&apos; of extension doesn&apos;t begin with x-..
+        /// </summary>
+        internal static string ExtensionFieldNameMustBeginWithXDash {
+            get {
+                return ResourceManager.GetString("ExtensionFieldNameMustBeginWithXDash", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Indentation level cannot be lower than 0..
+        /// </summary>
+        internal static string IndentationLevelInvalid {
+            get {
+                return ResourceManager.GetString("IndentationLevelInvalid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The input item should be in type of &apos;{0}&apos;..
+        /// </summary>
+        internal static string InputItemShouldBeType {
+            get {
+                return ResourceManager.GetString("InputItemShouldBeType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid Reference identifier &apos;{0}&apos;..
+        /// </summary>
+        internal static string InvalidReferenceId {
+            get {
+                return ResourceManager.GetString("InvalidReferenceId", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid Reference Type &apos;{0}&apos;..
+        /// </summary>
+        internal static string InvalidReferenceType {
+            get {
+                return ResourceManager.GetString("InvalidReferenceType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Local reference must have type specified..
+        /// </summary>
+        internal static string LocalReferenceRequiresType {
+            get {
+                return ResourceManager.GetString("LocalReferenceRequiresType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The active scope must be an object scope for property name &apos;{0}&apos; to be written..
+        /// </summary>
+        internal static string ObjectScopeNeededForPropertyNameWriting {
+            get {
+                return ResourceManager.GetString("ObjectScopeNeededForPropertyNameWriting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred while processing the Open API document..
+        /// </summary>
+        internal static string OpenApiExceptionGenericError {
+            get {
+                return ResourceManager.GetString("OpenApiExceptionGenericError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The given OpenAPI format &apos;{0}&apos; is not supported..
+        /// </summary>
+        internal static string OpenApiFormatNotSupported {
+            get {
+                return ResourceManager.GetString("OpenApiFormatNotSupported", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The object element name &apos;{0}&apos; is required..
+        /// </summary>
+        internal static string OpenApiObjectElementIsRequired {
+            get {
+                return ResourceManager.GetString("OpenApiObjectElementIsRequired", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The OpenApi element &apos;{0}&apos; is already marked as reference object..
+        /// </summary>
+        internal static string OpenApiObjectMarkAsReference {
+            get {
+                return ResourceManager.GetString("OpenApiObjectMarkAsReference", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to If the parameter location is &quot;path&quot;, this property is REQUIRED and its value MUST be true.
+        /// </summary>
+        internal static string OpenApiParameterRequiredPropertyMandatory {
+            get {
+                return ResourceManager.GetString("OpenApiParameterRequiredPropertyMandatory", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The given OpenAPI specification version &apos;{0}&apos; is not supported..
+        /// </summary>
+        internal static string OpenApiSpecVersionNotSupported {
+            get {
+                return ResourceManager.GetString("OpenApiSpecVersionNotSupported", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The type &apos;{0}&apos; is not supported in Open API document..
+        /// </summary>
+        internal static string OpenApiUnsupportedValueType {
+            get {
+                return ResourceManager.GetString("OpenApiUnsupportedValueType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred while writing the Open API document..
+        /// </summary>
+        internal static string OpenApiWriterExceptionGenericError {
+            get {
+                return ResourceManager.GetString("OpenApiWriterExceptionGenericError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid server variable &apos;{0}&apos;. A value was not provided and no default value was provided..
+        /// </summary>
+        internal static string ParseServerUrlDefaultValueNotAvailable {
+            get {
+                return ResourceManager.GetString("ParseServerUrlDefaultValueNotAvailable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not a valid value for variable &apos;{1}&apos;. If an enum is provided, it should not be empty and the value provided should exist in the enum.
+        /// </summary>
+        internal static string ParseServerUrlValueNotValid {
+            get {
+                return ResourceManager.GetString("ParseServerUrlValueNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The given primitive type &apos;{0}&apos; is not supported..
+        /// </summary>
+        internal static string PrimitiveTypeNotSupported {
+            get {
+                return ResourceManager.GetString("PrimitiveTypeNotSupported", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The reference string &apos;{0}&apos; has invalid format..
+        /// </summary>
+        internal static string ReferenceHasInvalidFormat {
+            get {
+                return ResourceManager.GetString("ReferenceHasInvalidFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remote reference not supported..
+        /// </summary>
+        internal static string RemoteReferenceNotSupported {
+            get {
+                return ResourceManager.GetString("RemoteReferenceNotSupported", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The runtime expression &apos;{0}&apos; has invalid format..
+        /// </summary>
+        internal static string RuntimeExpressionHasInvalidFormat {
+            get {
+                return ResourceManager.GetString("RuntimeExpressionHasInvalidFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The runtime expression &apos;{0}&apos; should start with &apos;$&apos;.
+        /// </summary>
+        internal static string RuntimeExpressionMustBeginWithDollar {
+            get {
+                return ResourceManager.GetString("RuntimeExpressionMustBeginWithDollar", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scope must be present to end..
+        /// </summary>
+        internal static string ScopeMustBePresentToEnd {
+            get {
+                return ResourceManager.GetString("ScopeMustBePresentToEnd", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The scope to end is expected to be of type &apos;{0}&apos; but it is of type &apos;{0}&apos;..
+        /// </summary>
+        internal static string ScopeToEndHasIncorrectType {
+            get {
+                return ResourceManager.GetString("ScopeToEndHasIncorrectType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The source expression &apos;{0}&apos; has invalid format..
+        /// </summary>
+        internal static string SourceExpressionHasInvalidFormat {
+            get {
+                return ResourceManager.GetString("SourceExpressionHasInvalidFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Can not find visitor type registered for type &apos;{0}&apos;..
+        /// </summary>
+        internal static string UnknownVisitorType {
+            get {
+                return ResourceManager.GetString("UnknownVisitorType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The key &apos;{0}&apos; in &apos;{1}&apos; of components MUST match the regular expression &apos;{2}&apos;..
+        /// </summary>
+        internal static string Validation_ComponentsKeyMustMatchRegularExpr {
+            get {
+                return ResourceManager.GetString("Validation_ComponentsKeyMustMatchRegularExpr", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The extension name &apos;{0}&apos; in &apos;{1}&apos; object MUST begin with &apos;x-&apos;..
+        /// </summary>
+        internal static string Validation_ExtensionNameMustBeginWithXDash {
+            get {
+                return ResourceManager.GetString("Validation_ExtensionNameMustBeginWithXDash", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The field &apos;{0}&apos; in &apos;{1}&apos; object is REQUIRED..
+        /// </summary>
+        internal static string Validation_FieldIsRequired {
+            get {
+                return ResourceManager.GetString("Validation_FieldIsRequired", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The path item name &apos;{0}&apos; MUST begin with a slash..
+        /// </summary>
+        internal static string Validation_PathItemMustBeginWithSlash {
+            get {
+                return ResourceManager.GetString("Validation_PathItemMustBeginWithSlash", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The path signature &apos;{0}&apos; MUST be unique..
+        /// </summary>
+        internal static string Validation_PathSignatureMustBeUnique {
+            get {
+                return ResourceManager.GetString("Validation_PathSignatureMustBeUnique", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The same rule cannot be in the same rule set twice..
+        /// </summary>
+        internal static string Validation_RuleAddTwice {
+            get {
+                return ResourceManager.GetString("Validation_RuleAddTwice", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Schema {0} must contain property specified in the discriminator {1} in the required field list..
+        /// </summary>
+        internal static string Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator {
+            get {
+                return ResourceManager.GetString("Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminat" +
+                        "or", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The string &apos;{0}&apos; MUST be in the format of an email address..
+        /// </summary>
+        internal static string Validation_StringMustBeEmailAddress {
+            get {
+                return ResourceManager.GetString("Validation_StringMustBeEmailAddress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to OpenAPI document must be added to an OpenApiWorkspace to be able to resolve external references..
+        /// </summary>
+        internal static string WorkspaceRequredForExternalReferenceResolution {
+            get {
+                return ResourceManager.GetString("WorkspaceRequredForExternalReferenceResolution", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Properties/SRResource.resx b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Properties/SRResource.resx
new file mode 100644
index 000000000000..0effa1d4440f
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Properties/SRResource.resx
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ActiveScopeNeededForPropertyNameWriting" xml:space="preserve">
+    <value>There must be an active scope for name '{0}' to be written.</value>
+  </data>
+  <data name="ArgumentNullOrWhiteSpace" xml:space="preserve">
+    <value>The argument '{0}' is null, empty or consists only of white-space.</value>
+  </data>
+  <data name="DefaultBaseUri" xml:space="preserve">
+    <value>http://localhost/</value>
+  </data>
+  <data name="ExtensionFieldNameMustBeginWithXDash" xml:space="preserve">
+    <value>The filed name '{0}' of extension doesn't begin with x-.</value>
+  </data>
+  <data name="IndentationLevelInvalid" xml:space="preserve">
+    <value>Indentation level cannot be lower than 0.</value>
+  </data>
+  <data name="InputItemShouldBeType" xml:space="preserve">
+    <value>The input item should be in type of '{0}'.</value>
+  </data>
+  <data name="InvalidReferenceId" xml:space="preserve">
+    <value>Invalid Reference identifier '{0}'.</value>
+  </data>
+  <data name="InvalidReferenceType" xml:space="preserve">
+    <value>Invalid Reference Type '{0}'.</value>
+  </data>
+  <data name="LocalReferenceRequiresType" xml:space="preserve">
+    <value>Local reference must have type specified.</value>
+  </data>
+  <data name="ObjectScopeNeededForPropertyNameWriting" xml:space="preserve">
+    <value>The active scope must be an object scope for property name '{0}' to be written.</value>
+  </data>
+  <data name="OpenApiExceptionGenericError" xml:space="preserve">
+    <value>An error occurred while processing the Open API document.</value>
+  </data>
+  <data name="OpenApiFormatNotSupported" xml:space="preserve">
+    <value>The given OpenAPI format '{0}' is not supported.</value>
+  </data>
+  <data name="OpenApiObjectElementIsRequired" xml:space="preserve">
+    <value>The object element name '{0}' is required.</value>
+  </data>
+  <data name="OpenApiObjectMarkAsReference" xml:space="preserve">
+    <value>The OpenApi element '{0}' is already marked as reference object.</value>
+  </data>
+  <data name="OpenApiParameterRequiredPropertyMandatory" xml:space="preserve">
+    <value>If the parameter location is "path", this property is REQUIRED and its value MUST be true</value>
+  </data>
+  <data name="OpenApiSpecVersionNotSupported" xml:space="preserve">
+    <value>The given OpenAPI specification version '{0}' is not supported.</value>
+  </data>
+  <data name="OpenApiUnsupportedValueType" xml:space="preserve">
+    <value>The type '{0}' is not supported in Open API document.</value>
+  </data>
+  <data name="OpenApiWriterExceptionGenericError" xml:space="preserve">
+    <value>An error occurred while writing the Open API document.</value>
+  </data>
+  <data name="PrimitiveTypeNotSupported" xml:space="preserve">
+    <value>The given primitive type '{0}' is not supported.</value>
+  </data>
+  <data name="ReferenceHasInvalidFormat" xml:space="preserve">
+    <value>The reference string '{0}' has invalid format.</value>
+  </data>
+  <data name="RemoteReferenceNotSupported" xml:space="preserve">
+    <value>Remote reference not supported.</value>
+  </data>
+  <data name="RuntimeExpressionHasInvalidFormat" xml:space="preserve">
+    <value>The runtime expression '{0}' has invalid format.</value>
+  </data>
+  <data name="RuntimeExpressionMustBeginWithDollar" xml:space="preserve">
+    <value>The runtime expression '{0}' should start with '$'</value>
+  </data>
+  <data name="ScopeMustBePresentToEnd" xml:space="preserve">
+    <value>Scope must be present to end.</value>
+  </data>
+  <data name="ScopeToEndHasIncorrectType" xml:space="preserve">
+    <value>The scope to end is expected to be of type '{0}' but it is of type '{0}'.</value>
+  </data>
+  <data name="SourceExpressionHasInvalidFormat" xml:space="preserve">
+    <value>The source expression '{0}' has invalid format.</value>
+  </data>
+  <data name="UnknownVisitorType" xml:space="preserve">
+    <value>Can not find visitor type registered for type '{0}'.</value>
+  </data>
+  <data name="Validation_ComponentsKeyMustMatchRegularExpr" xml:space="preserve">
+    <value>The key '{0}' in '{1}' of components MUST match the regular expression '{2}'.</value>
+  </data>
+  <data name="Validation_ExtensionNameMustBeginWithXDash" xml:space="preserve">
+    <value>The extension name '{0}' in '{1}' object MUST begin with 'x-'.</value>
+  </data>
+  <data name="Validation_FieldIsRequired" xml:space="preserve">
+    <value>The field '{0}' in '{1}' object is REQUIRED.</value>
+  </data>
+  <data name="Validation_PathItemMustBeginWithSlash" xml:space="preserve">
+    <value>The path item name '{0}' MUST begin with a slash.</value>
+  </data>
+  <data name="Validation_PathSignatureMustBeUnique" xml:space="preserve">
+    <value>The path signature '{0}' MUST be unique.</value>
+  </data>
+  <data name="Validation_RuleAddTwice" xml:space="preserve">
+    <value>The same rule cannot be in the same rule set twice.</value>
+  </data>
+  <data name="Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator" xml:space="preserve">
+    <value>Schema {0} must contain property specified in the discriminator {1} in the required field list.</value>
+  </data>
+  <data name="Validation_StringMustBeEmailAddress" xml:space="preserve">
+    <value>The string '{0}' MUST be in the format of an email address.</value>
+  </data>
+  <data name="WorkspaceRequredForExternalReferenceResolution" xml:space="preserve">
+    <value>OpenAPI document must be added to an OpenApiWorkspace to be able to resolve external references.</value>
+  </data>
+  <data name="ParseServerUrlDefaultValueNotAvailable" xml:space="preserve">
+      <value>Invalid server variable '{0}'. A value was not provided and no default value was provided.</value>
+  </data>
+  <data name="ParseServerUrlValueNotValid" xml:space="preserve">
+      <value>Value '{0}' is not a valid value for variable '{1}'. If an enum is provided, it should not be empty and the value provided should exist in the enum</value>
+  </data>
+</root>
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/LoopDetector.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/LoopDetector.cs
new file mode 100644
index 000000000000..2e680a986479
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/LoopDetector.cs
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+using System;
+using System.Collections.Generic;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Services
+{
+    internal class LoopDetector
+    {
+        private readonly Dictionary<Type, Stack<object>> _loopStacks = new();
+
+        /// <summary>
+        /// Maintain history of traversals to avoid stack overflows from cycles
+        /// </summary>
+        /// <param name="key">Identifier used for current context.</param>
+        /// <returns>If method returns false a loop was detected and the key is not added.</returns>
+        public bool PushLoop<T>(T key)
+        {
+            if (!_loopStacks.TryGetValue(typeof(T), out var stack))
+            {
+                stack = new();
+                _loopStacks.Add(typeof(T), stack);
+            }
+
+            if (!stack.Contains(key))
+            {
+                stack.Push(key);
+                return true;
+            }
+            else
+            {
+                return false;  // Loop detected
+            }
+        }
+
+        /// <summary>
+        /// Exit from the context in cycle detection
+        /// </summary>
+        public void PopLoop<T>()
+        {
+            if (_loopStacks[typeof(T)].Count > 0)
+            {
+                _loopStacks[typeof(T)].Pop();
+            }
+        }
+
+        public void SaveLoop<T>(T loop)
+        {
+            if (!Loops.ContainsKey(typeof(T)))
+            {
+                Loops[typeof(T)] = new();
+            }
+            Loops[typeof(T)].Add(loop);
+        }
+
+        /// <summary>
+        /// List of Loops detected
+        /// </summary>
+        public Dictionary<Type, List<object>> Loops { get; } = new();
+
+        /// <summary>
+        /// Reset loop tracking stack
+        /// </summary>
+        internal void ClearLoop<T>()
+        {
+            _loopStacks[typeof(T)].Clear();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiReferenceError.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiReferenceError.cs
new file mode 100644
index 000000000000..af4d8a261bc0
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiReferenceError.cs
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Services
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    internal class OpenApiReferenceError : OpenApiError
+    {
+        private OpenApiReference _reference;
+        /// <summary>
+        /// Initializes the <see cref="OpenApiError"/> class using the message and pointer from the given exception.
+        /// </summary>
+        public OpenApiReferenceError(OpenApiException exception) : base(exception.Pointer, exception.Message)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="reference"></param>
+        /// <param name="message"></param>
+        public OpenApiReferenceError(OpenApiReference reference, string message) : base("", message)
+        {
+            _reference = reference;
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs
new file mode 100644
index 000000000000..5992db7f0950
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs
@@ -0,0 +1,318 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Services
+{
+    /// <summary>
+    /// This class is used to walk an OpenApiDocument and convert unresolved references to references to populated objects
+    /// </summary>
+    internal class OpenApiReferenceResolver : OpenApiVisitorBase
+    {
+        private OpenApiDocument _currentDocument;
+        private readonly bool _resolveRemoteReferences;
+        private List<OpenApiError> _errors = new();
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiReferenceResolver"/> class.
+        /// </summary>
+        public OpenApiReferenceResolver(OpenApiDocument currentDocument, bool resolveRemoteReferences = true)
+        {
+            _currentDocument = currentDocument;
+            _resolveRemoteReferences = resolveRemoteReferences;
+        }
+
+        /// <summary>
+        /// List of errors related to the OpenApiDocument
+        /// </summary>
+        public IEnumerable<OpenApiError> Errors => _errors;
+
+        /// <summary>
+        /// Resolves tags in OpenApiDocument
+        /// </summary>
+        /// <param name="doc"></param>
+        public override void Visit(OpenApiDocument doc)
+        {
+            if (doc.Tags != null)
+            {
+                ResolveTags(doc.Tags);
+            }
+        }
+
+        /// <summary>
+        /// Visits the referenceable element in the host document
+        /// </summary>
+        /// <param name="referenceable">The referenceable element in the doc.</param>
+        public override void Visit(IOpenApiReferenceable referenceable)
+        {
+            if (referenceable.Reference != null)
+            {
+                referenceable.Reference.HostDocument = _currentDocument;
+            }
+        }
+
+        /// <summary>
+        /// Resolves references in components
+        /// </summary>
+        /// <param name="components"></param>
+        public override void Visit(OpenApiComponents components)
+        {
+            ResolveMap(components.Parameters);
+            ResolveMap(components.RequestBodies);
+            ResolveMap(components.Responses);
+            ResolveMap(components.Links);
+            ResolveMap(components.Callbacks);
+            ResolveMap(components.Examples);
+            ResolveMap(components.Schemas);
+            ResolveMap(components.SecuritySchemes);
+            ResolveMap(components.Headers);
+        }
+
+        /// <summary>
+        /// Resolves all references used in callbacks
+        /// </summary>
+        /// <param name="callbacks"></param>
+        public override void Visit(IDictionary<string, OpenApiCallback> callbacks)
+        {
+            ResolveMap(callbacks);
+        }
+
+        /// <summary>
+        /// Resolve all references used in an operation
+        /// </summary>
+        public override void Visit(OpenApiOperation operation)
+        {
+            ResolveObject(operation.RequestBody, r => operation.RequestBody = r);
+            ResolveList(operation.Parameters);
+
+            if (operation.Tags != null)
+            {
+                ResolveTags(operation.Tags);
+            }
+        }
+
+        /// <summary>
+        /// Resolve all references using in mediaType object
+        /// </summary>
+        /// <param name="mediaType"></param>
+        public override void Visit(OpenApiMediaType mediaType)
+        {
+            ResolveObject(mediaType.Schema, r => mediaType.Schema = r);
+        }
+
+        /// <summary>
+        /// Resolve all references to examples
+        /// </summary>
+        /// <param name="examples"></param>
+        public override void Visit(IDictionary<string, OpenApiExample> examples)
+        {
+            ResolveMap(examples);
+        }
+
+        /// <summary>
+        /// Resolve all references to responses
+        /// </summary>
+        public override void Visit(OpenApiResponses responses)
+        {
+            ResolveMap(responses);
+        }
+
+        /// <summary>
+        /// Resolve all references to headers
+        /// </summary>
+        /// <param name="headers"></param>
+        public override void Visit(IDictionary<string, OpenApiHeader> headers)
+        {
+            ResolveMap(headers);
+        }
+
+        /// <summary>
+        /// Resolve all references to SecuritySchemes
+        /// </summary>
+        public override void Visit(OpenApiSecurityRequirement securityRequirement)
+        {
+            foreach (var scheme in securityRequirement.Keys.ToList())
+            {
+                ResolveObject(scheme, (resolvedScheme) =>
+                {
+                    if (resolvedScheme != null)
+                    {
+                        // If scheme was unresolved
+                        // copy Scopes and remove old unresolved scheme
+                        var scopes = securityRequirement[scheme];
+                        securityRequirement.Remove(scheme);
+                        securityRequirement.Add(resolvedScheme, scopes);
+                    }
+                });
+            }
+        }
+
+        /// <summary>
+        /// Resolve all references to parameters
+        /// </summary>
+        public override void Visit(IList<OpenApiParameter> parameters)
+        {
+            ResolveList(parameters);
+        }
+
+        /// <summary>
+        /// Resolve all references used in a parameter
+        /// </summary>
+        public override void Visit(OpenApiParameter parameter)
+        {
+            ResolveObject(parameter.Schema, r => parameter.Schema = r);
+            ResolveMap(parameter.Examples);
+        }
+
+        /// <summary>
+        /// Resolve all references to links
+        /// </summary>
+        public override void Visit(IDictionary<string, OpenApiLink> links)
+        {
+            ResolveMap(links);
+        }
+
+        /// <summary>
+        /// Resolve all references used in a schema
+        /// </summary>
+        public override void Visit(OpenApiSchema schema)
+        {
+            ResolveObject(schema.Items, r => schema.Items = r);
+            ResolveList(schema.OneOf);
+            ResolveList(schema.AllOf);
+            ResolveList(schema.AnyOf);
+            ResolveMap(schema.Properties);
+            ResolveObject(schema.AdditionalProperties, r => schema.AdditionalProperties = r);
+        }
+
+        /// <summary>
+        /// Replace references to tags with either tag objects declared in components, or inline tag object
+        /// </summary>
+        private void ResolveTags(IList<OpenApiTag> tags)
+        {
+            for (var i = 0; i < tags.Count; i++)
+            {
+                var tag = tags[i];
+                if (IsUnresolvedReference(tag))
+                {
+                    var resolvedTag = ResolveReference<OpenApiTag>(tag.Reference);
+
+                    if (resolvedTag == null)
+                    {
+                        resolvedTag = new()
+                        {
+                            Name = tag.Reference.Id
+                        };
+                    }
+                    tags[i] = resolvedTag;
+                }
+            }
+        }
+
+        private void ResolveObject<T>(T entity, Action<T> assign) where T : class, IOpenApiReferenceable, new()
+        {
+            if (entity == null) return;
+
+            if (IsUnresolvedReference(entity))
+            {
+                assign(ResolveReference<T>(entity.Reference));
+            }
+        }
+
+        private void ResolveList<T>(IList<T> list) where T : class, IOpenApiReferenceable, new()
+        {
+            if (list == null) return;
+
+            for (var i = 0; i < list.Count; i++)
+            {
+                var entity = list[i];
+                if (IsUnresolvedReference(entity))
+                {
+                    list[i] = ResolveReference<T>(entity.Reference);
+                }
+            }
+        }
+
+        private void ResolveMap<T>(IDictionary<string, T> map) where T : class, IOpenApiReferenceable, new()
+        {
+            if (map == null) return;
+
+            foreach (var key in map.Keys.ToList())
+            {
+                var entity = map[key];
+                if (IsUnresolvedReference(entity))
+                {
+                    map[key] = ResolveReference<T>(entity.Reference);
+                }
+            }
+        }
+
+        private T ResolveReference<T>(OpenApiReference reference) where T : class, IOpenApiReferenceable, new()
+        {
+            if (string.IsNullOrEmpty(reference?.ExternalResource))
+            {
+                try
+                {
+                    var referencedObject = typeof(T).Name;
+                    var referenceType = reference?.Type.ToString();
+                    if (referenceType is not null && !referencedObject.Contains(referenceType))
+                    {
+                        throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceType, referenceType));
+                    }
+
+                    return _currentDocument.ResolveReference(reference, false) as T;
+                }
+                catch (OpenApiException ex)
+                {
+                    _errors.Add(new OpenApiReferenceError(ex));
+                    return null;
+                }
+            }
+            // The concept of merging references with their target at load time is going away in the next major version
+            // External references will not support this approach.
+            //else if (_resolveRemoteReferences == true)
+            //{
+            //    if (_currentDocument.Workspace == null)
+            //    {
+            //        _errors.Add(new OpenApiReferenceError(reference,"Cannot resolve external references for documents not in workspaces."));
+            //        // Leave as unresolved reference
+            //        return new T()
+            //        {
+            //            UnresolvedReference = true,
+            //            Reference = reference
+            //        };
+            //    }
+            //    var target = _currentDocument.Workspace.ResolveReference(reference);
+
+            //    // TODO:  If it is a document fragment, then we should resolve it within the current context
+
+            //    return target as T;
+            //}
+            else
+            {
+                // Leave as unresolved reference
+                return new()
+                {
+                    UnresolvedReference = true,
+                    Reference = reference
+                };
+            }
+        }
+
+        private bool IsUnresolvedReference(IOpenApiReferenceable possibleReference)
+        {
+            return possibleReference is {UnresolvedReference: true};
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
new file mode 100644
index 000000000000..5cd0d565c020
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
@@ -0,0 +1,347 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Services
+{
+    /// <summary>
+    /// Open API visitor base provides common logic for concrete visitors
+    /// </summary>
+    internal abstract class OpenApiVisitorBase
+    {
+        private readonly Stack<string> _path = new();
+
+        /// <summary>
+        /// Properties available to identify context of where an object is within OpenAPI Document
+        /// </summary>
+        public CurrentKeys CurrentKeys { get; } = new();
+
+        /// <summary>
+        /// Allow Rule to indicate validation error occured at a deeper context level.
+        /// </summary>
+        /// <param name="segment">Identifier for context</param>
+        public virtual void Enter(string segment)
+        {
+            this._path.Push(segment);
+        }
+
+        /// <summary>
+        /// Exit from path context level.  Enter and Exit calls should be matched.
+        /// </summary>
+        public virtual void Exit()
+        {
+            this._path.Pop();
+        }
+
+        /// <summary>
+        /// Pointer to source of validation error in document
+        /// </summary>
+        public string PathString { get => "#/" + String.Join("/", _path.Reverse()); }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiDocument"/>
+        /// </summary>
+        public virtual void Visit(OpenApiDocument doc)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiInfo"/>
+        /// </summary>
+        public virtual void Visit(OpenApiInfo info)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiContact"/>
+        /// </summary>
+        public virtual void Visit(OpenApiContact contact)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiLicense"/>
+        /// </summary>
+        public virtual void Visit(OpenApiLicense license)
+        {
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiServer"/>
+        /// </summary>
+        public virtual void Visit(IList<OpenApiServer> servers)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiServer"/>
+        /// </summary>
+        public virtual void Visit(OpenApiServer server)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiPaths"/>
+        /// </summary>
+        public virtual void Visit(OpenApiPaths paths)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiPathItem"/>
+        /// </summary>
+        public virtual void Visit(OpenApiPathItem pathItem)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiServerVariable"/>
+        /// </summary>
+        public virtual void Visit(OpenApiServerVariable serverVariable)
+        {
+        }
+
+        /// <summary>
+        /// Visits the operations.
+        /// </summary>
+        public virtual void Visit(IDictionary<OperationType, OpenApiOperation> operations)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiOperation"/>
+        /// </summary>
+        public virtual void Visit(OpenApiOperation operation)
+        {
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiParameter"/>
+        /// </summary>
+        public virtual void Visit(IList<OpenApiParameter> parameters)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiParameter"/>
+        /// </summary>
+        public virtual void Visit(OpenApiParameter parameter)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiRequestBody"/>
+        /// </summary>
+        public virtual void Visit(OpenApiRequestBody requestBody)
+        {
+        }
+
+        /// <summary>
+        /// Visits headers.
+        /// </summary>
+        public virtual void Visit(IDictionary<string, OpenApiHeader> headers)
+        {
+        }
+
+        /// <summary>
+        /// Visits callbacks.
+        /// </summary>
+        public virtual void Visit(IDictionary<string, OpenApiCallback> callbacks)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiResponse"/>
+        /// </summary>
+        public virtual void Visit(OpenApiResponse response)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiResponses"/>
+        /// </summary>
+        public virtual void Visit(OpenApiResponses response)
+        {
+        }
+
+        /// <summary>
+        /// Visits media type content.
+        /// </summary>
+        public virtual void Visit(IDictionary<string, OpenApiMediaType> content)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiMediaType"/>
+        /// </summary>
+        public virtual void Visit(OpenApiMediaType mediaType)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiEncoding"/>
+        /// </summary>
+        public virtual void Visit(OpenApiEncoding encoding)
+        {
+        }
+
+        /// <summary>
+        /// Visits the examples.
+        /// </summary>
+        public virtual void Visit(IDictionary<string, OpenApiExample> examples)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiComponents"/>
+        /// </summary>
+        public virtual void Visit(OpenApiComponents components)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiComponents"/>
+        /// </summary>
+        public virtual void Visit(OpenApiExternalDocs externalDocs)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiSchema"/>
+        /// </summary>
+        public virtual void Visit(OpenApiSchema schema)
+        {
+        }
+
+        /// <summary>
+        /// Visits the links.
+        /// </summary>
+        public virtual void Visit(IDictionary<string, OpenApiLink> links)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiLink"/>
+        /// </summary>
+        public virtual void Visit(OpenApiLink link)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiCallback"/>
+        /// </summary>
+        public virtual void Visit(OpenApiCallback callback)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiTag"/>
+        /// </summary>
+        public virtual void Visit(OpenApiTag tag)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiHeader"/>
+        /// </summary>
+        public virtual void Visit(OpenApiHeader tag)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiOAuthFlow"/>
+        /// </summary>
+        public virtual void Visit(OpenApiOAuthFlow openApiOAuthFlow)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiSecurityRequirement"/>
+        /// </summary>
+        public virtual void Visit(OpenApiSecurityRequirement securityRequirement)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiSecurityScheme"/>
+        /// </summary>
+        public virtual void Visit(OpenApiSecurityScheme securityScheme)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiExample"/>
+        /// </summary>
+        public virtual void Visit(OpenApiExample example)
+        {
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiTag"/>
+        /// </summary>
+        public virtual void Visit(IList<OpenApiTag> openApiTags)
+        {
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiSecurityRequirement"/>
+        /// </summary>
+        public virtual void Visit(IList<OpenApiSecurityRequirement> openApiSecurityRequirements)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="IOpenApiExtensible"/>
+        /// </summary>
+        public virtual void Visit(IOpenApiExtensible openApiExtensible)
+        {
+        }
+
+        /// <summary>
+        /// Visits <see cref="IOpenApiExtension"/>
+        /// </summary>
+        public virtual void Visit(IOpenApiExtension openApiExtension)
+        {
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiExample"/>
+        /// </summary>
+        public virtual void Visit(IList<OpenApiExample> example)
+        {
+        }
+
+        /// <summary>
+        /// Visits a dictionary of server variables
+        /// </summary>
+        public virtual void Visit(IDictionary<string, OpenApiServerVariable> serverVariables)
+        {
+        }
+
+        /// <summary>
+        /// Visits a dictionary of encodings
+        /// </summary>
+        /// <param name="encodings"></param>
+        public virtual void Visit(IDictionary<string, OpenApiEncoding> encodings)
+        {
+        }
+
+        /// <summary>
+        /// Visits IOpenApiReferenceable instances that are references and not in components
+        /// </summary>
+        /// <param name="referenceable">referenced object</param>
+        public virtual void Visit(IOpenApiReferenceable referenceable)
+        {
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiWalker.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiWalker.cs
new file mode 100644
index 000000000000..cda7648fd491
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiWalker.cs
@@ -0,0 +1,1169 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Services
+{
+    /// <summary>
+    /// The walker to visit multiple Open API elements.
+    /// </summary>
+    internal class OpenApiWalker
+    {
+        private readonly OpenApiVisitorBase _visitor;
+        private readonly Stack<OpenApiSchema> _schemaLoop = new();
+        private readonly Stack<OpenApiPathItem> _pathItemLoop = new();
+
+        /// <summary>
+        /// Initializes the <see cref="OpenApiWalker"/> class.
+        /// </summary>
+        public OpenApiWalker(OpenApiVisitorBase visitor)
+        {
+            _visitor = visitor;
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiDocument"/> and child objects
+        /// </summary>
+        /// <param name="doc">OpenApiDocument to be walked</param>
+        public void Walk(OpenApiDocument doc)
+        {
+            if (doc == null)
+            {
+                return;
+            }
+
+            _schemaLoop.Clear();
+            _pathItemLoop.Clear();
+
+            _visitor.Visit(doc);
+
+            Walk(OpenApiConstants.Info, () => Walk(doc.Info));
+            Walk(OpenApiConstants.Servers, () => Walk(doc.Servers));
+            Walk(OpenApiConstants.Paths, () => Walk(doc.Paths));
+            Walk(OpenApiConstants.Components, () => Walk(doc.Components));
+            Walk(OpenApiConstants.Security, () => Walk(doc.SecurityRequirements));
+            Walk(OpenApiConstants.ExternalDocs, () => Walk(doc.ExternalDocs));
+            Walk(OpenApiConstants.Tags, () => Walk(doc.Tags));
+            Walk(doc as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiTag"/> and child objects
+        /// </summary>
+        internal void Walk(IList<OpenApiTag> tags)
+        {
+            if (tags == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(tags);
+
+            // Visit tags
+            if (tags != null)
+            {
+                for (var i = 0; i < tags.Count; i++)
+                {
+                    Walk(i.ToString(), () => Walk(tags[i]));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiExternalDocs"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiExternalDocs externalDocs)
+        {
+            if (externalDocs == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(externalDocs);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiComponents"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiComponents components)
+        {
+            if (components == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(components);
+
+            if (components == null)
+            {
+                return;
+            }
+
+            Walk(OpenApiConstants.Schemas, () =>
+            {
+                if (components.Schemas != null)
+                {
+                    foreach (var item in components.Schemas)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.SecuritySchemes, () =>
+            {
+                if (components.SecuritySchemes != null)
+                {
+                    foreach (var item in components.SecuritySchemes)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.Callbacks, () =>
+            {
+                if (components.Callbacks != null)
+                {
+                    foreach (var item in components.Callbacks)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.Parameters, () =>
+            {
+                if (components.Parameters != null)
+                {
+                    foreach (var item in components.Parameters)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.Examples, () =>
+            {
+                if (components.Examples != null)
+                {
+                    foreach (var item in components.Examples)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.Headers, () =>
+            {
+                if (components.Headers != null)
+                {
+                    foreach (var item in components.Headers)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.Links, () =>
+            {
+                if (components.Links != null)
+                {
+                    foreach (var item in components.Links)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.RequestBodies, () =>
+            {
+                if (components.RequestBodies != null)
+                {
+                    foreach (var item in components.RequestBodies)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(OpenApiConstants.Responses, () =>
+            {
+                if (components.Responses != null)
+                {
+                    foreach (var item in components.Responses)
+                    {
+                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                    }
+                }
+            });
+
+            Walk(components as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiPaths"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiPaths paths)
+        {
+            if (paths == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(paths);
+
+            // Visit Paths
+            if (paths != null)
+            {
+                foreach (var pathItem in paths)
+                {
+                    _visitor.CurrentKeys.Path = pathItem.Key;
+                    Walk(pathItem.Key, () => Walk(pathItem.Value));// JSON Pointer uses ~1 as an escape character for /
+                    _visitor.CurrentKeys.Path = null;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Visits list of  <see cref="OpenApiServer"/> and child objects
+        /// </summary>
+        internal void Walk(IList<OpenApiServer> servers)
+        {
+            if (servers == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(servers);
+
+            // Visit Servers
+            if (servers != null)
+            {
+                for (var i = 0; i < servers.Count; i++)
+                {
+                    Walk(i.ToString(), () => Walk(servers[i]));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiInfo"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiInfo info)
+        {
+            if (info == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(info);
+            if (info != null)
+            {
+                Walk(OpenApiConstants.Contact, () => Walk(info.Contact));
+                Walk(OpenApiConstants.License, () => Walk(info.License));
+            }
+            Walk(info as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits dictionary of extensions
+        /// </summary>
+        internal void Walk(IOpenApiExtensible openApiExtensible)
+        {
+            if (openApiExtensible == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(openApiExtensible);
+
+            if (openApiExtensible.Extensions != null)
+            {
+                foreach (var item in openApiExtensible.Extensions)
+                {
+                    _visitor.CurrentKeys.Extension = item.Key;
+                    Walk(item.Key, () => Walk(item.Value));
+                    _visitor.CurrentKeys.Extension = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="IOpenApiExtension"/>
+        /// </summary>
+        internal void Walk(IOpenApiExtension extension)
+        {
+            if (extension == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(extension);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiLicense"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiLicense license)
+        {
+            if (license == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(license);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiContact"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiContact contact)
+        {
+            if (contact == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(contact);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiCallback"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiCallback callback, bool isComponent = false)
+        {
+            if (callback == null || ProcessAsReference(callback, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(callback);
+
+            if (callback != null)
+            {
+                foreach (var item in callback.PathItems)
+                {
+                    _visitor.CurrentKeys.Callback = item.Key.ToString();
+                    var pathItem = item.Value;
+                    Walk(item.Key.ToString(), () => Walk(pathItem));
+                    _visitor.CurrentKeys.Callback = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiTag"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiTag tag)
+        {
+            if (tag == null || ProcessAsReference(tag))
+            {
+                return;
+            }
+
+            _visitor.Visit(tag);
+            _visitor.Visit(tag.ExternalDocs);
+            _visitor.Visit(tag as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiServer"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiServer server)
+        {
+            if (server == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(server);
+            Walk(OpenApiConstants.Variables, () => Walk(server.Variables));
+            _visitor.Visit(server as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiServerVariable"/>
+        /// </summary>
+        internal void Walk(IDictionary<string, OpenApiServerVariable> serverVariables)
+        {
+            if (serverVariables == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(serverVariables);
+
+            if (serverVariables != null)
+            {
+                foreach (var variable in serverVariables)
+                {
+                    _visitor.CurrentKeys.ServerVariable = variable.Key;
+                    Walk(variable.Key, () => Walk(variable.Value));
+                    _visitor.CurrentKeys.ServerVariable = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiServerVariable"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiServerVariable serverVariable)
+        {
+            if (serverVariable == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(serverVariable);
+            _visitor.Visit(serverVariable as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiPathItem"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiPathItem pathItem)
+        {
+            if (pathItem == null)
+            {
+                return;
+            }
+
+            if (_pathItemLoop.Contains(pathItem))
+            {
+                return;  // Loop detected, this pathItem has already been walked.
+            }
+            else
+            {
+                _pathItemLoop.Push(pathItem);
+            }
+
+            _visitor.Visit(pathItem);
+
+            // The path may be a reference
+            if (pathItem != null && !ProcessAsReference(pathItem))
+            {
+                Walk(OpenApiConstants.Parameters, () => Walk(pathItem.Parameters));
+                Walk(pathItem.Operations);
+            }
+            _visitor.Visit(pathItem as IOpenApiExtensible);
+
+            _pathItemLoop.Pop();
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiOperation"/>
+        /// </summary>
+        internal void Walk(IDictionary<OperationType, OpenApiOperation> operations)
+        {
+            if (operations == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(operations);
+            if (operations != null)
+            {
+                foreach (var operation in operations)
+                {
+                    _visitor.CurrentKeys.Operation = operation.Key;
+                    Walk(operation.Key.GetDisplayName(), () => Walk(operation.Value));
+                    _visitor.CurrentKeys.Operation = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiOperation"/> and child objects
+        /// </summary>
+        /// <param name="operation"></param>
+        internal void Walk(OpenApiOperation operation)
+        {
+            if (operation == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(operation);
+
+            Walk(OpenApiConstants.Parameters, () => Walk(operation.Parameters));
+            Walk(OpenApiConstants.RequestBody, () => Walk(operation.RequestBody));
+            Walk(OpenApiConstants.Responses, () => Walk(operation.Responses));
+            Walk(OpenApiConstants.Callbacks, () => Walk(operation.Callbacks));
+            Walk(OpenApiConstants.Tags, () => Walk(operation.Tags));
+            Walk(OpenApiConstants.Security, () => Walk(operation.Security));
+            Walk(operation as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiSecurityRequirement"/>
+        /// </summary>
+        internal void Walk(IList<OpenApiSecurityRequirement> securityRequirements)
+        {
+            if (securityRequirements == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(securityRequirements);
+
+            if (securityRequirements != null)
+            {
+                for (var i = 0; i < securityRequirements.Count; i++)
+                {
+                    Walk(i.ToString(), () => Walk(securityRequirements[i]));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiParameter"/>
+        /// </summary>
+        internal void Walk(IList<OpenApiParameter> parameters)
+        {
+            if (parameters == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(parameters);
+
+            if (parameters != null)
+            {
+                for (var i = 0; i < parameters.Count; i++)
+                {
+                    Walk(i.ToString(), () => Walk(parameters[i]));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiParameter"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiParameter parameter, bool isComponent = false)
+        {
+            if (parameter == null || ProcessAsReference(parameter, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(parameter);
+            Walk(OpenApiConstants.Schema, () => Walk(parameter.Schema));
+            Walk(OpenApiConstants.Content, () => Walk(parameter.Content));
+            Walk(OpenApiConstants.Examples, () => Walk(parameter.Examples));
+
+            Walk(parameter as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiResponses"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiResponses responses)
+        {
+            if (responses == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(responses);
+
+            if (responses != null)
+            {
+                foreach (var response in responses)
+                {
+                    _visitor.CurrentKeys.Response = response.Key;
+                    Walk(response.Key, () => Walk(response.Value));
+                    _visitor.CurrentKeys.Response = null;
+                }
+            }
+            Walk(responses as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiResponse"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiResponse response, bool isComponent = false)
+        {
+            if (response == null || ProcessAsReference(response, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(response);
+            Walk(OpenApiConstants.Content, () => Walk(response.Content));
+            Walk(OpenApiConstants.Links, () => Walk(response.Links));
+            Walk(OpenApiConstants.Headers, () => Walk(response.Headers));
+            Walk(response as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiRequestBody"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiRequestBody requestBody, bool isComponent = false)
+        {
+            if (requestBody == null || ProcessAsReference(requestBody, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(requestBody);
+
+            if (requestBody is {Content: not null})
+            {
+                Walk(OpenApiConstants.Content, () => Walk(requestBody.Content));
+            }
+            Walk(requestBody as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiHeader"/>
+        /// </summary>
+        internal void Walk(IDictionary<string, OpenApiHeader> headers)
+        {
+            if (headers == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(headers);
+            if (headers != null)
+            {
+                foreach (var header in headers)
+                {
+                    _visitor.CurrentKeys.Header = header.Key;
+                    Walk(header.Key, () => Walk(header.Value));
+                    _visitor.CurrentKeys.Header = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiCallback"/>
+        /// </summary>
+        internal void Walk(IDictionary<string, OpenApiCallback> callbacks)
+        {
+            if (callbacks == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(callbacks);
+            if (callbacks != null)
+            {
+                foreach (var callback in callbacks)
+                {
+                    _visitor.CurrentKeys.Callback = callback.Key;
+                    Walk(callback.Key, () => Walk(callback.Value));
+                    _visitor.CurrentKeys.Callback = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiMediaType"/>
+        /// </summary>
+        internal void Walk(IDictionary<string, OpenApiMediaType> content)
+        {
+            if (content == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(content);
+            if (content != null)
+            {
+                foreach (var mediaType in content)
+                {
+                    _visitor.CurrentKeys.Content = mediaType.Key;
+                    Walk(mediaType.Key, () => Walk(mediaType.Value));
+                    _visitor.CurrentKeys.Content = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiMediaType"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiMediaType mediaType)
+        {
+            if (mediaType == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(mediaType);
+
+            Walk(OpenApiConstants.Example, () => Walk(mediaType.Examples));
+            Walk(OpenApiConstants.Schema, () => Walk(mediaType.Schema));
+            Walk(OpenApiConstants.Encoding, () => Walk(mediaType.Encoding));
+            Walk(mediaType as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiEncoding"/>
+        /// </summary>
+        internal void Walk(IDictionary<string, OpenApiEncoding> encodings)
+        {
+            if (encodings == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(encodings);
+
+            if (encodings != null)
+            {
+                foreach (var item in encodings)
+                {
+                    _visitor.CurrentKeys.Encoding = item.Key;
+                    Walk(item.Key, () => Walk(item.Value));
+                    _visitor.CurrentKeys.Encoding = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiEncoding"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiEncoding encoding)
+        {
+            if (encoding == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(encoding);
+
+            if (encoding.Headers != null)
+            {
+                Walk(encoding.Headers);
+            }
+            Walk(encoding as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiSchema"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiSchema schema, bool isComponent = false)
+        {
+            if (schema == null || ProcessAsReference(schema, isComponent))
+            {
+                return;
+            }
+
+            if (_schemaLoop.Contains(schema))
+            {
+                return;  // Loop detected, this schema has already been walked.
+            }
+            else
+            {
+                _schemaLoop.Push(schema);
+            }
+
+            _visitor.Visit(schema);
+
+            if (schema.Items != null)
+            {
+                Walk("items", () => Walk(schema.Items));
+            }
+
+            if (schema.Not != null)
+            {
+                Walk("not", () => Walk(schema.Not));
+            }
+
+            if (schema.AllOf != null)
+            {
+                Walk("allOf", () => Walk(schema.AllOf));
+            }
+
+            if (schema.AnyOf != null)
+            {
+                Walk("anyOf", () => Walk(schema.AnyOf));
+            }
+
+            if (schema.OneOf != null)
+            {
+                Walk("oneOf", () => Walk(schema.OneOf));
+            }
+
+            if (schema.Properties != null)
+            {
+                Walk("properties", () =>
+                {
+                    foreach (var item in schema.Properties)
+                    {
+                        Walk(item.Key, () => Walk(item.Value));
+                    }
+                });
+            }
+
+            if (schema.AdditionalProperties != null)
+            {
+                Walk("additionalProperties", () => Walk(schema.AdditionalProperties));
+            }
+
+            Walk(OpenApiConstants.ExternalDocs, () => Walk(schema.ExternalDocs));
+
+            Walk(schema as IOpenApiExtensible);
+
+            _schemaLoop.Pop();
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiExample"/>
+        /// </summary>
+        internal void Walk(IDictionary<string, OpenApiExample> examples)
+        {
+            if (examples == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(examples);
+
+            if (examples != null)
+            {
+                foreach (var example in examples)
+                {
+                    _visitor.CurrentKeys.Example = example.Key;
+                    Walk(example.Key, () => Walk(example.Value));
+                    _visitor.CurrentKeys.Example = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="IOpenApiAny"/> and child objects
+        /// </summary>
+        internal void Walk(IOpenApiAny example)
+        {
+            if (example == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(example);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiExample"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiExample example, bool isComponent = false)
+        {
+            if (example == null || ProcessAsReference(example, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(example);
+            Walk(example as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits the list of <see cref="OpenApiExample"/> and child objects
+        /// </summary>
+        internal void Walk(IList<OpenApiExample> examples)
+        {
+            if (examples == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(examples);
+
+            // Visit Examples
+            if (examples != null)
+            {
+                for (var i = 0; i < examples.Count; i++)
+                {
+                    Walk(i.ToString(), () => Walk(examples[i]));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits a list of <see cref="OpenApiSchema"/> and child objects
+        /// </summary>
+        internal void Walk(IList<OpenApiSchema> schemas)
+        {
+            if (schemas == null)
+            {
+                return;
+            }
+
+            // Visit Schemas
+            if (schemas != null)
+            {
+                for (var i = 0; i < schemas.Count; i++)
+                {
+                    Walk(i.ToString(), () => Walk(schemas[i]));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiOAuthFlows"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiOAuthFlows flows)
+        {
+            if (flows == null)
+            {
+                return;
+            }
+            _visitor.Visit(flows);
+            Walk(flows as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiOAuthFlow"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiOAuthFlow oAuthFlow)
+        {
+            if (oAuthFlow == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(oAuthFlow);
+            Walk(oAuthFlow as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits dictionary of <see cref="OpenApiLink"/> and child objects
+        /// </summary>
+        internal void Walk(IDictionary<string, OpenApiLink> links)
+        {
+            if (links == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(links);
+
+            if (links != null)
+            {
+                foreach (var item in links)
+                {
+                    _visitor.CurrentKeys.Link = item.Key;
+                    Walk(item.Key, () => Walk(item.Value));
+                    _visitor.CurrentKeys.Link = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiLink"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiLink link, bool isComponent = false)
+        {
+            if (link == null || ProcessAsReference(link, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(link);
+            Walk(OpenApiConstants.Server, () => Walk(link.Server));
+            Walk(link as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiHeader"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiHeader header, bool isComponent = false)
+        {
+            if (header == null || ProcessAsReference(header, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(header);
+            Walk(OpenApiConstants.Content, () => Walk(header.Content));
+            Walk(OpenApiConstants.Example, () => Walk(header.Example));
+            Walk(OpenApiConstants.Examples, () => Walk(header.Examples));
+            Walk(OpenApiConstants.Schema, () => Walk(header.Schema));
+            Walk(header as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiSecurityRequirement"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiSecurityRequirement securityRequirement)
+        {
+            if (securityRequirement == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(securityRequirement);
+            Walk(securityRequirement as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiSecurityScheme"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiSecurityScheme securityScheme, bool isComponent = false)
+        {
+            if (securityScheme == null || ProcessAsReference(securityScheme, isComponent))
+            {
+                return;
+            }
+
+            _visitor.Visit(securityScheme);
+            Walk(securityScheme as IOpenApiExtensible);
+        }
+
+        /// <summary>
+        /// Visits <see cref="OpenApiSecurityScheme"/> and child objects
+        /// </summary>
+        internal void Walk(IOpenApiReferenceable referenceable)
+        {
+            _visitor.Visit(referenceable);
+        }
+
+        /// <summary>
+        /// Dispatcher method that enables using a single method to walk the model
+        /// starting from any <see cref="IOpenApiElement"/>
+        /// </summary>
+        internal void Walk(IOpenApiElement element)
+        {
+            if (element == null)
+            {
+                return;
+            }
+
+            switch (element)
+            {
+                case OpenApiDocument e: Walk(e); break;
+                case OpenApiLicense e: Walk(e); break;
+                case OpenApiInfo e: Walk(e); break;
+                case OpenApiComponents e: Walk(e); break;
+                case OpenApiContact e: Walk(e); break;
+                case OpenApiCallback e: Walk(e); break;
+                case OpenApiEncoding e: Walk(e); break;
+                case OpenApiExample e: Walk(e); break;
+                case IDictionary<string, OpenApiExample> e: Walk(e); break;
+                case OpenApiExternalDocs e: Walk(e); break;
+                case OpenApiHeader e: Walk(e); break;
+                case OpenApiLink e: Walk(e); break;
+                case IDictionary<string, OpenApiLink> e: Walk(e); break;
+                case OpenApiMediaType e: Walk(e); break;
+                case OpenApiOAuthFlows e: Walk(e); break;
+                case OpenApiOAuthFlow e: Walk(e); break;
+                case OpenApiOperation e: Walk(e); break;
+                case OpenApiParameter e: Walk(e); break;
+                case OpenApiPaths e: Walk(e); break;
+                case OpenApiRequestBody e: Walk(e); break;
+                case OpenApiResponse e: Walk(e); break;
+                case OpenApiSchema e: Walk(e); break;
+                case OpenApiSecurityRequirement e: Walk(e); break;
+                case OpenApiSecurityScheme e: Walk(e); break;
+                case OpenApiServer e: Walk(e); break;
+                case OpenApiServerVariable e: Walk(e); break;
+                case OpenApiTag e: Walk(e); break;
+                case IList<OpenApiTag> e: Walk(e); break;
+                case IOpenApiExtensible e: Walk(e); break;
+                case IOpenApiExtension e: Walk(e); break;
+            }
+        }
+
+        /// <summary>
+        /// Adds a segment to the context path to enable pointing to the current location in the document
+        /// </summary>
+        /// <param name="context">An identifier for the context.</param>
+        /// <param name="walk">An action that walks objects within the context.</param>
+        private void Walk(string context, Action walk)
+        {
+            _visitor.Enter(context.Replace("/", "~1"));
+            walk();
+            _visitor.Exit();
+        }
+
+        /// <summary>
+        /// Identify if an element is just a reference to a component, or an actual component
+        /// </summary>
+        private bool ProcessAsReference(IOpenApiReferenceable referenceable, bool isComponent = false)
+        {
+            var isReference = referenceable.Reference != null && 
+                              (!isComponent || referenceable.UnresolvedReference);
+            if (isReference)
+            {
+                Walk(referenceable);
+            }
+            return isReference;
+        }
+    }
+
+    /// <summary>
+    /// Object containing contextual information based on where the walker is currently referencing in an OpenApiDocument
+    /// </summary>
+    internal class CurrentKeys
+    {
+        /// <summary>
+        /// Current Path key
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Current Operation Type
+        /// </summary>
+        public OperationType? Operation { get; set; }
+
+        /// <summary>
+        /// Current Response Status Code
+        /// </summary>
+        public string Response { get; set; }
+
+        /// <summary>
+        /// Current Content Media Type
+        /// </summary>
+        public string Content { get; set; }
+
+        /// <summary>
+        /// Current Callback Key
+        /// </summary>
+        public string Callback { get; set; }
+
+        /// <summary>
+        /// Current Link Key
+        /// </summary>
+        public string Link { get; set; }
+
+        /// <summary>
+        /// Current Header Key
+        /// </summary>
+        public string Header { get; internal set; }
+
+        /// <summary>
+        /// Current Encoding Key
+        /// </summary>
+        public string Encoding { get; internal set; }
+
+        /// <summary>
+        /// Current Example Key
+        /// </summary>
+        public string Example { get; internal set; }
+
+        /// <summary>
+        /// Current Extension Key
+        /// </summary>
+        public string Extension { get; internal set; }
+
+        /// <summary>
+        /// Current ServerVariable
+        /// </summary>
+        public string ServerVariable { get; internal set; }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiWorkspace.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiWorkspace.cs
new file mode 100644
index 000000000000..f705284657d4
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Services/OpenApiWorkspace.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Extensions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Services
+{
+    /// <summary>
+    /// Contains a set of OpenApi documents and document fragments that reference each other
+    /// </summary>
+    internal class OpenApiWorkspace
+    {
+        private Dictionary<Uri, OpenApiDocument> _documents = new();
+        private Dictionary<Uri, IOpenApiReferenceable> _fragments = new();
+        private Dictionary<Uri, Stream> _artifacts = new();
+
+        /// <summary>
+        /// A list of OpenApiDocuments contained in the workspace
+        /// </summary>
+        public IEnumerable<OpenApiDocument> Documents {
+            get {
+                return _documents.Values;
+            }
+        }
+
+        /// <summary>
+        /// A list of document fragments that are contained in the workspace
+        /// </summary>
+        public IEnumerable<IOpenApiElement> Fragments { get; }
+
+        /// <summary>
+        /// The base location from where all relative references are resolved
+        /// </summary>
+        public Uri BaseUrl { get; }
+
+        /// <summary>
+        /// A list of document fragments that are contained in the workspace
+        /// </summary>
+        public IEnumerable<Stream> Artifacts { get; }
+
+        /// <summary>
+        /// Initialize workspace pointing to a base URL to allow resolving relative document locations.  Use a file:// url to point to a folder
+        /// </summary>
+        /// <param name="baseUrl"></param>
+        public OpenApiWorkspace(Uri baseUrl)
+        {
+            BaseUrl = baseUrl;
+        }
+
+        /// <summary>
+        /// Initialize workspace using current directory as the default location.
+        /// </summary>
+        public OpenApiWorkspace()
+        {
+            BaseUrl = new("file://" + Environment.CurrentDirectory + $"{Path.DirectorySeparatorChar}" );
+        }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiWorkspace"/> object
+        /// </summary>
+        public OpenApiWorkspace(OpenApiWorkspace workspace){}
+
+        /// <summary>
+        /// Verify if workspace contains a document based on its URL.
+        /// </summary>
+        /// <param name="location">A relative or absolute URL of the file.  Use file:// for folder locations.</param>
+        /// <returns>Returns true if a matching document is found.</returns>
+        public bool Contains(string location)
+        {
+            var key = ToLocationUrl(location);
+            return _documents.ContainsKey(key) || _fragments.ContainsKey(key) || _artifacts.ContainsKey(key);
+        }
+
+        /// <summary>
+        /// Add an OpenApiDocument to the workspace.
+        /// </summary>
+        /// <param name="location"></param>
+        /// <param name="document"></param>
+        public void AddDocument(string location, OpenApiDocument  document)
+        {
+            document.Workspace = this;
+            _documents.Add(ToLocationUrl(location), document);
+        }
+
+        /// <summary>
+        /// Adds a fragment of an OpenApiDocument to the workspace.
+        /// </summary>
+        /// <param name="location"></param>
+        /// <param name="fragment"></param>
+        /// <remarks>Not sure how this is going to work.  Does the reference just point to the fragment as a whole, or do we need to
+        /// to be able to point into the fragment.  Keeping it private until we figure it out.
+        /// </remarks>
+        public void AddFragment(string location, IOpenApiReferenceable fragment)
+        {
+            _fragments.Add(ToLocationUrl(location), fragment);
+        }
+
+        /// <summary>
+        /// Add a stream based artifact to the workspace.  Useful for images, examples, alternative schemas.
+        /// </summary>
+        /// <param name="location"></param>
+        /// <param name="artifact"></param>
+        public void AddArtifact(string location, Stream artifact)
+        {
+            _artifacts.Add(ToLocationUrl(location), artifact);
+        }
+
+        /// <summary>
+        /// Returns the target of an OpenApiReference from within the workspace.
+        /// </summary>
+        /// <param name="reference">An instance of an OpenApiReference</param>
+        /// <returns></returns>
+        public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
+        {
+            if (_documents.TryGetValue(new(BaseUrl, reference.ExternalResource), out var doc))
+            {
+                return doc.ResolveReference(reference, false);
+            }
+            else if (_fragments.TryGetValue(new(BaseUrl, reference.ExternalResource), out var fragment))
+            {
+                var jsonPointer = new JsonPointer($"/{reference.Id ?? string.Empty}");
+                return fragment.ResolveReference(jsonPointer);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="location"></param>
+        /// <returns></returns>
+        public Stream GetArtifact(string location)
+        {
+            return _artifacts[ToLocationUrl(location)];
+        }
+
+        private Uri ToLocationUrl(string location)
+        {
+            return new(BaseUrl, location);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Utils.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Utils.cs
new file mode 100644
index 000000000000..3ac8526ecbb9
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Utils.cs
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi
+{
+    /// <summary>
+    /// Utilities methods
+    /// </summary>
+    internal static class Utils
+    {
+        /// <summary>
+        /// Check whether the input argument value is null or not.
+        /// </summary>
+        /// <typeparam name="T">The input value type.</typeparam>
+        /// <param name="value">The input value.</param>
+        /// <param name="parameterName">The input parameter name.</param>
+        /// <returns>The input value.</returns>
+        internal static T CheckArgumentNull<T>(
+            T value,
+            [CallerArgumentExpression("value")] string parameterName = "")
+        {
+            return value ?? throw new ArgumentNullException(parameterName, $"Value cannot be null: {parameterName}");
+        }
+
+        /// <summary>
+        /// Check whether the input string value is null or empty.
+        /// </summary>
+        /// <param name="value">The input string value.</param>
+        /// <param name="parameterName">The input parameter name.</param>
+        /// <returns>The input value.</returns>
+        internal static string CheckArgumentNullOrEmpty(
+            string value,
+            [CallerArgumentExpression(nameof(value))] string parameterName = "")
+        {
+            return string.IsNullOrWhiteSpace(value) ? throw new ArgumentNullException(parameterName, $"Value cannot be null or empty: {parameterName}") : value;
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/IOpenApiWriter.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/IOpenApiWriter.cs
new file mode 100644
index 000000000000..92a33ac18987
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/IOpenApiWriter.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Interface for writing Open API documentation.
+    /// </summary>
+    internal interface IOpenApiWriter
+    {
+        /// <summary>
+        /// Write the start object.
+        /// </summary>
+        void WriteStartObject();
+
+        /// <summary>
+        /// Write the end object.
+        /// </summary>
+        void WriteEndObject();
+
+        /// <summary>
+        /// Write the start array.
+        /// </summary>
+        void WriteStartArray();
+
+        /// <summary>
+        /// Write the end array.
+        /// </summary>
+        void WriteEndArray();
+
+        /// <summary>
+        /// Write the property name.
+        /// </summary>
+        void WritePropertyName(string name);
+
+        /// <summary>
+        /// Write the string value.
+        /// </summary>
+        void WriteValue(string value);
+
+        /// <summary>
+        /// Write the decimal value.
+        /// </summary>
+        void WriteValue(decimal value);
+
+        /// <summary>
+        /// Write the int value.
+        /// </summary>
+        void WriteValue(int value);
+
+        /// <summary>
+        /// Write the boolean value.
+        /// </summary>
+        void WriteValue(bool value);
+
+        /// <summary>
+        /// Write the null value.
+        /// </summary>
+        void WriteNull();
+
+        /// <summary>
+        /// Write the raw content value.
+        /// </summary>
+        void WriteRaw(string value);
+
+        /// <summary>
+        /// Write the object value.
+        /// </summary>
+        void WriteValue(object value);
+
+        /// <summary>
+        /// Flush the writer.
+        /// </summary>
+        void Flush();
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs
new file mode 100644
index 000000000000..04fa73af75cd
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs
@@ -0,0 +1,272 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// JSON Writer.
+    /// </summary>
+    internal class OpenApiJsonWriter : OpenApiWriterBase
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
+        /// </summary>
+        /// <param name="textWriter">The text writer.</param>
+        public OpenApiJsonWriter(TextWriter textWriter) : base(textWriter, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
+        /// </summary>
+        /// <param name="textWriter">The text writer.</param>
+        /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiJsonWriterSettings settings) : base(textWriter, settings)
+        {
+            _produceTerseOutput = settings.Terse;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
+        /// </summary>
+        /// <param name="textWriter">The text writer.</param>
+        /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
+        /// <param name="terseOutput"> Setting for allowing the JSON emitted to be in terse format.</param>
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings settings, bool terseOutput = false) : base(textWriter, settings)
+        {
+            _produceTerseOutput = terseOutput;
+        }
+
+        /// <summary>
+        /// Indicates whether or not the produced document will be written in a compact or pretty fashion.
+        /// </summary>
+        private readonly bool _produceTerseOutput;
+
+        /// <summary>
+        /// Base Indentation Level.
+        /// This denotes how many indentations are needed for the property in the base object.
+        /// </summary>
+        protected override int BaseIndentation => 1;
+
+        /// <summary>
+        /// Write JSON start object.
+        /// </summary>
+        public override void WriteStartObject()
+        {
+            var previousScope = CurrentScope();
+
+            var currentScope = StartScope(ScopeType.Object);
+
+            if (previousScope is {Type: ScopeType.Array})
+            {
+                currentScope.IsInArray = true;
+
+                if (previousScope.ObjectCount != 1)
+                {
+                    Writer.Write(WriterConstants.ArrayElementSeparator);
+                }
+
+                WriteLine();
+                WriteIndentation();
+            }
+
+            Writer.Write(WriterConstants.StartObjectScope);
+
+            IncreaseIndentation();
+        }
+
+        /// <summary>
+        /// Write JSON end object.
+        /// </summary>
+        public override void WriteEndObject()
+        {
+            var currentScope = EndScope(ScopeType.Object);
+            if (currentScope.ObjectCount != 0)
+            {
+                WriteLine();
+                DecreaseIndentation();
+                WriteIndentation();
+            }
+            else
+            {
+                if (!_produceTerseOutput)
+                {
+                    Writer.Write(WriterConstants.WhiteSpaceForEmptyObject);
+                }
+                DecreaseIndentation();
+            }
+
+            Writer.Write(WriterConstants.EndObjectScope);
+        }
+
+        /// <summary>
+        /// Write JSON start array.
+        /// </summary>
+        public override void WriteStartArray()
+        {
+            var previousScope = CurrentScope();
+
+            var currentScope = StartScope(ScopeType.Array);
+
+            if (previousScope is {Type: ScopeType.Array})
+            {
+                currentScope.IsInArray = true;
+
+                if (previousScope.ObjectCount != 1)
+                {
+                    Writer.Write(WriterConstants.ArrayElementSeparator);
+                }
+
+                WriteLine();
+                WriteIndentation();
+            }
+
+            Writer.Write(WriterConstants.StartArrayScope);
+            IncreaseIndentation();
+        }
+
+        /// <summary>
+        /// Write JSON end array.
+        /// </summary>
+        public override void WriteEndArray()
+        {
+            var current = EndScope(ScopeType.Array);
+            if (current.ObjectCount != 0)
+            {
+                WriteLine();
+                DecreaseIndentation();
+                WriteIndentation();
+            }
+            else
+            {
+                Writer.Write(WriterConstants.WhiteSpaceForEmptyArray);
+                DecreaseIndentation();
+            }
+
+            Writer.Write(WriterConstants.EndArrayScope);
+        }
+
+        /// <summary>
+        /// Write property name.
+        /// </summary>
+        /// <param name="name">The property name.</param>
+        /// public override void WritePropertyName(string name)
+        public override void WritePropertyName(string name)
+        {
+            VerifyCanWritePropertyName(name);
+
+            var currentScope = CurrentScope();
+            if (currentScope.ObjectCount != 0)
+            {
+                Writer.Write(WriterConstants.ObjectMemberSeparator);
+            }
+
+            WriteLine();
+
+            currentScope.ObjectCount++;
+
+            WriteIndentation();
+
+            name = name.GetJsonCompatibleString();
+
+            Writer.Write(name);
+
+            Writer.Write(WriterConstants.NameValueSeparator);
+
+            if (!_produceTerseOutput)
+            {
+                Writer.Write(WriterConstants.NameValueSeparatorWhiteSpaceSuffix);
+            }
+        }
+
+        /// <summary>
+        /// Write string value.
+        /// </summary>
+        /// <param name="value">The string value.</param>
+        public override void WriteValue(string value)
+        {
+            WriteValueSeparator();
+
+            value = value.GetJsonCompatibleString();
+
+            Writer.Write(value);
+        }
+
+        /// <summary>
+        /// Write null value.
+        /// </summary>
+        public override void WriteNull()
+        {
+            WriteValueSeparator();
+
+            Writer.Write("null");
+        }
+
+        /// <summary>
+        /// Writes a separator of a value if it's needed for the next value to be written.
+        /// </summary>
+        protected override void WriteValueSeparator()
+        {
+            if (Scopes.Count == 0)
+            {
+                return;
+            }
+
+            var currentScope = Scopes.Peek();
+
+            if (currentScope.Type == ScopeType.Array)
+            {
+                if (currentScope.ObjectCount != 0)
+                {
+                    Writer.Write(WriterConstants.ArrayElementSeparator);
+                }
+
+                WriteLine();
+                WriteIndentation();
+                currentScope.ObjectCount++;
+            }
+        }
+
+        /// <summary>
+        /// Writes the content raw value.
+        /// </summary>
+        public override void WriteRaw(string value)
+        {
+            WriteValueSeparator();
+            Writer.Write(value);
+        }
+
+        /// <summary>
+        /// Write the indentation.
+        /// </summary>
+        public override void WriteIndentation()
+        {
+            if (_produceTerseOutput)
+            {
+                return;
+            }
+
+            base.WriteIndentation();
+        }
+
+        /// <summary>
+        /// Writes a line terminator to the text string or stream.
+        /// </summary>
+        private void WriteLine()
+        {
+            if (_produceTerseOutput)
+            {
+                return;
+            }
+
+            Writer.WriteLine();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiJsonWriterSettings.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiJsonWriterSettings.cs
new file mode 100644
index 000000000000..8173ef4fe448
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiJsonWriterSettings.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Configuration settings to control how OpenAPI Json documents are written
+    /// </summary>
+    internal class OpenApiJsonWriterSettings : OpenApiWriterSettings
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriterSettings"/> class.
+        /// </summary>
+        public OpenApiJsonWriterSettings()
+        { }
+
+        /// <summary>
+        /// Indicates whether or not the produced document will be written in a compact or pretty fashion.
+        /// </summary>
+        public bool Terse { get; set; } = false;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs
new file mode 100644
index 000000000000..d1f8d7abde13
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs
@@ -0,0 +1,110 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Any;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Extensions methods for writing the <see cref="IOpenApiAny"/>
+    /// </summary>
+    internal static class OpenApiWriterAnyExtensions
+    {
+        /// <summary>
+        /// Write the specification extensions
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="extensions">The specification extensions.</param>
+        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
+        public static void WriteExtensions(this IOpenApiWriter writer, IDictionary<string, IOpenApiExtension> extensions, OpenApiSpecVersion specVersion)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (extensions != null)
+            {
+                foreach (var item in extensions)
+                {
+                    writer.WritePropertyName(item.Key);
+                    item.Value.Write(writer, specVersion);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Write the <see cref="IOpenApiAny"/> value.
+        /// </summary>
+        /// <typeparam name="T">The Open API Any type.</typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="any">The Any value</param>
+        public static void WriteAny<T>(this IOpenApiWriter writer, T any) where T : IOpenApiAny
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (any == null)
+            {
+                writer.WriteNull();
+                return;
+            }
+
+            switch (any.AnyType)
+            {
+                case AnyType.Array: // Array
+                    writer.WriteArray(any as OpenApiArray);
+                    break;
+
+                case AnyType.Object: // Object
+                    writer.WriteObject(any as OpenApiObject);
+                    break;
+
+                case AnyType.Primitive: // Primitive
+                    writer.WritePrimitive(any as IOpenApiPrimitive);
+                    break;
+
+                case AnyType.Null: // null
+                    writer.WriteNull();
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        private static void WriteArray(this IOpenApiWriter writer, OpenApiArray array)
+        {
+            writer.WriteStartArray();
+
+            foreach (var item in array)
+            {
+                writer.WriteAny(item);
+            }
+
+            writer.WriteEndArray();
+        }
+
+        private static void WriteObject(this IOpenApiWriter writer, OpenApiObject entity)
+        {
+            writer.WriteStartObject();
+
+            foreach (var item in entity)
+            {
+                writer.WritePropertyName(item.Key);
+                writer.WriteAny(item.Value);
+            }
+
+            writer.WriteEndObject();
+        }
+
+        private static void WritePrimitive(this IOpenApiWriter writer, IOpenApiPrimitive primitive)
+        {
+            // The Spec version is meaning for the Any type, so it's ok to use the latest one.
+            primitive.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs
new file mode 100644
index 000000000000..3d6c1a528633
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs
@@ -0,0 +1,414 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Exceptions;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Properties;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Base class for Open API writer.
+    /// </summary>
+    internal abstract class OpenApiWriterBase : IOpenApiWriter
+    {
+        /// <summary>
+        /// Settings for controlling how the OpenAPI document will be written out.
+        /// </summary>
+        public OpenApiWriterSettings Settings { get; set; }
+
+        /// <summary>
+        /// The indentation string to prepend to each line for each indentation level.
+        /// </summary>
+        protected const string IndentationString = "  ";
+
+        /// <summary>
+        /// Scope of the Open API element - object, array, property.
+        /// </summary>
+        protected readonly Stack<Scope> Scopes;
+
+        /// <summary>
+        /// Number which specifies the level of indentation.
+        /// </summary>
+        private int _indentLevel;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiWriterBase"/> class.
+        /// </summary>
+        /// <param name="textWriter">The text writer.</param>
+        public OpenApiWriterBase(TextWriter textWriter) : this(textWriter, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiWriterBase"/> class.
+        /// </summary>
+        /// <param name="textWriter"></param>
+        /// <param name="settings"></param>
+        public OpenApiWriterBase(TextWriter textWriter, OpenApiWriterSettings settings)
+        {
+            Writer = textWriter;
+            Writer.NewLine = "\n";
+
+            Scopes = new();
+            if (settings == null)
+            {
+                settings = new();
+            }
+            Settings = settings;
+        }
+
+        /// <summary>
+        /// Base Indentation Level.
+        /// This denotes how many indentations are needed for the property in the base object.
+        /// </summary>
+        protected abstract int BaseIndentation { get; }
+
+        /// <summary>
+        /// The text writer.
+        /// </summary>
+        protected TextWriter Writer { get; }
+
+        /// <summary>
+        /// Write start object.
+        /// </summary>
+        public abstract void WriteStartObject();
+
+        /// <summary>
+        /// Write end object.
+        /// </summary>
+        public abstract void WriteEndObject();
+
+        /// <summary>
+        /// Write start array.
+        /// </summary>
+        public abstract void WriteStartArray();
+
+        /// <summary>
+        /// Write end array.
+        /// </summary>
+        public abstract void WriteEndArray();
+
+        /// <summary>
+        /// Write the start property.
+        /// </summary>
+        public abstract void WritePropertyName(string name);
+
+        /// <summary>
+        /// Writes a separator of a value if it's needed for the next value to be written.
+        /// </summary>
+        protected abstract void WriteValueSeparator();
+
+        /// <summary>
+        /// Write null value.
+        /// </summary>
+        public abstract void WriteNull();
+
+        /// <summary>
+        /// Write content raw value.
+        /// </summary>
+        public abstract void WriteRaw(string value);
+
+        /// <summary>
+        /// Flush the writer.
+        /// </summary>
+        public void Flush()
+        {
+            Writer.Flush();
+        }
+
+        /// <summary>
+        /// Write string value.
+        /// </summary>
+        /// <param name="value">The string value.</param>
+        public abstract void WriteValue(string value);
+
+        /// <summary>
+        /// Write float value.
+        /// </summary>
+        /// <param name="value">The float value.</param>
+        public virtual void WriteValue(float value)
+        {
+            WriteValueSeparator();
+            Writer.Write(value);
+        }
+
+        /// <summary>
+        /// Write double value.
+        /// </summary>
+        /// <param name="value">The double value.</param>
+        public virtual void WriteValue(double value)
+        {
+            WriteValueSeparator();
+            Writer.Write(value);
+        }
+
+        /// <summary>
+        /// Write decimal value.
+        /// </summary>
+        /// <param name="value">The decimal value.</param>
+        public virtual void WriteValue(decimal value)
+        {
+            WriteValueSeparator();
+            Writer.Write(value);
+        }
+
+        /// <summary>
+        /// Write integer value.
+        /// </summary>
+        /// <param name="value">The integer value.</param>
+        public virtual void WriteValue(int value)
+        {
+            WriteValueSeparator();
+            Writer.Write(value);
+        }
+
+        /// <summary>
+        /// Write long value.
+        /// </summary>
+        /// <param name="value">The long value.</param>
+        public virtual void WriteValue(long value)
+        {
+            WriteValueSeparator();
+            Writer.Write(value);
+        }
+
+        /// <summary>
+        /// Write DateTime value.
+        /// </summary>
+        /// <param name="value">The DateTime value.</param>
+        public virtual void WriteValue(DateTime value)
+        {
+            this.WriteValue(value.ToString("o"));
+        }
+
+        /// <summary>
+        /// Write DateTimeOffset value.
+        /// </summary>
+        /// <param name="value">The DateTimeOffset value.</param>
+        public virtual void WriteValue(DateTimeOffset value)
+        {
+            this.WriteValue(value.ToString("o"));
+        }
+
+        /// <summary>
+        /// Write boolean value.
+        /// </summary>
+        /// <param name="value">The boolean value.</param>
+        public virtual void WriteValue(bool value)
+        {
+            WriteValueSeparator();
+            Writer.Write(value.ToString().ToLower());
+        }
+
+        /// <summary>
+        /// Write object value.
+        /// </summary>
+        /// <param name="value">The object value.</param>
+        public virtual void WriteValue(object value)
+        {
+            if (value == null)
+            {
+                WriteNull();
+                return;
+            }
+
+            var type = value.GetType();
+
+            if (type == typeof(string))
+            {
+                WriteValue((string)(value));
+            }
+            else if (type == typeof(int) || type == typeof(int?))
+            {
+                WriteValue((int)value);
+            }
+            else if (type == typeof(long) || type == typeof(long?))
+            {
+                WriteValue((long)value);
+            }
+            else if (type == typeof(bool) || type == typeof(bool?))
+            {
+                WriteValue((bool)value);
+            }
+            else if (type == typeof(float) || type == typeof(float?))
+            {
+                WriteValue((float)value);
+            }
+            else if (type == typeof(double) || type == typeof(double?))
+            {
+                WriteValue((double)value);
+            }
+            else if (type == typeof(decimal) || type == typeof(decimal?))
+            {
+                WriteValue((decimal)value);
+            }
+            else if (type == typeof(DateTime) || type == typeof(DateTime?))
+            {
+                WriteValue((DateTime)value);
+            }
+            else if (type == typeof(DateTimeOffset) || type == typeof(DateTimeOffset?))
+            {
+                WriteValue((DateTimeOffset)value);
+            }
+            else
+            {
+                throw new OpenApiWriterException(string.Format(SRResource.OpenApiUnsupportedValueType, type.FullName));
+            }
+        }
+
+        /// <summary>
+        /// Increases the level of indentation applied to the output.
+        /// </summary>
+        public virtual void IncreaseIndentation()
+        {
+            _indentLevel++;
+        }
+
+        /// <summary>
+        /// Decreases the level of indentation applied to the output.
+        /// </summary>
+        public virtual void DecreaseIndentation()
+        {
+            if (_indentLevel == 0)
+            {
+                throw new OpenApiWriterException(SRResource.IndentationLevelInvalid);
+            }
+
+            if (_indentLevel < 1)
+            {
+                _indentLevel = 0;
+            }
+            else
+            {
+                _indentLevel--;
+            }
+        }
+
+        /// <summary>
+        /// Write the indentation.
+        /// </summary>
+        public virtual void WriteIndentation()
+        {
+            for (var i = 0; i < (BaseIndentation + _indentLevel - 1); i++)
+            {
+                Writer.Write(IndentationString);
+            }
+        }
+
+        /// <summary>
+        /// Get current scope.
+        /// </summary>
+        /// <returns></returns>
+        protected Scope CurrentScope()
+        {
+            return Scopes.Count == 0 ? null : Scopes.Peek();
+        }
+
+        /// <summary>
+        /// Start the scope given the scope type.
+        /// </summary>
+        /// <param name="type">The scope type to start.</param>
+        protected Scope StartScope(ScopeType type)
+        {
+            if (Scopes.Count != 0)
+            {
+                var currentScope = Scopes.Peek();
+
+                currentScope.ObjectCount++;
+            }
+
+            var scope = new Scope(type);
+            Scopes.Push(scope);
+            return scope;
+        }
+
+        /// <summary>
+        /// End the scope of the given scope type.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        protected Scope EndScope(ScopeType type)
+        {
+            if (Scopes.Count == 0)
+            {
+                throw new OpenApiWriterException(SRResource.ScopeMustBePresentToEnd);
+            }
+
+            if (Scopes.Peek().Type != type)
+            {
+                throw new OpenApiWriterException(
+                    string.Format(
+                        SRResource.ScopeToEndHasIncorrectType,
+                        type,
+                        Scopes.Peek().Type));
+            }
+
+            return Scopes.Pop();
+        }
+
+        /// <summary>
+        /// Whether the current scope is the top level (outermost) scope.
+        /// </summary>
+        protected bool IsTopLevelScope()
+        {
+            return Scopes.Count == 1;
+        }
+
+        /// <summary>
+        /// Whether the current scope is an object scope.
+        /// </summary>
+        protected bool IsObjectScope()
+        {
+            return IsScopeType(ScopeType.Object);
+        }
+
+        /// <summary>
+        /// Whether the current scope is an array scope.
+        /// </summary>
+        /// <returns></returns>
+        protected bool IsArrayScope()
+        {
+            return IsScopeType(ScopeType.Array);
+        }
+
+        private bool IsScopeType(ScopeType type)
+        {
+            if (Scopes.Count == 0)
+            {
+                return false;
+            }
+
+            return Scopes.Peek().Type == type;
+        }
+
+        /// <summary>
+        /// Verifies whether a property name can be written based on whether
+        /// the property name is a valid string and whether the current scope is an object scope.
+        /// </summary>
+        /// <param name="name">property name</param>
+        protected void VerifyCanWritePropertyName(string name)
+        {
+            Utils.CheckArgumentNull(name);
+
+            if (Scopes.Count == 0)
+            {
+                throw new OpenApiWriterException(
+                    string.Format(SRResource.ActiveScopeNeededForPropertyNameWriting, name));
+            }
+
+            if (Scopes.Peek().Type != ScopeType.Object)
+            {
+                throw new OpenApiWriterException(
+                    string.Format(SRResource.ObjectScopeNeededForPropertyNameWriting, name));
+            }
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs
new file mode 100644
index 000000000000..e2acb840603e
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs
@@ -0,0 +1,408 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Interfaces;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Extension methods for writing Open API documentation.
+    /// </summary>
+    internal static class OpenApiWriterExtensions
+    {
+        /// <summary>
+        /// Write a string property.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        public static void WriteProperty(this IOpenApiWriter writer, string name, string value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            Utils.CheckArgumentNullOrEmpty(name);
+            writer.WritePropertyName(name);
+            writer.WriteValue(value);
+        }
+
+        /// <summary>
+        /// Write required string property.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        public static void WriteRequiredProperty(this IOpenApiWriter writer, string name, string value)
+        {
+            Utils.CheckArgumentNullOrEmpty(name);
+            writer.WritePropertyName(name);
+            if (value == null)
+            {
+                writer.WriteNull();
+            }
+            else
+            {
+                writer.WriteValue(value);
+            }
+        }
+
+        /// <summary>
+        /// Write a boolean property.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        /// <param name="defaultValue">The default boolean value.</param>
+        public static void WriteProperty(this IOpenApiWriter writer, string name, bool value, bool defaultValue = false)
+        {
+            if (value == defaultValue)
+            {
+                return;
+            }
+
+            Utils.CheckArgumentNullOrEmpty(name);
+            writer.WritePropertyName(name);
+            writer.WriteValue(value);
+        }
+
+        /// <summary>
+        /// Write a boolean property.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        /// <param name="defaultValue">The default boolean value.</param>
+        public static void WriteProperty(
+            this IOpenApiWriter writer,
+            string name,
+            bool? value,
+            bool defaultValue = false)
+        {
+            if (value == null || value.Value == defaultValue)
+            {
+                return;
+            }
+
+            Utils.CheckArgumentNullOrEmpty(name);
+            writer.WritePropertyName(name);
+            writer.WriteValue(value.Value);
+        }
+
+        /// <summary>
+        /// Write a primitive property.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        public static void WriteProperty<T>(this IOpenApiWriter writer, string name, T? value)
+            where T : struct
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            writer.WriteProperty(name, value.Value);
+        }
+
+        /// <summary>
+        /// Write a string/number property.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        public static void WriteProperty<T>(this IOpenApiWriter writer, string name, T value)
+            where T : struct
+        {
+            Utils.CheckArgumentNullOrEmpty(name);
+            writer.WritePropertyName(name);
+            writer.WriteValue(value);
+        }
+
+        /// <summary>
+        /// Write the optional Open API object/element.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        /// <param name="action">The property value writer action.</param>
+        public static void WriteOptionalObject<T>(
+            this IOpenApiWriter writer,
+            string name,
+            T value,
+            Action<IOpenApiWriter, T> action)
+            where T : IOpenApiElement
+        {
+            if (value != null)
+            {
+                if (value is IEnumerable values && !values.GetEnumerator().MoveNext())
+                {
+                    return; // Don't render optional empty collections
+                }
+
+                writer.WriteRequiredObject(name, value, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the required Open API object/element.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        /// <param name="action">The property value writer action.</param>
+        public static void WriteRequiredObject<T>(
+            this IOpenApiWriter writer,
+            string name,
+            T value,
+            Action<IOpenApiWriter, T> action)
+            where T : IOpenApiElement
+        {
+            Utils.CheckArgumentNull(action);
+
+            writer.WritePropertyName(name);
+            if (value != null)
+            {
+                action(writer, value);
+            }
+            else
+            {
+                writer.WriteStartObject();
+                writer.WriteEndObject();
+            }
+        }
+
+        /// <summary>
+        /// Write the optional of collection string.
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The collection values.</param>
+        /// <param name="action">The collection string writer action.</param>
+        public static void WriteOptionalCollection(
+            this IOpenApiWriter writer,
+            string name,
+            IEnumerable<string> elements,
+            Action<IOpenApiWriter, string> action)
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteCollectionInternal(name, elements, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the optional Open API object/element collection.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The collection values.</param>
+        /// <param name="action">The collection element writer action.</param>
+        public static void WriteOptionalCollection<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IEnumerable<T> elements,
+            Action<IOpenApiWriter, T> action)
+            where T : IOpenApiElement
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteCollectionInternal(name, elements, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the required Open API object/element collection.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The collection values.</param>
+        /// <param name="action">The collection element writer action.</param>
+        public static void WriteRequiredCollection<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IEnumerable<T> elements,
+            Action<IOpenApiWriter, T> action)
+            where T : IOpenApiElement
+        {
+            writer.WriteCollectionInternal(name, elements, action);
+        }
+
+        /// <summary>
+        /// Write the optional Open API element map (string to string mapping).
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action.</param>
+        public static void WriteOptionalMap(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, string> elements,
+            Action<IOpenApiWriter, string> action)
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteMapInternal(name, elements, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the required Open API element map (string to string mapping).
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action.</param>
+        public static void WriteRequiredMap(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, string> elements,
+            Action<IOpenApiWriter, string> action)
+        {
+            writer.WriteMapInternal(name, elements, action);
+        }
+
+        /// <summary>
+        /// Write the optional Open API element map.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action with writer and value as input.</param>
+        public static void WriteOptionalMap<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, T> elements,
+            Action<IOpenApiWriter, T> action)
+            where T : IOpenApiElement
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteMapInternal(name, elements, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the optional Open API element map.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action with writer, key, and value as input.</param>
+        public static void WriteOptionalMap<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, T> elements,
+            Action<IOpenApiWriter, string, T> action)
+            where T : IOpenApiElement
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteMapInternal(name, elements, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the required Open API element map.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action.</param>
+        public static void WriteRequiredMap<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, T> elements,
+            Action<IOpenApiWriter, T> action)
+            where T : IOpenApiElement
+        {
+            writer.WriteMapInternal(name, elements, action);
+        }
+
+        private static void WriteCollectionInternal<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IEnumerable<T> elements,
+            Action<IOpenApiWriter, T> action)
+        {
+            Utils.CheckArgumentNull(action);
+
+            writer.WritePropertyName(name);
+            writer.WriteStartArray();
+            if (elements != null)
+            {
+                foreach (var item in elements)
+                {
+                    if (item != null)
+                    {
+                        action(writer, item);
+                    }
+                    else
+                    {
+                        writer.WriteNull();
+                    }
+                }
+            }
+
+            writer.WriteEndArray();
+        }
+
+        private static void WriteMapInternal<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, T> elements,
+            Action<IOpenApiWriter, T> action)
+        {
+            WriteMapInternal(writer, name, elements, (w, _, s) => action(w, s));
+        }
+
+        private static void WriteMapInternal<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, T> elements,
+            Action<IOpenApiWriter, string, T> action)
+        {
+            Utils.CheckArgumentNull(action);
+
+            writer.WritePropertyName(name);
+            writer.WriteStartObject();
+
+            if (elements != null)
+            {
+                foreach (var item in elements)
+                {
+                    writer.WritePropertyName(item.Key);
+                    if (item.Value != null)
+                    {
+                        action(writer, item.Key, item.Value);
+                    }
+                    else
+                    {
+                        writer.WriteNull();
+                    }
+                }
+            }
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs
new file mode 100644
index 000000000000..f1976b7df818
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs
@@ -0,0 +1,83 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+
+using System;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Models;
+using Datadog.Trace.Vendors.Microsoft.OpenApi.Services;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Indicates if and when the writer should convert references into complete object renderings
+    /// </summary>
+    [Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
+    internal enum ReferenceInlineSetting
+    {
+        /// <summary>
+        /// Render all references as $ref.
+        /// </summary>
+        DoNotInlineReferences,
+        /// <summary>
+        /// Render all local references as inline objects
+        /// </summary>
+        InlineLocalReferences,
+        /// <summary>
+        /// Render all references as inline objects.
+        /// </summary>
+        InlineAllReferences
+    }
+
+    /// <summary>
+    /// Configuration settings to control how OpenAPI documents are written
+    /// </summary>
+    internal class OpenApiWriterSettings
+    {
+        [Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
+        private ReferenceInlineSetting referenceInline = ReferenceInlineSetting.DoNotInlineReferences;
+
+        internal LoopDetector LoopDetector { get; } = new();
+        /// <summary>
+        /// Indicates how references in the source document should be handled.
+        /// </summary>
+        [Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
+        public ReferenceInlineSetting ReferenceInline {
+            get { return referenceInline; }
+            set {
+                referenceInline = value;
+                switch(referenceInline)
+                {
+                    case ReferenceInlineSetting.DoNotInlineReferences:
+                        InlineLocalReferences = false;
+                        InlineExternalReferences = false;
+                        break;
+                    case ReferenceInlineSetting.InlineLocalReferences:
+                        InlineLocalReferences = true;
+                        InlineExternalReferences = false;
+                        break;
+                    case ReferenceInlineSetting.InlineAllReferences:
+                        InlineLocalReferences = true;
+                        InlineExternalReferences = true;
+                        break;
+                }
+            }
+        }
+        /// <summary>
+        /// Indicates if local references should be rendered as an inline object
+        /// </summary>
+        public bool InlineLocalReferences { get; set; }
+
+        /// <summary>
+        /// Indicates if external references should be rendered as an inline object
+        /// </summary>
+        public bool InlineExternalReferences { get; set; }
+
+        internal bool ShouldInlineReference(OpenApiReference reference)
+        {
+            return (reference.IsLocal && InlineLocalReferences)
+                             || (reference.IsExternal && InlineExternalReferences);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/Scope.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/Scope.cs
new file mode 100644
index 000000000000..4ec136b1698a
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/Scope.cs
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Various scope types for Open API writer.
+    /// </summary>
+    internal enum ScopeType
+    {
+        /// <summary>
+        /// Object scope.
+        /// </summary>
+        Object = 0,
+
+        /// <summary>
+        /// Array scope.
+        /// </summary>
+        Array = 1,
+    }
+
+    /// <summary>
+    /// Class representing scope information.
+    /// </summary>
+    internal sealed class Scope
+    {
+        /// <summary>
+        /// The type of the scope.
+        /// </summary>
+        private readonly ScopeType _type;
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="type">The type of the scope.</param>
+        public Scope(ScopeType type)
+        {
+            this._type = type;
+        }
+
+        /// <summary>
+        /// Get/Set the object count for this scope.
+        /// </summary>
+        public int ObjectCount { get; set; }
+
+        /// <summary>
+        /// Gets the scope type for this scope.
+        /// </summary>
+        public ScopeType Type { get => _type; }
+
+        /// <summary>
+        /// Get/Set the whether it is in previous array scope.
+        /// </summary>
+        public bool IsInArray { get; set; } = false;
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs
new file mode 100644
index 000000000000..04f4a8c96ade
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs
@@ -0,0 +1,210 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Extensions class for strings to handle special characters.
+    /// </summary>
+    internal static class SpecialCharacterStringExtensions
+    {
+        // Plain style strings cannot start with indicators.
+        // http://www.yaml.org/spec/1.2/spec.html#indicator//
+        private static readonly HashSet<string> _yamlIndicators = new()
+        {
+            "-",
+            "?",
+            ":",
+            ",",
+            "{",
+            "}",
+            "[",
+            "]",
+            "&",
+            "*",
+            "#",
+            "?",
+            "|",
+            "-",
+            ">",
+            "!",
+            "%",
+            "@",
+            "`",
+            "'",
+            "\""
+        };
+
+        // Plain style strings cannot contain these character combinations.
+        // http://www.yaml.org/spec/1.2/spec.html#style/flow/plain
+        private static readonly HashSet<string> _yamlPlainStringForbiddenCombinations = new()
+        {
+            ": ",
+            " #",
+
+            // These are technically forbidden only inside flow collections, but
+            // for the sake of simplicity, we will never allow them in our generated plain string.
+            "[",
+            "]",
+            "{",
+            "}",
+            ","
+        };
+
+        // Plain style strings cannot end with these characters.
+        // http://www.yaml.org/spec/1.2/spec.html#style/flow/plain
+        private static readonly HashSet<string> _yamlPlainStringForbiddenTerminals = new()
+        {
+            ":"
+        };
+
+        // Double-quoted strings are needed for these non-printable control characters.
+        // http://www.yaml.org/spec/1.2/spec.html#style/flow/double-quoted
+        private static readonly Dictionary<char, string> _yamlControlCharacterCharReplacements = new()
+        {
+            {'\0', "\\0"},
+            {'\x01', "\\x01"},
+            {'\x02', "\\x02"},
+            {'\x03', "\\x03"},
+            {'\x04', "\\x04"},
+            {'\x05', "\\x05"},
+            {'\x06', "\\x06"},
+            {'\a', "\\a"},
+            {'\b', "\\b"},
+            {'\t', "\\t"},
+            {'\n', "\\n"},
+            {'\v', "\\v"},
+            {'\f', "\\f"},
+            {'\r', "\\r"},
+            {'\x0e', "\\x0e"},
+            {'\x0f', "\\x0f"},
+            {'\x10', "\\x10"},
+            {'\x11', "\\x11"},
+            {'\x12', "\\x12"},
+            {'\x13', "\\x13"},
+            {'\x14', "\\x14"},
+            {'\x15', "\\x15"},
+            {'\x16', "\\x16"},
+            {'\x17', "\\x17"},
+            {'\x18', "\\x18"},
+            {'\x19', "\\x19"},
+            {'\x1a', "\\x1a"},
+            {'\x1b', "\\x1b"},
+            {'\x1c', "\\x1c"},
+            {'\x1d', "\\x1d"},
+            {'\x1e', "\\x1e"},
+            {'\x1f', "\\x1f"},
+        };
+        
+        private static readonly Dictionary<string, string> _yamlControlCharacterStringReplacements = _yamlControlCharacterCharReplacements
+            .ToDictionary(x => x.Key.ToString(), x => x.Value);
+
+        /// <summary>
+        /// Escapes all special characters and put the string in quotes if necessary to
+        /// get a YAML-compatible string.
+        /// </summary>
+        internal static string GetYamlCompatibleString(this string input)
+        {
+            switch (input)
+            {
+                // If string is an empty string, wrap it in quote to ensure it is not recognized as null.
+                case "":
+                    return "''";
+                // If string is the word null, wrap it in quote to ensure it is not recognized as empty scalar null.
+                case "null":
+                    return "'null'";
+                // If string is the letter ~, wrap it in quote to ensure it is not recognized as empty scalar null.
+                case "~":
+                    return "'~'";
+            }
+
+            // If string includes a control character, wrapping in double quote is required.
+            if (input.Any(c => _yamlControlCharacterCharReplacements.ContainsKey(c)))
+            {
+                // Replace the backslash first, so that the new backslashes created by other Replaces are not duplicated.
+                input = input.Replace("\\", "\\\\");
+
+                // Escape the double quotes.
+                input = input.Replace("\"", "\\\"");
+
+                // Escape all the control characters.
+                foreach (var replacement in _yamlControlCharacterStringReplacements)
+                {
+                    input = input.Replace(replacement.Key, replacement.Value);
+                }
+                
+                return $"\"{input}\"";
+            }
+
+            // If string
+            // 1) includes a character forbidden in plain string,
+            // 2) starts with an indicator, OR
+            // 3) has trailing/leading white spaces,
+            // wrap the string in single quote.
+            // http://www.yaml.org/spec/1.2/spec.html#style/flow/plain
+            if (_yamlPlainStringForbiddenCombinations.Any(fc => input.Contains(fc)) ||
+                _yamlIndicators.Any(i => input.StartsWith(i)) ||
+                _yamlPlainStringForbiddenTerminals.Any(i => input.EndsWith(i)) ||
+                input.Trim() != input)
+            {
+                // Escape single quotes with two single quotes.
+                input = input.Replace("'", "''");
+
+                return $"'{input}'";
+            }
+
+            // If string can be mistaken as a number, c-style hexadecimal notation, a boolean, or a timestamp,
+            // wrap it in quote to indicate that this is indeed a string, not a number, c-style hexadecimal notation, a boolean, or a timestamp
+            if (decimal.TryParse(input, NumberStyles.Float, CultureInfo.InvariantCulture, out _) ||
+                IsHexadecimalNotation(input) ||
+                bool.TryParse(input, out _) ||
+                DateTime.TryParse(input, CultureInfo.InvariantCulture, DateTimeStyles.None, out _))
+            {
+                return $"'{input}'";
+            }
+
+            return input;
+        }
+
+        /// <summary>
+        /// Handles control characters and backslashes and adds double quotes
+        /// to get JSON-compatible string.
+        /// </summary>
+        internal static string GetJsonCompatibleString(this string value)
+        {
+            if (value == null)
+            {
+                return "null";
+            }
+
+            // Show the control characters as strings
+            // http://json.org/
+
+            // Replace the backslash first, so that the new backslashes created by other Replaces are not duplicated.
+            value = value.Replace("\\", "\\\\")
+                .Replace("\b", "\\b")
+                .Replace("\f", "\\f")
+                .Replace("\n", "\\n")
+                .Replace("\r", "\\r")
+                .Replace("\t", "\\t")
+                .Replace("\"", "\\\"");
+
+            return $"\"{value}\"";
+        }
+
+        internal static bool IsHexadecimalNotation(string input)
+        {
+            return input.StartsWith("0x") && int.TryParse(input.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _);
+        }
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/WriterConstants.cs b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/WriterConstants.cs
new file mode 100644
index 000000000000..2de7896d1410
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/Writers/WriterConstants.cs
@@ -0,0 +1,129 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+// This file was automatically generated by the UpdateVendoredCode tool.
+//------------------------------------------------------------------------------
+#pragma warning disable CS0618, CS0649, CS1574, CS1580, CS1581, CS1584, CS1591, CS1573, CS8018, SYSLIB0011, SYSLIB0023, SYSLIB0032
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Datadog.Trace.Vendors.Microsoft.OpenApi.Writers
+{
+    /// <summary>
+    /// Constants for the writer.
+    /// </summary>
+    internal static class WriterConstants
+    {
+        /// <summary>
+        /// JSON datetime format.
+        /// </summary>
+        internal const string ODataDateTimeFormat = @"\/Date({0})\/";
+
+        /// <summary>
+        /// JSON datetime offset format.
+        /// </summary>
+        internal const string ODataDateTimeOffsetFormat = @"\/Date({0}{1}{2:D4})\/";
+
+        /// <summary>
+        /// A plus sign for the date time offset format.
+        /// </summary>
+        internal const string ODataDateTimeOffsetPlusSign = "+";
+
+        /// <summary>
+        /// The true value literal.
+        /// </summary>
+        internal const string JsonTrueLiteral = "true";
+
+        /// <summary>
+        /// The false value literal.
+        /// </summary>
+        internal const string JsonFalseLiteral = "false";
+
+        /// <summary>
+        /// The null value literal.
+        /// </summary>
+        internal const string JsonNullLiteral = "null";
+
+        /// <summary>
+        /// Character which starts the object scope.
+        /// </summary>
+        internal const string StartObjectScope = "{";
+
+        /// <summary>
+        /// Character which ends the object scope.
+        /// </summary>
+        internal const string EndObjectScope = "}";
+
+        /// <summary>
+        /// Character which starts the array scope.
+        /// </summary>
+        internal const string StartArrayScope = "[";
+
+        /// <summary>
+        /// Character which ends the array scope.
+        /// </summary>
+        internal const string EndArrayScope = "]";
+
+        /// <summary>
+        /// "(" Json Padding Function scope open parens.
+        /// </summary>
+        internal const string StartPaddingFunctionScope = "(";
+
+        /// <summary>
+        /// ")" Json Padding Function scope close parens.
+        /// </summary>
+        internal const string EndPaddingFunctionScope = ")";
+
+        /// <summary>
+        /// The separator between object members.
+        /// </summary>
+        internal const string ObjectMemberSeparator = ",";
+
+        /// <summary>
+        /// The separator between array elements.
+        /// </summary>
+        internal const string ArrayElementSeparator = ",";
+
+        /// <summary>
+        /// The separator between the name and the value.
+        /// </summary>
+        internal const string NameValueSeparator = ":";
+
+        /// <summary>
+        /// The white space postfixing <see cref="NameValueSeparator"/>
+        /// when producing pretty content.
+        /// </summary>
+        internal const string NameValueSeparatorWhiteSpaceSuffix = " ";
+
+        /// <summary>
+        /// The white space for empty object
+        /// </summary>
+        internal const string WhiteSpaceForEmptyObject = " ";
+
+        /// <summary>
+        /// The white space for empty array
+        /// </summary>
+        internal const string WhiteSpaceForEmptyArray = " ";
+
+        /// <summary>
+        /// The prefix of array item
+        /// </summary>
+        internal const string PrefixOfArrayItem = "- ";
+
+        /// <summary>
+        /// The white space for indent
+        /// </summary>
+        internal const string WhiteSpaceForIndent = "  ";
+
+        /// <summary>
+        /// Empty object
+        /// </summary>
+        /// <remarks>To indicate empty object in YAML.</remarks>
+        internal const string EmptyObject = "{ }";
+
+        /// <summary>
+        /// Empty array
+        /// </summary>
+        /// <remarks>To indicate empty array in YAML.</remarks>
+        internal const string EmptyArray = "[ ]";
+    }
+}
diff --git a/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/_last_downloaded_source_url.txt b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/_last_downloaded_source_url.txt
new file mode 100644
index 000000000000..b0d3ba897ed2
--- /dev/null
+++ b/tracer/src/Datadog.Trace/Vendors/Microsoft.OpenApi/_last_downloaded_source_url.txt
@@ -0,0 +1 @@
+https://github.com/microsoft/OpenAPI.NET/archive/1.6.23.zip
\ No newline at end of file
diff --git a/tracer/src/Datadog.Tracer.Native/CMakeLists.txt b/tracer/src/Datadog.Tracer.Native/CMakeLists.txt
index 997c44dc3a39..18ecbbc31e8a 100644
--- a/tracer/src/Datadog.Tracer.Native/CMakeLists.txt
+++ b/tracer/src/Datadog.Tracer.Native/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 # Project definition
 # ******************************************************
 
-project("Datadog.Tracer.Native" VERSION 3.8.0)
+project("Datadog.Tracer.Native" VERSION 3.9.0)
 
 # ******************************************************
 # Environment detection
diff --git a/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp b/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp
index 32f662882477..6fb4b5cbb189 100644
--- a/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp
+++ b/tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp
@@ -4,12 +4,16 @@
 // </copyright>
 // <auto-generated/>
 #include "generated_definitions.h"
+#include "../../../../shared/src/native-src/version.h"
 
 namespace trace
 {
 int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
 {
-WCHAR* assemblyName = (WCHAR*)WStr("Datadog.Trace, Version=3.8.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
+std::string version = PROFILER_VERSION;
+std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
+shared::WSTRING nameW = ToWSTRING(name);
+WCHAR* assemblyName = (WCHAR*) (nameW.c_str());
 
 WCHAR* sig000[]={(WCHAR*)WStr("!!0"),(WCHAR*)WStr("StackExchange.Redis.Message"),(WCHAR*)WStr("StackExchange.Redis.ResultProcessor`1[!!0]"),(WCHAR*)WStr("StackExchange.Redis.ServerEndPoint"),};
 WCHAR* sig001[]={(WCHAR*)WStr("!!0"),(WCHAR*)WStr("StackExchange.Redis.Message"),(WCHAR*)WStr("StackExchange.Redis.ResultProcessor`1[!!0]"),(WCHAR*)WStr("StackExchange.Redis.ServerEndPoint"),(WCHAR*)WStr("!!0"),};
@@ -320,38 +324,38 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Derived,1,15},
-{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("netstandard"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig224,3,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteNonQueryAsync"),sig227,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig224,3,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteNonQueryAsync"),sig227,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Derived,1,15},
 {(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.Common"),(WCHAR*)WStr("System.Data.Common.DbDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("AerospikeClient"),(WCHAR*)WStr("Aerospike.Client.AsyncCommand"),(WCHAR*)WStr("ExecuteCommand"),sig236,1,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Aerospike.AsyncCommandIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("AerospikeClient"),(WCHAR*)WStr("Aerospike.Client.SyncCommand"),(WCHAR*)WStr("ExecuteCommand"),sig236,1,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Aerospike.SyncCommandIntegration"),CallTargetKind::Default,1,15},
 #if _WIN32
@@ -427,7 +431,7 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("AWSSDK.SQS"),(WCHAR*)WStr("Amazon.SQS.AmazonSQSClient"),(WCHAR*)WStr("SendMessageAsync"),sig201,3,3,0,0,3,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AWS.SQS.SendMessageAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("AWSSDK.SQS"),(WCHAR*)WStr("Amazon.SQS.AmazonSQSClient"),(WCHAR*)WStr("SendMessageBatch"),sig026,2,3,0,0,3,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AWS.SQS.SendMessageBatchIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("AWSSDK.SQS"),(WCHAR*)WStr("Amazon.SQS.AmazonSQSClient"),(WCHAR*)WStr("SendMessageBatchAsync"),sig200,3,3,0,0,3,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AWS.SQS.SendMessageBatchAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Azure.Functions.Worker.Core"),(WCHAR*)WStr("Microsoft.Azure.Functions.Worker.Pipeline.FunctionExecutionMiddleware"),(WCHAR*)WStr("Invoke"),sig163,2,1,4,0,1,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Azure.Functions.FunctionExecutionMiddlewareInvokeIntegration"),CallTargetKind::Default,1,14},
+{(WCHAR*)WStr("Microsoft.Azure.Functions.Worker.Core"),(WCHAR*)WStr("Microsoft.Azure.Functions.Worker.Pipeline.FunctionExecutionMiddleware"),(WCHAR*)WStr("Invoke"),sig163,2,1,4,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Azure.Functions.FunctionExecutionMiddlewareInvokeIntegration"),CallTargetKind::Default,1,14},
 {(WCHAR*)WStr("Microsoft.Azure.WebJobs.Host"),(WCHAR*)WStr("Microsoft.Azure.WebJobs.Host.Executors.FunctionExecutor"),(WCHAR*)WStr("TryExecuteAsync"),sig212,3,3,0,0,3,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Azure.Functions.AzureFunctionsExecutorTryExecuteAsyncIntegration"),CallTargetKind::Default,1,14},
 {(WCHAR*)WStr("Microsoft.Azure.WebJobs.Script.Grpc"),(WCHAR*)WStr("Microsoft.Azure.WebJobs.Script.Grpc.GrpcMessageConversionExtensions"),(WCHAR*)WStr("ToRpcHttp"),sig213,4,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Azure.Functions.GrpcMessageConversionExtensionsToRpcHttpIntegration"),CallTargetKind::Default,1,14},
 {(WCHAR*)WStr("Microsoft.Azure.WebJobs.Script.WebHost"),(WCHAR*)WStr("Microsoft.Azure.WebJobs.Script.WebHost.Middleware.FunctionInvocationMiddleware"),(WCHAR*)WStr("Invoke"),sig160,2,3,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Azure.Functions.FunctionInvocationMiddlewareInvokeIntegration"),CallTargetKind::Default,1,14},
@@ -698,7 +702,7 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter"),(WCHAR*)WStr("Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.UnitTestDiscoverer"),(WCHAR*)WStr("SendTestCases"),sig293,6,14,0,0,14,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Testing.MsTestV2.UnitTestDiscovererSendTestCasesIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Microsoft.VisualStudio.TestPlatform.TestFramework"),(WCHAR*)WStr("Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute"),(WCHAR*)WStr("Execute"),sig069,2,14,0,0,14,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Testing.MsTestV2.TestMethodAttributeExecuteIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Microsoft.VisualStudio.TestPlatform.TestFramework"),(WCHAR*)WStr("Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute"),(WCHAR*)WStr("Execute"),sig069,2,14,0,0,14,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Testing.MsTestV2.TestMethodAttributeExecuteIntegration"),CallTargetKind::Derived,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("Close"),sig236,1,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("Close"),sig236,1,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig224,3,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
@@ -714,15 +718,15 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("GetString"),sig140,2,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("GetValue"),sig134,2,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("Read"),sig095,1,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ReadAsync"),sig232,2,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("GetString"),sig140,2,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("GetValue"),sig134,2,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("Read"),sig095,1,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ReadAsync"),sig232,2,6,7,0,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySql.Data"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,8,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,0,61,0,0,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig224,3,0,61,0,0,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySql.Data.MySqlClient.MySqlCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,0,61,0,0,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Default,1,15},
@@ -741,11 +745,11 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig221,3,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("MySqlConnector"),(WCHAR*)WStr("MySqlConnector.MySqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("NLog"),(WCHAR*)WStr("NLog.LogFactory"),(WCHAR*)WStr("BuildLoggerConfiguration"),sig075,3,5,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.NLog.DirectSubmission.LogFactoryBuildLoggerConfiguration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("NLog"),(WCHAR*)WStr("NLog.LogFactory"),(WCHAR*)WStr("BuildLoggerConfiguration"),sig288,3,5,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.NLog.DirectSubmission.LogFactoryGetConfigurationForLoggerInstrumentation"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("NLog"),(WCHAR*)WStr("NLog.LogFactory"),(WCHAR*)WStr("GetConfigurationForLogger"),sig288,3,2,1,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.NLog.DirectSubmission.LogFactoryGetConfigurationForLoggerInstrumentation"),CallTargetKind::Default,1,15},
@@ -761,10 +765,10 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,4,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("Close"),sig165,4,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.Npgsql.ReaderCloseNpgsqlIntegration"),CallTargetKind::Default,4,15},
-{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Npgsql"),(WCHAR*)WStr("Npgsql.NpgsqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,8,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("nunit.framework"),(WCHAR*)WStr("NUnit.Framework.Internal.Execution.CommandBuilder"),(WCHAR*)WStr("MakeSkipCommand"),sig078,2,3,0,0,3,6,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Testing.NUnit.NUnitCommandBuilderMakeTestCommandIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("nunit.framework"),(WCHAR*)WStr("NUnit.Framework.Internal.Execution.CommandBuilder"),(WCHAR*)WStr("MakeTestCommand"),sig080,2,3,0,0,3,6,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Testing.NUnit.NUnitCommandBuilderMakeTestCommandIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("nunit.framework"),(WCHAR*)WStr("NUnit.Framework.Internal.Execution.SimpleWorkItem"),(WCHAR*)WStr(".ctor"),sig255,4,3,13,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Testing.NUnit.SimpleWorkItemctor2Integration"),CallTargetKind::Default,1,15},
@@ -780,12 +784,12 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteReader"),sig088,1,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteReader"),sig089,2,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.DataAccess"),(WCHAR*)WStr("Oracle.DataAccess.Client.OracleDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,122,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Default,1,15},
@@ -796,15 +800,15 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteReader"),sig091,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Close"),sig236,1,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetString"),sig140,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Read"),sig095,1,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleCommand"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,4,122,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Close"),sig236,1,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetString"),sig140,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("Read"),sig095,1,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Oracle.ManagedDataAccess"),(WCHAR*)WStr("Oracle.ManagedDataAccess.Client.OracleDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,23,0,0,23,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("System"),(WCHAR*)WStr("System.Diagnostics.Process"),(WCHAR*)WStr("Start"),sig113,1,1,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Process.ProcessStartIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Diagnostics.Process"),(WCHAR*)WStr("System.Diagnostics.Process"),(WCHAR*)WStr("Start"),sig113,1,1,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.Process.ProcessStartIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("RabbitMQ.Client"),(WCHAR*)WStr("RabbitMQ.Client.AsyncDefaultBasicConsumer"),(WCHAR*)WStr("HandleBasicDeliver"),sig168,8,3,6,9,6,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.RabbitMQ.BasicDeliverAsyncIntegration"),CallTargetKind::Derived,1,15},
@@ -853,16 +857,16 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig216,3,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.SqlClient"),(WCHAR*)WStr("Microsoft.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,1,0,0,5,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("Close"),sig236,1,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("GetString"),sig140,2,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("Read"),sig095,1,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig224,3,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Default,1,15},
@@ -872,11 +876,11 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig225,3,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig224,3,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Default,1,15},
@@ -886,16 +890,16 @@ std::vector<CallTargetDefinition3> callTargets =
 {(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteReaderAsync"),sig225,3,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalar"),sig132,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlCommand"),(WCHAR*)WStr("ExecuteScalarAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteScalarAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("Close"),sig236,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("GetString"),sig140,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("Read"),sig095,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,1,15},
-{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,1,15},
+{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Close"),sig236,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetString"),sig140,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("Read"),sig095,1,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SqlClient"),(WCHAR*)WStr("System.Data.SqlClient.SqlDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,4,0,0,4,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("Close"),sig236,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderCloseIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("GetString"),sig140,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("GetValue"),sig134,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderGetStringIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("Read"),sig095,1,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadIntegration"),CallTargetKind::Default,4,15},
+{(WCHAR*)WStr("System.Data.SQLite"),(WCHAR*)WStr("System.Data.SQLite.SQLiteDataReader"),(WCHAR*)WStr("ReadAsync"),sig232,2,1,0,0,2,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.ReaderReadAsyncIntegration"),CallTargetKind::Default,4,15},
 {(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteCommand"),(WCHAR*)WStr("ExecuteDbDataReader"),sig108,2,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteCommand"),(WCHAR*)WStr("ExecuteDbDataReaderAsync"),sig224,3,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration"),CallTargetKind::Default,1,15},
 {(WCHAR*)WStr("Microsoft.Data.Sqlite"),(WCHAR*)WStr("Microsoft.Data.Sqlite.SqliteCommand"),(WCHAR*)WStr("ExecuteNonQuery"),sig118,1,2,0,0,9,65535,65535,assemblyName,(WCHAR*)WStr("Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet.CommandExecuteNonQueryIntegration"),CallTargetKind::Default,1,15},
diff --git a/tracer/src/Datadog.Tracer.Native/Resource.rc b/tracer/src/Datadog.Tracer.Native/Resource.rc
index a281c677b3e5..e0f30d34658f 100644
--- a/tracer/src/Datadog.Tracer.Native/Resource.rc
+++ b/tracer/src/Datadog.Tracer.Native/Resource.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,0,0
- PRODUCTVERSION 3,8,0,0
+ FILEVERSION 3,9,0,0
+ PRODUCTVERSION 3,9,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Datadog, Inc."
             VALUE "FileDescription", "Datadog CLR Profiler"
-            VALUE "FileVersion", "3.8.0.0"
+            VALUE "FileVersion", "3.9.0.0"
             VALUE "InternalName", "Datadog.Tracer.Native.DLL"
             VALUE "LegalCopyright", "Copyright 2017 Datadog, Inc."
             VALUE "OriginalFilename", "Datadog.Tracer.Native.DLL"
             VALUE "ProductName", "Datadog .NET Tracer"
-            VALUE "ProductVersion", "3.8.0"
+            VALUE "ProductVersion", "3.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/tracer/src/Datadog.Tracer.Native/clr_helpers.cpp b/tracer/src/Datadog.Tracer.Native/clr_helpers.cpp
index d06a61780558..8241e1bbb041 100644
--- a/tracer/src/Datadog.Tracer.Native/clr_helpers.cpp
+++ b/tracer/src/Datadog.Tracer.Native/clr_helpers.cpp
@@ -892,6 +892,8 @@ bool ParseParamOrLocal(PCCOR_SIGNATURE& pbCur, PCCOR_SIGNATURE pbEnd)
 
     if (*pbCur == ELEMENT_TYPE_TYPEDBYREF) return false;
 
+    if (*pbCur == ELEMENT_TYPE_PINNED) pbCur++;
+
     if (*pbCur == ELEMENT_TYPE_BYREF) pbCur++;
 
     if (*pbCur == ELEMENT_TYPE_PTR) pbCur++;
diff --git a/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp b/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp
index d9c69641405a..066bf36dbe7f 100644
--- a/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp
+++ b/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp
@@ -51,6 +51,22 @@ HRESULT STDMETHODCALLTYPE CorProfiler::Initialize(IUnknown* cor_profiler_info_un
         Logger::EnableDebug(true);
     }
 
+    auto isRunningInAas = IsAzureAppServices();
+
+    if (profiler != nullptr)
+    {
+        if (isRunningInAas)
+        {
+            Logger::Info("The Tracer Profiler is initialized multiple times. This is expected and currently unavoidable when running in AAS.");
+        }
+        else
+        {
+            Logger::Error("The Tracer Profiler is initialized multiple times. This may cause unpredictable failures.",
+                " When running aspnetcore in IIS, make sure to disable managed code in the application pool settings.",
+                " https://learn.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/advanced?view=aspnetcore-9.0#create-the-iis-site");
+        }
+    }
+
     CorProfilerBase::Initialize(cor_profiler_info_unknown);
 
     // we used to bail-out if tracing was disabled, but we now allow the tracer to be loaded
@@ -157,7 +173,7 @@ HRESULT STDMETHODCALLTYPE CorProfiler::Initialize(IUnknown* cor_profiler_info_un
         }
     }
 
-    if (IsAzureAppServices())
+    if (isRunningInAas)
     {
         Logger::Info("Profiler is operating within Azure App Services context.");
 
diff --git a/tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h b/tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h
index f16c8a2b10d1..772d098aa503 100644
--- a/tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h
+++ b/tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h
@@ -112,7 +112,7 @@ const shared::WSTRING system_private_corelib_assemblyName = WStr("System.Private
 const shared::WSTRING datadog_trace_clrprofiler_managed_loader_assemblyName = WStr("Datadog.Trace.ClrProfiler.Managed.Loader");
 
 const shared::WSTRING managed_profiler_full_assembly_version =
-    WStr("Datadog.Trace, Version=3.8.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
+    WStr("Datadog.Trace, Version=3.9.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
 
 const shared::WSTRING managed_profiler_name = WStr("Datadog.Trace");
 const shared::WSTRING manual_instrumentation_name = WStr("Datadog.Trace.Manual");
@@ -160,7 +160,7 @@ const AssemblyProperty managed_profiler_assembly_property = AssemblyProperty(
                   49,  105, 236, 40,  21,  176, 12, 238, 238, 204, 141, 90,  27,  244, 61,  182, 125, 41,  97,  163,
                   233, 190, 161, 57,  127, 4,   62, 192, 116, 145, 112, 150, 73,  37,  47,  85,  101, 183, 86,  197},
     160, 32772, 1)
-        .WithVersion(3, 8, 0, 0);
+        .WithVersion(3, 9, 0, 0);
 
 } // namespace trace
 
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AzureFunctionsTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AzureFunctionsTests.cs
index 9d9a8a794ae6..b60883be12f4 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AzureFunctionsTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AzureFunctionsTests.cs
@@ -48,7 +48,7 @@ protected AzureFunctionsTests(string sampleAppName, ITestOutputHelper output)
     protected async Task<ProcessResult> RunAzureFunctionAndWaitForExit(MockTracerAgent agent, string framework = null, int expectedExitCode = 0)
     {
         // run the azure function
-        var binFolder = EnvironmentHelper.GetSampleApplicationOutputDirectory(packageVersion: string.Empty, framework, usePublishFolder: false);
+        var binFolder = EnvironmentHelper.GetSampleApplicationOutputDirectory(packageVersion: string.Empty, framework);
         Output.WriteLine("Using binFolder: " + binFolder);
         var process = await ProfilerHelper.StartProcessWithProfiler(
             executable: "func",
@@ -84,7 +84,7 @@ await VerifyHelper.VerifySpans(spans, settings)
                           .DisableRequireUniquePrefix();
     }
 
-    protected async Task AssertIsolatedSpans(IImmutableList<MockSpan> spans)
+    protected async Task AssertIsolatedSpans(IImmutableList<MockSpan> spans, string filename = null)
     {
         // AAS _potentially_ attaches extra tags here, depending on exactly where in the trace the tags are
         // so can't easily validate
@@ -99,8 +99,11 @@ protected async Task AssertIsolatedSpans(IImmutableList<MockSpan> spans)
             new(@"Microsoft.Azure.WebJobs.Extensions, Version=\d.\d.\d.\d"),
             @"Microsoft.Azure.WebJobs.Extensions, Version=0.0.0.0");
 
+        settings.AddRegexScrubber(new(@" in .+\.cs:line \d+"), string.Empty);
+
+        filename ??= $"{nameof(AzureFunctionsTests)}.Isolated";
         await VerifyHelper.VerifySpans(spans, settings)
-                          .UseFileName($"{nameof(AzureFunctionsTests)}.Isolated")
+                          .UseFileName(filename)
                           .DisableRequireUniquePrefix();
     }
 
@@ -168,6 +171,38 @@ public async Task SubmitsTraces()
     }
 #endif
 
+// v1 is only supported on .NET 6 and 7
+#if NET6_0 || NET7_0
+    [UsesVerify]
+    [Collection(nameof(AzureFunctionsTestsCollection))]
+    public class IsolatedRuntimeV4SdkV1 : AzureFunctionsTests
+    {
+        public IsolatedRuntimeV4SdkV1(ITestOutputHelper output)
+            : base("AzureFunctions.V4Isolated.SdkV1", output)
+        {
+            SetEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME", "dotnet-isolated");
+        }
+
+        [SkippableFact]
+        [Trait("Category", "EndToEnd")]
+        [Trait("Category", "AzureFunctions")]
+        [Trait("RunOnWindows", "True")]
+        public async Task SubmitsTraces()
+        {
+            using var agent = EnvironmentHelper.GetMockAgent(useTelemetry: true);
+            using (await RunAzureFunctionAndWaitForExit(agent, expectedExitCode: -1))
+            {
+                const int expectedSpanCount = 21;
+                var spans = agent.WaitForSpans(expectedSpanCount);
+
+                using var s = new AssertionScope();
+
+                await AssertIsolatedSpans(spans, $"{nameof(AzureFunctionsTests)}.Isolated.V4.Sdk1");
+            }
+        }
+    }
+#endif
+
 #if NET6_0_OR_GREATER
     [UsesVerify]
     [Collection(nameof(AzureFunctionsTestsCollection))]
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2EvpTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2EvpTests.cs
index 505aea005c00..1fa869d6c166 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2EvpTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2EvpTests.cs
@@ -365,6 +365,7 @@ await Verifier.Verify(
         [Trait("Category", "EarlyFlakeDetection")]
         public async Task EarlyFlakeDetection(string packageVersion, string evpVersionToRemove, bool expectedGzip, string settingsJson, string testsJson, int expectedSpansForPre224, int expectedSpansForPost224, string friendlyName)
         {
+            SetEnvironmentVariable("DD_TRACE_DEBUG", "1");
             var version = string.IsNullOrEmpty(packageVersion) ? new Version("2.2.8") : new Version(packageVersion);
             var tests = new List<MockCIVisibilityTest>();
             var testSuites = new List<MockCIVisibilityTestSuite>();
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitEvpTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitEvpTests.cs
index 4bd7232a5259..4ae280407dad 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitEvpTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitEvpTests.cs
@@ -420,6 +420,7 @@ public async Task EarlyFlakeDetection(string packageVersion, string evpVersionTo
                 }
             }
 
+            SetEnvironmentVariable("DD_TRACE_DEBUG", "1");
             var tests = new List<MockCIVisibilityTest>();
             var testSuites = new List<MockCIVisibilityTestSuite>();
             var testModules = new List<MockCIVisibilityTestModule>();
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/PipesXUnitEvpTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/PipesXUnitEvpTests.cs
index 344a94afe670..afb98d9db1a6 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/PipesXUnitEvpTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/PipesXUnitEvpTests.cs
@@ -15,7 +15,7 @@ namespace Datadog.Trace.ClrProfiler.IntegrationTests.CI;
 [Collection(nameof(TransportTestsCollection))]
 public class PipesXUnitEvpTests(ITestOutputHelper output) : XUnitEvpTests(output)
 {
-    [SkippableTheory]
+    [SkippableTheory(Skip = "These are currently very flaky - revisit once we move to aspnetcore-based mock agent")]
     [MemberData(nameof(GetData))]
     [Trait("RunOnWindows", "True")]
     [Trait("Category", "EndToEnd")]
@@ -43,7 +43,7 @@ public override async Task SubmitTraces(string packageVersion, string evpVersion
         }
     }
 
-    [SkippableTheory]
+    [SkippableTheory(Skip = "These are currently very flaky - revisit once we move to aspnetcore-based mock agent")]
     [MemberData(nameof(GetDataForEarlyFlakeDetection))]
     [Trait("RunOnWindows", "True")]
     [Trait("Category", "EndToEnd")]
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitEvpTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitEvpTests.cs
index 51613b2f0b9b..3986799ab578 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitEvpTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitEvpTests.cs
@@ -379,6 +379,8 @@ public virtual async Task SubmitTraces(string packageVersion, string evpVersionT
 
     public virtual async Task EarlyFlakeDetection(string packageVersion, string evpVersionToRemove, bool expectedGzip, string settingsJson, string testsJson, int expectedSpans, string friendlyName)
     {
+        SetEnvironmentVariable("DD_TRACE_DEBUG", "1");
+
         var tests = new List<MockCIVisibilityTest>();
         var testSuites = new List<MockCIVisibilityTestSuite>();
         var testModules = new List<MockCIVisibilityTestModule>();
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CallTargetNativeTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CallTargetNativeTests.cs
index 210b9c2ae450..24ded2a40f01 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CallTargetNativeTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CallTargetNativeTests.cs
@@ -24,7 +24,7 @@ public CallTargetNativeTests(ITestOutputHelper output)
 
         public static IEnumerable<object[]> MethodArgumentsData()
         {
-            for (var i = 0; i < 10; i++)
+            for (var i = 0; i < 1; i++)
             {
                 var fastPath = i < 9;
                 yield return new object[] { i, fastPath };
@@ -65,8 +65,8 @@ public async Task MethodArgumentsInstrumentation(int numberOfArguments, bool fas
                 {
                     // On number of arguments = 0 the throw exception on integrations async continuation runs.
                     // So we have 1 more case with an exception being reported from the integration.
-                    Assert.Equal(172, beginMethodCount);
-                    Assert.Equal(172, endMethodCount);
+                    Assert.Equal(180, beginMethodCount);
+                    Assert.Equal(180, endMethodCount);
                     Assert.Equal(44, exceptionCount);
                 }
                 else
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj
index cf6e394928db..0c7b798d6745 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj
@@ -11,10 +11,10 @@
     <None Remove="xunit.runner.json" />
     <Compile Include="..\Datadog.Trace.TestHelpers.SharedSource\VerifyHelper.cs" Link="Helpers\VerifyHelper.cs" />
     <Content Include="applicationHost.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
 
     <ProjectReference Include="..\..\src\Datadog.Trace\Datadog.Trace.csproj" />
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/PathUtil.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/PathUtil.cs
new file mode 100644
index 000000000000..6e47dcc514d7
--- /dev/null
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/PathUtil.cs
@@ -0,0 +1,266 @@
+// <copyright file="PathUtil.cs" company="Datadog">
+// 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.
+// </copyright>
+
+using System;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace Datadog.Trace.ClrProfiler.IntegrationTests;
+
+public class PathUtil
+{
+    /// <summary>
+    /// Create a relative path from one path to another. Paths will be resolved before calculating the difference.
+    /// Default path comparison for the active platform will be used (OrdinalIgnoreCase for Windows or Mac, Ordinal for Unix).
+    /// </summary>
+    /// <param name="relativeTo">The source path the output should be relative to. This path is always considered to be a directory.</param>
+    /// <param name="path">The destination path.</param>
+    /// <returns>The relative path or <paramref name="path"/> if the paths don't share the same root.</returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="relativeTo"/> or <paramref name="path"/> is <c>null</c> or an empty string.</exception>
+    public static string GetRelativePath(string relativeTo, string path)
+#if NETCOREAPP
+        => Path.GetRelativePath(relativeTo, path);
+#else
+    {
+        const char directorySeparatorChar = '\\';
+        const char altDirectorySeparatorChar = '/';
+        const char volumeSeparatorChar = ':';
+
+        const string extendedDevicePathPrefix = @"\\?\";
+        const string uncExtendedPathPrefix = @"\\?\UNC\";
+
+        // based on https://github.com/dotnet/runtime/blob/1d1bf92fcf43aa6981804dc53c5174445069c9e4/src/libraries/System.Private.CoreLib/src/System/IO/Path.cs#L843
+        var comparisonType = StringComparison.OrdinalIgnoreCase; // Windows only
+        relativeTo = Path.GetFullPath(relativeTo);
+        path = Path.GetFullPath(path);
+
+        // Need to check if the roots are different- if they are we need to return the "to" path.
+        if (!AreRootsEqual(relativeTo, path, comparisonType))
+        {
+            return path;
+        }
+
+        var commonLength = GetCommonPathLength(relativeTo, path, ignoreCase: true);
+
+        // If there is nothing in common they can't share the same root, return the "to" path as is.
+        if (commonLength == 0)
+        {
+            return path;
+        }
+
+        // Trailing separators aren't significant for comparison
+        var relativeToLength = relativeTo.Length;
+        if (EndsInDirectorySeparator(relativeTo))
+        {
+            relativeToLength--;
+        }
+
+        var pathEndsInSeparator = EndsInDirectorySeparator(path);
+        var pathLength = path.Length;
+        if (pathEndsInSeparator)
+        {
+            pathLength--;
+        }
+
+        // If we have effectively the same path, return "."
+        if (relativeToLength == pathLength && commonLength >= relativeToLength)
+        {
+            return ".";
+        }
+
+        // We have the same root, we need to calculate the difference now using the
+        // common Length and Segment count past the length.
+        //
+        // Some examples:
+        //
+        //  C:\Foo C:\Bar L3, S1 -> ..\Bar
+        //  C:\Foo C:\Foo\Bar L6, S0 -> Bar
+        //  C:\Foo\Bar C:\Bar\Bar L3, S2 -> ..\..\Bar\Bar
+        //  C:\Foo\Foo C:\Foo\Bar L7, S1 -> ..\Bar
+
+        var sb = new StringBuilder();
+        sb.EnsureCapacity(Math.Max(relativeTo.Length, path.Length));
+
+        // Add parent segments for segments past the common on the "from" path
+        if (commonLength < relativeToLength)
+        {
+            sb.Append("..");
+
+            for (var i = commonLength + 1; i < relativeToLength; i++)
+            {
+                if (IsDirectorySeparator(relativeTo[i]))
+                {
+                    sb.Append(directorySeparatorChar);
+                    sb.Append("..");
+                }
+            }
+        }
+        else if (IsDirectorySeparator(path[commonLength]))
+        {
+            // No parent segments and we need to eat the initial separator
+            //  (C:\Foo C:\Foo\Bar case)
+            commonLength++;
+        }
+
+        // Now add the rest of the "to" path, adding back the trailing separator
+        var differenceLength = pathLength - commonLength;
+        if (pathEndsInSeparator)
+        {
+            differenceLength++;
+        }
+
+        if (differenceLength > 0)
+        {
+            if (sb.Length > 0)
+            {
+                sb.Append(directorySeparatorChar);
+            }
+
+            sb.Append(path, commonLength, differenceLength);
+        }
+
+        return sb.ToString();
+
+        static int GetCommonPathLength(string first, string second, bool ignoreCase)
+        {
+            var commonChars = EqualStartingCharacterCount(first, second, ignoreCase: ignoreCase);
+
+            // If nothing matches
+            if (commonChars == 0)
+            {
+                return commonChars;
+            }
+
+            // Or we're a full string and equal length or match to a separator
+            if (commonChars == first.Length
+             && (commonChars == second.Length || IsDirectorySeparator(second[commonChars])))
+            {
+                return commonChars;
+            }
+
+            if (commonChars == second.Length && IsDirectorySeparator(first[commonChars]))
+            {
+                return commonChars;
+            }
+
+            // It's possible we matched somewhere in the middle of a segment e.g. C:\Foodie and C:\Foobar.
+            while (commonChars > 0 && !IsDirectorySeparator(first[commonChars - 1]))
+            {
+                commonChars--;
+            }
+
+            return commonChars;
+        }
+
+        static int EqualStartingCharacterCount(string first, string second, bool ignoreCase)
+        {
+            if (string.IsNullOrEmpty(first) || string.IsNullOrEmpty(second))
+            {
+                return 0;
+            }
+
+            var commonChars = 0;
+            var f = 0;
+            var s = 0;
+
+            var l = first[f];
+            var r = second[s];
+            var leftEnd = first.Length;
+            var rightEnd = second.Length;
+
+            while (l < leftEnd
+                && r < rightEnd
+                && (l == r || (ignoreCase && char.ToUpperInvariant(l) == char.ToUpperInvariant(r))))
+            {
+                commonChars++;
+                l++;
+                r++;
+            }
+
+            return commonChars;
+        }
+
+        static bool AreRootsEqual(string first, string second, StringComparison comparisonType)
+        {
+            var firstRootLength = GetRootLength(first);
+            var secondRootLength = GetRootLength(second);
+
+            return firstRootLength == secondRootLength
+                && string.Compare(
+                       strA: first,
+                       indexA: 0,
+                       strB: second,
+                       indexB: 0,
+                       length: firstRootLength,
+                       comparisonType: comparisonType) == 0;
+        }
+
+        static int GetRootLength(string path)
+        {
+            var i = 0;
+            var volumeSeparatorLength = 2; // Length to the colon "C:"
+            var uncRootLength = 2; // Length to the start of the server name "\\"
+
+            var extendedSyntax = path.StartsWith(extendedDevicePathPrefix);
+            var extendedUncSyntax = path.StartsWith(uncExtendedPathPrefix);
+            if (extendedSyntax)
+            {
+                // Shift the position we look for the root from to account for the extended prefix
+                if (extendedUncSyntax)
+                {
+                    // "\\" -> "\\?\UNC\"
+                    uncRootLength = uncExtendedPathPrefix.Length;
+                }
+                else
+                {
+                    // "C:" -> "\\?\C:"
+                    volumeSeparatorLength += extendedDevicePathPrefix.Length;
+                }
+            }
+
+            if ((!extendedSyntax || extendedUncSyntax) && path.Length > 0 && IsDirectorySeparator(path[0]))
+            {
+                // UNC or simple rooted path (e.g. "\foo", NOT "\\?\C:\foo")
+
+                i = 1; // Drive rooted (\foo) is one character
+                if (extendedUncSyntax || (path.Length > 1 && IsDirectorySeparator(path[1])))
+                {
+                    // UNC (\\?\UNC\ or \\), scan past the next two directory separators at most
+                    // (e.g. to \\?\UNC\Server\Share or \\Server\Share\)
+                    i = uncRootLength;
+                    var n = 2; // Maximum separators to skip
+                    while (i < path.Length && (!IsDirectorySeparator(path[i]) || --n > 0))
+                    {
+                        i++;
+                    }
+                }
+            }
+            else if (path.Length >= volumeSeparatorLength &&
+                     path[volumeSeparatorLength - 1] == volumeSeparatorChar)
+            {
+                // Path is at least longer than where we expect a colon, and has a colon (\\?\A:, A:)
+                // If the colon is followed by a directory separator, move past it
+                i = volumeSeparatorLength;
+                if (path.Length >= volumeSeparatorLength + 1 && IsDirectorySeparator(path[volumeSeparatorLength]))
+                {
+                    i++;
+                }
+            }
+
+            return i;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        static bool IsDirectorySeparator(char c)
+        {
+            return c == directorySeparatorChar || c == altDirectorySeparatorChar;
+        }
+
+        static bool EndsInDirectorySeparator(string path)
+            => path.Length > 0 && IsDirectorySeparator(path[path.Length - 1]);
+    }
+#endif
+}
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelper.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelper.cs
index a6862a0c73e3..11bdaf6fd4d7 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelper.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelper.cs
@@ -1,4 +1,4 @@
-// <copyright file="TelemetryHelper.cs" company="Datadog">
+// <copyright file="TelemetryHelper.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -165,9 +165,45 @@ _ when data.TryGetPayload<AppIntegrationsChangedPayload>(TelemetryRequestTypes.A
                 }
             }
 
+            var spansCreatedByIntegration = new ConcurrentDictionary<string, MetricData>();
+            var metricsPayloads =
+                allData
+                    .Select(
+                        data => data switch
+                        {
+                            _ when data.TryGetPayload<GenerateMetricsPayload>(TelemetryRequestTypes.GenerateMetrics) is { } p => p.Series.Where(s => s.Metric == "spans_created"),
+                            _ => null,
+                        })
+                    .Where(x => x is not null);
+
+            // Flatten the spans_created metrics
+            foreach (var metricPayload in metricsPayloads)
+            {
+                foreach (var metricEntry in metricPayload)
+                {
+                    spansCreatedByIntegration.TryAdd(metricEntry.Tags.First(s => s.StartsWith("integration_name:")), metricEntry);
+                }
+            }
+
+            var integrationName = integrationId.ToString();
+            var integrationNameTagValue = integrationName switch
+            {
+                "OpenTelemetry" => "otel",
+                _ => integrationName.ToLowerInvariant(),
+            };
+
+            if (enabled)
+            {
+                spansCreatedByIntegration.Should().NotBeEmpty();
+
+                var spansCreated = spansCreatedByIntegration.Should().ContainKey($"integration_name:{integrationNameTagValue}").WhoseValue;
+                spansCreated.Points.Should().NotBeEmpty();
+                spansCreated.Points.Sum(p => p.Value).Should().BeGreaterThanOrEqualTo(1);
+            }
+
             latestIntegrations.Should().NotBeEmpty();
 
-            var integration = latestIntegrations.Should().ContainKey(integrationId.ToString()).WhoseValue;
+            var integration = latestIntegrations.Should().ContainKey(integrationName).WhoseValue;
 
             integration.Enabled.Should().Be(enabled, $"{integration.Name} should only be enabled if we generate a span");
             if (autoEnabled.HasValue)
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelperTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelperTests.cs
index 62f52538bb35..e68ca22f2544 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelperTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/TelemetryHelperTests.cs
@@ -11,6 +11,7 @@
 using Datadog.Trace.Configuration.ConfigurationSources.Telemetry;
 using Datadog.Trace.Configuration.Telemetry;
 using Datadog.Trace.Telemetry;
+using Datadog.Trace.Telemetry.Metrics;
 using Datadog.Trace.TestHelpers;
 using FluentAssertions;
 using FluentAssertions.Execution;
@@ -48,25 +49,35 @@ public TelemetryHelperTests(ITestOutputHelper output)
     public void AssertIntegration_HandlesMultipleTelemetryPushes()
     {
         var collector = new IntegrationTelemetryCollector();
+        var metricsCollector = new MetricsTelemetryCollector();
         var telemetryData = new List<TelemetryData>();
 
         collector.IntegrationRunning(IntegrationId.Aerospike);
 
-        telemetryData.Add(BuildTelemetryData(collector.GetData()));
+        metricsCollector.AggregateMetrics();
+        telemetryData.Add(BuildTelemetryData(collector.GetData(), metrics: metricsCollector.GetMetrics()));
 
+        // The updates to both the IntegrationTelemetryCollector and the MetricsTelemetryCollector
+        // are typically handled by TelemetryController.IntegrationGeneratedSpan(IntegrationId),
+        // so we simulate that here with the separate calls
         collector.IntegrationGeneratedSpan(IntegrationId.Aerospike);
+        metricsCollector.RecordCountSpanCreated(IntegrationId.Aerospike.GetMetricTag());
+
         collector.IntegrationRunning(IntegrationId.Couchbase);
-        telemetryData.Add(BuildTelemetryData(collector.GetData(), sendAppStarted: false));
+
+        metricsCollector.AggregateMetrics();
+        telemetryData.Add(BuildTelemetryData(collector.GetData(), metrics: metricsCollector.GetMetrics(), sendAppStarted: false));
 
         collector.IntegrationRunning(IntegrationId.Kafka);
-        collector.IntegrationGeneratedSpan(IntegrationId.Msmq);
+        collector.IntegrationRunning(IntegrationId.Msmq);
         var tracerSettings = TracerSettings.Create(new()
         {
             { ConfigurationKeys.DisabledIntegrations, $"{nameof(IntegrationId.Kafka)};{nameof(IntegrationId.Msmq)}" }
         });
 
         collector.RecordTracerSettings(tracerSettings);
-        telemetryData.Add(BuildTelemetryData(collector.GetData(), sendAppClosing: true));
+        metricsCollector.AggregateMetrics();
+        telemetryData.Add(BuildTelemetryData(collector.GetData(), metrics: metricsCollector.GetMetrics(), sendAppClosing: true));
 
         using var s = new AssertionScope();
         TelemetryHelper.AssertIntegration(telemetryData, IntegrationId.Aerospike, enabled: true, autoEnabled: true);
@@ -150,12 +161,13 @@ public void AssertConfiguration_HandlesMultipleTelemetryPushes()
     private TelemetryData BuildTelemetryData(
         ICollection<IntegrationTelemetryData> integrations,
         ICollection<ConfigurationKeyValue> configuration = null,
+        MetricResults? metrics = null,
         bool sendAppStarted = true,
         bool sendAppClosing = false)
         => _dataBuilder.BuildTelemetryData(
                 _app,
                 _host,
-                new TelemetryInput(configuration, null, integrations, null, null, sendAppStarted),
+                new TelemetryInput(configuration, null, integrations, metrics, null, sendAppStarted),
                 namingSchemeVersion: "1",
                 sendAppClosing);
 }
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/InstrumentationTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/InstrumentationTests.cs
index e9f01d5e3958..a9c78ab5a090 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/InstrumentationTests.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/InstrumentationTests.cs
@@ -132,6 +132,37 @@ public async Task InstrumentsDotNetTest()
         }
 #endif
 
+        [SkippableFact]
+        [Trait("RunOnWindows", "True")]
+        public async Task WhenUsingRelativeTracerHome_InstrumentsApp()
+        {
+            // the working dir when we run the app is the _test_ project, not the app itself, so we need to be relative to that
+            // This is a perfect example of why we don't recommend using relative paths for these variables
+            var workingDir = Environment.CurrentDirectory;
+            var monitoringHome = EnvironmentHelper.MonitoringHome;
+            var path = PathUtil.GetRelativePath(workingDir, monitoringHome);
+            var effectivePath = Path.GetFullPath(Path.Combine(workingDir, path));
+            Output.WriteLine($"Using DD_DOTNET_TRACER_HOME={path} with workingDir={workingDir} and monitoringHome={monitoringHome}, giving an effective path of {effectivePath}");
+            SetEnvironmentVariable("DD_DOTNET_TRACER_HOME", path);
+            using var agent = EnvironmentHelper.GetMockAgent(useTelemetry: true);
+            using var processResult = await RunSampleAndWaitForExit(agent, "traces 1");
+            agent.Spans.Should().NotBeEmpty();
+            agent.Telemetry.Should().NotBeEmpty();
+        }
+
+        [SkippableFact]
+        [Trait("RunOnWindows", "True")]
+        public async Task WhenUsingPathWithDotsInInTracerHome_InstrumentsApp()
+        {
+            var path = Path.Combine(EnvironmentHelper.MonitoringHome, "..", Path.GetFileName(EnvironmentHelper.MonitoringHome)!);
+            Output.WriteLine("Using DD_DOTNET_TRACER_HOME " + path);
+            SetEnvironmentVariable("DD_DOTNET_TRACER_HOME", path);
+            using var agent = EnvironmentHelper.GetMockAgent(useTelemetry: true);
+            using var processResult = await RunSampleAndWaitForExit(agent, "traces 1");
+            agent.Spans.Should().NotBeEmpty();
+            agent.Telemetry.Should().NotBeEmpty();
+        }
+
 #if NETCOREAPP && !NETCOREAPP3_1_OR_GREATER
         [SkippableFact]
         [Trait("RunOnWindows", "True")]
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
index 9f76b1ea9bdd..cdfba58082b4 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs
@@ -27,31 +27,31 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET5_0
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET6_0
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET7_0
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET8_0
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET9_0
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #endif
             };
@@ -64,31 +64,31 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET5_0
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET6_0
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET7_0
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET8_0
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET9_0
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #endif
             };
@@ -120,31 +120,31 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET5_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET6_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET7_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET8_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET9_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #endif
             };
@@ -157,31 +157,31 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET5_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET6_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET7_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET8_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET9_0
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #endif
             };
@@ -194,31 +194,31 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP2_1
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP3_0
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET5_0
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET6_0
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET7_0
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET8_0
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET9_0
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #endif
             };
@@ -804,7 +804,7 @@ public class PackageVersionsLatestMajors
 #else
 #if NET462
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "1.2.6" },
@@ -816,27 +816,27 @@ public class PackageVersionsLatestMajors
 #endif
 #if NETCOREAPP3_1
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET5_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET6_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET7_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET8_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET9_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #endif
             };
@@ -1093,7 +1093,7 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.4.2" },
@@ -1108,16 +1108,16 @@ public class PackageVersionsLatestMajors
                 new object[] { "2.4.2" },
 #endif
 #if NET6_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET7_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET8_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET9_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #endif
             };
@@ -1130,7 +1130,7 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.4.2" },
@@ -1145,16 +1145,16 @@ public class PackageVersionsLatestMajors
                 new object[] { "2.4.2" },
 #endif
 #if NET6_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET7_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET8_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET9_0
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #endif
             };
@@ -1168,7 +1168,7 @@ public class PackageVersionsLatestMajors
 #else
 #if NET462
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.14.0" },
@@ -1184,19 +1184,19 @@ public class PackageVersionsLatestMajors
 #endif
 #if NET6_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET7_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET8_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET9_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #endif
             };
@@ -1210,7 +1210,7 @@ public class PackageVersionsLatestMajors
 #else
 #if NET462
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.14.0" },
@@ -1226,19 +1226,19 @@ public class PackageVersionsLatestMajors
 #endif
 #if NET6_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET7_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET8_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET9_0
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #endif
             };
@@ -1252,39 +1252,39 @@ public class PackageVersionsLatestMajors
 #else
 #if NET462
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -1298,39 +1298,39 @@ public class PackageVersionsLatestMajors
 #else
 #if NET462
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -1344,39 +1344,39 @@ public class PackageVersionsLatestMajors
 #else
 #if NET462
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -1390,39 +1390,39 @@ public class PackageVersionsLatestMajors
 #else
 #if NET462
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET5_0
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET6_0
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET7_0
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET8_0
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET9_0
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #endif
             };
@@ -1435,7 +1435,7 @@ public class PackageVersionsLatestMajors
                 new object[] { string.Empty },
 #else
 #if NET462
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.28.0" },
@@ -1444,22 +1444,22 @@ public class PackageVersionsLatestMajors
                 new object[] { "3.28.0" },
 #endif
 #if NETCOREAPP3_1
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET5_0
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET6_0
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET7_0
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET8_0
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET9_0
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #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 d3d97b7d7638..63873c5ac857 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs
@@ -30,47 +30,47 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.1.5.3" },
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET5_0
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET6_0
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET7_0
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET8_0
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET9_0
                 new object[] { "3.3.106.47" },
                 new object[] { "3.5.4.38" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #endif
             };
@@ -86,47 +86,47 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.1.3.5" },
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET5_0
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET6_0
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET7_0
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET8_0
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET9_0
                 new object[] { "3.3.101.1" },
                 new object[] { "3.5.0.79" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #endif
             };
@@ -185,47 +185,47 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.1.0.13" },
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET5_0
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET6_0
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET7_0
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET8_0
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET9_0
                 new object[] { "3.3.103.26" },
                 new object[] { "3.5.1.28" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #endif
             };
@@ -241,47 +241,47 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.1.2.1" },
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET5_0
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET6_0
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET7_0
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET8_0
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET9_0
                 new object[] { "3.3.102.17" },
                 new object[] { "3.5.1.51" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #endif
             };
@@ -296,47 +296,47 @@ public class PackageVersionsLatestMinors
 #if NET462
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET5_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET6_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET7_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET8_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET9_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #endif
             };
@@ -2073,7 +2073,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.5.61" },
                 new object[] { "2.6.122" },
                 new object[] { "2.7.33" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "1.2.6" },
@@ -2096,7 +2096,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.5.61" },
                 new object[] { "2.6.122" },
                 new object[] { "2.7.33" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET5_0
                 new object[] { "1.2.6" },
@@ -2106,7 +2106,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.5.61" },
                 new object[] { "2.6.122" },
                 new object[] { "2.7.33" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET6_0
                 new object[] { "1.2.6" },
@@ -2116,7 +2116,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.5.61" },
                 new object[] { "2.6.122" },
                 new object[] { "2.7.33" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET7_0
                 new object[] { "1.2.6" },
@@ -2126,7 +2126,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.5.61" },
                 new object[] { "2.6.122" },
                 new object[] { "2.7.33" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET8_0
                 new object[] { "1.2.6" },
@@ -2136,7 +2136,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.5.61" },
                 new object[] { "2.6.122" },
                 new object[] { "2.7.33" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET9_0
                 new object[] { "1.2.6" },
@@ -2146,7 +2146,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.5.61" },
                 new object[] { "2.6.122" },
                 new object[] { "2.7.33" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #endif
             };
@@ -2863,7 +2863,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.2.0" },
@@ -2893,7 +2893,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET7_0
                 new object[] { "2.2.0" },
@@ -2903,7 +2903,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET8_0
                 new object[] { "2.2.0" },
@@ -2913,7 +2913,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET9_0
                 new object[] { "2.2.0" },
@@ -2923,7 +2923,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #endif
             };
@@ -2943,7 +2943,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.2.0" },
@@ -2973,7 +2973,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET7_0
                 new object[] { "2.2.0" },
@@ -2983,7 +2983,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET8_0
                 new object[] { "2.2.0" },
@@ -2993,7 +2993,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET9_0
                 new object[] { "2.2.0" },
@@ -3003,7 +3003,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.6.6" },
                 new object[] { "2.7.1" },
                 new object[] { "2.8.1" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #endif
             };
@@ -3028,7 +3028,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.6.1" },
@@ -3087,7 +3087,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET7_0
                 new object[] { "3.6.1" },
@@ -3102,7 +3102,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET8_0
                 new object[] { "3.6.1" },
@@ -3117,7 +3117,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET9_0
                 new object[] { "3.6.1" },
@@ -3132,7 +3132,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #endif
             };
@@ -3157,7 +3157,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.6.1" },
@@ -3216,7 +3216,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET7_0
                 new object[] { "3.6.1" },
@@ -3231,7 +3231,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET8_0
                 new object[] { "3.6.1" },
@@ -3246,7 +3246,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET9_0
                 new object[] { "3.6.1" },
@@ -3261,7 +3261,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "4.0.1" },
                 new object[] { "4.1.0" },
                 new object[] { "4.2.2" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #endif
             };
@@ -3284,6 +3284,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.0.0" },
@@ -3296,6 +3297,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.0.0" },
@@ -3308,6 +3310,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.0.0" },
@@ -3320,6 +3323,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.0.0" },
@@ -3332,6 +3336,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.0.0" },
@@ -3344,6 +3349,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.0.0" },
@@ -3356,6 +3362,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.0.0" },
@@ -3368,6 +3375,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.0.0" },
@@ -3380,6 +3388,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -3402,6 +3411,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.0.0" },
@@ -3414,6 +3424,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.0.0" },
@@ -3426,6 +3437,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.0.0" },
@@ -3438,6 +3450,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.0.0" },
@@ -3450,6 +3463,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.0.0" },
@@ -3462,6 +3476,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.0.0" },
@@ -3474,6 +3489,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.0.0" },
@@ -3486,6 +3502,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.0.0" },
@@ -3498,6 +3515,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -3520,6 +3538,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.0.0" },
@@ -3532,6 +3551,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.0.0" },
@@ -3544,6 +3564,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.0.0" },
@@ -3556,6 +3577,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.0.0" },
@@ -3568,6 +3590,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.0.0" },
@@ -3580,6 +3603,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.0.0" },
@@ -3592,6 +3616,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.0.0" },
@@ -3604,6 +3629,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.0.0" },
@@ -3616,6 +3642,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.4.3" },
                 new object[] { "3.5.2" },
                 new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -3641,6 +3668,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "1.4.4" },
@@ -3656,6 +3684,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "1.4.4" },
@@ -3671,6 +3700,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "1.4.4" },
@@ -3686,6 +3716,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET5_0
                 new object[] { "1.4.4" },
@@ -3701,6 +3732,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET6_0
                 new object[] { "1.4.4" },
@@ -3716,6 +3748,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET7_0
                 new object[] { "1.4.4" },
@@ -3731,6 +3764,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET8_0
                 new object[] { "1.4.4" },
@@ -3746,6 +3780,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET9_0
                 new object[] { "1.4.4" },
@@ -3761,6 +3796,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "2.4.0" },
                 new object[] { "2.5.3" },
                 new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #endif
             };
@@ -3813,7 +3849,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.43.1" },
                 new object[] { "3.44.1" },
                 new object[] { "3.45.2" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.6.0" },
@@ -3906,7 +3942,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.43.1" },
                 new object[] { "3.44.1" },
                 new object[] { "3.45.2" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET5_0
                 new object[] { "3.6.0" },
@@ -3949,7 +3985,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.43.1" },
                 new object[] { "3.44.1" },
                 new object[] { "3.45.2" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET6_0
                 new object[] { "3.6.0" },
@@ -3992,7 +4028,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.43.1" },
                 new object[] { "3.44.1" },
                 new object[] { "3.45.2" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET7_0
                 new object[] { "3.6.0" },
@@ -4035,7 +4071,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.43.1" },
                 new object[] { "3.44.1" },
                 new object[] { "3.45.2" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET8_0
                 new object[] { "3.6.0" },
@@ -4078,7 +4114,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.43.1" },
                 new object[] { "3.44.1" },
                 new object[] { "3.45.2" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET9_0
                 new object[] { "3.6.0" },
@@ -4121,7 +4157,7 @@ public class PackageVersionsLatestMinors
                 new object[] { "3.43.1" },
                 new object[] { "3.44.1" },
                 new object[] { "3.45.2" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #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 398810e62d8c..6787b8ae4316 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs
+++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs
@@ -29,39 +29,39 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "3.1.5.3" },
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET5_0
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET6_0
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET7_0
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET8_0
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #if NET9_0
                 new object[] { "3.3.106.47" },
-                new object[] { "3.7.404.5" },
+                new object[] { "3.7.405.3" },
 #endif
 #endif
             };
@@ -76,39 +76,39 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "3.1.3.5" },
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET5_0
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET6_0
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET7_0
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET8_0
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #if NET9_0
                 new object[] { "3.3.101.1" },
-                new object[] { "3.7.402.41" },
+                new object[] { "3.7.402.54" },
 #endif
 #endif
             };
@@ -142,39 +142,39 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "3.1.0.13" },
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET5_0
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET6_0
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET7_0
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET8_0
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET9_0
                 new object[] { "3.3.103.26" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #endif
             };
@@ -189,39 +189,39 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "3.1.2.1" },
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET5_0
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET6_0
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET7_0
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET8_0
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #if NET9_0
                 new object[] { "3.3.102.17" },
-                new object[] { "3.7.400.64" },
+                new object[] { "3.7.400.77" },
 #endif
 #endif
             };
@@ -236,47 +236,47 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET5_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET6_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET7_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET8_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #if NET9_0
                 new object[] { "3.3.102.16" },
                 new object[] { "3.5.6.5" },
-                new object[] { "3.7.402.6" },
+                new object[] { "3.7.402.19" },
 #endif
 #endif
             };
@@ -946,7 +946,7 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "1.0.488" },
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "1.2.6" },
@@ -958,27 +958,27 @@ public class PackageVersionsLatestSpecific
 #endif
 #if NETCOREAPP3_1
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET5_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET6_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET7_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET8_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #if NET9_0
                 new object[] { "1.2.6" },
-                new object[] { "2.8.22" },
+                new object[] { "2.8.24" },
 #endif
 #endif
             };
@@ -1238,7 +1238,7 @@ public class PackageVersionsLatestSpecific
 #else
 #if NET462
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.2.0" },
@@ -1258,19 +1258,19 @@ public class PackageVersionsLatestSpecific
 #endif
 #if NET6_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET7_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET8_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET9_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #endif
             };
@@ -1284,7 +1284,7 @@ public class PackageVersionsLatestSpecific
 #else
 #if NET462
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.2.0" },
@@ -1304,19 +1304,19 @@ public class PackageVersionsLatestSpecific
 #endif
 #if NET6_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET7_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET8_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #if NET9_0
                 new object[] { "2.2.0" },
-                new object[] { "2.9.2" },
+                new object[] { "2.9.3" },
 #endif
 #endif
             };
@@ -1332,7 +1332,7 @@ public class PackageVersionsLatestSpecific
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.6.1" },
@@ -1358,25 +1358,25 @@ public class PackageVersionsLatestSpecific
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET7_0
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET8_0
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET9_0
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #endif
             };
@@ -1392,7 +1392,7 @@ public class PackageVersionsLatestSpecific
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.6.1" },
@@ -1418,25 +1418,25 @@ public class PackageVersionsLatestSpecific
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET7_0
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET8_0
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #if NET9_0
                 new object[] { "3.6.1" },
                 new object[] { "3.10.1" },
                 new object[] { "3.14.0" },
-                new object[] { "4.3.0" },
+                new object[] { "4.3.2" },
 #endif
 #endif
             };
@@ -1451,47 +1451,47 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -1506,47 +1506,47 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -1561,47 +1561,47 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET5_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET6_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET7_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET8_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #if NET9_0
                 new object[] { "2.0.0" },
                 new object[] { "2.2.10" },
-                new object[] { "3.6.4" },
+                new object[] { "3.7.0" },
 #endif
 #endif
             };
@@ -1616,47 +1616,47 @@ public class PackageVersionsLatestSpecific
 #if NET462
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP3_0
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NETCOREAPP3_1
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET5_0
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET6_0
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET7_0
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET8_0
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #if NET9_0
                 new object[] { "1.4.4" },
                 new object[] { "1.9.3" },
-                new object[] { "2.6.1" },
+                new object[] { "2.8.0" },
 #endif
 #endif
             };
@@ -1670,7 +1670,7 @@ public class PackageVersionsLatestSpecific
 #else
 #if NET462
                 new object[] { "3.6.0" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NETCOREAPP2_1
                 new object[] { "3.6.0" },
@@ -1682,27 +1682,27 @@ public class PackageVersionsLatestSpecific
 #endif
 #if NETCOREAPP3_1
                 new object[] { "3.6.0" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET5_0
                 new object[] { "3.6.0" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET6_0
                 new object[] { "3.6.0" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET7_0
                 new object[] { "3.6.0" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET8_0
                 new object[] { "3.6.0" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #if NET9_0
                 new object[] { "3.6.0" },
-                new object[] { "3.46.0" },
+                new object[] { "3.46.1" },
 #endif
 #endif
             };
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/Datadog.Trace.ClrProfiler.Managed.Tests.csproj b/tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/Datadog.Trace.ClrProfiler.Managed.Tests.csproj
index 885bb3763995..0286700674eb 100644
--- a/tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/Datadog.Trace.ClrProfiler.Managed.Tests.csproj
+++ b/tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/Datadog.Trace.ClrProfiler.Managed.Tests.csproj
@@ -44,7 +44,7 @@
 
   <ItemGroup>
     <None Remove="xunit.runner.json" />
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="Always" />
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>
diff --git a/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Approvals/snapshots/ProbeTests.FixedBlockTest.verified.txt b/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Approvals/snapshots/ProbeTests.FixedBlockTest.verified.txt
new file mode 100644
index 000000000000..5697d982093d
--- /dev/null
+++ b/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Approvals/snapshots/ProbeTests.FixedBlockTest.verified.txt
@@ -0,0 +1,69 @@
+[
+  {
+    "dd.span_id": "ScrubbedValue",
+    "dd.trace_id": "ScrubbedValue",
+    "ddsource": "dd_debugger",
+    "debugger": {
+      "snapshot": {
+        "captures": {
+          "entry": {
+            "arguments": {
+              "a": {
+                "type": "Byte",
+                "value": "5"
+              },
+              "this": {
+                "type": "FixedBlockTest",
+                "value": "FixedBlockTest"
+              }
+            }
+          },
+          "return": {
+            "arguments": {
+              "a": {
+                "type": "Byte",
+                "value": "5"
+              },
+              "this": {
+                "type": "FixedBlockTest",
+                "value": "FixedBlockTest"
+              }
+            },
+            "locals": {
+              "array": {
+                "isNull": "true",
+                "type": "Byte[]"
+              },
+              "ptr": {
+                "type": "Byte",
+                "value": "1"
+              }
+            }
+          }
+        },
+        "duration": "ScrubbedValue",
+        "id": "ScrubbedValue",
+        "language": "dotnet",
+        "probe": {
+          "id": "ScrubbedValue",
+          "location": {
+            "method": "Test",
+            "type": "Samples.Probes.TestRuns.SmokeTests.FixedBlockTest"
+          },
+          "version": 0
+        },
+        "stack": "ScrubbedValue",
+        "timestamp": "ScrubbedValue"
+      }
+    },
+    "logger": {
+      "method": "Test",
+      "name": "Samples.Probes.TestRuns.SmokeTests.FixedBlockTest",
+      "thread_id": "ScrubbedValue",
+      "thread_name": "ScrubbedValue",
+      "version": "2"
+    },
+    "message": "ScrubbedValue",
+    "service": "probes"
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Approvals/statuses/ProbeTests.FixedBlockTest.verified.txt b/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Approvals/statuses/ProbeTests.FixedBlockTest.verified.txt
new file mode 100644
index 000000000000..09d2b2f1d2d5
--- /dev/null
+++ b/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Approvals/statuses/ProbeTests.FixedBlockTest.verified.txt
@@ -0,0 +1,16 @@
+[
+  {
+    "ddsource": "dd_debugger",
+    "debugger": {
+      "diagnostics": {
+        "exception": null,
+        "probeId": "8286d046-9740-a3e4-95cf-ff46699c73c4",
+        "probeVersion": 0,
+        "runtimeId": "scrubbed",
+        "status": "EMITTING"
+      }
+    },
+    "message": "Emitted probe 8286d046-9740-a3e4-95cf-ff46699c73c4.",
+    "service": "probes"
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Datadog.Trace.Debugger.IntegrationTests.csproj b/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Datadog.Trace.Debugger.IntegrationTests.csproj
index dea5b8851769..8042e711fe7e 100644
--- a/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Datadog.Trace.Debugger.IntegrationTests.csproj
+++ b/tracer/test/Datadog.Trace.Debugger.IntegrationTests/Datadog.Trace.Debugger.IntegrationTests.csproj
@@ -3,7 +3,7 @@
   <ItemGroup>
     <None Remove="xunit.runner.json" />
     <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
 
     <Compile Include="..\Datadog.Trace.TestHelpers.SharedSource\VerifyHelper.cs" Link="Helpers\VerifyHelper.cs" />
diff --git a/tracer/test/Datadog.Trace.DuckTyping.Tests/Datadog.Trace.DuckTyping.Tests.csproj b/tracer/test/Datadog.Trace.DuckTyping.Tests/Datadog.Trace.DuckTyping.Tests.csproj
index a859d188c832..358dbad8cc96 100644
--- a/tracer/test/Datadog.Trace.DuckTyping.Tests/Datadog.Trace.DuckTyping.Tests.csproj
+++ b/tracer/test/Datadog.Trace.DuckTyping.Tests/Datadog.Trace.DuckTyping.Tests.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <None Remove="xunit.runner.json" />
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="Always" />
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>
diff --git a/tracer/test/Datadog.Trace.IntegrationTests/Sampling/DelaySamplingDecisionTests.cs b/tracer/test/Datadog.Trace.IntegrationTests/Sampling/DelaySamplingDecisionTests.cs
index 178d0a0bcd1e..eca7c45e76e3 100644
--- a/tracer/test/Datadog.Trace.IntegrationTests/Sampling/DelaySamplingDecisionTests.cs
+++ b/tracer/test/Datadog.Trace.IntegrationTests/Sampling/DelaySamplingDecisionTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="DelaySamplingDecisionTests.cs" company="Datadog">
+// <copyright file="DelaySamplingDecisionTests.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -77,7 +77,7 @@ public void SamplingDecisionIsMadeWhenPropagating()
             traceContext.SamplingPriority.Should().BeNull();
 
             var headers = new NameValueCollection();
-            SpanContextPropagator.Instance.Inject(
+            tracer.TracerManager.SpanContextPropagator.Inject(
                 new PropagationContext(scope1.Span.Context, baggage: null),
                 headers.Wrap());
 
diff --git a/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5BlockingTemplates.cs b/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5BlockingTemplates.cs
index 696de00d4b3a..b98831f48e8a 100644
--- a/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5BlockingTemplates.cs
+++ b/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5BlockingTemplates.cs
@@ -76,8 +76,8 @@ public async Task TestGet(string test, HttpStatusCode expectedStatusCode, string
         var settings = VerifyHelper.GetSpanVerifierSettings(test, (int)expectedStatusCode, sanitisedUrl);
         var minDateTime = DateTime.UtcNow;
         var (x, page) = await SubmitRequest(url, body: null, contentType: null, accept: "text/html");
-        page.Should().Be(@"<!DOCTYPE html>
-<html lang=""en""></html>");
+        var normalizedPage = page.Replace("\r\n", "\n");
+        normalizedPage.Should().Be($"""<!DOCTYPE html>{"\n"}<html lang="en"></html>""");
         var spans = WaitForSpans(agent, 1, string.Empty, minDateTime, url);
         await VerifySpans(spans, settings);
     }
diff --git a/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs b/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs
index 706f579ec633..e0903489f15b 100644
--- a/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs
+++ b/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs
@@ -106,6 +106,28 @@ public async Task TestBlockedRequest(string test)
             await TestAppSecRequestWithVerifyAsync(_iisFixture.Agent, url, null, 5, 1, settings, userAgent: "Hello/V");
         }
 
+        [Trait("Category", "EndToEnd")]
+        [Trait("RunOnWindows", "True")]
+        [Trait("LoadFromGAC", "True")]
+        [SkippableTheory]
+        [InlineData(AddressesConstants.RequestPathParams, "/api/route/2?arg=[blocking_test]")]
+        [InlineData(AddressesConstants.RequestBody, "/api/Home/Upload", "{\"Property1\": \"[blocking_test]\"}")]
+        [InlineData(AddressesConstants.ResponseHeaderNoCookies, "/api/asm/injectedheader")] // Blocked on response
+        public async Task TestBlockedRequests(string test, string url, string body = null)
+        {
+            var sanitisedUrl = VerifyHelper.SanitisePathsForVerify(url);
+            var settings = VerifyHelper.GetSpanVerifierSettings(test, sanitisedUrl, body);
+
+            var expectedSpans = test == AddressesConstants.RequestPathParams ? 1 : 2;
+
+            if (test == AddressesConstants.ResponseHeaderNoCookies && _classicMode)
+            {
+                throw new SkipException("Response header injection is not supported in classic mode");
+            }
+
+            await TestAppSecRequestWithVerifyAsync(_iisFixture.Agent, url, body, 5, expectedSpans, settings, "application/json");
+        }
+
         [SkippableFact]
         public async Task TestNullAction()
         {
diff --git a/tracer/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj b/tracer/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj
index d2273676e0c8..1757f266c9de 100644
--- a/tracer/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj
+++ b/tracer/test/Datadog.Trace.Security.IntegrationTests/Datadog.Trace.Security.IntegrationTests.csproj
@@ -12,10 +12,10 @@
     <None Remove="xunit.runner.json" />
     <Compile Include="..\Datadog.Trace.TestHelpers.SharedSource\VerifyHelper.cs" Link="VerifyHelper.cs" />
     <Content Include="applicationHost.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <ProjectReference Include="..\..\src\Datadog.Trace\Datadog.Trace.csproj" />
     <ProjectReference Include="..\Datadog.Trace.TestHelpers.AutoInstrumentation\Datadog.Trace.TestHelpers.AutoInstrumentation.csproj" />
@@ -75,10 +75,10 @@
 
   <ItemGroup>
     <None Update="CI\Data\*.*">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="CI\Data\**\*.*">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/Datadog.Trace.Security.IntegrationTests/IAST/AspNetCore5IastDbTests.cs b/tracer/test/Datadog.Trace.Security.IntegrationTests/IAST/AspNetCore5IastDbTests.cs
index aa8aabd49e3f..a72344f37ad8 100644
--- a/tracer/test/Datadog.Trace.Security.IntegrationTests/IAST/AspNetCore5IastDbTests.cs
+++ b/tracer/test/Datadog.Trace.Security.IntegrationTests/IAST/AspNetCore5IastDbTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="AspNetCore5IastDbTests.cs" company="Datadog">
+// <copyright file="AspNetCore5IastDbTests.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -18,7 +18,7 @@ namespace Datadog.Trace.Security.IntegrationTests.IAST;
 public class AspNetCore5IastDbTests : AspNetCore5IastTests
 {
     public AspNetCore5IastDbTests(AspNetCoreTestFixture fixture, ITestOutputHelper outputHelper)
-        : base(fixture, outputHelper, enableIast: true, testName: "AspNetCore5IastDbTestsIastEnabled", samplingRate: 100, vulnerabilitiesPerRequest: 200, isIastDeduplicationEnabled: false, sampleName: "AspNetCore5.DatabaseIntegration")
+        : base(fixture, outputHelper, enableIast: true, testName: "AspNetCore5IastDbTestsIastEnabled", samplingRate: 100, vulnerabilitiesPerRequest: 200, isIastDeduplicationEnabled: false, sampleName: "AspNetCore5")
     {
     }
 
diff --git a/tracer/test/Datadog.Trace.Security.IntegrationTests/ruleset.3.0.json b/tracer/test/Datadog.Trace.Security.IntegrationTests/ruleset.3.0.json
index 3c7740fb8083..3c241feeff21 100644
--- a/tracer/test/Datadog.Trace.Security.IntegrationTests/ruleset.3.0.json
+++ b/tracer/test/Datadog.Trace.Security.IntegrationTests/ruleset.3.0.json
@@ -319,6 +319,9 @@
               },
               {
                 "address": "server.request.path_params"
+              },
+              {
+                "address": "server.response.headers.no_cookies"
               }
             ],
             "list": [
@@ -5946,6 +5949,78 @@
       "on_match": [
         "block"
       ]
+    },
+    {
+      "id": "block-on-path-params",
+      "name": "Block on path params",
+      "tags": {
+        "type": "nosql_injection",
+        "crs_id": "000009",
+        "category": "attack_attempt"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.query"
+              },
+              {
+                "address": "server.request.body"
+              },
+              {
+                "address": "server.request.path_params"
+              }
+            ],
+            "regex": "(?i:(?:\\[blocking_test\\]))",
+            "options": {
+              "case_sensitive": true,
+              "min_length": 5
+            }
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": [],
+      "on_match": [
+        "customblock"
+      ]
+    },
+    {
+      "id": "block-on-path-params-redirect",
+      "name": "Block on path params with block redirection",
+      "tags": {
+        "type": "nosql_injection",
+        "crs_id": "000010",
+        "category": "attack_attempt"
+      },
+      "conditions": [
+        {
+          "parameters": {
+            "inputs": [
+              {
+                "address": "server.request.query"
+              },
+              {
+                "address": "server.request.body"
+              },
+              {
+                "address": "server.request.path_params"
+              }
+            ],
+            "regex": "(?i:(?:\\[block_redir\\]))",
+            "options": {
+              "case_sensitive": true,
+              "min_length": 5
+            }
+          },
+          "operator": "match_regex"
+        }
+      ],
+      "transformers": [],
+      "on_match": [
+        "blockredir"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/tracer/test/Datadog.Trace.Security.Unit.Tests/RASP/RaspWafTests.cs b/tracer/test/Datadog.Trace.Security.Unit.Tests/RASP/RaspWafTests.cs
index b91a65404319..b8bb55ea712b 100644
--- a/tracer/test/Datadog.Trace.Security.Unit.Tests/RASP/RaspWafTests.cs
+++ b/tracer/test/Datadog.Trace.Security.Unit.Tests/RASP/RaspWafTests.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Datadog.Trace.AppSec;
 using Datadog.Trace.AppSec.Rcm;
 using Datadog.Trace.AppSec.Waf;
@@ -103,6 +104,20 @@ public void GivenARaspRule_WhenInsecureAccess_ThenBlock(object value, string par
             actionType);
     }
 
+    [Fact]
+    public void GivenWafInstance_WhenGetKnownAddressesInParallel_ThenResultIsOk()
+    {
+        var args = CreateArgs("paramValue");
+        var context = InitWaf(true, "rasp-rule-set.json", args, out var waf);
+
+        Parallel.For(0, 100, i =>
+        {
+            var addresses = waf.GetKnownAddresses();
+            addresses.Should().NotBeNull();
+            addresses.Count().Should().BeGreaterThan(0);
+        });
+    }
+
     private void EnableDebugInfo(bool enable)
     {
         if (enable)
diff --git a/tracer/test/Datadog.Trace.SourceGenerators.Tests/TelemetryMetricGeneratorTests.cs b/tracer/test/Datadog.Trace.SourceGenerators.Tests/TelemetryMetricGeneratorTests.cs
index 0e3368ec04e7..65c11db30cc1 100644
--- a/tracer/test/Datadog.Trace.SourceGenerators.Tests/TelemetryMetricGeneratorTests.cs
+++ b/tracer/test/Datadog.Trace.SourceGenerators.Tests/TelemetryMetricGeneratorTests.cs
@@ -451,10 +451,16 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                     var index = 5 + ((int)tag1 * 3) + (int)tag2;
                     Interlocked.Add(ref _buffer.TestMetric[index], increment);
                 }
+            
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int increment = 1)
+                {
+                    var index = 17 + ((int)tag1 * 9) + ((int)tag2 * 3) + (int)tag3;
+                    Interlocked.Add(ref _buffer.TestMetric[index], increment);
+                }
 
                 public void RecordTestMetricZeroAgainTagMetric(int increment = 1)
                 {
-                    Interlocked.Add(ref _buffer.TestMetric[17], increment);
+                    Interlocked.Add(ref _buffer.TestMetric[53], increment);
                 }
             }
             """;
@@ -477,6 +483,10 @@ public void RecordTestMetricOneTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                 public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, int increment = 1)
                 {
                 }
+            
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int increment = 1)
+                {
+                }
 
                 public void RecordTestMetricZeroAgainTagMetric(int increment = 1)
                 {
@@ -494,6 +504,8 @@ internal partial interface IMetricsTelemetryCollector
 
                 public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, int increment = 1);
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int increment = 1);
+            
                 public void RecordTestMetricZeroAgainTagMetric(int increment = 1);
             }
             """;
@@ -517,6 +529,10 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                 {
                 }
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int increment = 1)
+                {
+                }
+
                 public void RecordTestMetricZeroAgainTagMetric(int increment = 1)
                 {
                 }
@@ -745,9 +761,15 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                     Interlocked.Exchange(ref _buffer.TestMetric[index], value);
                 }
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int value)
+                {
+                    var index = 17 + ((int)tag1 * 9) + ((int)tag2 * 3) + (int)tag3;
+                    Interlocked.Exchange(ref _buffer.TestMetric[index], value);
+                }
+
                 public void RecordTestMetricZeroAgainTagMetric(int value)
                 {
-                    Interlocked.Exchange(ref _buffer.TestMetric[17], value);
+                    Interlocked.Exchange(ref _buffer.TestMetric[53], value);
                 }
             }
             """;
@@ -771,6 +793,10 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                 {
                 }
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int value)
+                {
+                }
+
                 public void RecordTestMetricZeroAgainTagMetric(int value)
                 {
                 }
@@ -787,6 +813,8 @@ internal partial interface IMetricsTelemetryCollector
 
                 public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, int value);
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int value);
+
                 public void RecordTestMetricZeroAgainTagMetric(int value);
             }
             """;
@@ -810,6 +838,10 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                 {
                 }
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, int value)
+                {
+                }
+
                 public void RecordTestMetricZeroAgainTagMetric(int value)
                 {
                 }
@@ -1040,9 +1072,15 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                     _buffer.TestMetric[index].TryEnqueue(value);
                 }
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, double value)
+                {
+                    var index = 17 + ((int)tag1 * 9) + ((int)tag2 * 3) + (int)tag3;
+                    _buffer.TestMetric[index].TryEnqueue(value);
+                }
+
                 public void RecordTestMetricZeroAgainTagMetric(double value)
                 {
-                    _buffer.TestMetric[17].TryEnqueue(value);
+                    _buffer.TestMetric[53].TryEnqueue(value);
                 }
             }
             """;
@@ -1066,6 +1104,10 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                 {
                 }
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, double value)
+                {
+                }
+
                 public void RecordTestMetricZeroAgainTagMetric(double value)
                 {
                 }
@@ -1082,6 +1124,8 @@ internal partial interface IMetricsTelemetryCollector
 
                 public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, double value);
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, double value);
+
                 public void RecordTestMetricZeroAgainTagMetric(double value);
             }
             """;
@@ -1105,6 +1149,10 @@ public void RecordTestMetricTwoTagMetric(MyTests.TestMetricNameSpace.LogLevel ta
                 {
                 }
 
+                public void RecordTestMetricThreeTagMetric(MyTests.TestMetricNameSpace.LogLevel tag1, MyTests.TestMetricNameSpace.ErrorType tag2, MyTests.TestMetricNameSpace.OtherTag tag3, double value)
+                {
+                }
+
                 public void RecordTestMetricZeroAgainTagMetric(double value)
                 {
                 }
@@ -1400,7 +1448,7 @@ internal static partial class TestMetricExtensions
                 /// <summary>
                 /// The number of separate metrics in the <see cref="MyTests.TestMetricNameSpace.TestMetric" /> metric.
                 /// </summary>
-                public const int Length = 4;
+                public const int Length = 5;
 
                 /// <summary>
                 /// Gets the metric name for the provided metric
@@ -1413,6 +1461,7 @@ public static string GetName(this MyTests.TestMetricNameSpace.TestMetric metric)
                         MyTests.TestMetricNameSpace.TestMetric.ZeroTagMetric => "metric.zero",
                         MyTests.TestMetricNameSpace.TestMetric.OneTagMetric => "metric.one",
                         MyTests.TestMetricNameSpace.TestMetric.TwoTagMetric => "metric.two",
+                        MyTests.TestMetricNameSpace.TestMetric.ThreeTagMetric => "metric.three",
                         MyTests.TestMetricNameSpace.TestMetric.ZeroAgainTagMetric => "metric.zeroagain",
                         _ => null!,
                     };
@@ -2277,7 +2326,7 @@ public static string GetTestMetricBuffers(bool isDistribution = false)
         {
             var aggregation = isDistribution ? "AggregatedDistribution" : "AggregatedMetric";
             return $$"""
-                private const int TestMetricLength = 18;
+                private const int TestMetricLength = 54;
 
                 /// <summary>
                 /// Creates the buffer for the <see cref="MyTests.TestMetricNameSpace.TestMetric" /> values.
@@ -2305,7 +2354,44 @@ public static string GetTestMetricBuffers(bool isDistribution = false)
                         new(new[] { "error" }),
                         new(new[] { "error", "random" }),
                         new(new[] { "error", "ducktyping", "othertag", "somethingelse" }),
-                        // metric.zeroagain, index = 17
+                        // metric.three, index = 17
+                        new(new[] { "one" }),
+                        new(new[] { "two" }),
+                        new(new[] { "three" }),
+                        new(new[] { "random", "one" }),
+                        new(new[] { "random", "two" }),
+                        new(new[] { "random", "three" }),
+                        new(new[] { "ducktyping", "othertag", "somethingelse", "one" }),
+                        new(new[] { "ducktyping", "othertag", "somethingelse", "two" }),
+                        new(new[] { "ducktyping", "othertag", "somethingelse", "three" }),
+                        new(new[] { "debug", "one" }),
+                        new(new[] { "debug", "two" }),
+                        new(new[] { "debug", "three" }),
+                        new(new[] { "debug", "random", "one" }),
+                        new(new[] { "debug", "random", "two" }),
+                        new(new[] { "debug", "random", "three" }),
+                        new(new[] { "debug", "ducktyping", "othertag", "somethingelse", "one" }),
+                        new(new[] { "debug", "ducktyping", "othertag", "somethingelse", "two" }),
+                        new(new[] { "debug", "ducktyping", "othertag", "somethingelse", "three" }),
+                        new(new[] { "info", "one" }),
+                        new(new[] { "info", "two" }),
+                        new(new[] { "info", "three" }),
+                        new(new[] { "info", "random", "one" }),
+                        new(new[] { "info", "random", "two" }),
+                        new(new[] { "info", "random", "three" }),
+                        new(new[] { "info", "ducktyping", "othertag", "somethingelse", "one" }),
+                        new(new[] { "info", "ducktyping", "othertag", "somethingelse", "two" }),
+                        new(new[] { "info", "ducktyping", "othertag", "somethingelse", "three" }),
+                        new(new[] { "error", "one" }),
+                        new(new[] { "error", "two" }),
+                        new(new[] { "error", "three" }),
+                        new(new[] { "error", "random", "one" }),
+                        new(new[] { "error", "random", "two" }),
+                        new(new[] { "error", "random", "three" }),
+                        new(new[] { "error", "ducktyping", "othertag", "somethingelse", "one" }),
+                        new(new[] { "error", "ducktyping", "othertag", "somethingelse", "two" }),
+                        new(new[] { "error", "ducktyping", "othertag", "somethingelse", "three" }),
+                        // metric.zeroagain, index = 53
                         new(null),
                     };
 
@@ -2315,7 +2401,7 @@ public static string GetTestMetricBuffers(bool isDistribution = false)
                 /// It is equal to the cardinality of the tag combinations (or 1 if there are no tags)
                 /// </summary>
                 private static int[] TestMetricEntryCounts { get; }
-                    = new int[]{ 1, 4, 12, 1, };
+                    = new int[]{ 1, 4, 12, 36, 1, };
             """;
         }
 
@@ -2426,6 +2512,9 @@ public enum TestMetric
                 [TelemetryMetric<LogLevel, ErrorType>("metric.two")]
                 TwoTagMetric,
 
+                [TelemetryMetric<LogLevel, ErrorType, OtherTag>("metric.three")]
+                ThreeTagMetric,
+
                 [TelemetryMetric("metric.zeroagain")]
                 ZeroAgainTagMetric,
             }
@@ -2470,6 +2559,13 @@ public enum ErrorType
                 [Description("random;;")] Random,
                 [Description("ducktyping;;othertag;somethingelse")] DuckTyping,
             }
+
+            public enum OtherTag
+            {
+                [Description("one")] One,
+                [Description("two")] Two,
+                [Description("three")] Three,
+            }
             """;
     }
 }
diff --git a/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/TestHelper.cs b/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/TestHelper.cs
index c67a8b2095c2..c3c6a4b5dc3e 100644
--- a/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/TestHelper.cs
+++ b/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/TestHelper.cs
@@ -191,7 +191,7 @@ public ProcessResult WaitForProcessResult(ProcessHelper helper, int expectedExit
 
             if (!ranToCompletion && !process.HasExited)
             {
-                var tookMemoryDump = MemoryDumpHelper.CaptureMemoryDump(process);
+                var tookMemoryDump = MemoryDumpHelper.CaptureMemoryDump(process, includeChildProcesses: dumpChildProcesses);
                 process.Kill();
                 throw new Exception($"The sample did not exit in {timeoutMs}ms. Memory dump taken: {tookMemoryDump}. Killing process.");
             }
diff --git a/tracer/test/Datadog.Trace.TestHelpers.SharedSource/VerifyHelper.cs b/tracer/test/Datadog.Trace.TestHelpers.SharedSource/VerifyHelper.cs
index 6ff9d11acccd..76501f00e691 100644
--- a/tracer/test/Datadog.Trace.TestHelpers.SharedSource/VerifyHelper.cs
+++ b/tracer/test/Datadog.Trace.TestHelpers.SharedSource/VerifyHelper.cs
@@ -262,6 +262,8 @@ public static void AddSimpleScrubber(this VerifySettings settings, string oldVal
                            Trace.Ci.Tags.CommonTags.RuntimeName => new KeyValuePair<string, string>(kvp.Key, "RuntimeName"),
                            Trace.Ci.Tags.CommonTags.RuntimeVersion => new KeyValuePair<string, string>(kvp.Key, "RuntimeVersion"),
                            Trace.Ci.Tags.CommonTags.LibraryVersion => new KeyValuePair<string, string>(kvp.Key, "LibraryVersion"),
+                           // In CI, we build the samples separately, so can end up with additional prefix in the source file
+                           Trace.Ci.Tags.TestTags.SourceFile => new KeyValuePair<string, string>(kvp.Key, kvp.Value.Substring(kvp.Value.StartsWith(@"D:/a/1/s/") ? 9 : 0)),
                            Trace.Ci.Tags.TestTags.Command => new KeyValuePair<string, string>(kvp.Key, "Command"),
                            Trace.Ci.Tags.TestTags.CommandWorkingDirectory => new KeyValuePair<string, string>(kvp.Key, "CommandWorkingDirectory"),
                            Trace.Ci.Tags.TestTags.FrameworkVersion => new KeyValuePair<string, string>(kvp.Key, "FrameworkVersion"),
diff --git a/tracer/test/Datadog.Trace.TestHelpers/CustomTestFramework.cs b/tracer/test/Datadog.Trace.TestHelpers/CustomTestFramework.cs
index 10651578d279..f695e1e49b41 100644
--- a/tracer/test/Datadog.Trace.TestHelpers/CustomTestFramework.cs
+++ b/tracer/test/Datadog.Trace.TestHelpers/CustomTestFramework.cs
@@ -210,7 +210,9 @@ protected override async Task<RunSummary> RunTestCaseAsync(IXunitTestCase testCa
 
                 if (testCase.TestMethodArguments != null)
                 {
-                    parameters = string.Join(", ", testCase.TestMethodArguments.Select(a => a?.ToString() ?? "null"));
+                    // We replace ##vso to avoid sending "commands" via the log output when we're testing CI Visibility stuff
+                    // We should redact other CI's command prefixes as well in the future, but for now this is enough
+                    parameters = string.Join(", ", testCase.TestMethodArguments.Select(a => a?.ToString()?.Replace("##vso", "#####") ?? "null"));
                 }
 
                 var test = $"{TestMethod.TestClass.Class.Name}.{TestMethod.Method.Name}({parameters})";
diff --git a/tracer/test/Datadog.Trace.TestHelpers/EnvironmentHelper.cs b/tracer/test/Datadog.Trace.TestHelpers/EnvironmentHelper.cs
index cf53277b7ace..12164af4264d 100644
--- a/tracer/test/Datadog.Trace.TestHelpers/EnvironmentHelper.cs
+++ b/tracer/test/Datadog.Trace.TestHelpers/EnvironmentHelper.cs
@@ -454,36 +454,23 @@ public string GetSampleProjectDirectory()
             return projectDir;
         }
 
-        public string GetSampleApplicationOutputDirectory(string packageVersion = "", string framework = "", bool usePublishFolder = true, bool usePublishWithRID = false)
+        public string GetSampleApplicationOutputDirectory(string packageVersion = "", string framework = "", bool usePublishWithRID = false)
         {
-            var targetFramework = string.IsNullOrEmpty(framework) ? GetTargetFramework() : framework;
-            var binDir = Path.Combine(GetSampleProjectDirectory(), "bin");
-            var artifactsBinDir = Path.Combine(EnvironmentTools.GetSolutionDirectory(), "artifacts", "bin");
-            var artifactsPublishDir = Path.Combine(EnvironmentTools.GetSolutionDirectory(), "artifacts", "publish");
-
             if (_samplesDirectory.Contains("aspnet"))
             {
+                var binDir = Path.Combine(GetSampleProjectDirectory(), "bin");
                 return Path.Combine(
                     binDir,
                     EnvironmentTools.GetBuildConfiguration(),
                     "publish");
             }
-            else if (EnvironmentTools.GetOS() == "win" && !usePublishWithRID)
-            {
-                return Path.Combine(artifactsBinDir, FullSampleName, GetPivot());
-            }
-            else if (usePublishWithRID)
-            {
-                return Path.Combine(artifactsPublishDir, FullSampleName, GetPivot());
-            }
-            else if (usePublishFolder)
-            {
-                return Path.Combine(artifactsPublishDir, FullSampleName, GetPivot());
-            }
-            else
-            {
-                return Path.Combine(artifactsBinDir, FullSampleName, GetPivot());
-            }
+
+            // "normal" apps are not published, unless we have a package version, in which case they are
+            var usePublishFolder = usePublishWithRID || !string.IsNullOrEmpty(packageVersion);
+            var outputDir = usePublishFolder ? "publish" : "bin";
+            var artifactsDir = Path.Combine(EnvironmentTools.GetSolutionDirectory(), "artifacts", outputDir);
+
+            return Path.Combine(artifactsDir, FullSampleName, GetPivot());
 
             string GetPivot()
             {
@@ -491,6 +478,7 @@ string GetPivot()
                               ? $"_{EnvironmentTools.GetOS()}{(IsAlpine() ? "-musl" : string.Empty)}-{EnvironmentTools.GetPlatform().ToLowerInvariant()}"
                               : string.Empty;
 
+                var targetFramework = string.IsNullOrEmpty(framework) ? GetTargetFramework() : framework;
                 var config = EnvironmentTools.GetBuildConfiguration().ToLowerInvariant();
                 var packageVersionPivot = string.IsNullOrEmpty(packageVersion) ? string.Empty : $"_{packageVersion}";
                 return $"{config}_{targetFramework}{packageVersionPivot}{rid}";
diff --git a/tracer/test/Datadog.Trace.TestHelpers/MemoryDumpHelper.cs b/tracer/test/Datadog.Trace.TestHelpers/MemoryDumpHelper.cs
index 3ec52549207d..fd956a7eb916 100644
--- a/tracer/test/Datadog.Trace.TestHelpers/MemoryDumpHelper.cs
+++ b/tracer/test/Datadog.Trace.TestHelpers/MemoryDumpHelper.cs
@@ -129,7 +129,7 @@ void OnDataReceived(string output)
 
         public static bool CaptureMemoryDump(Process process, IProgress<string> output = null, bool includeChildProcesses = false)
         {
-            return CaptureMemoryDump(process.Id, output);
+            return CaptureMemoryDump(process.Id, output, includeChildProcesses);
         }
 
         private static bool CaptureMemoryDump(int pid, IProgress<string> output = null, bool includeChildProcesses = false)
diff --git a/tracer/test/Datadog.Trace.TestHelpers/ProcessHelper.Children.cs b/tracer/test/Datadog.Trace.TestHelpers/ProcessHelper.Children.cs
index 5aca7ac95a9f..8a8c839c1f8f 100644
--- a/tracer/test/Datadog.Trace.TestHelpers/ProcessHelper.Children.cs
+++ b/tracer/test/Datadog.Trace.TestHelpers/ProcessHelper.Children.cs
@@ -49,6 +49,12 @@ public static IReadOnlyList<int> GetChildrenIds(int parentId)
             Console.WriteLine($"Error retrieving child processes: {ex.Message}");
         }
 
+        // Now we will check for children of the children (recursively)
+        foreach (var childPid in childPids.ToArray())
+        {
+            childPids.AddRange(GetChildrenIds(childPid));
+        }
+
         return childPids;
     }
 
diff --git a/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs b/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs
index 967b6e638c6b..0af46c1b4506 100644
--- a/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs
@@ -141,11 +141,17 @@ public void SpanLink_Tag_Serialization()
             new("pair", "false"),
             new("arbitrary", "56709")
         };
-        spans[0].AddSpanLink(spans[1], attributesToAdd);
-        var tmpSpanLink = spans[1].AddSpanLink(spans[2]);
-        tmpSpanLink.AddAttribute("attribute1", "value1");
-        tmpSpanLink.AddAttribute("attribute2", "value2");
-        spans[1].AddSpanLink(spans[0]);
+        spans[0].AddLink(new SpanLink(spans[1].Context, attributesToAdd));
+
+        var tmpSpanLinkAttributesToAdd = new List<KeyValuePair<string, string>>
+        {
+            new("attribute1", "value1"),
+            new("attribute2", "value2"),
+        };
+        var tmpSpanLink = new SpanLink(spans[2].Context, tmpSpanLinkAttributesToAdd);
+        spans[1].AddLink(tmpSpanLink);
+
+        spans[1].AddLink(new SpanLink(spans[0].Context));
 
         foreach (var span in spans)
         {
diff --git a/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskActivatorTests.cs b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskActivatorTests.cs
new file mode 100644
index 000000000000..264d6bfc25f7
--- /dev/null
+++ b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskActivatorTests.cs
@@ -0,0 +1,74 @@
+// <copyright file="ValueTaskActivatorTests.cs" company="Datadog">
+// 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.
+// </copyright>
+
+#if !NETCOREAPP3_1_OR_GREATER
+using System.Threading.Tasks;
+using Datadog.Trace.ClrProfiler.CallTarget.Handlers.Continuations;
+using FluentAssertions;
+using Xunit;
+
+namespace Datadog.Trace.Tests.CallTarget;
+
+public class ValueTaskActivatorTests
+{
+    [Fact]
+    public async Task NonGeneric_CreateTaskActivator_CanBeAwaited()
+    {
+        var activator = ValueTaskActivator<ValueTask>.CreateActivator();
+        var task = Task.CompletedTask;
+
+        var instance = activator(task);
+        await instance;
+    }
+
+    [Fact]
+    public async Task NonGeneric_FallbackActivator_CanBeAwaited()
+    {
+        var task = Task.CompletedTask;
+        var instance = ValueTaskActivator<ValueTask>.FallbackActivator(task);
+        await instance;
+    }
+
+    [Fact]
+    public async Task Generic_CreateTaskActivator_CanBeAwaited()
+    {
+        var activator = ValueTaskActivator<ValueTask<int>, int>.CreateTaskActivator();
+        var task = Task.FromResult(123);
+
+        var instance = activator(task);
+        var result = await instance;
+        result.Should().Be(123);
+    }
+
+    [Fact]
+    public async Task Generic_CreateResultActivator_CanBeAwaited()
+    {
+        var activator = ValueTaskActivator<ValueTask<int>, int>.CreateResultActivator();
+        var value = 123;
+
+        var instance = activator(value);
+        var result = await instance;
+        result.Should().Be(123);
+    }
+
+    [Fact]
+    public async Task Generic_FallbackTaskActivator_CanBeAwaited()
+    {
+        var task = Task.FromResult(123);
+        var instance = ValueTaskActivator<ValueTask<int>, int>.FallbackTaskActivator(task);
+        var result = await instance;
+        result.Should().Be(123);
+    }
+
+    [Fact]
+    public async Task Generic_FallbackResultActivator_CanBeAwaited()
+    {
+        var value = 123;
+        var instance = ValueTaskActivator<ValueTask<int>, int>.FallbackResultActivator(value);
+        var result = await instance;
+        result.Should().Be(123);
+    }
+}
+#endif
diff --git a/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskAsyncContinuationGeneratorTests.cs b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskAsyncContinuationGeneratorTests.cs
index 98e89baa53b7..2ca5bd767944 100644
--- a/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskAsyncContinuationGeneratorTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskAsyncContinuationGeneratorTests.cs
@@ -3,7 +3,6 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
-#if NETCOREAPP3_1_OR_GREATER
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -348,4 +347,3 @@ public static async Task<string> OnAsyncMethodEnd<TTarget>(TTarget instance, str
         }
     }
 }
-#endif
diff --git a/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskContinuationGeneratorTests.cs b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskContinuationGeneratorTests.cs
index 6789418ec6da..5b5568ad863e 100644
--- a/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskContinuationGeneratorTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskContinuationGeneratorTests.cs
@@ -3,7 +3,6 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
-#if NETCOREAPP3_1_OR_GREATER
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -343,4 +342,3 @@ public static string OnAsyncMethodEnd<TTarget>(TTarget instance, string returnVa
         }
     }
 }
-#endif
diff --git a/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskHelperTests.cs b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskHelperTests.cs
new file mode 100644
index 000000000000..9d0f3adecd43
--- /dev/null
+++ b/tracer/test/Datadog.Trace.Tests/CallTarget/ValueTaskHelperTests.cs
@@ -0,0 +1,62 @@
+// <copyright file="ValueTaskHelperTests.cs" company="Datadog">
+// 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.
+// </copyright>
+
+using System.Threading.Tasks;
+using Datadog.Trace.ClrProfiler.CallTarget.Handlers;
+using FluentAssertions;
+using Xunit;
+
+namespace Datadog.Trace.Tests.CallTarget;
+
+public class ValueTaskHelperTests
+{
+    [Fact]
+    public void IsValueTask_WhenValueTask_ReturnsTrue()
+    {
+        var task = new ValueTask(Task.CompletedTask);
+        Helper.IsValueTask(task).Should().BeTrue();
+    }
+
+    [Fact]
+    public void IsValueTask_WhenGenericValueTask_ReturnsFalse()
+    {
+        var task = new ValueTask<bool>(Task.FromResult(true));
+        Helper.IsValueTask(task).Should().BeFalse();
+    }
+
+    [Fact]
+    public void IsValueTask_WhenTask_ReturnsFalse()
+    {
+        var task = Task.FromResult(true);
+        Helper.IsValueTask(task).Should().BeFalse();
+    }
+
+    [Fact]
+    public void IsGenericValueTask_WhenGenericValueTask_ReturnsTrue()
+    {
+        var task = new ValueTask<bool>(Task.FromResult(true));
+        Helper.IsGenericTask(task).Should().BeTrue();
+    }
+
+    [Fact]
+    public void IsGenericValueTask_WhenTask_ReturnsFalse()
+    {
+        var task = Task.FromResult(true);
+        Helper.IsGenericTask(task).Should().BeFalse();
+    }
+
+    private static class Helper
+    {
+        public static bool IsValueTask<T>(T task)
+        {
+            return ValueTaskHelper.IsValueTask(typeof(T));
+        }
+
+        public static bool IsGenericTask<T>(T task)
+        {
+            return ValueTaskHelper.IsGenericValueTask(typeof(T));
+        }
+    }
+}
diff --git a/tracer/test/Datadog.Trace.Tests/Configuration/CIVisibilitySettingsTests.cs b/tracer/test/Datadog.Trace.Tests/Configuration/CIVisibilitySettingsTests.cs
index 67a83017a420..2e5a49003d5a 100644
--- a/tracer/test/Datadog.Trace.Tests/Configuration/CIVisibilitySettingsTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Configuration/CIVisibilitySettingsTests.cs
@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
+using System;
 using Datadog.Trace.Ci.Configuration;
 using Datadog.Trace.Configuration;
 using Datadog.Trace.Configuration.Telemetry;
@@ -14,6 +15,8 @@ namespace Datadog.Trace.Tests.Configuration
 {
     public class CIVisibilitySettingsTests : SettingsTestsBase
     {
+        private static readonly string ExpectedExcludedSession = "/session/FakeSessionIdForPollingPurposes".ToUpperInvariant();
+
         [Theory]
         [MemberData(nameof(BooleanTestCases), null)]
         public void Enabled(string value, bool? expected)
@@ -185,5 +188,107 @@ public void ForceAgentsEvpProxy(string value, string expected)
 
             settings.ForceAgentsEvpProxy.Should().Be(expected);
         }
+
+        [Theory]
+        [InlineData("some-service", "true")]
+        [InlineData(null, "false")]
+        public void AddsUserProvidedTestServiceTagToGlobalTags(string serviceName, string expectedTag)
+        {
+            var source = CreateConfigurationSource((ConfigurationKeys.ServiceName, serviceName));
+
+            var ciVisSettings = new CIVisibilitySettings(source, NullConfigurationTelemetry.Instance);
+            var tracerSettings = ciVisSettings.InitializeTracerSettings([source]);
+
+            tracerSettings.GlobalTags.Should()
+                          .ContainKey(Datadog.Trace.Ci.Tags.CommonTags.UserProvidedTestServiceTag)
+                          .WhoseValue.Should()
+                          .Be(expectedTag);
+        }
+
+        [Fact]
+        public void ServiceNameIsNormalized()
+        {
+            var originalName = "My Service Name!";
+            var normalizedName = "my_service_name";
+
+            var source = CreateConfigurationSource((ConfigurationKeys.ServiceName, originalName));
+
+            var ciVisSettings = new CIVisibilitySettings(source, NullConfigurationTelemetry.Instance);
+            var tracerSettings = ciVisSettings.InitializeTracerSettings([source]);
+
+            tracerSettings.ServiceName.Should().Be(normalizedName);
+        }
+
+        [Fact]
+        public void AddsFakeSessionToExcludedHttpClientUrls()
+        {
+            var source = CreateConfigurationSource();
+
+            var ciVisSettings = new CIVisibilitySettings(source, NullConfigurationTelemetry.Instance);
+            var tracerSettings = ciVisSettings.InitializeTracerSettings([source]);
+
+            tracerSettings.HttpClientExcludedUrlSubstrings
+                          .Should()
+                          .Contain(ExpectedExcludedSession);
+        }
+
+        [Fact]
+        public void AddsFakeSessionToExcludedHttpClientUrls_WhenUrlsAlreadyExist()
+        {
+            var source = CreateConfigurationSource(
+                (ConfigurationKeys.HttpClientExcludedUrlSubstrings, "/some-url/path"));
+
+            var ciVisSettings = new CIVisibilitySettings(source, NullConfigurationTelemetry.Instance);
+            var tracerSettings = ciVisSettings.InitializeTracerSettings([source]);
+
+            tracerSettings.HttpClientExcludedUrlSubstrings
+                          .Should()
+                          .Contain(ExpectedExcludedSession);
+        }
+
+        [Fact]
+        public void AddsFakeSessionToExcludedHttpClientUrls_WhenRunningInAas()
+        {
+            var source = CreateConfigurationSource(
+                (ConfigurationKeys.AzureAppService.AzureAppServicesContextKey, "true"),
+                (ConfigurationKeys.HttpClientExcludedUrlSubstrings, "/some-url/path"));
+
+            var ciVisSettings = new CIVisibilitySettings(source, NullConfigurationTelemetry.Instance);
+            var tracerSettings = ciVisSettings.InitializeTracerSettings([source]);
+
+            tracerSettings.HttpClientExcludedUrlSubstrings
+                          .Should()
+                          .Contain(ExpectedExcludedSession);
+        }
+
+        [Fact]
+        public void WhenLogsEnabled_AddsDirectSubmission()
+        {
+            var source = CreateConfigurationSource(
+                (ConfigurationKeys.CIVisibility.Logs, "true"));
+
+            var ciVisSettings = new CIVisibilitySettings(source, NullConfigurationTelemetry.Instance);
+            var tracerSettings = ciVisSettings.InitializeTracerSettings([source]);
+
+            tracerSettings.LogSubmissionSettings
+                          .EnabledIntegrationNames
+                          .Should()
+                          .Contain(nameof(IntegrationId.XUnit));
+            tracerSettings.LogSubmissionSettings.BatchPeriod.Should().Be(TimeSpan.FromSeconds(1));
+        }
+
+        [Fact]
+        public void WhenLogsNotEnabled_DoesNotAddDirectSubmission()
+        {
+            var source = CreateConfigurationSource();
+
+            var ciVisSettings = new CIVisibilitySettings(source, NullConfigurationTelemetry.Instance);
+            var tracerSettings = ciVisSettings.InitializeTracerSettings([source]);
+
+            tracerSettings.LogSubmissionSettings
+                          .EnabledIntegrationNames
+                          .Should()
+                          .NotContain(nameof(IntegrationId.XUnit));
+        }
     }
 }
diff --git a/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs b/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs
index e94021292600..4044fc0612f1 100644
--- a/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs
@@ -217,6 +217,8 @@ public void Environment(string value, string expected)
 
         [Theory]
         [InlineData("test", null, null, "test")]
+        // This is the current behaviour - _should_ it be, or should the result be normalized, is a separate question...
+        [InlineData("My Service Name!", null, null, "My Service Name!")]
         [InlineData("test", null, "ignored_otel", "test")]
         [InlineData("test", "error", "ignored_otel", "test")]
         [InlineData(null, "test", null, "test")]
diff --git a/tracer/test/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj b/tracer/test/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj
index 191d99a1bcc2..ae6412d9edb1 100644
--- a/tracer/test/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj
+++ b/tracer/test/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
diff --git a/tracer/test/Datadog.Trace.Tests/DistributedTracer/AutomaticTracerTests.cs b/tracer/test/Datadog.Trace.Tests/DistributedTracer/AutomaticTracerTests.cs
index 9f636f3f626c..9038ef3474b9 100644
--- a/tracer/test/Datadog.Trace.Tests/DistributedTracer/AutomaticTracerTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/DistributedTracer/AutomaticTracerTests.cs
@@ -89,7 +89,7 @@ public void GetDistributedTrace()
 
             using (var scope = Tracer.Instance.StartActive("Test"))
             {
-                var context = SpanContextPropagator.Instance.Extract(automaticTracer.GetDistributedTrace());
+                var context = Tracer.Instance.TracerManager.SpanContextPropagator.Extract(automaticTracer.GetDistributedTrace());
                 var spanContext = context.SpanContext!;
 
                 spanContext.Should().NotBeNull();
diff --git a/tracer/test/Datadog.Trace.Tests/ManualInstrumentation/DuckTypingTests.cs b/tracer/test/Datadog.Trace.Tests/ManualInstrumentation/DuckTypingTests.cs
index 213f9c1d0386..d4f1fd8ed927 100644
--- a/tracer/test/Datadog.Trace.Tests/ManualInstrumentation/DuckTypingTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/ManualInstrumentation/DuckTypingTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="DuckTypingTests.cs" company="Datadog">
+// <copyright file="DuckTypingTests.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -86,61 +86,69 @@ public void CanDuckTypeScopeAsManualIScope()
     [Fact]
     public void CanDuckTypeManualTestSessionAsISession()
     {
-        var autoSession = TestSession.GetOrCreate("blah");
-
-        var session = autoSession.DuckCast<ManualITestSession>();
-
-        // call the methods to make sure it works
-        var module = session.CreateModule("somemodule");
-        module.Should().NotBeNull();
-
-        var suite = module.GetOrCreateSuite("mysuite");
-        suite.Should().NotBeNull();
-
-        var test = suite.CreateTest("mytest");
-        test.Should().NotBeNull();
-
-        var stats = new ManualBenchmarkDiscreteStats(100, 100, 100, 100, 100, 0, 0, 0, 0, 100, 100, 100);
-        var statsDuckType = stats.DuckCast<IBenchmarkDiscreteStats>();
-        TestExtensionsAddBenchmarkDataIntegration.OnMethodBegin<ManualITestSession, ManualITest, IBenchmarkDiscreteStats>(test, BenchmarkMeasureType.RunTime, "some info", statsDuckType);
-        // test.AddBenchmarkData(BenchmarkMeasureType.ApplicationLaunch, info: "something", in stats);
-
-        var parameters = new ManualTestParameters { Arguments = new(), Metadata = new() };
-        var paramsDuckType = parameters.DuckCast<ITestParameters>();
-        TestExtensionsSetParametersIntegration.OnMethodBegin<ManualITestSession, ManualITest, ITestParameters>(test, paramsDuckType);
-        // test.SetParameters(new TestParameters { Arguments = new(), Metadata = new() });
-
-        var hostInfo = new ManualBenchmarkHostInfo { RuntimeVersion = "123" };
-        var jobInfo = new ManualBenchmarkJobInfo { Description = "weeble" };
-        var hostInfoDuckType = hostInfo.DuckCast<IBenchmarkHostInfo>();
-        var jobInfoDuckType = jobInfo.DuckCast<IBenchmarkJobInfo>();
-        TestExtensionsSetBenchmarkMetadataIntegration.OnMethodBegin<ManualITestSession, ManualITest, IBenchmarkHostInfo, IBenchmarkJobInfo>(test, in hostInfoDuckType, in jobInfoDuckType);
-        // test.SetBenchmarkMetadata(new BenchmarkHostInfo() { RuntimeVersion = "123" }, new BenchmarkJobInfo() { Description = "weeble" });
-
-        // basic check that things were pushed down correctly
-        var span = test.Should()
-                       .BeAssignableTo<IDuckType>()
-                       .Subject.Instance.Should()
-                       .BeOfType<Test>()
-                       .Subject.GetInternalSpan()
-                       .Should()
-                       .BeOfType<Span>()
-                       .Subject;
-        span.GetMetric("benchmark.run_time.run").Should().Be(100);
-
-        span.GetTag("host.runtime_version").Should().Be("123");
-        span.GetTag("test.configuration.job_description").Should().Be("weeble");
-
-        var tags = span.Tags.Should().BeOfType<TestSpanTags>().Subject;
-        tags.Parameters
-            .Should()
-            .NotBeNull()
-            .And.Be(new TestParameters { Arguments = new(), Metadata = new() }.ToJSON());
-
-        test.Close(TestStatus.Pass);
-        suite.Close();
-        module.Close();
-        session.Close(TestStatus.Pass);
+        try
+        {
+            var autoSession = TestSession.GetOrCreate("blah");
+
+            var session = autoSession.DuckCast<ManualITestSession>();
+
+            // call the methods to make sure it works
+            var module = session.CreateModule("somemodule");
+            module.Should().NotBeNull();
+
+            var suite = module.GetOrCreateSuite("mysuite");
+            suite.Should().NotBeNull();
+
+            var test = suite.CreateTest("mytest");
+            test.Should().NotBeNull();
+
+            var stats = new ManualBenchmarkDiscreteStats(100, 100, 100, 100, 100, 0, 0, 0, 0, 100, 100, 100);
+            var statsDuckType = stats.DuckCast<IBenchmarkDiscreteStats>();
+            TestExtensionsAddBenchmarkDataIntegration.OnMethodBegin<ManualITestSession, ManualITest, IBenchmarkDiscreteStats>(test, BenchmarkMeasureType.RunTime, "some info", statsDuckType);
+            // test.AddBenchmarkData(BenchmarkMeasureType.ApplicationLaunch, info: "something", in stats);
+
+            var parameters = new ManualTestParameters { Arguments = new(), Metadata = new() };
+            var paramsDuckType = parameters.DuckCast<ITestParameters>();
+            TestExtensionsSetParametersIntegration.OnMethodBegin<ManualITestSession, ManualITest, ITestParameters>(test, paramsDuckType);
+            // test.SetParameters(new TestParameters { Arguments = new(), Metadata = new() });
+
+            var hostInfo = new ManualBenchmarkHostInfo { RuntimeVersion = "123" };
+            var jobInfo = new ManualBenchmarkJobInfo { Description = "weeble" };
+            var hostInfoDuckType = hostInfo.DuckCast<IBenchmarkHostInfo>();
+            var jobInfoDuckType = jobInfo.DuckCast<IBenchmarkJobInfo>();
+            TestExtensionsSetBenchmarkMetadataIntegration.OnMethodBegin<ManualITestSession, ManualITest, IBenchmarkHostInfo, IBenchmarkJobInfo>(test, in hostInfoDuckType, in jobInfoDuckType);
+            // test.SetBenchmarkMetadata(new BenchmarkHostInfo() { RuntimeVersion = "123" }, new BenchmarkJobInfo() { Description = "weeble" });
+
+            // basic check that things were pushed down correctly
+            var span = test.Should()
+                           .BeAssignableTo<IDuckType>()
+                           .Subject.Instance.Should()
+                           .BeOfType<Test>()
+                           .Subject.GetInternalSpan()
+                           .Should()
+                           .BeOfType<Span>()
+                           .Subject;
+            span.GetMetric("benchmark.run_time.run").Should().Be(100);
+
+            span.GetTag("host.runtime_version").Should().Be("123");
+            span.GetTag("test.configuration.job_description").Should().Be("weeble");
+
+            var tags = span.Tags.Should().BeOfType<TestSpanTags>().Subject;
+            tags.Parameters
+                .Should()
+                .NotBeNull()
+                .And.Be(new TestParameters { Arguments = new(), Metadata = new() }.ToJSON());
+
+            test.Close(TestStatus.Pass);
+            suite.Close();
+            module.Close();
+            session.Close(TestStatus.Pass);
+        }
+        finally
+        {
+            CIVisibility.Close();
+            CIVisibility.Reset();
+        }
     }
 
     [Fact]
diff --git a/tracer/test/Datadog.Trace.Tests/Propagators/DistributedPropagatorTests.cs b/tracer/test/Datadog.Trace.Tests/Propagators/DistributedPropagatorTests.cs
deleted file mode 100644
index 7bd5f8160fb9..000000000000
--- a/tracer/test/Datadog.Trace.Tests/Propagators/DistributedPropagatorTests.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-// <copyright file="DistributedPropagatorTests.cs" company="Datadog">
-// 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.
-// </copyright>
-
-using System.Collections.Generic;
-using System.Globalization;
-using Datadog.Trace.Propagators;
-using Datadog.Trace.Tagging;
-using FluentAssertions;
-using Moq;
-using Xunit;
-
-namespace Datadog.Trace.Tests.Propagators;
-
-public class DistributedPropagatorTests
-{
-    private const int SamplingPriority = SamplingPriorityValues.UserReject;
-    private const string Origin = "origin";
-    private const string PropagatedTagsString = "_dd.p.key1=value1,_dd.p.key2=value2";
-    private const string AdditionalW3CTraceState = "key3=value3,key4=value4";
-    private const ulong SpanId = 0x1122334455667788;                       // 1234605616436508552
-    private const string RawSpanId = "1122334455667788";                   // 1234605616436508552
-    private const string RawTraceId = "00000000000000001234567890abcdef";  // 1311768467294899695
-    private static readonly TraceId TraceId = (TraceId)0x1234567890abcdef; // 1311768467294899695
-
-    private static readonly CultureInfo InvariantCulture = CultureInfo.InvariantCulture;
-
-    private static readonly SpanContextPropagator Propagator;
-
-    private static readonly KeyValuePair<string, string>[] DefaultHeaderValues =
-    {
-        new("__DistributedKey-TraceId", TraceId.Lower.ToString(InvariantCulture)),
-        new("__DistributedKey-ParentId", SpanId.ToString(InvariantCulture)),
-        new("__DistributedKey-SamplingPriority", SamplingPriority.ToString(InvariantCulture)),
-        new("__DistributedKey-Origin", Origin),
-        new("__DistributedKey-RawTraceId", RawTraceId),
-        new("__DistributedKey-RawSpanId", RawSpanId),
-        new("__DistributedKey-PropagatedTags", PropagatedTagsString),
-        new("__DistributedKey-AdditionalW3CTraceState", AdditionalW3CTraceState),
-    };
-
-    private static readonly TraceTagCollection PropagatedTagsCollection = new(
-        new List<KeyValuePair<string, string>>
-        {
-            new("_dd.p.key1", "value1"),
-            new("_dd.p.key2", "value2"),
-        },
-        PropagatedTagsString);
-
-    private static readonly TraceTagCollection EmptyPropagatedTags = new();
-
-    static DistributedPropagatorTests()
-    {
-        Propagator = new SpanContextPropagator(
-            injectors: [],
-            extractors: [DistributedContextExtractor.Instance],
-            propagationExtractFirstValue: false);
-    }
-
-    public static TheoryData<string> GetInvalidIds() => new()
-    {
-        null,
-        string.Empty,
-        "0",
-        "-1",
-        "id",
-    };
-
-    [Fact]
-    public void Extract_ReadOnlyDictionary()
-    {
-        // set up all key/value pairs
-        var headers = SetupMockReadOnlyDictionary();
-
-        // extract SpanContext
-        var result = Propagator.Extract(headers.Object);
-
-        VerifyGetCalls(headers);
-
-        result.SpanContext
-              .Should()
-              .NotBeNull()
-              .And
-              .BeEquivalentTo(
-                  new SpanContextMock
-                  {
-                      TraceId128 = TraceId,
-                      TraceId = TraceId.Lower,
-                      SpanId = SpanId,
-                      RawTraceId = RawTraceId,
-                      RawSpanId = RawSpanId,
-                      Origin = Origin,
-                      SamplingPriority = SamplingPriority,
-                      PropagatedTags = PropagatedTagsCollection,
-                      AdditionalW3CTraceState = AdditionalW3CTraceState,
-                  });
-    }
-
-    [Fact]
-    public void Extract_EmptyHeadersReturnsNull()
-    {
-        // empty
-        var headers = new Mock<IReadOnlyDictionary<string, string>>();
-
-        // extract SpanContext
-        var result = Propagator.Extract(headers.Object);
-
-        result.SpanContext.Should().BeNull();
-    }
-
-    [Fact]
-    public void Extract_TraceIdOnly()
-    {
-        var value = TraceId.Lower.ToString(InvariantCulture);
-
-        // only setup TraceId, other properties remain null/empty
-        var headers = new Mock<IReadOnlyDictionary<string, string>>();
-        headers.Setup(h => h.Count).Returns(1);
-        headers.Setup(h => h.TryGetValue("__DistributedKey-TraceId", out value)).Returns(true);
-
-        // extract SpanContext
-        var result = Propagator.Extract(headers.Object);
-
-        result.SpanContext
-              .Should()
-              .NotBeNull()
-              .And
-              .BeEquivalentTo(
-                  new SpanContextMock
-                  {
-                      TraceId128 = TraceId,
-                      TraceId = TraceId.Lower,
-                      RawTraceId = RawTraceId,
-                      RawSpanId = "0000000000000000",
-                      PropagatedTags = EmptyPropagatedTags,
-                  });
-
-        // TODO: add this to all tests
-        result.Baggage.Should().BeNull();
-    }
-
-    [Fact]
-    public void SpanContextRoundTrip()
-    {
-        var propagatedTags = new TraceTagCollection();
-        propagatedTags.SetTag("_dd.p.key1", "value1");
-        propagatedTags.SetTag("_dd.p.key2", "value2");
-
-        var traceContext = new TraceContext(Mock.Of<IDatadogTracer>(), propagatedTags);
-        traceContext.SetSamplingPriority(SamplingPriority);
-        traceContext.Origin = Origin;
-        traceContext.AdditionalW3CTraceState = AdditionalW3CTraceState;
-
-        // create and populate SpanContext
-        IReadOnlyDictionary<string, string> context = new SpanContext(
-            parent: SpanContext.None,
-            traceContext,
-            serviceName: null,
-            TraceId,
-            SpanId,
-            RawTraceId,
-            RawSpanId);
-
-        // extract SpanContext
-        var result = Propagator.Extract(context);
-
-        // they are not the same SpanContext instance...
-        result.SpanContext.Should().NotBeSameAs(context);
-
-        // ...but they contain the same values
-        result.SpanContext.Should().BeEquivalentTo(context);
-    }
-
-    [Theory]
-    [MemberData(nameof(GetInvalidIds))]
-    public void Extract_InvalidTraceId(string traceId)
-    {
-        // set up all key/value pairs
-        var headers = SetupMockReadOnlyDictionary();
-
-        // replace TraceId setup
-        var value = traceId;
-        headers.Setup(h => h.TryGetValue("__DistributedKey-TraceId", out value)).Returns(true);
-
-        // extract SpanContext
-        var result = Propagator.Extract(headers.Object);
-
-        // invalid traceId should return a null context even if other values are set
-        result.SpanContext.Should().BeNull();
-    }
-
-    [Theory]
-    [MemberData(nameof(GetInvalidIds))]
-    public void Extract_InvalidSpanId(string spanId)
-    {
-        // set up all key/value pairs
-        var headers = SetupMockReadOnlyDictionary();
-
-        // replace ParentId setup
-        var value = spanId;
-        headers.Setup(h => h.TryGetValue("__DistributedKey-ParentId", out value)).Returns(true);
-
-        // extract SpanContext
-        var result = Propagator.Extract(headers.Object);
-
-        result.SpanContext
-              .Should()
-              .NotBeNull()
-              .And
-              .BeEquivalentTo(
-                  new SpanContextMock
-                  {
-                      // SpanId has default value
-                      TraceId128 = TraceId,
-                      TraceId = TraceId.Lower,
-                      Origin = Origin,
-                      RawTraceId = RawTraceId,
-                      RawSpanId = RawSpanId,
-                      SamplingPriority = SamplingPriority,
-                      PropagatedTags = PropagatedTagsCollection,
-                      AdditionalW3CTraceState = AdditionalW3CTraceState,
-                  });
-    }
-
-    [Theory]
-    [InlineData("-1000", -1000)]
-    [InlineData("1000", 1000)]
-    [InlineData("1.0", null)]
-    [InlineData("1,0", null)]
-    [InlineData("sampling.priority", null)]
-    public void Extract_InvalidSamplingPriority(string samplingPriority, int? expectedSamplingPriority)
-    {
-        // if the extracted sampling priority is a valid integer, pass it along as-is,
-        // even if we don't recognize its value (to allow forward compatibility with newly added values).
-        // ignore the extracted sampling priority if it is not a valid integer.
-
-        // set up all key/value pairs
-        var headers = SetupMockReadOnlyDictionary();
-
-        // replace SamplingPriority setup
-        var value = samplingPriority;
-        headers.Setup(h => h.TryGetValue("__DistributedKey-SamplingPriority", out value)).Returns(true);
-
-        // extract SpanContext
-        var result = Propagator.Extract(headers.Object);
-
-        result.SpanContext
-              .Should()
-              .NotBeNull()
-              .And
-              .BeEquivalentTo(
-                  new SpanContextMock
-                  {
-                      TraceId128 = TraceId,
-                      TraceId = TraceId.Lower,
-                      SpanId = SpanId,
-                      RawTraceId = RawTraceId,
-                      RawSpanId = RawSpanId,
-                      Origin = Origin,
-                      SamplingPriority = expectedSamplingPriority,
-                      PropagatedTags = PropagatedTagsCollection,
-                      AdditionalW3CTraceState = AdditionalW3CTraceState,
-                  });
-    }
-
-    private static Mock<IReadOnlyDictionary<string, string>> SetupMockReadOnlyDictionary()
-    {
-        var headers = new Mock<IReadOnlyDictionary<string, string>>(MockBehavior.Strict);
-        headers.Setup(h => h.Count).Returns(DefaultHeaderValues.Length);
-
-        foreach (var pair in DefaultHeaderValues)
-        {
-            var value = pair.Value;
-            headers.Setup(h => h.TryGetValue(pair.Key, out value)).Returns(true);
-        }
-
-        return headers;
-    }
-
-    private static void VerifyGetCalls(Mock<IReadOnlyDictionary<string, string>> headers)
-    {
-        var once = Times.Once();
-        string value;
-
-        headers.Verify(h => h.Count, once);
-
-        foreach (var pair in DefaultHeaderValues)
-        {
-            headers.Verify(h => h.TryGetValue(pair.Key, out value), once);
-        }
-
-        headers.VerifyNoOtherCalls();
-    }
-}
diff --git a/tracer/test/Datadog.Trace.Tests/Propagators/MultiSpanContextPropagatorTests.cs b/tracer/test/Datadog.Trace.Tests/Propagators/MultiSpanContextPropagatorTests.cs
index 131878491971..d98b4d0d7b25 100644
--- a/tracer/test/Datadog.Trace.Tests/Propagators/MultiSpanContextPropagatorTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Propagators/MultiSpanContextPropagatorTests.cs
@@ -52,6 +52,7 @@ static MultiSpanContextPropagatorTests()
                             ContextPropagationHeaderStyle.Datadog,
                             ContextPropagationHeaderStyle.B3MultipleHeaders,
                             ContextPropagationHeaderStyle.B3SingleHeader,
+                            ContextPropagationHeaderStyle.W3CBaggage,
                         };
 
             Propagator = SpanContextPropagatorFactory.GetSpanContextPropagator(names, names, propagationExtractFirst: true);
@@ -62,11 +63,13 @@ static MultiSpanContextPropagatorTests()
                 {
                     ContextPropagationHeaderStyle.W3CTraceContext,
                     ContextPropagationHeaderStyle.Datadog,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 new[]
                 {
                     ContextPropagationHeaderStyle.W3CTraceContext,
                     ContextPropagationHeaderStyle.Datadog,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 propagationExtractFirst: true);
 
@@ -76,11 +79,13 @@ static MultiSpanContextPropagatorTests()
                 {
                     ContextPropagationHeaderStyle.Datadog,
                     ContextPropagationHeaderStyle.W3CTraceContext,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 new[]
                 {
                     ContextPropagationHeaderStyle.Datadog,
                     ContextPropagationHeaderStyle.W3CTraceContext,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 propagationExtractFirst: true);
 
@@ -90,11 +95,13 @@ static MultiSpanContextPropagatorTests()
                 {
                     ContextPropagationHeaderStyle.W3CTraceContext,
                     ContextPropagationHeaderStyle.Datadog,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 new[]
                 {
                     ContextPropagationHeaderStyle.W3CTraceContext,
                     ContextPropagationHeaderStyle.Datadog,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 propagationExtractFirst: false);
 
@@ -104,11 +111,13 @@ static MultiSpanContextPropagatorTests()
                 {
                     ContextPropagationHeaderStyle.Datadog,
                     ContextPropagationHeaderStyle.W3CTraceContext,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 new[]
                 {
                     ContextPropagationHeaderStyle.Datadog,
                     ContextPropagationHeaderStyle.W3CTraceContext,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 false);
 
@@ -118,11 +127,13 @@ static MultiSpanContextPropagatorTests()
                 {
                     ContextPropagationHeaderStyle.Datadog,
                     ContextPropagationHeaderStyle.B3MultipleHeaders,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 new[]
                 {
                     ContextPropagationHeaderStyle.Datadog,
                     ContextPropagationHeaderStyle.B3MultipleHeaders,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 propagationExtractFirst: false);
 
@@ -132,11 +143,13 @@ static MultiSpanContextPropagatorTests()
                 {
                     ContextPropagationHeaderStyle.B3MultipleHeaders,
                     ContextPropagationHeaderStyle.W3CTraceContext,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 new[]
                 {
                     ContextPropagationHeaderStyle.B3MultipleHeaders,
                     ContextPropagationHeaderStyle.W3CTraceContext,
+                    ContextPropagationHeaderStyle.W3CBaggage,
                 },
                 propagationExtractFirst: false);
 
@@ -181,6 +194,8 @@ public void Inject_All_IHeadersCollection()
             headers.Verify(h => h.Set("traceparent", "00-000000000000000000000000075bcd15-000000003ade68b1-01"), Times.Once());
             headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:000000003ade68b1;t.key1:value1;t.key2:value2"), Times.Once());
 
+            headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());
+
             headers.VerifyNoOtherCalls();
         }
 
@@ -223,6 +238,8 @@ public void Inject_All_IHeadersCollection_128Bit_TraceId()
             headers.Verify(h => h.Set("traceparent", "00-1234567890abcdef1122334455667788-0000000000000001-01"), Times.Once());
             headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:0000000000000001;t.key1:value1;t.key2:value2"), Times.Once());
 
+            headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());
+
             headers.VerifyNoOtherCalls();
         }
 
@@ -264,6 +281,7 @@ public void Inject_All_CarrierAndDelegate()
             headers.Verify(h => h.Set("traceparent", "00-000000000000000000000000075bcd15-000000003ade68b1-01"), Times.Once());
             headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:000000003ade68b1;t.key1:value1;t.key2:value2"), Times.Once());
 
+            headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());
             headers.VerifyNoOtherCalls();
         }
 
@@ -309,6 +327,8 @@ public void Inject_All_CarrierAndDelegate_128Bit_TraceId()
             headers.Verify(h => h.Set("traceparent", "00-1234567890abcdef1122334455667788-0000000000000001-01"), Times.Once());
             headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:0000000000000001;t.key1:value1;t.key2:value2"), Times.Once());
 
+            headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());
+
             headers.VerifyNoOtherCalls();
         }
 
@@ -420,7 +440,7 @@ public void Extract_W3C_IHeadersCollection_traceparent()
         [Fact]
         public void Extract_W3C_IHeadersCollection_traceparent_tracestate()
         {
-            var headers = new Mock<IHeadersCollection>(MockBehavior.Strict);
+            var headers = new Mock<IHeadersCollection>();
 
             headers.Setup(h => h.GetValues("traceparent"))
                    .Returns(new[] { "00-000000000000000000000000075bcd15-000000003ade68b1-01" });
@@ -432,7 +452,7 @@ public void Extract_W3C_IHeadersCollection_traceparent_tracestate()
 
             headers.Verify(h => h.GetValues("traceparent"), Times.Once());
             headers.Verify(h => h.GetValues("tracestate"), Times.Once());
-            headers.VerifyNoOtherCalls();
+            headers.Verify(h => h.GetValues("baggage"), Times.Once());
 
             result.SpanContext
                   .Should()
@@ -841,6 +861,8 @@ public void TraceContextPrecedence_ConsistentBehaviour_WithDifferentTraceIds(boo
                    .Returns(new[] { "00-11111111111111110000000000000005-000000003ade68b1-01" });
             headers.Setup(h => h.GetValues("tracestate"))
                    .Returns(new[] { "foo=1" });
+            headers.Setup(h => h.GetValues("baggage"))
+                   .Returns(new[] { "usr=customer" });
             headers.Setup(h => h.GetValues("x-datadog-trace-id"))
                    .Returns(new[] { "3541" });
             headers.Setup(h => h.GetValues("x-datadog-parent-id"))
@@ -881,6 +903,8 @@ public void TraceContextPrecedence_ConsistentBehaviour_WithDifferentTraceIds(boo
                           IsRemote = true,
                           LastParentId = w3CHeaderFirst ? ZeroLastParentId : null,
                       });
+
+            result.Baggage.Should().BeEquivalentTo(new Baggage([new KeyValuePair<string, string>("usr", "customer")]));
         }
 
         [Theory]
diff --git a/tracer/test/Datadog.Trace.Tests/SpanContextPropagatorTests_ExtractHeaderTags.cs b/tracer/test/Datadog.Trace.Tests/SpanContextPropagatorTests_ExtractHeaderTags.cs
index 6f7fd9df699e..a186c169b5f7 100644
--- a/tracer/test/Datadog.Trace.Tests/SpanContextPropagatorTests_ExtractHeaderTags.cs
+++ b/tracer/test/Datadog.Trace.Tests/SpanContextPropagatorTests_ExtractHeaderTags.cs
@@ -8,9 +8,11 @@
 using System.Collections.Specialized;
 using System.Linq;
 using System.Net;
+using System.Threading.Tasks;
 using Datadog.Trace.ExtensionMethods;
 using Datadog.Trace.Headers;
 using Datadog.Trace.Propagators;
+using Datadog.Trace.TestHelpers;
 using Xunit;
 
 namespace Datadog.Trace.Tests
@@ -46,7 +48,7 @@ internal static IHeadersCollection GetHeadersCollection(HeaderCollectionType typ
 
         [Theory]
         [MemberData(nameof(GetHeaderCollections))]
-        internal void ExtractHeaderTags_MatchesCaseInsensitiveHeaders(HeaderCollectionType headersType)
+        internal async Task ExtractHeaderTags_MatchesCaseInsensitiveHeaders(HeaderCollectionType headersType)
         {
             var headers = GetHeadersCollection(headersType);
 
@@ -75,7 +77,8 @@ internal void ExtractHeaderTags_MatchesCaseInsensitiveHeaders(HeaderCollectionTy
 
             // Test
             var processor = new HeaderTagsProcessor();
-            SpanContextPropagator.Instance.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix);
+            await using var tracer = TracerHelper.CreateWithFakeAgent();
+            tracer.TracerManager.SpanContextPropagator.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix);
             var tagsFromHeader = processor.TagsFromHeader;
 
             // Assert
@@ -85,7 +88,7 @@ internal void ExtractHeaderTags_MatchesCaseInsensitiveHeaders(HeaderCollectionTy
 
         [Theory]
         [MemberData(nameof(GetHeaderCollections))]
-        internal void ExtractHeaderTags_EmptyHeaders_AddsNoTags(HeaderCollectionType headersType)
+        internal async Task ExtractHeaderTags_EmptyHeaders_AddsNoTags(HeaderCollectionType headersType)
         {
             var headers = GetHeadersCollection(headersType);
 
@@ -99,7 +102,8 @@ internal void ExtractHeaderTags_EmptyHeaders_AddsNoTags(HeaderCollectionType hea
 
             // Test
             var processor = new HeaderTagsProcessor();
-            SpanContextPropagator.Instance.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix);
+            await using var tracer = TracerHelper.CreateWithFakeAgent();
+            tracer.TracerManager.SpanContextPropagator.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix);
             var tagsFromHeader = processor.TagsFromHeader;
 
             // Assert
@@ -109,7 +113,7 @@ internal void ExtractHeaderTags_EmptyHeaders_AddsNoTags(HeaderCollectionType hea
 
         [Theory]
         [MemberData(nameof(GetHeaderCollections))]
-        internal void ExtractHeaderTags_EmptyHeaderTags_AddsNoTags(HeaderCollectionType headersType)
+        internal async Task ExtractHeaderTags_EmptyHeaderTags_AddsNoTags(HeaderCollectionType headersType)
         {
             var headers = GetHeadersCollection(headersType);
 
@@ -122,7 +126,8 @@ internal void ExtractHeaderTags_EmptyHeaderTags_AddsNoTags(HeaderCollectionType
 
             // Test
             var processor = new HeaderTagsProcessor();
-            SpanContextPropagator.Instance.ExtractHeaderTags(ref processor, headers, headerToTagMap, TestPrefix);
+            await using var tracer = TracerHelper.CreateWithFakeAgent();
+            tracer.TracerManager.SpanContextPropagator.ExtractHeaderTags(ref processor, headers, headerToTagMap, TestPrefix);
             var tagsFromHeader = processor.TagsFromHeader;
 
             // Assert
@@ -132,7 +137,7 @@ internal void ExtractHeaderTags_EmptyHeaderTags_AddsNoTags(HeaderCollectionType
 
         [Theory]
         [MemberData(nameof(GetHeaderCollections))]
-        internal void ExtractHeaderTags_ForEmptyStringMappings_CreatesNormalizedTagWithPrefix(HeaderCollectionType headersType)
+        internal async Task ExtractHeaderTags_ForEmptyStringMappings_CreatesNormalizedTagWithPrefix(HeaderCollectionType headersType)
         {
             var headers = GetHeadersCollection(headersType);
 
@@ -158,7 +163,8 @@ internal void ExtractHeaderTags_ForEmptyStringMappings_CreatesNormalizedTagWithP
 
             // Test
             var processor = new HeaderTagsProcessor();
-            SpanContextPropagator.Instance.ExtractHeaderTags(ref processor, headers, headerToTagMap, TestPrefix);
+            await using var tracer = TracerHelper.CreateWithFakeAgent();
+            tracer.TracerManager.SpanContextPropagator.ExtractHeaderTags(ref processor, headers, headerToTagMap, TestPrefix);
             var tagsFromHeader = processor.TagsFromHeader;
 
             // Assert
@@ -169,7 +175,7 @@ internal void ExtractHeaderTags_ForEmptyStringMappings_CreatesNormalizedTagWithP
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        internal void ExtractHeaderTags_WithUserAgent(bool provideUserAgent)
+        internal async Task ExtractHeaderTags_WithUserAgent(bool provideUserAgent)
         {
             // Initialize constants
             const string uaInHeaders = "A wonderful useragent";
@@ -187,13 +193,15 @@ internal void ExtractHeaderTags_WithUserAgent(bool provideUserAgent)
 
             // Test no user agent
             var processor = new HeaderTagsProcessor();
+            await using var tracer = TracerHelper.CreateWithFakeAgent();
+
             if (provideUserAgent)
             {
-                SpanContextPropagator.Instance.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix, uaInParameter);
+                tracer.TracerManager.SpanContextPropagator.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix, uaInParameter);
             }
             else
             {
-                SpanContextPropagator.Instance.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix);
+                tracer.TracerManager.SpanContextPropagator.ExtractHeaderTags(ref processor, headers, headerTags, TestPrefix);
             }
 
             var tagsFromHeader = processor.TagsFromHeader;
diff --git a/tracer/test/Datadog.Trace.Tests/SpanLinksTests.cs b/tracer/test/Datadog.Trace.Tests/SpanLinksTests.cs
deleted file mode 100644
index ce2904f34d41..000000000000
--- a/tracer/test/Datadog.Trace.Tests/SpanLinksTests.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// <copyright file="SpanLinksTests.cs" company="Datadog">
-// 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.
-// </copyright>
-
-using Castle.Core.Internal;
-using Datadog.Trace.Agent;
-using Datadog.Trace.Configuration;
-using Datadog.Trace.Sampling;
-using Moq;
-using Xunit;
-
-namespace Datadog.Trace.Tests
-{
-    public class SpanLinksTests
-    {
-        private readonly Tracer _tracer;
-
-        public SpanLinksTests()
-        {
-            var settings = new TracerSettings();
-            var writerMock = new Mock<IAgentWriter>();
-            var samplerMock = new Mock<ITraceSampler>();
-
-            _tracer = new Tracer(settings, writerMock.Object, samplerMock.Object, scopeManager: null, statsd: null);
-        }
-
-        [Fact]
-        public void AddLink_InCloseSpan()
-        {
-            var parentScope = (Scope)_tracer.StartActive("Parent");
-            var childScope = (Scope)_tracer.StartActive("Child");
-
-            var parentSpan = parentScope.Span;
-            var childSpan = childScope.Span;
-
-            childSpan.Finish();
-            Assert.Null(childSpan.AddSpanLink(parentSpan));
-        }
-
-        [Fact]
-        public void AddAttribute_ToLink_InCloseSpan()
-        {
-            var parentScope = (Scope)_tracer.StartActive("Parent");
-            var childScope = (Scope)_tracer.StartActive("Child");
-
-            var parentSpan = parentScope.Span;
-            var childSpan = childScope.Span;
-            var spanLink = childSpan.AddSpanLink(parentSpan);
-            childSpan.Finish();
-            spanLink.AddAttribute("should", "return null");
-            Assert.Null(spanLink.Attributes);
-        }
-    }
-}
diff --git a/tracer/test/Datadog.Trace.Tests/SpanTests.cs b/tracer/test/Datadog.Trace.Tests/SpanTests.cs
index 6a217d299e88..9ebae42de3b5 100644
--- a/tracer/test/Datadog.Trace.Tests/SpanTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/SpanTests.cs
@@ -69,6 +69,38 @@ public void SetPeerServiceTag_CallsRemapper()
             span.GetTag(Tags.PeerServiceRemappedFrom).Should().Be("a-peer-service");
         }
 
+        [Fact]
+        public void AddLink_BeforeSpanFinished_IsSuccessful()
+        {
+            var parentScope = (Scope)_tracer.StartActive("Parent");
+            var childScope = (Scope)_tracer.StartActive("Child");
+
+            var parentSpan = parentScope.Span;
+            var childSpan = childScope.Span;
+            var spanLink = new SpanLink(parentSpan.Context);
+
+            childSpan.AddLink(spanLink);
+            childSpan.Finish();
+
+            childSpan.SpanLinks.Should().ContainSingle().Which.Should().Match<SpanLink>(spanLink => spanLink.Context.TraceId128 == parentSpan.TraceId128 && spanLink.Context.SpanId == parentSpan.SpanId);
+        }
+
+        [Fact]
+        public void AddLink_AfterSpanFinished_IsNoOp()
+        {
+            var parentScope = (Scope)_tracer.StartActive("Parent");
+            var childScope = (Scope)_tracer.StartActive("Child");
+
+            var parentSpan = parentScope.Span;
+            var childSpan = childScope.Span;
+            var spanLink = new SpanLink(parentSpan.Context);
+
+            childSpan.Finish();
+            childSpan.AddLink(spanLink);
+
+            childSpan.SpanLinks.Should().BeNullOrEmpty();
+        }
+
         [Fact]
         public void Finish_StartTimeInThePastWithNoEndTime_DurationProperlyComputed()
         {
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs
index 52ce64ad11d7..97ce7563e83f 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Datadog.Trace.Agent;
 using Datadog.Trace.AppSec;
+using Datadog.Trace.Ci.Configuration;
 using Datadog.Trace.ClrProfiler.AutoInstrumentation.Http.HttpClient.HttpClientHandler;
 using Datadog.Trace.ClrProfiler.CallTarget;
 using Datadog.Trace.Configuration;
@@ -129,6 +130,10 @@ public void RecordProfilerSettings(Profiler profiler)
             {
             }
 
+            public void RecordCiVisibilitySettings(CIVisibilitySettings settings)
+            {
+            }
+
             public Task DisposeAsync()
             {
                 return Task.CompletedTask;
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/RedactedErrorLogCollectorTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/RedactedErrorLogCollectorTests.cs
index ed1fce65524b..dbe9a344d783 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/RedactedErrorLogCollectorTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/RedactedErrorLogCollectorTests.cs
@@ -378,6 +378,23 @@ public void WhenDeDupeEnabled_AndUniqueMessages_DoesNotSetCount()
             .OnlyContain(x => x.Count == null);
     }
 
+    [Fact]
+    public void AddsTagsToLogDuringSerialization()
+    {
+        var tagBuilder = new TelemetryController.TagBuilder();
+        var collector = new RedactedErrorLogCollector();
+        collector.EnqueueLog(new($"Some log", TelemetryLogLevel.WARN, DateTimeOffset.UtcNow));
+
+        var logTags = tagBuilder.GetLogTags();
+        var logs = collector.GetLogs(logTags);
+        logs.Should()
+            .ContainSingle()
+            .Which.Should()
+            .ContainSingle()
+            .Which.Tags.Should()
+            .Be(logTags);
+    }
+
     private static string RandomString(int length)
     {
         const string options = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ,!\"£$%^&*()[]{}<>`¬";
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs
index 15bb836107a1..2a2968b846a0 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs
@@ -35,8 +35,8 @@ public class MetricTests
     private static readonly Dictionary<string, string[]> OptionalTagsByMetricName = new()
     {
         { "event_created", new[] { "has_codeowner", "is_unsupported_ci", "is_benchmark" } },
-        { "event_finished", new[] { "has_codeowner", "is_unsupported_ci", "is_benchmark", "is_new", "early_flake_detection_abort_reason", "browser_driver", "is_rum" } },
-        { "git_requests.settings_response", new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled" } },
+        { "event_finished", new[] { "has_codeowner", "is_unsupported_ci", "is_benchmark", "is_new", "early_flake_detection_abort_reason", "browser_driver", "is_rum", "agentless_log_submission_enabled" } },
+        { "git_requests.settings_response", new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled", "flaky_test_retries_enabled" } },
         { "endpoint_payload.requests_errors", ["status_code"] },
         { "git_requests.search_commits_errors", ["status_code"] },
         { "git_requests.objects_pack_errors", ["status_code"] },
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json
index c058438eca59..bc846be12b44 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json
@@ -904,7 +904,8 @@
     "test_session": {
       "tags": [
         "provider",
-        "auto_injected"
+        "auto_injected",
+        "agentless_log_submission_enabled",
       ],
       "metric_type": "count",
       "data_type": "events",
@@ -1195,6 +1196,7 @@
       "tags": [
         "coverage_enabled",
         "itrskip_enabled",
+        "flaky_test_retries_enabled",
         "early_flake_detection_enabled"
       ],
       "metric_type": "count",
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetryControllerLogTagBuilderTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetryControllerLogTagBuilderTests.cs
new file mode 100644
index 000000000000..f0ab94ef77f8
--- /dev/null
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetryControllerLogTagBuilderTests.cs
@@ -0,0 +1,74 @@
+// <copyright file="TelemetryControllerLogTagBuilderTests.cs" company="Datadog">
+// 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.
+// </copyright>
+
+using Datadog.Trace.Ci.Configuration;
+using Datadog.Trace.Configuration;
+using Datadog.Trace.Configuration.Telemetry;
+using Datadog.Trace.Telemetry;
+using FluentAssertions;
+using Xunit;
+
+namespace Datadog.Trace.Tests.Telemetry;
+
+public class TelemetryControllerLogTagBuilderTests
+{
+    [Fact]
+    public void TagBuilder_ReturnsExpectedDefaults()
+    {
+        var builder = new TelemetryController.TagBuilder();
+        builder.GetLogTags().Should().Be("ci:0,asm:0,prof:0,dyn:0");
+    }
+
+    [Fact]
+    public void TagBuilder_UpdateCiVisTag()
+    {
+        var builder = new TelemetryController.TagBuilder();
+        builder.Update(new CIVisibilitySettings(NullConfigurationSource.Instance, NullConfigurationTelemetry.Instance), enabled: true);
+        builder.GetLogTags().Should().Be("ci:1,asm:0,prof:0,dyn:0");
+    }
+
+    [Theory]
+    [InlineData((int)TelemetryProductType.AppSec, "ci:0,asm:1,prof:0,dyn:0")]
+    [InlineData((int)TelemetryProductType.Profiler, "ci:0,asm:0,prof:1,dyn:0")]
+    [InlineData((int)TelemetryProductType.DynamicInstrumentation, "ci:0,asm:0,prof:0,dyn:1")]
+    public void TagBuilder_UpdateProductTag(int product, string expected)
+    {
+        var builder = new TelemetryController.TagBuilder();
+        builder.Update((TelemetryProductType)product, enabled: true);
+        builder.GetLogTags().Should().Be(expected);
+    }
+
+    [Fact]
+    public void TagBuilder_UpdateCloudTag()
+    {
+        var builder = new TelemetryController.TagBuilder();
+        builder.Update(TracerSettings.Create(new() { { "DD_AZURE_APP_SERVICES", "true" } }));
+        builder.GetLogTags().Should().Be("ci:0,asm:0,prof:0,dyn:0,aas");
+    }
+
+    [Fact]
+    public void TagBuilder_AddsEverything()
+    {
+        var builder = new TelemetryController.TagBuilder();
+        builder.Update(TracerSettings.Create(new() { { "FUNCTIONS_EXTENSION_VERSION", "true" } }));
+        builder.Update(TelemetryProductType.Profiler, enabled: true);
+        builder.Update(TelemetryProductType.DynamicInstrumentation, enabled: true);
+        builder.Update(TelemetryProductType.AppSec, enabled: true);
+        builder.Update(new CIVisibilitySettings(NullConfigurationSource.Instance, NullConfigurationTelemetry.Instance), enabled: true);
+        builder.GetLogTags().Should().Be("ci:1,asm:1,prof:1,dyn:1,azf");
+    }
+
+    [Fact]
+    public void TagBuilder_WhenAdded()
+    {
+        var builder = new TelemetryController.TagBuilder();
+        builder.Update(TracerSettings.Create(new() { { "FUNCTIONS_EXTENSION_VERSION", "true" } }));
+        builder.Update(TelemetryProductType.Profiler, enabled: true);
+        builder.Update(TelemetryProductType.DynamicInstrumentation, enabled: true);
+        builder.Update(TelemetryProductType.AppSec, enabled: true);
+        builder.Update(new CIVisibilitySettings(NullConfigurationSource.Instance, NullConfigurationTelemetry.Instance), enabled: true);
+        builder.GetLogTags().Should().Be("ci:1,asm:1,prof:1,dyn:1,azf");
+    }
+}
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetryControllerSchedulerTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetryControllerSchedulerTests.cs
index 58fe4ace3ce5..91d2329d8b56 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetryControllerSchedulerTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetryControllerSchedulerTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="TelemetryControllerSchedulerTests.cs" company="Datadog">
+// <copyright file="TelemetryControllerSchedulerTests.cs" company="Datadog">
 // 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.
 // </copyright>
@@ -162,6 +162,8 @@ public async Task TypicalLoop_WithLogsQueueTrigger()
         delayMutex.Wait();
         queueTcs.SetResult(true); // this triggers the queue task
 
+        await waitTask;
+
         // t = 15s;
         _scheduler.ShouldFlushTelemetry.Should().BeFalse(); // not a complete interval
         _scheduler.ShouldFlushRedactedErrorLogs.Should().BeTrue(); // triggered by queue
@@ -180,7 +182,7 @@ public async Task TypicalLoop_WithLogsQueueTrigger()
         // t = 125s;
         _scheduler.ShouldFlushTelemetry.Should().BeTrue();
         _scheduler.ShouldFlushRedactedErrorLogs.Should().BeTrue();
-     }
+    }
 
     [Fact]
     public async Task DoesNotFlushTelemetryUntilInitialized()
diff --git a/tracer/test/Datadog.Trace.Tests/TracerTests.cs b/tracer/test/Datadog.Trace.Tests/TracerTests.cs
index 7e25032cb721..2911c089014f 100644
--- a/tracer/test/Datadog.Trace.Tests/TracerTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/TracerTests.cs
@@ -498,8 +498,8 @@ public void OriginHeader_InjectFromChildSpan()
 
             IHeadersCollection headers = WebRequest.CreateHttp("http://localhost").Headers.Wrap();
 
-            SpanContextPropagator.Instance.Inject(new PropagationContext(secondSpan.Context, baggage: null), headers);
-            var context = SpanContextPropagator.Instance.Extract(headers);
+            _tracer.TracerManager.SpanContextPropagator.Inject(new PropagationContext(secondSpan.Context, baggage: null), headers);
+            var context = _tracer.TracerManager.SpanContextPropagator.Extract(headers);
             var spanContext = context.SpanContext!;
 
             spanContext.Should().NotBeNull();
diff --git a/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/BeforeAfterAspectAnalyzerTests.cs b/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/BeforeAfterAspectAnalyzerTests.cs
index 754eeb7c41fe..fda478ab51f1 100644
--- a/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/BeforeAfterAspectAnalyzerTests.cs
+++ b/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/BeforeAfterAspectAnalyzerTests.cs
@@ -126,7 +126,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                             return myParam;
                         }
                     }
@@ -163,7 +163,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                             return myParam;
                         }
                     }
@@ -211,7 +211,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                             return myParam;
                         }
                     }
@@ -259,7 +259,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                             return myParam;
                         }
                     }
@@ -314,6 +314,8 @@ public void Error(Exception? exception, string messageTemplate) { }
                   static class IastModule
                   {
                       public static readonly IDatadogLogger Log = new DatadogLogging();
+                      
+                      public static void LogAspectException(Exception ex, string message) => Log.Error(ex, message);
                   }
 
                   class BlockException : Exception
diff --git a/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/ReplaceAspectAnalyzerTests.cs b/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/ReplaceAspectAnalyzerTests.cs
index 1aaadb4e94b0..9f37f52a55e3 100644
--- a/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/ReplaceAspectAnalyzerTests.cs
+++ b/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/AspectAnalyzers/ReplaceAspectAnalyzerTests.cs
@@ -195,7 +195,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                         }
 
                         return result;
@@ -238,7 +238,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                         }
 
                         return result;
@@ -295,7 +295,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                         }
 
                         return result;
@@ -406,7 +406,7 @@ string TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                         }
 
                         return result;
@@ -466,7 +466,7 @@ TestClass TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                         }
 
                         return result;
@@ -577,7 +577,7 @@ TestClass TestMethod(string myParam)
                         }
                         catch (Exception ex)
                         {
-                            IastModule.Log.Error(ex, $"Error invoking {nameof(TestClass)}.{nameof(TestMethod)}");
+                            IastModule.LogAspectException(ex, $"{nameof(TestClass)}.{nameof(TestMethod)}");
                         }
 
                         return result;
@@ -636,6 +636,8 @@ public void Error(Exception? exception, string messageTemplate) { }
                   static class IastModule
                   {
                       public static readonly IDatadogLogger Log = new DatadogLogging();
+                      
+                      public static void LogAspectException(Exception ex, string message) => Log.Error(ex, message);
                   }
               }
               """;
diff --git a/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/Datadog.Trace.Tools.Analyzers.Tests.csproj b/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/Datadog.Trace.Tools.Analyzers.Tests.csproj
index 0a3f62f80816..898f61caa8fc 100644
--- a/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/Datadog.Trace.Tools.Analyzers.Tests.csproj
+++ b/tracer/test/Datadog.Trace.Tools.Analyzers.Tests/Datadog.Trace.Tools.Analyzers.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
diff --git a/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CiRunCommandTests.cs b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CiRunCommandTests.cs
index a977dfb78bce..3ac4a9f487df 100644
--- a/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CiRunCommandTests.cs
+++ b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CiRunCommandTests.cs
@@ -35,7 +35,6 @@ public class CiRunCommandTests : BaseRunCommandTests
         public CiRunCommandTests()
             : base("ci run", enableCiVisibilityMode: true)
         {
-            CIVisibility.UseLockedTracerManager = false;
         }
 
         [Fact]
diff --git a/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CustomTestFramework.cs b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CustomTestFramework.cs
index 2e3050929695..2120a20aab32 100644
--- a/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CustomTestFramework.cs
+++ b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/CustomTestFramework.cs
@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
+using Datadog.Trace.Ci;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -15,6 +16,7 @@ public class CustomTestFramework : TestHelpers.CustomTestFramework
         public CustomTestFramework(IMessageSink messageSink)
             : base(messageSink)
         {
+            CIVisibility.UseLockedTracerManager = false;
         }
     }
 }
diff --git a/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/Datadog.Trace.Tools.Runner.IntegrationTests.csproj b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/Datadog.Trace.Tools.Runner.IntegrationTests.csproj
index 0e77cbacc246..5b9f17cdd6fa 100644
--- a/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/Datadog.Trace.Tools.Runner.IntegrationTests.csproj
+++ b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/Datadog.Trace.Tools.Runner.IntegrationTests.csproj
@@ -17,19 +17,25 @@
     <PackageReference Remove="coverlet.collector" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="xunit.runner.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Verify.Xunit" Version="14.13.1" />
   </ItemGroup>
 
   <ItemGroup>
     <None Update="coverage.cobertura.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="coverage.opencover.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="DummyLibrary.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/xunit.runner.json b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/xunit.runner.json
new file mode 100644
index 000000000000..eae9335ded8e
--- /dev/null
+++ b/tracer/test/Datadog.Trace.Tools.Runner.IntegrationTests/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "diagnosticMessages": true,
+  "internalDiagnosticMessages": true
+}
\ No newline at end of file
diff --git a/tracer/test/Datadog.Trace.Tools.Runner.Tests/Datadog.Trace.Tools.Runner.Tests.csproj b/tracer/test/Datadog.Trace.Tools.Runner.Tests/Datadog.Trace.Tools.Runner.Tests.csproj
index 11400436fee9..c4a38d7c5f0a 100644
--- a/tracer/test/Datadog.Trace.Tools.Runner.Tests/Datadog.Trace.Tools.Runner.Tests.csproj
+++ b/tracer/test/Datadog.Trace.Tools.Runner.Tests/Datadog.Trace.Tools.Runner.Tests.csproj
@@ -9,15 +9,15 @@
   <ItemGroup>
     <None Remove="xunit.runner.json" />
     <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Remove="CoverageRewriterAssembly.dll" />
     <Content Include="CoverageRewriterAssembly.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Remove="CoverageRewriterAssembly.pdb" />
     <Content Include="CoverageRewriterAssembly.pdb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
@@ -35,7 +35,7 @@
   
   <ItemGroup>
     <None Update="datadogConfig.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 </Project>
diff --git a/tracer/test/Datadog.Trace.Tools.dd_dotnet.ArtifactTests/Datadog.Trace.Tools.dd_dotnet.ArtifactTests.csproj b/tracer/test/Datadog.Trace.Tools.dd_dotnet.ArtifactTests/Datadog.Trace.Tools.dd_dotnet.ArtifactTests.csproj
index 3f17fb174ecb..a53cc17e605d 100644
--- a/tracer/test/Datadog.Trace.Tools.dd_dotnet.ArtifactTests/Datadog.Trace.Tools.dd_dotnet.ArtifactTests.csproj
+++ b/tracer/test/Datadog.Trace.Tools.dd_dotnet.ArtifactTests/Datadog.Trace.Tools.dd_dotnet.ArtifactTests.csproj
@@ -17,10 +17,10 @@
 
   <ItemGroup>
     <Content Include="applicationHost.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   
diff --git a/tracer/test/Datadog.Trace.Tools.dd_dotnet.IntegrationTests/Datadog.Trace.Tools.dd_dotnet.IntegrationTests.csproj b/tracer/test/Datadog.Trace.Tools.dd_dotnet.IntegrationTests/Datadog.Trace.Tools.dd_dotnet.IntegrationTests.csproj
index 021463e41f23..bda8d87b25dc 100644
--- a/tracer/test/Datadog.Trace.Tools.dd_dotnet.IntegrationTests/Datadog.Trace.Tools.dd_dotnet.IntegrationTests.csproj
+++ b/tracer/test/Datadog.Trace.Tools.dd_dotnet.IntegrationTests/Datadog.Trace.Tools.dd_dotnet.IntegrationTests.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <Content Include="applicationHost.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
diff --git a/tracer/test/Datadog.Trace.Tools.dd_dotnet.Tests/Datadog.Trace.Tools.dd_dotnet.Tests.csproj b/tracer/test/Datadog.Trace.Tools.dd_dotnet.Tests/Datadog.Trace.Tools.dd_dotnet.Tests.csproj
index ac56404f2c42..776447492f53 100644
--- a/tracer/test/Datadog.Trace.Tools.dd_dotnet.Tests/Datadog.Trace.Tools.dd_dotnet.Tests.csproj
+++ b/tracer/test/Datadog.Trace.Tools.dd_dotnet.Tests/Datadog.Trace.Tools.dd_dotnet.Tests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <None Remove="xunit.runner.json" />
     <Content Include="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
@@ -33,19 +33,19 @@
   
   <ItemGroup>
     <None Update="CallDatadogConfigJson.exe.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="datadog.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="datadogConfig.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="DoNotCallDatadogConfigJson.exe.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="maps.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 </Project>
diff --git a/tracer/test/snapshots/AzureFunctionsTests.Isolated.V4.Sdk1.verified.txt b/tracer/test/snapshots/AzureFunctionsTests.Isolated.V4.Sdk1.verified.txt
new file mode 100644
index 000000000000..28b158a42fcd
--- /dev/null
+++ b/tracer/test/snapshots/AzureFunctionsTests.Isolated.V4.Sdk1.verified.txt
@@ -0,0 +1,607 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: azure-functions.invoke,
+    Resource: Timer TriggerAllTimer,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.method: Samples.AzureFunctions.AllTriggers.AllTriggers.TriggerAllTimer,
+      aas.function.name: TriggerAllTimer,
+      aas.function.trigger: Timer,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: http.request,
+    Resource: GET localhost:00000/api/trigger,
+    Service: AzureFunctionsAllTriggers-http-client,
+    Type: http,
+    ParentId: Id_2,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: HttpMessageHandler,
+      env: integration_tests,
+      http-client-handler-type: System.Net.Http.HttpClientHandler,
+      http.method: GET,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/trigger,
+      language: dotnet,
+      out.host: localhost,
+      runtime-id: Guid_1,
+      span.kind: client,
+      _dd.base_service: AzureFunctionsAllTriggers
+    },
+    Metrics: {
+      _dd.top_level: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_4,
+    Name: azure-functions.invoke,
+    Resource: GET /api/trigger,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_3,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.binding: Microsoft.Azure.WebJobs.Host.Executors.BindingSource,
+      aas.function.name: TriggerCaller,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/trigger,
+      language: dotnet,
+      runtime-id: Guid_2,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_5,
+    Name: azure-functions.invoke,
+    Resource: Http TriggerCaller,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_4,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.method: Samples.AzureFunctions.AllTriggers.AllTriggers.Trigger,
+      aas.function.name: TriggerCaller,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_6,
+    Name: Manual inside Trigger,
+    Resource: Manual inside Trigger,
+    Service: AzureFunctionsAllTriggers,
+    ParentId: Id_5,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      env: integration_tests,
+      language: dotnet
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_7,
+    Name: http.request,
+    Resource: GET localhost:00000/api/simple,
+    Service: AzureFunctionsAllTriggers-http-client,
+    Type: http,
+    ParentId: Id_6,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: HttpMessageHandler,
+      env: integration_tests,
+      http-client-handler-type: System.Net.Http.HttpClientHandler,
+      http.method: GET,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/simple,
+      language: dotnet,
+      out.host: localhost,
+      runtime-id: Guid_1,
+      span.kind: client,
+      _dd.base_service: AzureFunctionsAllTriggers
+    },
+    Metrics: {
+      _dd.top_level: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_8,
+    Name: http.request,
+    Resource: GET localhost:00000/api/exception,
+    Service: AzureFunctionsAllTriggers-http-client,
+    Type: http,
+    ParentId: Id_6,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: HttpMessageHandler,
+      env: integration_tests,
+      http-client-handler-type: System.Net.Http.HttpClientHandler,
+      http.method: GET,
+      http.status_code: 500,
+      http.url: http://localhost:00000/api/exception,
+      language: dotnet,
+      out.host: localhost,
+      runtime-id: Guid_1,
+      span.kind: client,
+      _dd.base_service: AzureFunctionsAllTriggers
+    },
+    Metrics: {
+      _dd.top_level: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_9,
+    Name: http.request,
+    Resource: GET localhost:00000/api/error,
+    Service: AzureFunctionsAllTriggers-http-client,
+    Type: http,
+    ParentId: Id_6,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: HttpMessageHandler,
+      env: integration_tests,
+      http-client-handler-type: System.Net.Http.HttpClientHandler,
+      http.method: GET,
+      http.status_code: 500,
+      http.url: http://localhost:00000/api/error,
+      language: dotnet,
+      out.host: localhost,
+      runtime-id: Guid_1,
+      span.kind: client,
+      _dd.base_service: AzureFunctionsAllTriggers
+    },
+    Metrics: {
+      _dd.top_level: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_10,
+    Name: http.request,
+    Resource: GET localhost:00000/api/badrequest,
+    Service: AzureFunctionsAllTriggers-http-client,
+    Type: http,
+    ParentId: Id_6,
+    Error: 1,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: HttpMessageHandler,
+      env: integration_tests,
+      error.msg: The HTTP response has status code 400.,
+      http-client-handler-type: System.Net.Http.HttpClientHandler,
+      http.method: GET,
+      http.status_code: 400,
+      http.url: http://localhost:00000/api/badrequest,
+      language: dotnet,
+      out.host: localhost,
+      runtime-id: Guid_1,
+      span.kind: client,
+      _dd.base_service: AzureFunctionsAllTriggers
+    },
+    Metrics: {
+      _dd.top_level: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_11,
+    Name: azure-functions.invoke,
+    Resource: GET /api/simple,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_7,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.binding: Microsoft.Azure.WebJobs.Host.Executors.BindingSource,
+      aas.function.name: SimpleHttpTrigger,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/simple,
+      language: dotnet,
+      runtime-id: Guid_2,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_12,
+    Name: azure-functions.invoke,
+    Resource: GET /api/exception,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_8,
+    Error: 1,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.binding: Microsoft.Azure.WebJobs.Host.Executors.BindingSource,
+      aas.function.name: Exception,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      error.msg: Exception while executing function: Functions.Exception,
+      error.stack:
+Microsoft.Azure.WebJobs.Host.FunctionInvocationException: Exception while executing function: Functions.Exception
+---> Microsoft.Azure.WebJobs.Script.Workers.Rpc.RpcException: Result: Failure
+Exception: System.InvalidOperationException: Task failed successfully.
+at Samples.AzureFunctions.AllTriggers.AllTriggers.Exception(HttpRequestData req, ILogger log),
+      error.type: Microsoft.Azure.WebJobs.Host.FunctionInvocationException,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 500,
+      http.url: http://localhost:00000/api/exception,
+      language: dotnet,
+      runtime-id: Guid_2,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_13,
+    Name: azure-functions.invoke,
+    Resource: GET /api/error,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_9,
+    Error: 1,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.binding: Microsoft.Azure.WebJobs.Host.Executors.BindingSource,
+      aas.function.name: ServerError,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      error.msg: The HTTP response has status code 500.,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 500,
+      http.url: http://localhost:00000/api/error,
+      language: dotnet,
+      runtime-id: Guid_2,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_14,
+    Name: azure-functions.invoke,
+    Resource: GET /api/badrequest,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_10,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.binding: Microsoft.Azure.WebJobs.Host.Executors.BindingSource,
+      aas.function.name: BadRequest,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 400,
+      http.url: http://localhost:00000/api/badrequest,
+      language: dotnet,
+      runtime-id: Guid_2,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_15,
+    Name: azure-functions.invoke,
+    Resource: Http SimpleHttpTrigger,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_11,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.method: Samples.AzureFunctions.AllTriggers.AllTriggers.SimpleHttpTrigger,
+      aas.function.name: SimpleHttpTrigger,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_16,
+    Name: azure-functions.invoke,
+    Resource: Http Exception,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_12,
+    Error: 1,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.method: Samples.AzureFunctions.AllTriggers.AllTriggers.Exception,
+      aas.function.name: Exception,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      error.msg: Task failed successfully.,
+      error.stack:
+System.InvalidOperationException: Task failed successfully.
+at Samples.AzureFunctions.AllTriggers.AllTriggers.Exception(HttpRequestData req, ILogger log),
+      error.type: System.InvalidOperationException,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_17,
+    Name: azure-functions.invoke,
+    Resource: Http ServerError,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_13,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.method: Samples.AzureFunctions.AllTriggers.AllTriggers.ServerError,
+      aas.function.name: ServerError,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_18,
+    Name: azure-functions.invoke,
+    Resource: Http BadRequest,
+    Service: AzureFunctionsAllTriggers,
+    Type: serverless,
+    ParentId: Id_14,
+    Tags: {
+      aas.environment.extension_version: unknown,
+      aas.environment.instance_id: unknown,
+      aas.environment.instance_name: IntegrationTestHost,
+      aas.environment.os: unknown,
+      aas.environment.runtime: .NET,
+      aas.function.method: Samples.AzureFunctions.AllTriggers.AllTriggers.BadRequest,
+      aas.function.name: BadRequest,
+      aas.function.trigger: Http,
+      aas.site.kind: functionapp,
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      component: AzureFunctions,
+      env: integration_tests,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_19,
+    Name: Manual inside Simple,
+    Resource: Manual inside Simple,
+    Service: AzureFunctionsAllTriggers,
+    ParentId: Id_15,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      env: integration_tests,
+      language: dotnet
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_20,
+    Name: Manual inside Exception,
+    Resource: Manual inside Exception,
+    Service: AzureFunctionsAllTriggers,
+    ParentId: Id_16,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      env: integration_tests,
+      language: dotnet
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_21,
+    Name: Manual inside ServerError,
+    Resource: Manual inside ServerError,
+    Service: AzureFunctionsAllTriggers,
+    ParentId: Id_17,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      env: integration_tests,
+      language: dotnet
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_22,
+    Name: Manual inside BadRequest,
+    Resource: Manual inside BadRequest,
+    Service: AzureFunctionsAllTriggers,
+    ParentId: Id_18,
+    Tags: {
+      aas.site.name: AzureFunctionsAllTriggers,
+      aas.site.type: function,
+      env: integration_tests,
+      language: dotnet
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/AzureFunctionsTests.Isolated.verified.txt b/tracer/test/snapshots/AzureFunctionsTests.Isolated.verified.txt
index 28b158a42fcd..14b25690002b 100644
--- a/tracer/test/snapshots/AzureFunctionsTests.Isolated.verified.txt
+++ b/tracer/test/snapshots/AzureFunctionsTests.Isolated.verified.txt
@@ -316,8 +316,9 @@
       error.stack:
 Microsoft.Azure.WebJobs.Host.FunctionInvocationException: Exception while executing function: Functions.Exception
 ---> Microsoft.Azure.WebJobs.Script.Workers.Rpc.RpcException: Result: Failure
-Exception: System.InvalidOperationException: Task failed successfully.
-at Samples.AzureFunctions.AllTriggers.AllTriggers.Exception(HttpRequestData req, ILogger log),
+Exception: Task failed successfully.
+Stack:    at Samples.AzureFunctions.AllTriggers.AllTriggers.Exception(HttpRequestData req, ILogger log)
+at Samples.AzureFunctions.V4Isolated.DirectFunctionExecutor.ExecuteAsync(FunctionContext context),
       error.type: Microsoft.Azure.WebJobs.Host.FunctionInvocationException,
       http.method: GET,
       http.request.headers.host: localhost:00000,
diff --git a/tracer/test/snapshots/Iast.StoredSqli.AspNetCore5.IastEnabled.verified.txt b/tracer/test/snapshots/Iast.StoredSqli.AspNetCore5.IastEnabled.verified.txt
index c1538d57852d..971316388480 100644
--- a/tracer/test/snapshots/Iast.StoredSqli.AspNetCore5.IastEnabled.verified.txt
+++ b/tracer/test/snapshots/Iast.StoredSqli.AspNetCore5.IastEnabled.verified.txt
@@ -4,10 +4,10 @@
     SpanId: Id_2,
     Name: aspnet_core.request,
     Resource: GET /iast/storedsqli,
-    Service: Samples.Security.AspNetCore5.DatabaseIntegration,
+    Service: Samples.Security.AspNetCore5,
     Type: web,
     Tags: {
-      aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.DatabaseIntegration.IastController.StoredSqli (Samples.Security.AspNetCore5.DatabaseIntegration),
+      aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.IastController.StoredSqli (Samples.Security.AspNetCore5),
       aspnet_core.route: iast/storedsqli,
       component: aspnet_core,
       env: integration_tests,
@@ -29,7 +29,7 @@
       "hash": XXX,
       "location": {
         "spanId": XXX,
-        "path": "Samples.Security.AspNetCore5.Controllers.DatabaseIntegration.IastController",
+        "path": "Samples.Security.AspNetCore5.Controllers.IastController",
         "method": "StoredSqli"
       },
       "evidence": {
@@ -72,7 +72,7 @@
     SpanId: Id_3,
     Name: aspnet_core_mvc.request,
     Resource: GET /iast/storedsqli,
-    Service: Samples.Security.AspNetCore5.DatabaseIntegration,
+    Service: Samples.Security.AspNetCore5,
     Type: web,
     ParentId: Id_2,
     Tags: {
diff --git a/tracer/test/snapshots/Iast.StoredXss.AspNetCore5.IastEnabled.verified.txt b/tracer/test/snapshots/Iast.StoredXss.AspNetCore5.IastEnabled.verified.txt
index 2a330025dc14..74cd8eb39780 100644
--- a/tracer/test/snapshots/Iast.StoredXss.AspNetCore5.IastEnabled.verified.txt
+++ b/tracer/test/snapshots/Iast.StoredXss.AspNetCore5.IastEnabled.verified.txt
@@ -4,10 +4,10 @@
     SpanId: Id_2,
     Name: aspnet_core.request,
     Resource: GET /iast/storedxss,
-    Service: Samples.Security.AspNetCore5.DatabaseIntegration,
+    Service: Samples.Security.AspNetCore5,
     Type: web,
     Tags: {
-      aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.DatabaseIntegration.IastController.StoredXss (Samples.Security.AspNetCore5.DatabaseIntegration),
+      aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.IastController.StoredXss (Samples.Security.AspNetCore5),
       aspnet_core.route: iast/storedxss,
       component: aspnet_core,
       env: integration_tests,
@@ -69,7 +69,7 @@
     SpanId: Id_3,
     Name: aspnet_core_mvc.request,
     Resource: GET /iast/storedxss,
-    Service: Samples.Security.AspNetCore5.DatabaseIntegration,
+    Service: Samples.Security.AspNetCore5,
     Type: web,
     ParentId: Id_2,
     Tags: {
diff --git a/tracer/test/snapshots/Iast.StoredXssEscaped.AspNetCore5.IastEnabled.verified.txt b/tracer/test/snapshots/Iast.StoredXssEscaped.AspNetCore5.IastEnabled.verified.txt
index 048846a9dae9..7c6c2b4f1894 100644
--- a/tracer/test/snapshots/Iast.StoredXssEscaped.AspNetCore5.IastEnabled.verified.txt
+++ b/tracer/test/snapshots/Iast.StoredXssEscaped.AspNetCore5.IastEnabled.verified.txt
@@ -4,10 +4,10 @@
     SpanId: Id_2,
     Name: aspnet_core.request,
     Resource: GET /iast/storedxssescaped,
-    Service: Samples.Security.AspNetCore5.DatabaseIntegration,
+    Service: Samples.Security.AspNetCore5,
     Type: web,
     Tags: {
-      aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.DatabaseIntegration.IastController.StoredXssEscaped (Samples.Security.AspNetCore5.DatabaseIntegration),
+      aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.IastController.StoredXssEscaped (Samples.Security.AspNetCore5),
       aspnet_core.route: iast/storedxssescaped,
       component: aspnet_core,
       env: integration_tests,
@@ -34,7 +34,7 @@
     SpanId: Id_3,
     Name: aspnet_core_mvc.request,
     Resource: GET /iast/storedxssescaped,
-    Service: Samples.Security.AspNetCore5.DatabaseIntegration,
+    Service: Samples.Security.AspNetCore5,
     Type: web,
     ParentId: Id_2,
     Tags: {
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=False.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=False.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt
new file mode 100644
index 000000000000..aa6e6b09c085
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=False.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt	
@@ -0,0 +1,237 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=False.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=False.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
new file mode 100644
index 000000000000..b3f43ae6a294
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=False.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
@@ -0,0 +1,237 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=True.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=True.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt
new file mode 100644
index 000000000000..19b2638823eb
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=True.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt	
@@ -0,0 +1,347 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-3-4d739311,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-3-4d739311,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-3-4d739311,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-3-4d739311,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-3-4d739311,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=True.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=True.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
new file mode 100644
index 000000000000..01089b212941
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Classic.enableSecurity=True.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
@@ -0,0 +1,222 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-1-4740ae63,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_3,
+    SpanId: Id_4,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-1-4740ae63,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_5,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-1-4740ae63,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-1-4740ae63,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_9,
+    SpanId: Id_10,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-1-4740ae63,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt
new file mode 100644
index 000000000000..aa6e6b09c085
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt	
@@ -0,0 +1,237 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 204,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
new file mode 100644
index 000000000000..b3f43ae6a294
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
@@ -0,0 +1,237 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.controller: route,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: GET /api/route/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/{controller}/{id},
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.response.headers.no_cookies_url=_api_asm_injectedheader_body=null.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.response.headers.no_cookies_url=_api_asm_injectedheader_body=null.verified.txt
new file mode 100644
index 000000000000..ca8e5c04939e
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=False.__test=server.response.headers.no_cookies_url=_api_asm_injectedheader_body=null.verified.txt
@@ -0,0 +1,232 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/asm/injectedheader,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/asm/injectedheader,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/asm/injectedheader,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/asm/injectedheader,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.route: api/asm/injectedheader,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      runtime-id: Guid_1,
+      span.kind: server
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 1.0
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt
new file mode 100644
index 000000000000..9f2b383a496d
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.request.body_url=_api_Home_Upload_body={-Property1-- -[blocking_test]-}.verified.txt	
@@ -0,0 +1,357 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-length: 167,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-5-07490af2,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-length: 167,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-5-07490af2,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-length: 167,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-5-07490af2,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-length: 167,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-5-07490af2,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.controller: home,
+      aspnet.route: api/{controller}/{id},
+      env: integration_tests,
+      http.method: POST,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: POST /api/home/{id},
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: POST,
+      http.request.headers.content-length: 32,
+      http.request.headers.content-type: application/json; charset=utf-8,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-length: 167,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/{controller}/{id},
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/Home/Upload,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-post-ae7cd782--2d59fcb7,
+      _dd.appsec.fp.http.header: hdr-0000000100-3626b5f8-5-07490af2,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.body","highlight":["[blocking_test]"],"key_path":["miscModel","Property1"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
new file mode 100644
index 000000000000..d9d6e95c4164
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.request.path_params_url=_api_route_2-arg=[blocking_test]_body=null.verified.txt
@@ -0,0 +1,227 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_3,
+    SpanId: Id_4,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_5,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_9,
+    SpanId: Id_10,
+    Name: aspnet.request,
+    Resource: GET /api/route/?,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/route/2?arg=[blocking_test],
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-33e6044f-b25f03de-,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"block-on-path-params","name":"Block on path params","tags":{"category":"attack_attempt","type":"nosql_injection"}},"rule_matches":[{"operator":"match_regex","operator_value":"(?i:(?:\\[blocking_test\\]))","parameters":[{"address":"server.request.query","highlight":["[blocking_test]"],"key_path":["arg","0"],"value":"[blocking_test]"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.response.headers.no_cookies_url=_api_asm_injectedheader_body=null.verified.txt b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.response.headers.no_cookies_url=_api_asm_injectedheader_body=null.verified.txt
new file mode 100644
index 000000000000..d51ac2c07bc7
--- /dev/null
+++ b/tracer/test/snapshots/Security.AspNetWebApi.Integrated.enableSecurity=True.__test=server.response.headers.no_cookies_url=_api_asm_injectedheader_body=null.verified.txt
@@ -0,0 +1,337 @@
+[
+  {
+    TraceId: Id_1,
+    SpanId: Id_2,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_3,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_1,
+    SpanId: Id_3,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/asm/injectedheader,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-46993086--,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"test-dummy-rule","name":"Dummy rule to test blocking","tags":{"category":"attack_attempt","type":"security_scanner"}},"rule_matches":[{"operator":"phrase_match","operator_value":"","parameters":[{"address":"server.response.headers.no_cookies","highlight":["dummy_rule"],"key_path":["x-test"],"value":"dummy_rule"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_5,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_6,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_4,
+    SpanId: Id_6,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/asm/injectedheader,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-46993086--,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"test-dummy-rule","name":"Dummy rule to test blocking","tags":{"category":"attack_attempt","type":"security_scanner"}},"rule_matches":[{"operator":"phrase_match","operator_value":"","parameters":[{"address":"server.response.headers.no_cookies","highlight":["dummy_rule"],"key_path":["x-test"],"value":"dummy_rule"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_8,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_9,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_7,
+    SpanId: Id_9,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/asm/injectedheader,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-46993086--,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"test-dummy-rule","name":"Dummy rule to test blocking","tags":{"category":"attack_attempt","type":"security_scanner"}},"rule_matches":[{"operator":"phrase_match","operator_value":"","parameters":[{"address":"server.response.headers.no_cookies","highlight":["dummy_rule"],"key_path":["x-test"],"value":"dummy_rule"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_11,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_12,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_10,
+    SpanId: Id_12,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/asm/injectedheader,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-46993086--,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"test-dummy-rule","name":"Dummy rule to test blocking","tags":{"category":"attack_attempt","type":"security_scanner"}},"rule_matches":[{"operator":"phrase_match","operator_value":"","parameters":[{"address":"server.response.headers.no_cookies","highlight":["dummy_rule"],"key_path":["x-test"],"value":"dummy_rule"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_14,
+    Name: aspnet-webapi.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    ParentId: Id_15,
+    Tags: {
+      aspnet.route: api/asm/injectedheader,
+      env: integration_tests,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.status_code: 200,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      span.kind: server,
+      _dd.origin: appsec
+    }
+  },
+  {
+    TraceId: Id_13,
+    SpanId: Id_15,
+    Name: aspnet.request,
+    Resource: GET /api/asm/injectedheader,
+    Service: sample,
+    Type: web,
+    Tags: {
+      actor.ip: 86.242.244.246,
+      appsec.blocked: true,
+      appsec.event: true,
+      env: integration_tests,
+      http.client_ip: 127.0.0.1,
+      http.method: GET,
+      http.request.headers.host: localhost:00000,
+      http.request.headers.user-agent: Mistake Not...,
+      http.request.headers.x-forwarded-for: 86.242.244.246,
+      http.response.headers.content-type: application/json; charset=utf-8,
+      http.route: api/asm/injectedheader,
+      http.status_code: 403,
+      http.url: http://localhost:00000/api/asm/injectedheader,
+      http.useragent: Mistake Not...,
+      language: dotnet,
+      network.client.ip: ::1,
+      runtime-id: Guid_1,
+      span.kind: server,
+      _dd.appsec.fp.http.endpoint: http-get-46993086--,
+      _dd.appsec.fp.http.header: hdr-0000000000-3626b5f8-3-98425651,
+      _dd.appsec.fp.http.network: net-1-1000000000,
+      _dd.appsec.json: {"triggers":[{"rule":{"id":"test-dummy-rule","name":"Dummy rule to test blocking","tags":{"category":"attack_attempt","type":"security_scanner"}},"rule_matches":[{"operator":"phrase_match","operator_value":"","parameters":[{"address":"server.response.headers.no_cookies","highlight":["dummy_rule"],"key_path":["x-test"],"value":"dummy_rule"}]}]}]},
+      _dd.origin: appsec,
+      _dd.runtime_family: dotnet
+    },
+    Metrics: {
+      process_id: 0,
+      _dd.appsec.enabled: 1.0,
+      _dd.appsec.waf.duration: 0.0,
+      _dd.appsec.waf.duration_ext: 0.0,
+      _dd.top_level: 1.0,
+      _dd.tracer_kr: 1.0,
+      _sampling_priority_v1: 2.0
+    },
+    MetaStruct: {
+      appsec: 
+    }
+  }
+]
\ No newline at end of file
diff --git a/tracer/test/test-applications/aspnet/Samples.AspNet472.LoaderOptimizationRegKey/Samples.AspNet472.LoaderOptimizationRegKey.csproj b/tracer/test/test-applications/aspnet/Samples.AspNet472.LoaderOptimizationRegKey/Samples.AspNet472.LoaderOptimizationRegKey.csproj
index dc73dad7ea44..0d582f06849f 100644
--- a/tracer/test/test-applications/aspnet/Samples.AspNet472.LoaderOptimizationRegKey/Samples.AspNet472.LoaderOptimizationRegKey.csproj
+++ b/tracer/test/test-applications/aspnet/Samples.AspNet472.LoaderOptimizationRegKey/Samples.AspNet472.LoaderOptimizationRegKey.csproj
@@ -140,7 +140,7 @@
     <Content Include="Default.aspx" />
     <Content Include="Global.asax" />
     <Content Include="log4net.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Site.Master" />
diff --git a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/launchSettings.json b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/launchSettings.json
new file mode 100644
index 000000000000..9a73526b0cca
--- /dev/null
+++ b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/launchSettings.json
@@ -0,0 +1,24 @@
+{
+  "profiles": {
+    "Samples.AzureFunctions.AllTriggers": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "CORECLR_ENABLE_PROFILING": "1",
+        "CORECLR_PROFILER": "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}",
+        "CORECLR_PROFILER_PATH": "$(SolutionDir)shared\\bin\\monitoring-home\\tracer\\win-$(Platform)\\Datadog.Trace.ClrProfiler.Native.dll",
+
+        "DD_DOTNET_TRACER_HOME": "$(SolutionDir)shared\\bin\\monitoring-home\\tracer",
+        "DD_VERSION": "1.0.0",
+
+        // local.settings.json only applies to the function script, not the host, so this needs to exist here
+        "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+
+        "DD_AZURE_APP_SERVICES": "1",
+        "DD_TRACE_AZURE_FUNCTIONS_ENABLED": "1",
+        "DD_LOGS_INJECTION": "1",
+        "DD_TRACE_DEBUG": "0"
+      },
+      "nativeDebugging": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/serviceDependencies.json b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/serviceDependencies.json
new file mode 100644
index 000000000000..df4dcc9d888d
--- /dev/null
+++ b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/serviceDependencies.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights"
+    },
+    "storage1": {
+      "type": "storage",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/serviceDependencies.local.json b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/serviceDependencies.local.json
new file mode 100644
index 000000000000..b804a2893992
--- /dev/null
+++ b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Properties/serviceDependencies.local.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights.sdk"
+    },
+    "storage1": {
+      "type": "storage.emulator",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Samples.AzureFunctions.V4Isolated.SdkV1.csproj b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Samples.AzureFunctions.V4Isolated.SdkV1.csproj
new file mode 100644
index 000000000000..7a360dd9cffd
--- /dev/null
+++ b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/Samples.AzureFunctions.V4Isolated.SdkV1.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
+    <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.12" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
+    <!-- We can't build and run these as multi-package versions, so we have to manually update this as required for now -->
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.24.0" />
+  </ItemGroup>
+
+  <!-- Just reducing duplication, we can evolve these separate if we need to later -->
+  <ItemGroup>
+    <Compile Include="..\Samples.AzureFunctions.V4Isolated\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="host.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/host.json b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/host.json
new file mode 100644
index 000000000000..95b693276695
--- /dev/null
+++ b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/host.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.0",
+    "logging": {
+        "applicationInsights": {
+            "samplingSettings": {
+                "isEnabled": true,
+                "excludedTypes": "Request"
+            }
+        }
+    }
+}
diff --git a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/local.settings.json b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/local.settings.json
new file mode 100644
index 000000000000..64a872fcd528
--- /dev/null
+++ b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated.SdkV1/local.settings.json
@@ -0,0 +1,7 @@
+{
+    "IsEncrypted": false,
+    "Values": {
+        "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+        "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated"
+    }
+}
\ No newline at end of file
diff --git a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated/Samples.AzureFunctions.V4Isolated.csproj b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated/Samples.AzureFunctions.V4Isolated.csproj
index cfb8e54bfcb9..574a027c11e7 100644
--- a/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated/Samples.AzureFunctions.V4Isolated.csproj
+++ b/tracer/test/test-applications/azure-functions/Samples.AzureFunctions.V4Isolated/Samples.AzureFunctions.V4Isolated.csproj
@@ -1,16 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.12" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.7.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.8.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
+    <!-- We can't build and run these as multi-package versions, so we have to manually update this as required for now -->
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
   </ItemGroup>
+  
   <ItemGroup>
     <None Update="host.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/tracer/test/test-applications/debugger/Samples.Debugger.AspNetCore5/Controllers/HomeController.cs b/tracer/test/test-applications/debugger/Samples.Debugger.AspNetCore5/Controllers/HomeController.cs
index 73df5247a755..5036da1c909a 100644
--- a/tracer/test/test-applications/debugger/Samples.Debugger.AspNetCore5/Controllers/HomeController.cs
+++ b/tracer/test/test-applications/debugger/Samples.Debugger.AspNetCore5/Controllers/HomeController.cs
@@ -29,7 +29,7 @@ public IActionResult Index()
 
         public IActionResult LangHeader()
         {
-            Response.Headers.Add("content-language", "krypton");
+            Response.Headers["content-language"] = "krypton";
             return Content("Setting content-language");
         }
 
diff --git a/tracer/test/test-applications/debugger/dependency-libs/Samples.Probes.TestRuns/ExceptionReplay/ExceptionWithNonSupportedFramesTest.cs b/tracer/test/test-applications/debugger/dependency-libs/Samples.Probes.TestRuns/ExceptionReplay/ExceptionWithNonSupportedFramesTest.cs
index e17f4bad657e..0d5d052143c3 100644
--- a/tracer/test/test-applications/debugger/dependency-libs/Samples.Probes.TestRuns/ExceptionReplay/ExceptionWithNonSupportedFramesTest.cs
+++ b/tracer/test/test-applications/debugger/dependency-libs/Samples.Probes.TestRuns/ExceptionReplay/ExceptionWithNonSupportedFramesTest.cs
@@ -27,7 +27,9 @@ void SupportedFrame(string str)
 
         ref struct MeRefStruct
         {
+#pragma warning disable CS0649 // Field 'ExceptionWithNonSupportedFramesTest.MeRefStruct.Field' is never assigned to, and will always have its default value null
             public string Field;
+#pragma warning restore CS0649
         }
     }
 }
diff --git a/tracer/test/test-applications/debugger/dependency-libs/Samples.Probes.TestRuns/SmokeTests/FixedBlockTest.cs b/tracer/test/test-applications/debugger/dependency-libs/Samples.Probes.TestRuns/SmokeTests/FixedBlockTest.cs
new file mode 100644
index 000000000000..b72a3493faa8
--- /dev/null
+++ b/tracer/test/test-applications/debugger/dependency-libs/Samples.Probes.TestRuns/SmokeTests/FixedBlockTest.cs
@@ -0,0 +1,44 @@
+#if NET6_0_OR_GREATER
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using static Samples.Probes.TestRuns.SmokeTests.MultidimensionalArrayTest;
+
+namespace Samples.Probes.TestRuns.SmokeTests
+{
+    internal class FixedBlockTest : IRun
+    {
+        public unsafe void Run()
+        {
+            Test(5);
+        }
+
+        [LogMethodProbeTestData]
+        public unsafe void Test(byte a)
+        {
+            byte[] array = null;
+            Span<byte> span2 = new Span<byte>([1, 2, 3, a]);
+            try
+            {
+                fixed (byte* ptr = &MemoryMarshal.GetReference(span2))
+                {
+                    Span<byte> byteSpan = new Span<byte>(ptr, span2.Length);
+                }
+            }
+            finally
+            {
+                if (array != null)
+                {
+                    ArrayPool<byte>.Shared.Return(array);
+                }
+            }
+        }
+    }
+}
+
+#endif
diff --git a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetBubbleUpExceptions.cs b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetBubbleUpExceptions.cs
index 443e116d81e3..183229b4c750 100644
--- a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetBubbleUpExceptions.cs
+++ b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetBubbleUpExceptions.cs
@@ -26,11 +26,11 @@ private static void CallTargetBubbleUpExceptions()
 
         var callTargetBubbleUpExceptionsThrowBubbleUpOnAsyncEnd = new CallTargetBubbleUpExceptionsThrowBubbleUpOnAsyncEnd();
         Console.WriteLine($"{typeof(CallTargetBubbleUpExceptionsThrowBubbleUpOnAsyncEnd).FullName}.{nameof(CallTargetBubbleUpExceptionsThrowBubbleUpOnAsyncEnd.DoSomething)}");
-        RunMethod(() => callTargetBubbleUpExceptionsThrowBubbleUpOnAsyncEnd.DoSomething().Wait(), bubblingUpException: true);
+        RunMethod(() => callTargetBubbleUpExceptionsThrowBubbleUpOnAsyncEnd.DoSomething().Wait(), bubblingUpException: true, asyncMethod: true);
         
         var callTargetBubbleUpExceptionsThrowNestedBubbleUpOnAsyncEnd = new CallTargetBubbleUpExceptionsThrowNestedBubbleUpOnAsyncEnd();
         Console.WriteLine($"{typeof(CallTargetBubbleUpExceptionsThrowNestedBubbleUpOnAsyncEnd).FullName}.{nameof(CallTargetBubbleUpExceptionsThrowNestedBubbleUpOnAsyncEnd.DoSomething)}");
-        RunMethod(() => callTargetBubbleUpExceptionsThrowNestedBubbleUpOnAsyncEnd.DoSomething().Wait(), bubblingUpException: true);
+        RunMethod(() => callTargetBubbleUpExceptionsThrowNestedBubbleUpOnAsyncEnd.DoSomething().Wait(), bubblingUpException: true, asyncMethod: true);
     }
 }
 
diff --git a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetNativeTest.csproj b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetNativeTest.csproj
index 83812b8836eb..0a9623c28ae7 100644
--- a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetNativeTest.csproj
+++ b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/CallTargetNativeTest.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
     <ProjectReference Include="..\..\..\..\src\Datadog.Trace\Datadog.Trace.csproj" />
   </ItemGroup>
 
diff --git a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/Program.cs b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/Program.cs
index 1e5cfe19bc15..87d300b993ce 100644
--- a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/Program.cs
+++ b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/Program.cs
@@ -36,6 +36,18 @@ static void InjectCallTargetDefinitions()
             definitionsList.Add(new(TargetAssembly, typeof(ArgumentsStructParentType.With0ArgumentsThrowOnAsyncEnd).FullName, "Wait2Seconds", new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
             definitionsList.Add(new(TargetAssembly, typeof(ArgumentsGenericParentType<>.With0ArgumentsThrowOnAsyncEnd).FullName, "Wait2Seconds", new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
 
+            // task definitions
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasks).FullName, nameof(With0ArgumentsTasks.ReturnTaskSync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasks).FullName, nameof(With0ArgumentsTasks.ReturnTaskAsync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasks).FullName, nameof(With0ArgumentsTasks.ReturnValueTaskSync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasks).FullName, nameof(With0ArgumentsTasks.ReturnValueTaskAsync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+
+            // generic task definitions
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasksGeneric<>).FullName, nameof(With0ArgumentsTasksGeneric<int>.ReturnTaskSync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasksGeneric<>).FullName, nameof(With0ArgumentsTasksGeneric<int>.ReturnTaskAsync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasksGeneric<>).FullName, nameof(With0ArgumentsTasksGeneric<int>.ReturnValueTaskSync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+            definitionsList.Add(new(TargetAssembly, typeof(With0ArgumentsTasksGeneric<>).FullName, nameof(With0ArgumentsTasksGeneric<int>.ReturnValueTaskAsync), new[] { "_" }, 0, 0, 0, 1, 1, 1, integrationAssembly, "CallTargetNativeTest.NoOp.Noop0ArgumentsIntegration"));
+
             for (var i = 0; i < 10; i++)
             {
                 var signaturesArray = Enumerable.Range(0, i + 1).Select(i => "_").ToArray();
@@ -409,7 +421,7 @@ static void RunTests(string[] args)
 #endif
         }
 
-        private static void RunMethod(Action action, bool checkInstrumented = true, bool bubblingUpException = false)
+        private static void RunMethod(Action action, bool checkInstrumented = true, bool bubblingUpException = false, bool asyncMethod = false)
         {
             var cOut = Console.Out;
             Console.SetOut(sWriter);
@@ -440,10 +452,15 @@ private static void RunMethod(Action action, bool checkInstrumented = true, bool
                 {
                     throw new Exception("The profiler is not connected or is not compiled as DEBUG with the DD_CTARGET_TESTMODE=True environment variable.");
                 }
-                if (!str.Contains("ProfilerOK: BeginMethod") || !str.Contains("ProfilerOK: EndMethod"))
+                if (!str.Contains("ProfilerOK: BeginMethod"))
                 {
                     throw new Exception("Profiler didn't return a valid ProfilerOK: BeginMethod string.");
                 }
+                var endMethodString = asyncMethod ? "ProfilerOK: EndMethodAsync(" : "ProfilerOK: EndMethod(";
+                if (!str.Contains(endMethodString))
+                {
+                    throw new Exception($"Profiler didn't return a valid {endMethodString} string.");
+                }
             }
             else 
             {
diff --git a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/With0Arguments.cs b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/With0Arguments.cs
index 55e1e798d6f4..5ec702df52f3 100644
--- a/tracer/test/test-applications/instrumentation/CallTargetNativeTest/With0Arguments.cs
+++ b/tracer/test/test-applications/instrumentation/CallTargetNativeTest/With0Arguments.cs
@@ -119,7 +119,31 @@ private static void Argument0()
         //
         var w0TAsyncEnd = new With0ArgumentsThrowOnAsyncEnd();
         Console.WriteLine($"{typeof(With0ArgumentsThrowOnAsyncEnd).FullName}.Wait2Seconds");
-        RunMethod(() => w0TAsyncEnd.Wait2Seconds().Wait());
+        RunMethod(() => w0TAsyncEnd.Wait2Seconds().Wait(), asyncMethod: true);
+        Console.WriteLine();
+
+        // tasks
+        var w0Task = new With0ArgumentsTasks();
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnTaskSync");
+        RunMethod(() => w0Task.ReturnTaskSync().GetAwaiter().GetResult(), asyncMethod: true);
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnTaskAsync");
+        RunMethod(() => w0Task.ReturnTaskAsync().GetAwaiter().GetResult(), asyncMethod: true);
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnValueTaskSync");
+        RunMethod(() => w0Task.ReturnValueTaskSync().GetAwaiter().GetResult(), asyncMethod: true);
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnValueTaskAsync");
+        RunMethod(() => w0Task.ReturnValueTaskAsync().GetAwaiter().GetResult(), asyncMethod: true);
+        Console.WriteLine();
+
+        // tasks generic
+        var w0TaskGeneric = new With0ArgumentsTasksGeneric<int>();
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnTaskSync");
+        RunMethod(() => w0TaskGeneric.ReturnTaskSync().GetAwaiter().GetResult(), asyncMethod: true);
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnTaskAsync");
+        RunMethod(() => w0TaskGeneric.ReturnTaskAsync().GetAwaiter().GetResult(), asyncMethod: true);
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnValueTaskSync");
+        RunMethod(() => w0TaskGeneric.ReturnValueTaskSync().GetAwaiter().GetResult(), asyncMethod: true);
+        Console.WriteLine($"{typeof(With0Arguments).FullName}.ReturnValueTaskAsync");
+        RunMethod(() => w0TaskGeneric.ReturnValueTaskAsync().GetAwaiter().GetResult(), asyncMethod: true);
         Console.WriteLine();
     }
 
@@ -514,6 +538,29 @@ class With0ArgumentsThrowOnAsyncEnd
 {
     public Task Wait2Seconds() => Task.Delay(2000);
 }
+class With0ArgumentsTasks
+{
+    public Task ReturnTaskSync() => Task.CompletedTask;
+    public async Task ReturnTaskAsync() => await Task.Yield();
+    public ValueTask ReturnValueTaskSync() => default;
+    public ValueTask ReturnValueTaskAsync() => new(Task.Delay(TimeSpan.FromSeconds(2)));
+}
+class With0ArgumentsTasksGeneric<T>
+{
+    public Task<T> ReturnTaskSync() => Task.FromResult<T>(default);
+    public async Task<T> ReturnTaskAsync()
+    {
+        await Task.Yield();
+        return default;
+    }
+
+    public ValueTask<T> ReturnValueTaskSync() => default;
+    public async ValueTask<T> ReturnValueTaskAsync()
+    {
+        await Task.Yield();
+        return default;
+    }
+}
 
 partial class ArgumentsParentType
 {
diff --git a/tracer/test/test-applications/integrations/LogsInjection.Log4Net.VersionConflict.2x/LogsInjection.Log4Net.VersionConflict.2x.csproj b/tracer/test/test-applications/integrations/LogsInjection.Log4Net.VersionConflict.2x/LogsInjection.Log4Net.VersionConflict.2x.csproj
index b8453b26f5c6..59201912f494 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.Log4Net.VersionConflict.2x/LogsInjection.Log4Net.VersionConflict.2x.csproj
+++ b/tracer/test/test-applications/integrations/LogsInjection.Log4Net.VersionConflict.2x/LogsInjection.Log4Net.VersionConflict.2x.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <None Update="log4net.205.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
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 7cf492b87052..34f498f225e8 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.Log4Net/LogsInjection.Log4Net.csproj
+++ b/tracer/test/test-applications/integrations/LogsInjection.Log4Net/LogsInjection.Log4Net.csproj
@@ -32,10 +32,10 @@
   <ItemGroup>
     <!-- It appears that this works fine for V3 as well - re-using -->
     <None Update="log4net.205.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="log4net.Pre205.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/test-applications/integrations/LogsInjection.NLog.VersionConflict.2x/LogsInjection.NLog.VersionConflict.2x.csproj b/tracer/test/test-applications/integrations/LogsInjection.NLog.VersionConflict.2x/LogsInjection.NLog.VersionConflict.2x.csproj
index 3e198036f9d9..ce2997f05b1a 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.NLog.VersionConflict.2x/LogsInjection.NLog.VersionConflict.2x.csproj
+++ b/tracer/test/test-applications/integrations/LogsInjection.NLog.VersionConflict.2x/LogsInjection.NLog.VersionConflict.2x.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <None Update="NLog.46.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/test-applications/integrations/LogsInjection.NLog/LogsInjection.NLog.csproj b/tracer/test/test-applications/integrations/LogsInjection.NLog/LogsInjection.NLog.csproj
index 99eae63b7794..d1fcdf2008f0 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.NLog/LogsInjection.NLog.csproj
+++ b/tracer/test/test-applications/integrations/LogsInjection.NLog/LogsInjection.NLog.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <None Update="Configurations\*">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/test-applications/integrations/LogsInjection.NLog/Program.cs b/tracer/test/test-applications/integrations/LogsInjection.NLog/Program.cs
index 7d14030c1bb1..d243ecc566de 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.NLog/Program.cs
+++ b/tracer/test/test-applications/integrations/LogsInjection.NLog/Program.cs
@@ -239,8 +239,13 @@ private static void AddToContextAndLog(string message, ContextProperty contextPr
                     throw new ArgumentException("Invalid context property '{0}' for this NLog version", contextProperty.ToString());
 #endif
                 case ContextProperty.Mdc:
+
+#if NLOG_5_0 || NLOG_4_6 || NLOG_4_0
                     global::NLog.MappedDiagnosticsContext.Set(propKey, propValue);
                     break;
+#else
+                    throw new ArgumentException("Invalid context property '{0}' for this NLog version", contextProperty.ToString());
+#endif
             }
 
             Logger logger = LogManager.GetCurrentClassLogger();
diff --git a/tracer/test/test-applications/integrations/LogsInjection.NLog10.VersionConflict.2x/LogsInjection.NLog10.VersionConflict.2x.csproj b/tracer/test/test-applications/integrations/LogsInjection.NLog10.VersionConflict.2x/LogsInjection.NLog10.VersionConflict.2x.csproj
index fd511029d2b3..5d638f8a25d4 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.NLog10.VersionConflict.2x/LogsInjection.NLog10.VersionConflict.2x.csproj
+++ b/tracer/test/test-applications/integrations/LogsInjection.NLog10.VersionConflict.2x/LogsInjection.NLog10.VersionConflict.2x.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <None Update="NLog.Pre40.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/test-applications/integrations/LogsInjection.NLog20.VersionConflict.2x/LogsInjection.NLog20.VersionConflict.2x.csproj b/tracer/test/test-applications/integrations/LogsInjection.NLog20.VersionConflict.2x/LogsInjection.NLog20.VersionConflict.2x.csproj
index 36b08a92db0c..7372a808da98 100644
--- a/tracer/test/test-applications/integrations/LogsInjection.NLog20.VersionConflict.2x/LogsInjection.NLog20.VersionConflict.2x.csproj
+++ b/tracer/test/test-applications/integrations/LogsInjection.NLog20.VersionConflict.2x/LogsInjection.NLog20.VersionConflict.2x.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <None Update="NLog.Pre40.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/test-applications/integrations/Samples.AspNetCoreMinimalApis/Samples.AspNetCoreMinimalApis.csproj b/tracer/test/test-applications/integrations/Samples.AspNetCoreMinimalApis/Samples.AspNetCoreMinimalApis.csproj
index 299d488b58ea..d2fd951faee0 100644
--- a/tracer/test/test-applications/integrations/Samples.AspNetCoreMinimalApis/Samples.AspNetCoreMinimalApis.csproj
+++ b/tracer/test/test-applications/integrations/Samples.AspNetCoreMinimalApis/Samples.AspNetCoreMinimalApis.csproj
@@ -13,6 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="..\Samples.AspNetCoreMvc21\web.config" Link="web.config" CopyToOutputDirectory="Always" />
+    <Content Include="..\Samples.AspNetCoreMvc21\web.config" Link="web.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 </Project>
diff --git a/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc21/Controllers/ApiController.cs b/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc21/Controllers/ApiController.cs
index 7507a63b7215..a00cea4ee133 100644
--- a/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc21/Controllers/ApiController.cs
+++ b/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc21/Controllers/ApiController.cs
@@ -32,7 +32,7 @@ private void AddCorrelationIdentifierToResponse()
         {
             if (Request.Headers.ContainsKey(CorrelationIdentifierHeaderName))
             {
-                Response.Headers.Add(CorrelationIdentifierHeaderName, Request.Headers[CorrelationIdentifierHeaderName]);
+                Response.Headers[CorrelationIdentifierHeaderName] = Request.Headers[CorrelationIdentifierHeaderName];
             }
         }
     }
diff --git a/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc30/Samples.AspNetCoreMvc30.csproj b/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc30/Samples.AspNetCoreMvc30.csproj
index f5f4a5aae240..d53668fcfe66 100644
--- a/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc30/Samples.AspNetCoreMvc30.csproj
+++ b/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc30/Samples.AspNetCoreMvc30.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <Content Include="..\Samples.AspNetCoreMvc21\web.config" Link="web.config" CopyToOutputDirectory="Always" />
+    <Content Include="..\Samples.AspNetCoreMvc21\web.config" Link="web.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc31/Samples.AspNetCoreMvc31.csproj b/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc31/Samples.AspNetCoreMvc31.csproj
index 16a703513589..9c8a7b04d39e 100644
--- a/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc31/Samples.AspNetCoreMvc31.csproj
+++ b/tracer/test/test-applications/integrations/Samples.AspNetCoreMvc31/Samples.AspNetCoreMvc31.csproj
@@ -17,6 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="..\Samples.AspNetCoreMvc21\web.config" Link="web.config" CopyToOutputDirectory="Always" />
+    <Content Include="..\Samples.AspNetCoreMvc21\web.config" Link="web.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tracer/test/test-applications/integrations/Samples.CIVisibilityVersionMismatch/Samples.CIVisibilityVersionMismatch.csproj b/tracer/test/test-applications/integrations/Samples.CIVisibilityVersionMismatch/Samples.CIVisibilityVersionMismatch.csproj
index 5caead659da4..b51743c4b37d 100644
--- a/tracer/test/test-applications/integrations/Samples.CIVisibilityVersionMismatch/Samples.CIVisibilityVersionMismatch.csproj
+++ b/tracer/test/test-applications/integrations/Samples.CIVisibilityVersionMismatch/Samples.CIVisibilityVersionMismatch.csproj
@@ -30,8 +30,20 @@
 
   <ItemGroup>
     <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
+  <Target Name="CodeCoverageFixTarget" AfterTargets="Build" Condition=" '$(TargetFramework)' != '' AND '$(ManuallyCopyCodeCoverageFiles)' != 'false' ">
+    <Message Importance="High" Text="Fixing Code Coverage: $(TargetFramework)" />
+    <CallTarget Targets="ComputeFilesToPublish" />
+    <CallTarget Targets="CopyCoverletDataCollectorFiles" />
+
+    <!-- Because we don't publish on windows, we just move the code coverage binaries from the publish folder to the actual build bin folder-->
+    <ItemGroup>
+      <PublishedTraceDataCollectorArtifacts Include="$(PublishDir)**\*.*" />
+    </ItemGroup>
+    <Move SourceFiles="@(PublishedTraceDataCollectorArtifacts)" DestinationFolder="$(OutputPath)\%(RecursiveDir)" />
+  </Target>
+
 </Project>
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Bugs/GetCustomAttributesCrashTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Bugs/GetCustomAttributesCrashTests.cs
index cfbde39af791..1794fb279e91 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Bugs/GetCustomAttributesCrashTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Bugs/GetCustomAttributesCrashTests.cs
@@ -8,7 +8,7 @@
 
 namespace Samples.InstrumentedTests.Iast.Bugs;
 
-public class GetCustomAttributesCrashTests : Samples.InstrumentedTests.Iast.Vulnerabilities.InstrumentationTestsBase
+public class GetCustomAttributesCrashTests : Samples.InstrumentedTests.Iast.InstrumentationTestsBase
 {
     public GetCustomAttributesCrashTests()
     {
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/InstrumentationTestsBase.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/InstrumentationTestsBase.cs
similarity index 99%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/InstrumentationTestsBase.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/InstrumentationTestsBase.cs
index 7315939c4ef7..b6e582c99123 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/InstrumentationTestsBase.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/InstrumentationTestsBase.cs
@@ -15,7 +15,7 @@
 using Castle.Core.Internal;
 using FluentAssertions;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities;
+namespace Samples.InstrumentedTests.Iast;
 
 public class InstrumentationTestsBase : IDisposable
 {
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/ObjectsForTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/ObjectsForTests.cs
similarity index 97%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/ObjectsForTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/ObjectsForTests.cs
index 407cbd84af9b..dc21e9c2d773 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/ObjectsForTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/ObjectsForTests.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities;
+namespace Samples.InstrumentedTests.Iast;
 struct StructForStringTest
 {
     readonly string str;
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/DefaultInterpolatedStringHandlerTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/DefaultInterpolatedStringHandlerTests.cs
similarity index 99%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/DefaultInterpolatedStringHandlerTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/DefaultInterpolatedStringHandlerTests.cs
index e8fb6b46a000..197314fc807e 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/DefaultInterpolatedStringHandlerTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/DefaultInterpolatedStringHandlerTests.cs
@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 using FluentAssertions;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class DefaultInterpolatedStringHandlerTests : InstrumentationTestsBase
 {
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringCaseChangeTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringCaseChangeTests.cs
similarity index 90%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringCaseChangeTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringCaseChangeTests.cs
index 70f461a7ce41..96c3b21a1e88 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringCaseChangeTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringCaseChangeTests.cs
@@ -3,7 +3,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class StringCaseChangeTests : InstrumentationTestsBase
 {
@@ -33,8 +33,8 @@ public void GivenATaintedObject_WhenCallingToUpper_ResultIsOk()
         string str1 = AddTaintedString("0a2");
         string str2 = AddTaintedString("0b2");
         AssertTaintedFormatWithOriginalCallCheck("    :+-0A2-+:    :+-0B2-+:",
-            String.Concat("    ", str1, "    ", str2).ToUpper(),
-            () => String.Concat("    ", str1, "    ", str2).ToUpper());
+            System.String.Concat("    ", str1, "    ", str2).ToUpper(),
+            () => System.String.Concat("    ", str1, "    ", str2).ToUpper());
     }
 
     [Fact]
@@ -49,8 +49,8 @@ public void GivenATaintedObject_WhenCallingToLower_ResultIsOk()
         string str1 = AddTaintedString("0A2");
         string str2 = AddTaintedString("0B2");
         AssertTaintedFormatWithOriginalCallCheck("    :+-0a2-+:    :+-0b2-+:",
-            String.Concat("    ", str1, "    ", str2).ToLower(),
-            () => String.Concat("    ", str1, "    ", str2).ToLower());
+            System.String.Concat("    ", str1, "    ", str2).ToLower(),
+            () => System.String.Concat("    ", str1, "    ", str2).ToLower());
     }
 
     [Fact]
@@ -65,8 +65,8 @@ public void GivenATaintedObject_WhenCallingToUpperInvariant_ResultIsOk()
         string str1 = AddTaintedString("0a2");
         string str2 = AddTaintedString("0b2");
         AssertTaintedFormatWithOriginalCallCheck("    :+-0A2-+:    :+-0B2-+:",
-            String.Concat("    ", str1, "    ", str2).ToUpperInvariant(),
-            () => String.Concat("    ", str1, "    ", str2).ToUpperInvariant());
+            System.String.Concat("    ", str1, "    ", str2).ToUpperInvariant(),
+            () => System.String.Concat("    ", str1, "    ", str2).ToUpperInvariant());
     }
 
     [Fact]
@@ -81,8 +81,8 @@ public void GivenATaintedObject_WhenCallingToLowerInvariant_ResultIsOk()
         string str1 = AddTaintedString("0A2");
         string str2 = AddTaintedString("0B2");
         AssertTaintedFormatWithOriginalCallCheck("    :+-0a2-+:    :+-0b2-+:", 
-            String.Concat("    ", str1, "    ", str2).ToLowerInvariant(), 
-            () => String.Concat("    ", str1, "    ", str2).ToLowerInvariant());
+            System.String.Concat("    ", str1, "    ", str2).ToLowerInvariant(), 
+            () => System.String.Concat("    ", str1, "    ", str2).ToLowerInvariant());
     }
 
     [Fact]
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringConcatTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringConcatTests.cs
similarity index 53%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringConcatTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringConcatTests.cs
index 3a9e1fc043cd..4a757682334f 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringConcatTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringConcatTests.cs
@@ -3,7 +3,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class StringConcatTests : InstrumentationTestsBase
 {
@@ -39,33 +39,33 @@ public void GivenStringConcatOperations_WhenPerformed_ResultIsOK()
         var testString4 = AddTaintedString(".,;:?");
         var testString5 = AddTaintedString("+-*/{}");
 
-        FormatTainted(String.Concat(testString1, testString2)).Should().Be(":+-01-+::+-abc-+:");
-        FormatTainted(String.Concat("01", testString2)).Should().Be("01:+-abc-+:");
-        FormatTainted(String.Concat(testString1, "abc")).Should().Be(":+-01-+:abc");
+        FormatTainted(System.String.Concat(testString1, testString2)).Should().Be(":+-01-+::+-abc-+:");
+        FormatTainted(System.String.Concat("01", testString2)).Should().Be("01:+-abc-+:");
+        FormatTainted(System.String.Concat(testString1, "abc")).Should().Be(":+-01-+:abc");
 
-        FormatTainted(String.Concat(testString1, null, testString2)).Should().Be(":+-01-+::+-abc-+:");
-        FormatTainted(String.Concat((object)testString1, (object)testString2)).Should().Be(":+-01-+::+-abc-+:");
-        FormatTainted(String.Concat((object)testString1, null, (object)testString2)).Should().Be(":+-01-+::+-abc-+:");
+        FormatTainted(System.String.Concat(testString1, null, testString2)).Should().Be(":+-01-+::+-abc-+:");
+        FormatTainted(System.String.Concat((object)testString1, (object)testString2)).Should().Be(":+-01-+::+-abc-+:");
+        FormatTainted(System.String.Concat((object)testString1, null, (object)testString2)).Should().Be(":+-01-+::+-abc-+:");
 
-        FormatTainted(String.Concat(testString1, testString2, testString3)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+:");
-        FormatTainted(String.Concat((object)testString1, (object)testString2, (object)testString3)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+:");
+        FormatTainted(System.String.Concat(testString1, testString2, testString3)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+:");
+        FormatTainted(System.String.Concat((object)testString1, (object)testString2, (object)testString3)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+:");
 
-        FormatTainted(String.Concat(testString1, testString2, testString3, testString4)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+:");
-        FormatTainted(String.Concat((object)testString1, (object)testString2, (object)testString3, (object)testString4)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+:");
+        FormatTainted(System.String.Concat(testString1, testString2, testString3, testString4)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+:");
+        FormatTainted(System.String.Concat((object)testString1, (object)testString2, (object)testString3, (object)testString4)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+:");
 
-        FormatTainted(String.Concat(testString1, testString2, testString3, testString4, testString5)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
-        FormatTainted(String.Concat((object)testString1, (object)testString2, (object)testString3, (object)testString4, (object)testString5)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
+        FormatTainted(System.String.Concat(testString1, testString2, testString3, testString4, testString5)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
+        FormatTainted(System.String.Concat((object)testString1, (object)testString2, (object)testString3, (object)testString4, (object)testString5)).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
 
-        FormatTainted(String.Concat(new string[] { testString1, testString2, testString3, testString4, testString5 })).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
-        FormatTainted(String.Concat(new object[] { testString1, testString2, testString3, testString4, testString5 })).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
-        FormatTainted(String.Concat(testString1, " dummy ")).Should().Be(":+-01-+: dummy ");
-        FormatTainted(String.Concat(" dummy ", testString2, " dummy ")).Should().Be(" dummy :+-abc-+: dummy ");
-        FormatTainted(String.Concat(" dummy ", testString3)).Should().Be(" dummy :+-ABCD-+:");
-        FormatTainted(String.Concat(testString1, " dummy ", testString3)).Should().Be(":+-01-+: dummy :+-ABCD-+:");
+        FormatTainted(System.String.Concat(new string[] { testString1, testString2, testString3, testString4, testString5 })).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
+        FormatTainted(System.String.Concat(new object[] { testString1, testString2, testString3, testString4, testString5 })).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
+        FormatTainted(System.String.Concat(testString1, " dummy ")).Should().Be(":+-01-+: dummy ");
+        FormatTainted(System.String.Concat(" dummy ", testString2, " dummy ")).Should().Be(" dummy :+-abc-+: dummy ");
+        FormatTainted(System.String.Concat(" dummy ", testString3)).Should().Be(" dummy :+-ABCD-+:");
+        FormatTainted(System.String.Concat(testString1, " dummy ", testString3)).Should().Be(":+-01-+: dummy :+-ABCD-+:");
 
-        FormatTainted(String.Concat(null, testString2, " dummy ")).Should().Be(":+-abc-+: dummy ");
-        FormatTainted(String.Concat(null, testString2, (object)" dummy ")).Should().Be(":+-abc-+: dummy ");
-        FormatTainted(String.Concat((object)" dummy ", null, testString2, (object)" dummy ")).Should().Be(" dummy :+-abc-+: dummy ");
+        FormatTainted(System.String.Concat(null, testString2, " dummy ")).Should().Be(":+-abc-+: dummy ");
+        FormatTainted(System.String.Concat(null, testString2, (object)" dummy ")).Should().Be(":+-abc-+: dummy ");
+        FormatTainted(System.String.Concat((object)" dummy ", null, testString2, (object)" dummy ")).Should().Be(" dummy :+-abc-+: dummy ");
     }
 
     [Fact]
@@ -77,19 +77,19 @@ public void GivenStringConcatOperations_WhenPerformedWithGenerics_ResultIsOK()
         var testString4 = AddTaintedString(".,;:?");
         var testString5 = AddTaintedString("+-*/{}");
 
-        FormatTainted(String.Concat(new List<string> { testString1, testString2, testString3, testString4, testString5 })).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
+        FormatTainted(System.String.Concat(new List<string> { testString1, testString2, testString3, testString4, testString5 })).Should().Be(":+-01-+::+-abc-+::+-ABCD-+::+-.,;:?-+::+-+-*/{}-+:");
     }
 
     [Fact]
     public void GivenAStringConcatOneString_WhenPerformed_ResultIsOK()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Concat(taintedValue), () => String.Concat(taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Concat(taintedValue), () => System.String.Concat(taintedValue));
     }
 
     [Fact]
     public void GivenAStringConcatOneObject_WhenPerformed_ResultIsOK()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedObject-+:", String.Concat(TaintedObject), () => String.Concat(TaintedObject));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedObject-+:", System.String.Concat(TaintedObject), () => System.String.Concat(TaintedObject));
     }
 
     [Fact]
@@ -97,8 +97,8 @@ public void GivenAStringConcatBasicWithTainted_WhenPerformed_ResultIsOK()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             "This is a tainted literal :+-TaintedString-+:",
-            String.Concat("This is a tainted literal ", TaintedString), 
-            () => String.Concat("This is a tainted literal ", TaintedString));
+            System.String.Concat("This is a tainted literal ", TaintedString), 
+            () => System.String.Concat("This is a tainted literal ", TaintedString));
     }
 
     [Fact]
@@ -106,8 +106,8 @@ public void GivenAStringConcatBasicWithBothTainted_WhenPerformed_ResultIsOK()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+::+-TaintedString-+:",
-            String.Concat(TaintedString, TaintedString),
-            () => String.Concat(TaintedString, TaintedString));
+            System.String.Concat(TaintedString, TaintedString),
+            () => System.String.Concat(TaintedString, TaintedString));
     }
 
     [Fact]
@@ -115,8 +115,8 @@ public void GivenAStringConcatBasicWithBoth2_WhenPerformed_ResultIsOK()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedString",
-            String.Concat(TaintedString, UntaintedString),
-            () => String.Concat(TaintedString, UntaintedString));
+            System.String.Concat(TaintedString, UntaintedString),
+            () => System.String.Concat(TaintedString, UntaintedString));
     }
 
     [Fact]
@@ -124,14 +124,14 @@ public void GivenAStringLiteralsOptimizationsConcat_WhenPerformed_ResultIsOK()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedString",
-            String.Concat(TaintedString, "UntaintedString"),
-            () => String.Concat(TaintedString, "UntaintedString"));
+            System.String.Concat(TaintedString, "UntaintedString"),
+            () => System.String.Concat(TaintedString, "UntaintedString"));
     }
 
     [Fact]
     public void GivenAStringLiteralsOptimizationsConcat_WhenPerformed_ResultIsOK2()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-TaintedString-+:",String.Concat("UntaintedString", TaintedString),() => String.Concat("UntaintedString", TaintedString));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-TaintedString-+:", System.String.Concat("UntaintedString", TaintedString),() => System.String.Concat("UntaintedString", TaintedString));
     }
 
     [Fact]
@@ -143,7 +143,7 @@ public void GivenAStringLiteralsOptimizationsConcat_WhenPerformed_ResultIsOK3()
     [Fact]
     public void GivenAStringConcatBasicWithBothJoined_WhenPerformed_ResultIsOK()
     {
-        FormatTainted(String.Concat(String.Concat(TaintedString, UntaintedString), TaintedString)).Should().Be(":+-TaintedString-+:UntaintedString:+-TaintedString-+:");
+        FormatTainted(System.String.Concat(System.String.Concat(TaintedString, UntaintedString), TaintedString)).Should().Be(":+-TaintedString-+:UntaintedString:+-TaintedString-+:");
     }
 
     [Fact]
@@ -151,8 +151,8 @@ public void GivenAStringConcatThreeParamsWithBoth_WhenPerformed_ResultIsOK()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedString:+-OtherTaintedString-+:",
-            String.Concat(TaintedString, UntaintedString, OtherTaintedString),
-            () => String.Concat(TaintedString, UntaintedString, OtherTaintedString));
+            System.String.Concat(TaintedString, UntaintedString, OtherTaintedString),
+            () => System.String.Concat(TaintedString, UntaintedString, OtherTaintedString));
     }
 
     [Fact]
@@ -160,18 +160,18 @@ public void GivenAStringConcatThreeParamsWithUntainted_WhenPerformed_ResultIsOK(
     {
         AssertTaintedFormatWithOriginalCallCheck(
             "UntaintedString:+-TaintedString-+:OtherUntaintedString",
-            String.Concat(UntaintedString, TaintedString, OtherUntaintedString),
-            () => String.Concat(UntaintedString, TaintedString, OtherUntaintedString));
+            System.String.Concat(UntaintedString, TaintedString, OtherUntaintedString),
+            () => System.String.Concat(UntaintedString, TaintedString, OtherUntaintedString));
     }
 
     [Fact]
     public void GivenAStringConcatThreeParamsWithBothJoined_WhenPerformed_ResultIsOK()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedString:+-OtherTaintedString-+:OtherUntaintedString",
-            String.Concat(str, OtherUntaintedString),
-            () => String.Concat(str, OtherUntaintedString));
+            System.String.Concat(str, OtherUntaintedString),
+            () => System.String.Concat(str, OtherUntaintedString));
     }
 
     [Fact]
@@ -179,8 +179,8 @@ public void GivenAStringConcatFourParam_WithBoth_WhenPerformed_ResultIsOK()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedString:+-OtherTaintedString-+:OtherUntaintedString",
-            String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString),
-            () => String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString));
+            System.String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString),
+            () => System.String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString));
     }
 
     [Fact]
@@ -188,102 +188,102 @@ public void GivenAStringConcatFourParamsWithUntainted_WhenPerformed_ResultIsOK()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             "UntaintedString:+-TaintedString-+:OtherUntaintedString:+-OtherTaintedString-+:",
-            String.Concat(UntaintedString, TaintedString, OtherUntaintedString, OtherTaintedString),
-            () => String.Concat(UntaintedString, TaintedString, OtherUntaintedString, OtherTaintedString));
+            System.String.Concat(UntaintedString, TaintedString, OtherUntaintedString, OtherTaintedString),
+            () => System.String.Concat(UntaintedString, TaintedString, OtherUntaintedString, OtherTaintedString));
     }
 
     [Fact]
     public void GivenAStringConcatFourParamsWithBothJoined_WhenPerformed_ResultIsOK()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedString:+-OtherTaintedString-+:OtherUntaintedString:+-TaintedString-+:",
-            String.Concat(str, TaintedString),
-            () => String.Concat(str, TaintedString));
+            System.String.Concat(str, TaintedString),
+            () => System.String.Concat(str, TaintedString));
     }
 
     [Fact]
     public void GivenAStringConcatFourParamsWithBothJoinedInverse_WhenPerformed_ResultIsOK()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherUntaintedString, UntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherUntaintedString, UntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedStringOtherUntaintedStringUntaintedString:+-OtherTaintedString-+:",
-            String.Concat(str, OtherTaintedString),
-            () => String.Concat(str, OtherTaintedString));
+            System.String.Concat(str, OtherTaintedString),
+            () => System.String.Concat(str, OtherTaintedString));
     }
 
     [Fact]
     public void GivenAStringConcatFiveParamsWithBothJoinedWhenPerformed_ResultIsOK()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherUntaintedString, OtherTaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherUntaintedString, OtherTaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+:UntaintedStringOtherUntaintedString:+-OtherTaintedString-+::+-OtherTaintedString-+:OtherUntaintedString",
-            String.Concat(str, OtherUntaintedString),
-            () => (String.Concat(str, OtherUntaintedString)));
+            System.String.Concat(str, OtherUntaintedString),
+            () => (System.String.Concat(str, OtherUntaintedString)));
     }
 
     [Fact]
     public void GivenAStringConcatFiveParamsWithBothJoinedInverse_WhenPerformed_ResultIsOK()
     {
-        string str = String.Concat(UntaintedString, OtherUntaintedString, TaintedString, OtherTaintedString, OtherUntaintedString);
+        string str = System.String.Concat(UntaintedString, OtherUntaintedString, TaintedString, OtherTaintedString, OtherUntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             "UntaintedStringOtherUntaintedString:+-TaintedString-+::+-OtherTaintedString-+:OtherUntaintedStringOtherUntaintedString",
-            String.Concat(str, OtherUntaintedString),
-            () => String.Concat(str, OtherUntaintedString));
+            System.String.Concat(str, OtherUntaintedString),
+            () => System.String.Concat(str, OtherUntaintedString));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWith2StringParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concat:+-tainted-+:", String.Concat("concat", taintedValue), () => String.Concat("concat", taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck("concat:+-tainted-+:", System.String.Concat("concat", taintedValue), () => System.String.Concat("concat", taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWith2StringParams_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:concat", String.Concat(taintedValue, "concat"), () => String.Concat(taintedValue, "concat"));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:concat", System.String.Concat(taintedValue, "concat"), () => System.String.Concat(taintedValue, "concat"));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWith3StringParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:", String.Concat(taintedValue2, "concat", taintedValue), () => String.Concat(taintedValue2, "concat", taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:", System.String.Concat(taintedValue2, "concat", taintedValue), () => System.String.Concat(taintedValue2, "concat", taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWith4Params_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:CONCAT2", String.Concat(taintedValue2, "concat", taintedValue, "CONCAT2"), () => String.Concat(taintedValue2, "concat", taintedValue, "CONCAT2"));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:CONCAT2", System.String.Concat(taintedValue2, "concat", taintedValue, "CONCAT2"), () => System.String.Concat(taintedValue2, "concat", taintedValue, "CONCAT2"));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWithStringNullParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-TAINTED2-+:", String.Concat("concat", "CONCAT2", null, taintedValue2), () => String.Concat("concat", "CONCAT2", null, taintedValue2));
+        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-TAINTED2-+:", System.String.Concat("concat", "CONCAT2", null, taintedValue2), () => System.String.Concat("concat", "CONCAT2", null, taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcat_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Concat(taintedValue), () => String.Concat(taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Concat(taintedValue), () => System.String.Concat(taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcat_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Concat(null, taintedValue), () => String.Concat(null, taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Concat(null, taintedValue), () => System.String.Concat(null, taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcat_ResultIsTainted3()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Concat(taintedValue, null), () => String.Concat(taintedValue, null));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Concat(taintedValue, null), () => System.String.Concat(taintedValue, null));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcat_ResultIsTainted4()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:", String.Concat(taintedValue, taintedValue, null), () => String.Concat(taintedValue, taintedValue, null));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:", System.String.Concat(taintedValue, taintedValue, null), () => System.String.Concat(taintedValue, taintedValue, null));
     }
 
     [Fact]
@@ -295,13 +295,13 @@ public void GivenATaintedString_WhenCallingConcat_ResultIsTainted5()
     [Fact]
     public void GivenANullString_WhenCallingConcat_ResultIsEmpty()
     {
-        Assert.Throws<ArgumentNullException>(() => String.Concat(null));
+        Assert.Throws<ArgumentNullException>(() => System.String.Concat(null));
     }
 
     [Fact]
     public void Given2NullStrings_WhenCallingConcat_ResultIsEmpty()
     {
-        String.Concat(null, null).Should().BeEmpty();
+        System.String.Concat(null, null).Should().BeEmpty();
     }
 
     //Literals
@@ -309,25 +309,25 @@ public void Given2NullStrings_WhenCallingConcat_ResultIsEmpty()
     [Fact]
     public void GivenStringLiteralsOptimizations_WhenConcat_ResultIsNotTainted()
     {
-        AssertNotTainted(String.Concat("Literal1", "Literal2"));
+        AssertNotTainted(System.String.Concat("Literal1", "Literal2"));
     }
 
     [Fact]
     public void GivenStringLiteralsOptimizations_WhenConcat3Literals_ResultIsNotTainted()
     {
-        AssertNotTainted(String.Concat("Literal1", "Literal2", "Literal3"));
+        AssertNotTainted(System.String.Concat("Literal1", "Literal2", "Literal3"));
     }
 
     [Fact]
     public void GivenStringLiteralsOptimizations_WhenConcat4Literals_ResultIsNotTainted()
     {
-        AssertNotTainted(String.Concat("Literal1", "Literal2", "Literal3", "Literal4"));
+        AssertNotTainted(System.String.Concat("Literal1", "Literal2", "Literal3", "Literal4"));
     }
 
     [Fact]
     public void GivenStringLiteralsOptimizations_WhenConcat5Literals_ResultIsNotTainted()
     {
-        AssertNotTainted(String.Concat("Literal1", "Literal2", "Literal3", "Literal4", "Literal5"));
+        AssertNotTainted(System.String.Concat("Literal1", "Literal2", "Literal3", "Literal4", "Literal5"));
     }
 
     [Fact]
@@ -363,8 +363,8 @@ public void GivenStringConcatObjectWithTainted_WhenConcat_ResultISTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             "This is a tainted literal :+-TaintedObject-+:",
-            String.Concat("This is a tainted literal ", TaintedObject),
-            () => String.Concat("This is a tainted literal ", TaintedObject));
+            System.String.Concat("This is a tainted literal ", TaintedObject),
+            () => System.String.Concat("This is a tainted literal ", TaintedObject));
     }
 
     [Fact]
@@ -372,8 +372,8 @@ public void GivenStringConcatObjectWithBoth_WhenConcat_ResultISTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObject",
-            String.Concat(TaintedObject, UntaintedObject),
-            () => String.Concat(TaintedObject, UntaintedObject));
+            System.String.Concat(TaintedObject, UntaintedObject),
+            () => System.String.Concat(TaintedObject, UntaintedObject));
     }
 
     [Fact]
@@ -381,8 +381,8 @@ public void GivenStringConcatObjectWithBothJoined_WhenConcat_ResultISTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObject:+-TaintedObject-+:",
-            String.Concat(String.Concat(TaintedObject, UntaintedObject), TaintedObject),
-            () => String.Concat(String.Concat(TaintedObject, UntaintedObject), TaintedObject));
+            System.String.Concat(System.String.Concat(TaintedObject, UntaintedObject), TaintedObject),
+            () => System.String.Concat(System.String.Concat(TaintedObject, UntaintedObject), TaintedObject));
     }
 
     [Fact]
@@ -390,8 +390,8 @@ public void GivenStringConcatObjectThreeParamsWithBoth_WhenConcat_ResultISTainte
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObject:+-OtherTaintedObject-+:",
-            String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject),
-            () => String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject));
+            System.String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject),
+            () => System.String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject));
     }
 
     [Fact]
@@ -399,18 +399,18 @@ public void GivenStringConcatObjectThreeParamsWithUntainted_WhenConcat_ResultIST
     {
         AssertTaintedFormatWithOriginalCallCheck(
             "UntaintedObject:+-TaintedObject-+:OtherUntaintedObject",
-            String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject),
-            () => String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject));
+            System.String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject),
+            () => System.String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject));
     }
 
     [Fact]
     public void GivenStringConcatObjectThreeParamsWithBothJoined_WhenConcat_ResultIsTainted()
     {
-        string str = String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject);
+        string str = System.String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObject:+-OtherTaintedObject-+:OtherUntaintedObject",
-            String.Concat(str, OtherUntaintedObject),
-            () => String.Concat(str, OtherUntaintedObject));
+            System.String.Concat(str, OtherUntaintedObject),
+            () => System.String.Concat(str, OtherUntaintedObject));
     }
 
     [Fact]
@@ -418,8 +418,8 @@ public void GivenStringConcatObjectFourParamsWithBoth_WhenConcat_ResultIsTainted
     {
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObject:+-OtherTaintedObject-+:OtherUntaintedObject",
-            String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject, OtherUntaintedObject),
-            () => String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject, OtherUntaintedObject));
+            System.String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject, OtherUntaintedObject),
+            () => System.String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject, OtherUntaintedObject));
 
     }
 
@@ -428,78 +428,78 @@ public void GivenStringConcatObjectFourParamsWithUntainted_WhenConcat_ResultIsTa
     {
         AssertTaintedFormatWithOriginalCallCheck(
             "UntaintedObject:+-TaintedObject-+:OtherUntaintedObject:+-OtherTaintedObject-+:",
-            String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject, OtherTaintedObject),
-            () => String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject, OtherTaintedObject));
+            System.String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject, OtherTaintedObject),
+            () => System.String.Concat(UntaintedObject, TaintedObject, OtherUntaintedObject, OtherTaintedObject));
     }
 
     [Fact]
     public void GivenStringConcatObjectFourParamsWithBothJoined_WhenConcat_ResultIsTainted()
     {
-        string str = String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject, OtherUntaintedObject);
+        string str = System.String.Concat(TaintedObject, UntaintedObject, OtherTaintedObject, OtherUntaintedObject);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObject:+-OtherTaintedObject-+:OtherUntaintedObject:+-TaintedObject-+:",
-            String.Concat(str, TaintedObject),
-            () => String.Concat(str, TaintedObject));
+            System.String.Concat(str, TaintedObject),
+            () => System.String.Concat(str, TaintedObject));
     }
 
     [Fact]
     public void GivenStringConcatObjectFourParamsWithBothJoinedInverse_WhenConcat_ResultIsTainted()
     {
-        string str = String.Concat(TaintedObject, UntaintedObject, OtherUntaintedObject, UntaintedObject);
+        string str = System.String.Concat(TaintedObject, UntaintedObject, OtherUntaintedObject, UntaintedObject);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObjectOtherUntaintedObjectUntaintedObject:+-OtherTaintedObject-+:",
-            String.Concat(str, OtherTaintedObject),
-            () => String.Concat(str, OtherTaintedObject));
+            System.String.Concat(str, OtherTaintedObject),
+            () => System.String.Concat(str, OtherTaintedObject));
     }
 
     [Fact]
     public void GivenStringConcatObjectFiveParamsWithBothJoined_WhenConcat_ResultIsTainted()
     {
-        string str = String.Concat(TaintedObject, UntaintedObject, OtherUntaintedObject, OtherTaintedObject, OtherTaintedObject);
+        string str = System.String.Concat(TaintedObject, UntaintedObject, OtherUntaintedObject, OtherTaintedObject, OtherTaintedObject);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedObject-+:UntaintedObjectOtherUntaintedObject:+-OtherTaintedObject-+::+-OtherTaintedObject-+:OtherUntaintedObject",
-            String.Concat(str, OtherUntaintedObject),
-            () => String.Concat(str, OtherUntaintedObject));
+            System.String.Concat(str, OtherUntaintedObject),
+            () => System.String.Concat(str, OtherUntaintedObject));
     }
 
     [Fact]
     public void GivenStringConcatObjectFiveParamsWithBothJoinedInverse_WhenConcat_ResultIsTainted()
     {
-        string str = String.Concat(UntaintedObject, OtherUntaintedObject, TaintedObject, OtherTaintedObject, OtherUntaintedObject);
+        string str = System.String.Concat(UntaintedObject, OtherUntaintedObject, TaintedObject, OtherTaintedObject, OtherUntaintedObject);
         AssertTaintedFormatWithOriginalCallCheck(
             "UntaintedObjectOtherUntaintedObject:+-TaintedObject-+::+-OtherTaintedObject-+:OtherUntaintedObjectOtherUntaintedObject",
-            String.Concat(str, OtherUntaintedObject), 
-            () => String.Concat(str, OtherUntaintedObject));
+            System.String.Concat(str, OtherUntaintedObject), 
+            () => System.String.Concat(str, OtherUntaintedObject));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingConcatWith2ObjectParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concat:+-tainted-+:", String.Concat((object)"concat", taintedValue), () => String.Concat((object)"concat", taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck("concat:+-tainted-+:", System.String.Concat((object)"concat", taintedValue), () => System.String.Concat((object)"concat", taintedValue));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingConcatWith2ObjectParams_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concat:+-tainted-+:", String.Concat("concat", (object)taintedValue), () => String.Concat("concat", (object)taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck("concat:+-tainted-+:", System.String.Concat("concat", (object)taintedValue), () => System.String.Concat("concat", (object)taintedValue));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingConcatWith3ObjectParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:", String.Concat(taintedValue2, (object)"concat", taintedValue), () => String.Concat(taintedValue2, (object)"concat", taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:", System.String.Concat(taintedValue2, (object)"concat", taintedValue), () => System.String.Concat(taintedValue2, (object)"concat", taintedValue));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingConcatWith4ObjectParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:concat2", String.Concat(taintedValue2, (object)"concat", taintedValue, (object)"concat2"), () => String.Concat(taintedValue2, (object)"concat", taintedValue, (object)"concat2"));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:concat:+-tainted-+:concat2", System.String.Concat(taintedValue2, (object)"concat", taintedValue, (object)"concat2"), () => System.String.Concat(taintedValue2, (object)"concat", taintedValue, (object)"concat2"));
     }
 
     [Fact]
     public void GivenAnObjectList_WhenConcat_ResultIsOk()
     {
-        AssertTaintedFormatWithOriginalCallCheck("123:+-TaintedObject-+:", String.Concat<object>(new List<object> { 1, 2, 3, TaintedObject }), () => String.Concat<object>(new List<object> { 1, 2, 3, TaintedObject }));
+        AssertTaintedFormatWithOriginalCallCheck("123:+-TaintedObject-+:", System.String.Concat<object>(new List<object> { 1, 2, 3, TaintedObject }), () => System.String.Concat<object>(new List<object> { 1, 2, 3, TaintedObject }));
     }
 
     // structs and built-in types
@@ -507,40 +507,40 @@ public void GivenAnObjectList_WhenConcat_ResultIsOk()
     [Fact]
     public void Given_StringConcatGenericStruct_WhenConcat_ResultIsTainted()
     {
-        string str = String.Concat<StructForStringTest>(new List<StructForStringTest> { new StructForStringTest(UntaintedString), new StructForStringTest(TaintedString) });
+        string str = System.String.Concat<StructForStringTest>(new List<StructForStringTest> { new StructForStringTest(UntaintedString), new StructForStringTest(TaintedString) });
         FormatTainted(str).Should().Be("UntaintedString:+-TaintedString-+:");
     }
 
     [Fact]
     public void GivenATaintedStringInStruct_WhenCallingConcat_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-tainted-+:", String.Concat<StructForStringTest>(new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }), () => String.Concat<StructForStringTest>(new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-tainted-+:", System.String.Concat<StructForStringTest>(new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }), () => System.String.Concat<StructForStringTest>(new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenANullStruct_WhenCallingConcat_ResultIsEmpty()
     {
-        String.Concat<StructForStringTest?>(new List<StructForStringTest?> { null }).Should().Be(string.Empty);
+        System.String.Concat<StructForStringTest?>(new List<StructForStringTest?> { null }).Should().Be(string.Empty);
     }
 
     [Fact]
     public void GivenAnIntList_WhenConcat_ResultIsOk()
     {
-        string str = String.Concat<int>(new List<int> { 1, 2, 3});
+        string str = System.String.Concat<int>(new List<int> { 1, 2, 3});
         str.Should().Be("123");
     }
 
     [Fact]
     public void GivenAnIntList_WhenConcat_ResultIsOk2()
     {
-        string str = String.Concat<int?>(new List<int?> { 1, 2, null, 3 });
+        string str = System.String.Concat<int?>(new List<int?> { 1, 2, null, 3 });
         str.Should().Be("123");
     }
 
     [Fact]
     public void GivenAnCharList_WhenConcat_ResultIsOk2()
     {
-        string str = String.Concat<char?>(new List<char?> { '1', '2', null, '3' });
+        string str = System.String.Concat<char?>(new List<char?> { '1', '2', null, '3' });
         str.Should().Be("123");
     }
 
@@ -550,28 +550,28 @@ public void GivenAnCharList_WhenConcat_ResultIsOk2()
     public void GivenATaintedStringInClassList_WhenCallingConcat_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-TaintedString-+:",
-            String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest(UntaintedString), new ClassForStringTest(TaintedString) }),
-            () => String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest(UntaintedString), new ClassForStringTest(TaintedString) }));
+            System.String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest(UntaintedString), new ClassForStringTest(TaintedString) }),
+            () => System.String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest(UntaintedString), new ClassForStringTest(TaintedString) }));
     }
 
     [Fact]
     public void GivenATaintedStringInClassArray_WhenCallingConcat_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-tainted-+:", 
-            String.Concat<ClassForStringTest>(new ClassForStringTest[] { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), 
-            () => String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
+            System.String.Concat<ClassForStringTest>(new ClassForStringTest[] { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), 
+            () => System.String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenATaintedStringInStruct_WhenCallingConcat_ResultIsTainted3()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-tainted-+:", String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), () => String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-tainted-+:", System.String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), () => System.String.Concat<ClassForStringTest>(new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenANullInList_WhenCallingConcat_ResultIsTainted4()
     {
-        String.Concat<ClassForStringTest>(new List<ClassForStringTest> { null }).Should().Be(string.Empty);
+        System.String.Concat<ClassForStringTest>(new List<ClassForStringTest> { null }).Should().Be(string.Empty);
     }
 
     // string enumerables 
@@ -579,31 +579,31 @@ public void GivenANullInList_WhenCallingConcat_ResultIsTainted4()
     [Fact]
     public void GivenATaintedObject_WhenCallingConcatWithStringArrayParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-tainted-+::+-TAINTED2-+:", String.Concat(new string[] { "concat", "CONCAT2", taintedValue, taintedValue2 }), () => String.Concat(new string[] { "concat", "CONCAT2", taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-tainted-+::+-TAINTED2-+:", System.String.Concat(new string[] { "concat", "CONCAT2", taintedValue, taintedValue2 }), () => System.String.Concat(new string[] { "concat", "CONCAT2", taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWithStringIEnumerableStringParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-tainted-+::+-TAINTED2-+:", String.Concat(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }), () => String.Concat(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-tainted-+::+-TAINTED2-+:", System.String.Concat(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }), () => System.String.Concat(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWithStringIEnumerableNullParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-TAINTED2-+:", String.Concat(new List<string> { "concat", "CONCAT2", null, taintedValue2 }), () => String.Concat(new List<string> { "concat", "CONCAT2", null, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-TAINTED2-+:", System.String.Concat(new List<string> { "concat", "CONCAT2", null, taintedValue2 }), () => System.String.Concat(new List<string> { "concat", "CONCAT2", null, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWithStringIEnumerableStringParam_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-tainted-+::+-TAINTED2-+:", String.Concat<string>(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }), () => String.Concat<string>(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-tainted-+::+-TAINTED2-+:", System.String.Concat<string>(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }), () => System.String.Concat<string>(new List<string> { "concat", "CONCAT2", taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWithStringArrayNullParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-TAINTED2-+:", String.Concat(new string[] { "concat", "CONCAT2", null, taintedValue2 }), () => String.Concat(new string[] { "concat", "CONCAT2", null, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatCONCAT2:+-TAINTED2-+:", System.String.Concat(new string[] { "concat", "CONCAT2", null, taintedValue2 }), () => System.String.Concat(new string[] { "concat", "CONCAT2", null, taintedValue2 }));
     }
 
     // object enumerables
@@ -611,39 +611,39 @@ public void GivenATaintedString_WhenCallingConcatWithStringArrayNullParam_Result
     [Fact]
     public void GivenATaintedString_WhenCallingConcatWithObjectArrayParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", String.Concat(new object[] { "concat", "concat2", taintedValue, taintedValue2 }), () => String.Concat(new object[] { "concat", "concat2", taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", System.String.Concat(new object[] { "concat", "concat2", taintedValue, taintedValue2 }), () => System.String.Concat(new object[] { "concat", "concat2", taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingConcatWithObjectListParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", String.Concat(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }), () => String.Concat(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", System.String.Concat(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }), () => System.String.Concat(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }));
     }
 
     [Fact]
 
     public void GivenATaintedObject_WhenCallingConcatWithGenericObjectArrayParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", String.Concat<object>(new object[] { "concat", "concat2", taintedValue, taintedValue2 }), () => String.Concat<object>(new object[] { "concat", "concat2", taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", System.String.Concat<object>(new object[] { "concat", "concat2", taintedValue, taintedValue2 }), () => System.String.Concat<object>(new object[] { "concat", "concat2", taintedValue, taintedValue2 }));
     }
 
     [Fact]
 
     public void GivenATaintedObject_WhenCallingConcatWithGenericObjectListParam_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", String.Concat<object>(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }), () => String.Concat<object>(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck("concatconcat2:+-tainted-+::+-TAINTED2-+:", System.String.Concat<object>(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }), () => System.String.Concat<object>(new List<object> { "concat", "concat2", taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenAListOfObjects_WhenCallingConcat_ThenNoExceptionIsThrown()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:4str2", String.Concat(taintedValue, 4, null, "str2"), () => String.Concat(taintedValue, 4, null, "str2"));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:4str2", System.String.Concat(taintedValue, 4, null, "str2"), () => System.String.Concat(taintedValue, 4, null, "str2"));
     }
 
     [Fact]
     public void GivenAListOfStrings_WhenCallingConcat_ThenNoExceptionIsThrown()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:str2", String.Concat(taintedValue, null, "str2"), () => String.Concat(taintedValue, null, "str2"));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:str2", System.String.Concat(taintedValue, null, "str2"), () => System.String.Concat(taintedValue, null, "str2"));
     }
 
     [Fact]
@@ -660,7 +660,7 @@ public void GivenAnArrayOfObjectsWithFirstNullArgument_WhenCalling_Concat_Result
         obj[2] = testString2;
         obj[3] = testString3;
 
-        AssertTaintedFormatWithOriginalCallCheck(":+-01-+::+-abc-+::+-ABCD-+:", String.Concat(obj), () => String.Concat(obj));
+        AssertTaintedFormatWithOriginalCallCheck(":+-01-+::+-abc-+::+-ABCD-+:", System.String.Concat(obj), () => System.String.Concat(obj));
     }
 
     [Fact]
@@ -677,7 +677,7 @@ public void GivenAnArrayOfObjectsWithOneNullArgument_WhenCalling_Concat_ResultIs
         obj[2] = null;
         obj[3] = testString3;
 
-        AssertTaintedFormatWithOriginalCallCheck(":+-abc-+::+-01-+::+-ABCD-+:", String.Concat(obj), () => String.Concat(obj));
+        AssertTaintedFormatWithOriginalCallCheck(":+-abc-+::+-01-+::+-ABCD-+:", System.String.Concat(obj), () => System.String.Concat(obj));
     }
 
     [Fact]
@@ -692,7 +692,7 @@ public void GivenAnArrayOfObjectsWithOneNotNullArgument_WhenCalling_Concat_Resul
         obj[2] = null;
         obj[3] = null;
 
-        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:", String.Concat(obj), () => String.Concat(obj));
+        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:", System.String.Concat(obj), () => System.String.Concat(obj));
     }
 
     [Fact]
@@ -705,7 +705,7 @@ public void GivenAnArrayOfObjectsWithAllNullArguments_WhenCalling_Concat_ResultI
         obj[2] = null;
         obj[3] = null;
 
-        String.Concat(obj).Should().BeEmpty();
+        System.String.Concat(obj).Should().BeEmpty();
     }
 }
 
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringCopyTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringCopyTests.cs
similarity index 65%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringCopyTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringCopyTests.cs
index a4cc794bff0b..cc6569a6dbc3 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringCopyTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringCopyTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 #pragma warning disable CS0618 // Obsolete
 
 public class StringCopyTests : InstrumentationTestsBase
@@ -17,19 +17,19 @@ public StringCopyTests()
     [Fact]
     public void GivenATaintedObject_WhenCallingCopy_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Copy(taintedValue), () => String.Copy(taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Copy(taintedValue), () => System.String.Copy(taintedValue));
     }
 
     [Fact]
     public void GivenAUntaintedObject_WhenCallingCopy_ResultIsNotTainted()
     {
-        AssertUntaintedWithOriginalCallCheck(() => String.Copy(UntaintedString), () => String.Copy(UntaintedString));
+        AssertUntaintedWithOriginalCallCheck(() => System.String.Copy(UntaintedString), () => System.String.Copy(UntaintedString));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingCopyWithNull_ArgumentNullException()
     {
-        AssertUntaintedWithOriginalCallCheck(() => String.Copy(null), () => String.Copy(null));
+        AssertUntaintedWithOriginalCallCheck(() => System.String.Copy(null), () => System.String.Copy(null));
     }
 }
 #pragma warning restore CS0618 // Obsolete
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringFormatTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringFormatTests.cs
similarity index 56%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringFormatTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringFormatTests.cs
index 12e23632c57f..dd0fa8e42f19 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringFormatTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringFormatTests.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class StringFormatTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
@@ -28,24 +28,24 @@ public StringFormatTests()
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: taintedcustomformat-+:", 
-            String.Format(new FormatProviderForTest(), "test: {0}", new object[] { _taintedValue }), 
-            () => String.Format(new FormatProviderForTest(), "test: {0}", new object[] { _taintedValue }));
+            System.String.Format(new FormatProviderForTest(), "test: {0}", new object[] { _taintedValue }), 
+            () => System.String.Format(new FormatProviderForTest(), "test: {0}", new object[] { _taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatUntaintedStringcustomformatTAINTED2customformat-+:", 
-            String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _taintedValue2 }), 
-            () => String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _taintedValue2 }));
+            System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _taintedValue2 }), 
+            () => System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted8()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatUntaintedStringcustomformatUntaintedStringcustomformat-+:", 
-            String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _untaintedString }), 
-            () => String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _untaintedString }));
+            System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _untaintedString }), 
+            () => System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, new object[] { _untaintedString, _untaintedString }));
     }
 
     [Fact]
@@ -53,16 +53,16 @@ public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted3()
     {
         string str = "Literal with tainteds {0}{1} and untainted {2} and tainted {3} and another untainted {4}";
         AssertTaintedFormatWithOriginalCallCheck(":+-Literal with tainteds taintedcustomformatTAINTED2customformat and untainted UntaintedStringcustomformat and tainted TAINTED2customformat and another untainted OtherUntaintedStringcustomformat-+:",
-            String.Format(new FormatProviderForTest(), str, _taintedValue, _taintedValue2, _untaintedString, _taintedValue2, _otherUntaintedString),
-            () => String.Format(new FormatProviderForTest(), str, _taintedValue, _taintedValue2, _untaintedString, _taintedValue2, _otherUntaintedString));
+            System.String.Format(new FormatProviderForTest(), str, _taintedValue, _taintedValue2, _untaintedString, _taintedValue2, _otherUntaintedString),
+            () => System.String.Format(new FormatProviderForTest(), str, _taintedValue, _taintedValue2, _untaintedString, _taintedValue2, _otherUntaintedString));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted13()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatwwcustomformat-+:",
-            String.Format(new FormatProviderForTest(), _taintedFormat1Arg, new object[] { "ww" }),
-            () => String.Format(new FormatProviderForTest(), _taintedFormat1Arg, new object[] { "ww" }));
+            System.String.Format(new FormatProviderForTest(), _taintedFormat1Arg, new object[] { "ww" }),
+            () => System.String.Format(new FormatProviderForTest(), _taintedFormat1Arg, new object[] { "ww" }));
     }
 
     // Testing public static string Format(IFormatProvider provider, string format, object arg0, object arg1)
@@ -71,8 +71,8 @@ public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted13(
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted4()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattaintedcustomformatTAINTED2customformat-+:",
-            String.Format(new FormatProviderForTest(), _taintedFormat2Args, _taintedValue, _taintedValue2),
-            () => String.Format(new FormatProviderForTest(), _taintedFormat2Args, _taintedValue, _taintedValue2));
+            System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, _taintedValue, _taintedValue2),
+            () => System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, _taintedValue, _taintedValue2));
     }
 
     [Fact]
@@ -80,16 +80,16 @@ public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted5()
     {
         Customer customer = new Customer(_taintedValue, 999654);
         AssertTaintedFormatWithOriginalCallCheck(":+-Tainted literal equals to tainted and number 0000-999-654-+:",
-            String.Format(new CustomerNumberFormatter(), "Tainted literal equals to {0} and number {1}", customer.Name, customer.CustomerNumber),
-            () => String.Format(new CustomerNumberFormatter(), "Tainted literal equals to {0} and number {1}", customer.Name, customer.CustomerNumber));
+            System.String.Format(new CustomerNumberFormatter(), "Tainted literal equals to {0} and number {1}", customer.Name, customer.CustomerNumber),
+            () => System.String.Format(new CustomerNumberFormatter(), "Tainted literal equals to {0} and number {1}", customer.Name, customer.CustomerNumber));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted14()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatwwcustomformatwwcustomformat-+:",
-            String.Format(new FormatProviderForTest(), _taintedFormat2Args, "ww", "ww"),
-            () => String.Format(new FormatProviderForTest(), _taintedFormat2Args, "ww", "ww"));
+            System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, "ww", "ww"),
+            () => System.String.Format(new FormatProviderForTest(), _taintedFormat2Args, "ww", "ww"));
     }
 
     // Testing public static string Format(IFormatProvider provider, string format, object arg0)
@@ -98,32 +98,32 @@ public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted14(
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted6()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattaintedcustomformat-+:",
-            String.Format(new FormatProviderForTest(), "format{0}", _taintedValue),
-            () => String.Format(new FormatProviderForTest(), "format{0}", _taintedValue));
+            System.String.Format(new FormatProviderForTest(), "format{0}", _taintedValue),
+            () => System.String.Format(new FormatProviderForTest(), "format{0}", _taintedValue));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted15()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatwwcustomformat-+:",
-            String.Format(new FormatProviderForTest(), _taintedFormat1Arg, "ww"),
-            () => String.Format(new FormatProviderForTest(), _taintedFormat1Arg, "ww"));
+            System.String.Format(new FormatProviderForTest(), _taintedFormat1Arg, "ww"),
+            () => System.String.Format(new FormatProviderForTest(), _taintedFormat1Arg, "ww"));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted7()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", 
-            String.Format(null, _taintedValue, _taintedValue2), 
-            () => String.Format(null, _taintedValue, _taintedValue2));
+            System.String.Format(null, _taintedValue, _taintedValue2), 
+            () => System.String.Format(null, _taintedValue, _taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormatWithNullParams_FormatException()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => String.Format(null, null, "r"),
-            () => String.Format(null, null, "r"));
+            () => System.String.Format(null, null, "r"),
+            () => System.String.Format(null, null, "r"));
     }
 
     // Testing public static string Format(IFormatProvider provider, string format, object arg0, object arg1, object arg2)
@@ -132,40 +132,40 @@ public void GivenATaintedFormatObject_WhenCallingFormatWithNullParams_FormatExce
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted9()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattaintedcustomformat TAINTED2customformat TAINTED2customformat-+:",
-            String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2),
-            () => String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2));
+            System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2),
+            () => System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted10()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatUntaintedStringcustomformat taintedcustomformat UntaintedStringcustomformat-+:",
-            String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _taintedValue, _untaintedString),
-            () => String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _taintedValue, _untaintedString));
+            System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _taintedValue, _untaintedString),
+            () => System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _taintedValue, _untaintedString));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted11()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattaintedcustomformat UntaintedStringcustomformat UntaintedStringcustomformat-+:",
-            String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _untaintedString, _untaintedString),
-            () => String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _untaintedString, _untaintedString));
+            System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _untaintedString, _untaintedString),
+            () => System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _taintedValue, _untaintedString, _untaintedString));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted12()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatUntaintedStringcustomformat UntaintedStringcustomformat taintedcustomformat-+:",
-            String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _untaintedString, _taintedValue),
-            () => String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _untaintedString, _taintedValue));
+            System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _untaintedString, _taintedValue),
+            () => System.String.Format(new FormatProviderForTest(), "format{0} {1} {2}", _untaintedString, _untaintedString, _taintedValue));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted16()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatwwcustomformatwwcustomformatwwcustomformat-+:",
-            String.Format(new FormatProviderForTest(), _taintedFormat3Args, "ww", "ww", "ww"),
-            () => String.Format(new FormatProviderForTest(), _taintedFormat3Args, "ww", "ww", "ww"));
+            System.String.Format(new FormatProviderForTest(), _taintedFormat3Args, "ww", "ww", "ww"),
+            () => System.String.Format(new FormatProviderForTest(), _taintedFormat3Args, "ww", "ww", "ww"));
     }
 
     // Testing public static string Format(string format, params object[] args)
@@ -174,24 +174,24 @@ public void GivenATaintedObject_WhenCallingFormatWithProvider_ResultIsTainted16(
     public void GivenATaintedObject_WhenCallingFormatWithObjectArray_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: tainted-+:", 
-            String.Format("test: {0}", new object[] { _taintedValue }), 
-            () => String.Format("test: {0}", new object[] { _taintedValue }));
+            System.String.Format("test: {0}", new object[] { _taintedValue }), 
+            () => System.String.Format("test: {0}", new object[] { _taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithObjectArray_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: UntaintedString tainted-+:", 
-            String.Format("test: {0} {1}", new object[] { _untaintedString, _taintedValue }), 
-            () => String.Format("test: {0} {1}", new object[] { _untaintedString, _taintedValue }));
+            System.String.Format("test: {0} {1}", new object[] { _untaintedString, _taintedValue }), 
+            () => System.String.Format("test: {0} {1}", new object[] { _untaintedString, _taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithObjectArray_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatww-+:",
-            String.Format(_taintedFormat1Arg, new object[] { "ww" }),
-            () => String.Format(_taintedFormat1Arg, new object[] { "ww" }));
+            System.String.Format(_taintedFormat1Arg, new object[] { "ww" }),
+            () => System.String.Format(_taintedFormat1Arg, new object[] { "ww" }));
     }
 
     // Testing public static string Format(string format, object arg0)
@@ -200,38 +200,38 @@ public void GivenATaintedObject_WhenCallingFormatWithObjectArray_ResultIsTainted
     public void GivenATaintedObject_WhenCallingFormatWithOneObject_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: tainted-+:", 
-            String.Format("test: {0}", _taintedValue), 
-            () => String.Format("test: {0}", _taintedValue));
+            System.String.Format("test: {0}", _taintedValue), 
+            () => System.String.Format("test: {0}", _taintedValue));
     }
 
     [Fact]
     public void GivenANotTaintedObject_WhenCallingFormatWithOneObject_ResultIsNotTainted()
     {
-        AssertNotTainted(String.Format("test: {0}", _untaintedString));
+        AssertNotTainted(System.String.Format("test: {0}", _untaintedString));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithNewStringBuilder_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: tainted-+:", 
-            String.Format("test: {0}", new StringBuilder(_taintedValue)), 
-            () => String.Format("test: {0}", new StringBuilder(_taintedValue)));
+            System.String.Format("test: {0}", new System.Text.StringBuilder(_taintedValue)), 
+            () => System.String.Format("test: {0}", new System.Text.StringBuilder(_taintedValue)));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormatWithOneObjectLess_FormatException()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => String.Format(_taintedFormat2Args, _taintedValue),
-            () => String.Format(_taintedFormat2Args, _taintedValue));
+            () => System.String.Format(_taintedFormat2Args, _taintedValue),
+            () => System.String.Format(_taintedFormat2Args, _taintedValue));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithOneObject_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatww-+:",
-            String.Format(_taintedFormat1Arg, "ww"),
-            () => String.Format(_taintedFormat1Arg, "ww"));
+            System.String.Format(_taintedFormat1Arg, "ww"),
+            () => System.String.Format(_taintedFormat1Arg, "ww"));
     }
 
     // Testing public static string Format(string format, object arg0, object arg1)
@@ -240,8 +240,8 @@ public void GivenATaintedObject_WhenCallingFormatWithOneObject_ResultIsTainted2(
     public void GivenATaintedObject_WhenCallingFormatWithTwoObjects_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: tainted TAINTED2-+:", 
-            String.Format("test: {0} {1}", _taintedValue, _taintedValue2), 
-            () => String.Format("test: {0} {1}", _taintedValue, _taintedValue2));
+            System.String.Format("test: {0} {1}", _taintedValue, _taintedValue2), 
+            () => System.String.Format("test: {0} {1}", _taintedValue, _taintedValue2));
     }
 
     [Fact]
@@ -249,24 +249,24 @@ public void GivenATaintedObject_WhenCallingFormatWithTwoObjects_ResultIsTainted2
     {
         string str = "{0} and Literal equals to {1}";
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted and Literal equals to UntaintedString-+:",
-            String.Format(str, _taintedValue, _untaintedString),
-            () => String.Format(str, _taintedValue, _untaintedString));
+            System.String.Format(str, _taintedValue, _untaintedString),
+            () => System.String.Format(str, _taintedValue, _untaintedString));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormatWithTwoObjects_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatUntaintedStringTAINTED2-+:", 
-            String.Format(_taintedFormat2Args, _untaintedString, _taintedValue2), 
-            () => String.Format(_taintedFormat2Args, _untaintedString, _taintedValue2));
+            System.String.Format(_taintedFormat2Args, _untaintedString, _taintedValue2), 
+            () => System.String.Format(_taintedFormat2Args, _untaintedString, _taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormatWithTwoObjects_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatwwww-+:",
-            String.Format(_taintedFormat2Args, "ww", "ww"),
-            () => String.Format(_taintedFormat2Args, "ww", "ww"));
+            System.String.Format(_taintedFormat2Args, "ww", "ww"),
+            () => System.String.Format(_taintedFormat2Args, "ww", "ww"));
     }
 
     // Testing public static string Format(string format, object arg0, object arg1, object arg2)
@@ -275,40 +275,40 @@ public void GivenATaintedFormatObject_WhenCallingFormatWithTwoObjects_ResultIsTa
     public void GivenATaintedObject_WhenCallingFormatWithThreebjects_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: www www TAINTED2-+:", 
-            String.Format("test: {0} {1} {2}", "www", "www", _taintedValue2), 
-            () => String.Format("test: {0} {1} {2}", "www", "www", _taintedValue2));
+            System.String.Format("test: {0} {1} {2}", "www", "www", _taintedValue2), 
+            () => System.String.Format("test: {0} {1} {2}", "www", "www", _taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithThreebjects_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: www tainted www-+:", 
-            String.Format("test: {0} {1} {2}", "www", _taintedValue, "www"), 
-            () => String.Format("test: {0} {1} {2}", "www", _taintedValue, "www"));
+            System.String.Format("test: {0} {1} {2}", "www", _taintedValue, "www"), 
+            () => System.String.Format("test: {0} {1} {2}", "www", _taintedValue, "www"));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingFormatWithThreebjects_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-test: tainted www www-+:", 
-            String.Format("test: {0} {1} {2}", _taintedValue, "www", "www"), 
-            () => String.Format("test: {0} {1} {2}", _taintedValue, "www", "www"));
+            System.String.Format("test: {0} {1} {2}", _taintedValue, "www", "www"), 
+            () => System.String.Format("test: {0} {1} {2}", _taintedValue, "www", "www"));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormat_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattainted TAINTED2 TAINTED2-+:",
-            String.Format("format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2),
-            () => String.Format("format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2));
+            System.String.Format("format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2),
+            () => System.String.Format("format{0} {1} {2}", _taintedValue, _taintedValue2, _taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormat_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatwwwwww-+:",
-            String.Format(_taintedFormat3Args, "ww", "ww", "ww"),
-            () => String.Format(_taintedFormat3Args, "ww", "ww", "ww"));
+            System.String.Format(_taintedFormat3Args, "ww", "ww", "ww"),
+            () => System.String.Format(_taintedFormat3Args, "ww", "ww", "ww"));
     }
 
     // Testing public static string Format(string format, params object[] args)
@@ -317,48 +317,48 @@ public void GivenATaintedFormatObject_WhenCallingFormat_ResultIsTainted3()
     public void GivenATaintedFormatObject_WhenCallingFormatWithObjectArray_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattaintedTAINTED2-+:", 
-            String.Format(_taintedFormat2Args, new object[] { _taintedValue, _taintedValue2 }), 
-            () => String.Format(_taintedFormat2Args, new object[] { _taintedValue, _taintedValue2 }));
+            System.String.Format(_taintedFormat2Args, new object[] { _taintedValue, _taintedValue2 }), 
+            () => System.String.Format(_taintedFormat2Args, new object[] { _taintedValue, _taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormatWithObjectArray_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattaintednotTainted-+:", 
-            String.Format(_taintedFormat2Args, new object[] { _taintedValue, "notTainted" }), 
-            () => String.Format(_taintedFormat2Args, new object[] { _taintedValue, "notTainted" }));
+            System.String.Format(_taintedFormat2Args, new object[] { _taintedValue, "notTainted" }), 
+            () => System.String.Format(_taintedFormat2Args, new object[] { _taintedValue, "notTainted" }));
     }
 
     [Fact]
     public void GivenANotTaintedFormatObject_WhenCallingFormatWithObjectArray_ResultIsNotTainted2()
     {
         AssertUntaintedWithOriginalCallCheck("FormatnotTaintednotTainted",
-            String.Format("Format{0}{1}", new object[] { "notTainted", "notTainted" }),
-            () => String.Format("Format{0}{1}", new object[] { "notTainted", "notTainted" }));
+            System.String.Format("Format{0}{1}", new object[] { "notTainted", "notTainted" }),
+            () => System.String.Format("Format{0}{1}", new object[] { "notTainted", "notTainted" }));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormatWithObjectArray_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-abcnotTaintedtainted-+:", 
-            String.Format("abc{0}{1}", new object[] { "notTainted", _taintedValue }), 
-            () => String.Format("abc{0}{1}", new object[] { "notTainted", _taintedValue }));
+            System.String.Format("abc{0}{1}", new object[] { "notTainted", _taintedValue }), 
+            () => System.String.Format("abc{0}{1}", new object[] { "notTainted", _taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedFormatObject_WhenCallingFormatWithObjectArray_ResultIsTainted4()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formatwwwwww-+:",
-            String.Format(_taintedFormat3Args, new object[] { "ww", "ww", "ww" }),
-            () => String.Format(_taintedFormat3Args, new object[] { "ww", "ww", "ww" }));
+            System.String.Format(_taintedFormat3Args, new object[] { "ww", "ww", "ww" }),
+            () => System.String.Format(_taintedFormat3Args, new object[] { "ww", "ww", "ww" }));
     }
 
     [Fact]
     public void GivenANotTaintedFormatObject_WhenCallingFormatWithTaintedObjectNoReplace_ResultIsNotTainted2()
     {
         AssertUntaintedWithOriginalCallCheck("Format",
-            String.Format("Format", _taintedValue),
-            () => String.Format("Format", _taintedValue));
+            System.String.Format("Format", _taintedValue),
+            () => System.String.Format("Format", _taintedValue));
     }
 
 
@@ -371,8 +371,8 @@ public void GivenATaintedString_WhenCallingStringFormatObjectArrayFormatProvider
         var composite = CompositeFormat.Parse("myformat{0}{1}");
         AssertUntaintedWithOriginalCallCheck(
             "myformattaintedcustomformatUntaintedStringcustomformat",
-            String.Format(new FormatProviderForTest(), composite, new object[] { _taintedValue, _untaintedString }).ToString(),
-            () => String.Format(new FormatProviderForTest(), composite, new object[] { _taintedValue, _untaintedString }).ToString());
+            System.String.Format(new FormatProviderForTest(), composite, new object[] { _taintedValue, _untaintedString }).ToString(),
+            () => System.String.Format(new FormatProviderForTest(), composite, new object[] { _taintedValue, _untaintedString }).ToString());
     }
 #endif
 }
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringGeneralTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringGeneralTests.cs
similarity index 84%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringGeneralTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringGeneralTests.cs
index b60a3eaf48e8..a7014f8f8e39 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringGeneralTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringGeneralTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class StringGeneralTests : InstrumentationTestsBase
 {
     protected string taintedValue = "tainted";
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringInsertTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringInsertTests.cs
similarity index 88%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringInsertTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringInsertTests.cs
index fa052bcf8c54..79048df5a9a1 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringInsertTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringInsertTests.cs
@@ -3,7 +3,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class StringInsertTests : InstrumentationTestsBase
 {
@@ -64,7 +64,7 @@ public void String_Insert_Index_With_Both()
     [Fact]
     public void String_Insert_Index_Two_Tainted_With_Two_Untainted()
     {
-        string str = String.Concat(LargeTaintedString, " and ", OtherTaintedString);
+        string str = System.String.Concat(LargeTaintedString, " and ", OtherTaintedString);
         str = str.Insert(2, UntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-La-+:UntaintedString:+-rgeTaintedString-+: and UntaintedString:+-OtherTaintedString-+:", str.Insert(38, UntaintedString), () => str.Insert(38, UntaintedString));
     }
@@ -72,7 +72,7 @@ public void String_Insert_Index_Two_Tainted_With_Two_Untainted()
     [Fact]
     public void String_Insert_Index_Two_Tainted_With_Two_Tainted()
     {
-        string str = String.Concat(LargeTaintedString, " and ", OtherTaintedString);
+        string str = System.String.Concat(LargeTaintedString, " and ", OtherTaintedString);
         str = str.Insert(5, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-Large-+::+-OtherTaintedString-+::+-TaintedString-+: and :+-Other-+::+-TaintedString-+::+-TaintedString-+:", str.Insert(46, TaintedString), () => str.Insert(46, TaintedString));
     }
@@ -81,14 +81,14 @@ public void String_Insert_Index_Two_Tainted_With_Two_Tainted()
     public void String_Insert_Index_Two_Tainted_With_Both()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-Large-+::+-OtherTaintedString-+::+-TaintedString-+: and :+-Other-+:UntaintedString:+-TaintedString-+:",
-            String.Concat(LargeTaintedString, " and ", OtherTaintedString).Insert(5, OtherTaintedString).Insert(46, UntaintedString),
-            () => String.Concat(LargeTaintedString, " and ", OtherTaintedString).Insert(5, OtherTaintedString).Insert(46, UntaintedString));
+            System.String.Concat(LargeTaintedString, " and ", OtherTaintedString).Insert(5, OtherTaintedString).Insert(46, UntaintedString),
+            () => System.String.Concat(LargeTaintedString, " and ", OtherTaintedString).Insert(5, OtherTaintedString).Insert(46, UntaintedString));
     }
 
     [Fact]
     public void String_Insert_Index_Both_With_Two_Untainted()
     {
-        string str = String.Concat(LargeTaintedString, " and ", UntaintedString);
+        string str = System.String.Concat(LargeTaintedString, " and ", UntaintedString);
         str = str.Insert(2, UntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-La-+:UntaintedString:+-rgeTaintedString-+: and UntaintedStringUntaintedString", str.Insert(38, UntaintedString), () => str.Insert(38, UntaintedString));
     }
@@ -96,7 +96,7 @@ public void String_Insert_Index_Both_With_Two_Untainted()
     [Fact]
     public void String_Insert_Index_Both_With_Two_Tainted()
     {
-        string str = String.Concat(LargeTaintedString, " and ", UntaintedString);
+        string str = System.String.Concat(LargeTaintedString, " and ", UntaintedString);
         str = str.Insert(2, TaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-La-+::+-TaintedString-+::+-rgeTaintedString-+: and Un:+-OtherTaintedString-+:taintedString", str.Insert(38, OtherTaintedString), () => str.Insert(38, OtherTaintedString));
     }
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringJoinTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringJoinTests.cs
similarity index 60%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringJoinTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringJoinTests.cs
index 4e52cf89e625..b0c3c52112e6 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringJoinTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringJoinTests.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class StringJoinTests : InstrumentationTestsBase
 {
@@ -31,91 +31,91 @@ public StringJoinTests()
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithObjectArray_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", String.Join(",", new object[] { taintedValue, taintedValue2 }), () => String.Join(",", new object[] { taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", System.String.Join(",", new object[] { taintedValue, taintedValue2 }), () => System.String.Join(",", new object[] { taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithObjectArray_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", String.Join(",", taintedValue, taintedValue2), () => String.Join(",", taintedValue , taintedValue2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", System.String.Join(",", taintedValue, taintedValue2), () => System.String.Join(",", taintedValue , taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithObjectArrayAndTaintedSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", String.Join(taintedValue, new object[] { taintedValue2, "eee" }), () => String.Join(taintedValue, new object[] { taintedValue2, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", System.String.Join(taintedValue, new object[] { taintedValue2, "eee" }), () => System.String.Join(taintedValue, new object[] { taintedValue2, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArray_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", String.Join(",", new string[] { taintedValue, taintedValue2 }), () => String.Join(",", new string[] { taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", System.String.Join(",", new string[] { taintedValue, taintedValue2 }), () => System.String.Join(",", new string[] { taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArray_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", String.Join(",", taintedValue, taintedValue2), () => String.Join(",", taintedValue, taintedValue2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", System.String.Join(",", taintedValue, taintedValue2), () => System.String.Join(",", taintedValue, taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndTaintedSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", String.Join(taintedValue, new string[] { taintedValue2, "eee" }), () => String.Join(taintedValue, new string[] { taintedValue2, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", System.String.Join(taintedValue, new string[] { taintedValue2, "eee" }), () => System.String.Join(taintedValue, new string[] { taintedValue2, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringList_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", String.Join(",", new List<string> { taintedValue, taintedValue2 }), () => String.Join(",", new List<string> { taintedValue, taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", System.String.Join(",", new List<string> { taintedValue, taintedValue2 }), () => System.String.Join(",", new List<string> { taintedValue, taintedValue2 }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringListAndTaintedSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", String.Join(taintedValue, new List<string> { taintedValue2, "eee" }), () => String.Join(taintedValue, new List<string> { taintedValue2, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", System.String.Join(taintedValue, new List<string> { taintedValue2, "eee" }), () => System.String.Join(taintedValue, new List<string> { taintedValue2, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringListAndTaintedSeparator_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:", String.Join(taintedValue, new List<string> { taintedValue2}), () => String.Join(taintedValue, new List<string> { taintedValue2}));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:", System.String.Join(taintedValue, new List<string> { taintedValue2}), () => System.String.Join(taintedValue, new List<string> { taintedValue2}));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndex_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 1), () => String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 1));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 1), () => System.String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 1));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndex_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 2), () => String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", System.String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 2), () => System.String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndex_ResultIsTainted3()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", String.Join(",", new string[] { taintedValue, taintedValue2 }), () => String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,:+-TAINTED2-+:", System.String.Join(",", new string[] { taintedValue, taintedValue2 }), () => System.String.Join(",", new string[] { taintedValue, taintedValue2 }, 0, 2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndex_ResultIsTainted4()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Join(",", new string[] { taintedValue }), () => String.Join(",", new string[] { taintedValue}, 0, 1));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Join(",", new string[] { taintedValue }), () => System.String.Join(",", new string[] { taintedValue}, 0, 1));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndex_ResultIsTainted5()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Join(",", new string[] { taintedValue }), () => String.Join(",", new string[] { taintedValue }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Join(",", new string[] { taintedValue }), () => System.String.Join(",", new string[] { taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndexAndTaintedSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", String.Join(taintedValue, new string[] { taintedValue2, "eee" }, 0, 2), () => String.Join(taintedValue, new string[] { taintedValue2, "eee" }, 0, 2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", System.String.Join(taintedValue, new string[] { taintedValue2, "eee" }, 0, 2), () => System.String.Join(taintedValue, new string[] { taintedValue2, "eee" }, 0, 2));
     }
 
 #if NETFRAMEWORK
@@ -123,130 +123,130 @@ public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndexAndTainted
     public void GivenATaintedObject_WhenCallingJoinWithObjectArrayAndTaintedSeparatorOneNullParams_ResultIsTainted()
     {
 
-        AssertUntaintedWithOriginalCallCheck(String.Empty, String.Join(taintedValue, new object[] { null, "eee" }),
-                () => String.Join(taintedValue, new object[] { null, "eee" }));
+        AssertUntaintedWithOriginalCallCheck(System.String.Empty, System.String.Join(taintedValue, new object[] { null, "eee" }),
+                () => System.String.Join(taintedValue, new object[] { null, "eee" }));
     }
 #else
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithObjectArrayAndTaintedSeparatorOneNullParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:eee", String.Join(taintedValue, new object[] { null, "eee" }), 
-            () => String.Join(taintedValue, new object[] { null, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:eee", System.String.Join(taintedValue, new object[] { null, "eee" }), 
+            () => System.String.Join(taintedValue, new object[] { null, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithObjectArrayAndTaintedSeparatorOneNullParams_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:", String.Join(taintedValue, new object[] { taintedValue2 }), 
-            () => String.Join(taintedValue, new object[] { taintedValue2 }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:", System.String.Join(taintedValue, new object[] { taintedValue2 }), 
+            () => System.String.Join(taintedValue, new object[] { taintedValue2 }));
     }
 #endif
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayOneNullParams_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(",:+-TAINTED2-+:", String.Join(",", null, taintedValue2), () => String.Join(",", null, taintedValue2));
+        AssertTaintedFormatWithOriginalCallCheck(",:+-TAINTED2-+:", System.String.Join(",", null, taintedValue2), () => System.String.Join(",", null, taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndexOneNullParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(",:+-TAINTED2-+:", String.Join(",", new string[] { null, taintedValue2 }, 0, 2), () => String.Join(",", new string[] { null, taintedValue2 }, 0, 2));
+        AssertTaintedFormatWithOriginalCallCheck(",:+-TAINTED2-+:", System.String.Join(",", new string[] { null, taintedValue2 }, 0, 2), () => System.String.Join(",", new string[] { null, taintedValue2 }, 0, 2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithObjectArrayAndNullSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", String.Join(null, new object[] { taintedValue2, "eee" }), () => String.Join(null, new object[] { taintedValue2, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", System.String.Join(null, new object[] { taintedValue2, "eee" }), () => System.String.Join(null, new object[] { taintedValue2, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayNullSeparator_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-TAINTED2-+:", String.Join(null, taintedValue, taintedValue2), () => String.Join(null, taintedValue, taintedValue2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-TAINTED2-+:", System.String.Join(null, taintedValue, taintedValue2), () => System.String.Join(null, taintedValue, taintedValue2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringListAndNullSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", String.Join(null, new List<string> { taintedValue2, "eee" }), () => String.Join(null, new List<string> { taintedValue2, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", System.String.Join(null, new List<string> { taintedValue2, "eee" }), () => System.String.Join(null, new List<string> { taintedValue2, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithStringArrayAndIndexAndNullSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", String.Join(null, new string[] { taintedValue2, "eee" }, 0, 2), () => String.Join(null, new string[] { taintedValue2, "eee" }, 0, 2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", System.String.Join(null, new string[] { taintedValue2, "eee" }, 0, 2), () => System.String.Join(null, new string[] { taintedValue2, "eee" }, 0, 2));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithGenericListNullSeparator_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", String.Join<string>(null, new List<string> { taintedValue2, "eee" }), () => String.Join<string>(null, new List<string> { taintedValue2, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+:eee", System.String.Join<string>(null, new List<string> { taintedValue2, "eee" }), () => System.String.Join<string>(null, new List<string> { taintedValue2, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithGenericListOneNullParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:", String.Join<string>(taintedValue, new List<string> { taintedValue2, null }), () => String.Join<string>(taintedValue, new List<string> { taintedValue2, null }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:", System.String.Join<string>(taintedValue, new List<string> { taintedValue2, null }), () => System.String.Join<string>(taintedValue, new List<string> { taintedValue2, null }));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingJoinWithGenericList_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", String.Join<string>(taintedValue, new List<string> { taintedValue2, "eee" }), () => String.Join<string>(taintedValue, new List<string> { taintedValue2, "eee" }));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TAINTED2-+::+-tainted-+:eee", System.String.Join<string>(taintedValue, new List<string> { taintedValue2, "eee" }), () => System.String.Join<string>(taintedValue, new List<string> { taintedValue2, "eee" }));
     }
 
     [Fact]
     public void GivenATaintedStringInStruct_WhenCallingJoin_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join<StructForStringTest>(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }), () => String.Join<StructForStringTest>(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join<StructForStringTest>(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }), () => System.String.Join<StructForStringTest>(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenATaintedStringInStruct_WhenCallingJoin_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }), () => String.Join(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }), () => System.String.Join(",", new List<StructForStringTest> { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenATaintedStringInStruct_WhenCallingJoin_ResultIsTainted4()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join(",", new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue)), () => String.Join(",", new object[] { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join(",", new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue)), () => System.String.Join(",", new object[] { new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenATaintedStringInStruct_WhenCallingJoin_ResultIsTainted3()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join(",", new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue)), () => String.Join(",", new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue)));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join(",", new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue)), () => System.String.Join(",", new StructForStringTest("UntaintedString"), new StructForStringTest(taintedValue)));
     }
 
     [Fact]
     public void GivenATaintedStringInClass_WhenCallingJoin_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join<ClassForStringTest>(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), () => String.Join<ClassForStringTest>(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join<ClassForStringTest>(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), () => System.String.Join<ClassForStringTest>(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenATaintedStringInClass_WhenCallingJoin_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), () => String.Join(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }), () => System.String.Join(",", new List<ClassForStringTest> { new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue) }));
     }
 
     [Fact]
     public void GivenATaintedStringInClass_WhenCallingJoin_ResultIsTainted3()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)), () => String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)), () => System.String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)));
     }
 
     [Fact]
     public void GivenATaintedStringInClass_WhenCallingJoin_ResultIsTainted4()
     {
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)), () => String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString,:+-tainted-+:", System.String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)), () => System.String.Join(",", new ClassForStringTest("UntaintedString"), new ClassForStringTest(taintedValue)));
     }
 
     [Fact]
     public void GivenATaintedStringInClass_WhenCallingJoin_ResultIsTainted5()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Join(",", new ClassForStringTest(taintedValue)), () => String.Join(",", new ClassForStringTest(taintedValue)));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Join(",", new ClassForStringTest(taintedValue)), () => System.String.Join(",", new ClassForStringTest(taintedValue)));
     }
 
 #if NETCOREAPP3_1_OR_GREATER
@@ -266,7 +266,7 @@ public void GivenATaintedStringInNestedMethodObject_WhenCallingJoinWithChar_Resu
     {
         void NestedMethod<T>(List<T> parameters)
         {
-            AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", String.Join(',', parameters), () => String.Join(',', parameters));
+            AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", System.String.Join(',', parameters), () => System.String.Join(',', parameters));
         }
 
         NestedMethod(new List<string> { taintedValue });
@@ -277,7 +277,7 @@ public void GivenATaintedStringInNestedMethodObject_WhenCallingJoinWithChar_Resu
     {
         void NestedMethod<T>(List<T> parameters)
         {
-            AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,NonTainted", String.Join(',', parameters), () => String.Join(',', parameters));
+            AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,NonTainted", System.String.Join(',', parameters), () => System.String.Join(',', parameters));
         }
 
         NestedMethod(new List<string> { taintedValue, "NonTainted" });
@@ -287,72 +287,72 @@ void NestedMethod<T>(List<T> parameters)
     public void GivenATaintedStringInList_WhenCallingJoinWithChar_ResultIsTainted8()
     {
         var parameters = new List<string> { taintedValue, "NonTainted" };
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,NonTainted", String.Join(',', parameters), () => String.Join(',', parameters));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:,NonTainted", System.String.Join(',', parameters), () => System.String.Join(',', parameters));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted7()
     {
-        String.Concat(taintedValue, "eee");
+        System.String.Concat(taintedValue, "eee");
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:a:+-tainted-+:",
-            String.Join('a', taintedValue, taintedValue),
-            () => String.Join('a', taintedValue, taintedValue));
+            System.String.Join('a', taintedValue, taintedValue),
+            () => System.String.Join('a', taintedValue, taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted8()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:a:+-tainted-+:",
-            String.Join('a', (object)taintedValue, (object)taintedValue),
-            () => String.Join('a', (object)taintedValue, (object)taintedValue));
+            System.String.Join('a', (object)taintedValue, (object)taintedValue),
+            () => System.String.Join('a', (object)taintedValue, (object)taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted9()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:a:+-tainted-+:a1",
-            String.Join('a', (object)taintedValue, (object)taintedValue, 1),
-            () => String.Join('a', (object)taintedValue, (object)taintedValue, 1));
+            System.String.Join('a', (object)taintedValue, (object)taintedValue, 1),
+            () => System.String.Join('a', (object)taintedValue, (object)taintedValue, 1));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted10()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:a:+-tainted-+:",
-            String.Join('a', new string[] { taintedValue, taintedValue }, 0, 2),
-            () => String.Join('a', new string[] { taintedValue, taintedValue }, 0, 2));
+            System.String.Join('a', new string[] { taintedValue, taintedValue }, 0, 2),
+            () => System.String.Join('a', new string[] { taintedValue, taintedValue }, 0, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted12()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:a:+-tainted-+:",
-            String.Join('a', new List<string> { taintedValue, taintedValue }),
-            () => String.Join('a', new List<string> { taintedValue, taintedValue }));
+            System.String.Join('a', new List<string> { taintedValue, taintedValue }),
+            () => System.String.Join('a', new List<string> { taintedValue, taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted13()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:aa:+-tainted-+:",
-            String.Join('a', new List<string> { taintedValue, null, taintedValue }),
-            () => String.Join('a', new List<string> { taintedValue, null, taintedValue }));
+            System.String.Join('a', new List<string> { taintedValue, null, taintedValue }),
+            () => System.String.Join('a', new List<string> { taintedValue, null, taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted14()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:a:+-tainted-+:",
-            String.Join('a', new List<string> { taintedValue, taintedValue }),
-            () => String.Join('a', new List<string> { taintedValue, taintedValue }));
+            System.String.Join('a', new List<string> { taintedValue, taintedValue }),
+            () => System.String.Join('a', new List<string> { taintedValue, taintedValue }));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted15()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:aa:+-tainted-+:",
-            String.Join<string>('a', new List<string> { taintedValue, null, taintedValue }),
-            () => String.Join<string>('a', new List<string> { taintedValue, null, taintedValue }));
+            System.String.Join<string>('a', new List<string> { taintedValue, null, taintedValue }),
+            () => System.String.Join<string>('a', new List<string> { taintedValue, null, taintedValue }));
     }
 #endif
 
@@ -360,8 +360,8 @@ public void GivenATaintedString_WhenCallingJoin_ResultIsTainted15()
     public void GivenATaintedString_WhenCallingJoin_ResultIsTainted16()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:a:+-tainted-+:",
-            String.Join("a", new string[] { taintedValue, taintedValue }, 0, 2),
-            () => String.Join("a", new string[] { taintedValue, taintedValue }, 0, 2));
+            System.String.Join("a", new string[] { taintedValue, taintedValue }, 0, 2),
+            () => System.String.Join("a", new string[] { taintedValue, taintedValue }, 0, 2));
     }
 
     [Fact]
@@ -371,30 +371,30 @@ public void GivenSomeStrings_WhenJoin_ResultIsOk()
         string testString1 = (string) AddTainted("01");
         string testString2 = (string) AddTainted("abc");
 
-        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:", String.Join("-", testString1), () => String.Join("-",testString1));
-        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:", String.Join(separator, testString1), () => String.Join(separator, testString1));
-        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:-:+-abc-+:", String.Join("-", testString1, testString2), () => String.Join("-", testString1, testString2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:", System.String.Join("-", testString1), () => System.String.Join("-",testString1));
+        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:", System.String.Join(separator, testString1), () => System.String.Join(separator, testString1));
+        AssertTaintedFormatWithOriginalCallCheck(":+-01-+:-:+-abc-+:", System.String.Join("-", testString1, testString2), () => System.String.Join("-", testString1, testString2));
     }
 
     [Fact]
     public void GivenStringJoinBasicWithBoth_WhenJoin_ResultIsOk()
     {
         string[] sArr = new string[] { TaintedString, UntaintedString };
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString", String.Join("|", sArr), () => String.Join("|", sArr));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString", System.String.Join("|", sArr), () => System.String.Join("|", sArr));
     }
 
     [Fact]
     public void GivenStringJoinBasicWithTwoTainted_WhenJoin_ResultIsOk()
     {
         string[] sArr = new string[] { TaintedString, UntaintedString, OtherTaintedString };
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:", String.Join("|", sArr), () => String.Join("|", sArr));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:", System.String.Join("|", sArr), () => System.String.Join("|", sArr));
     }
 
     [Fact]
     public void GivenStringJoinBasicWithTwoUntainted_WhenJoin_ResultIsOk()
     {
         string[] sArr = new string[] { UntaintedString, TaintedString, OtherUntaintedString };
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString|:+-TaintedString-+:|OtherUntaintedString", String.Join("|", sArr), () => String.Join("|", sArr));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString|:+-TaintedString-+:|OtherUntaintedString", System.String.Join("|", sArr), () => System.String.Join("|", sArr));
     }
 
     [Fact]
@@ -402,29 +402,29 @@ public void GivenStringJoinBasicWithTwoTaintedAndTwoUntainted_WhenJoin_ResultIsO
     {
         string[] sArr = new string[] { TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString };
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:|OtherUntaintedString", 
-            String.Join("|", sArr), 
-            () => String.Join("|", sArr));
+            System.String.Join("|", sArr), 
+            () => System.String.Join("|", sArr));
     }
 
     [Fact]
     public void GivenStringJoinObjectWithBoth_WhenJoin_ResultIsOk()
     {
         object[] sArr = new object[] { TaintedObject, UntaintedObject };
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedObject-+:|UntaintedObject", String.Join("|", sArr), () => String.Join("|", sArr));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedObject-+:|UntaintedObject", System.String.Join("|", sArr), () => System.String.Join("|", sArr));
     }
 
     [Fact]
     public void GivenStringJoinObjectWithTwoTainted_WhenJoin_ResultIsOk()
     {
         object[] sArr = new object[] { TaintedObject, UntaintedObject, OtherTaintedObject };
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedObject-+:|UntaintedObject|:+-OtherTaintedObject-+:", String.Join("|", sArr), () => String.Join("|", sArr));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedObject-+:|UntaintedObject|:+-OtherTaintedObject-+:", System.String.Join("|", sArr), () => System.String.Join("|", sArr));
     }
 
     [Fact]
     public void GivenStringJoinObjectWithTwoUntainted_WhenJoin_ResultIsOk()
     {
         object[] sArr = new object[] { UntaintedObject, TaintedObject, OtherUntaintedObject };
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedObject|:+-TaintedObject-+:|OtherUntaintedObject", String.Join("|", sArr), () => String.Join("|", sArr));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedObject|:+-TaintedObject-+:|OtherUntaintedObject", System.String.Join("|", sArr), () => System.String.Join("|", sArr));
     }
 
     [Fact]
@@ -432,8 +432,8 @@ public void GivenStringJoinObjectWithTwoTaintedAndTwoUntainted_WhenJoin_ResultIs
     {
         object[] sArr = new object[] { TaintedObject, UntaintedObject, OtherTaintedObject, OtherUntaintedObject };
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedObject-+:|UntaintedObject|:+-OtherTaintedObject-+:|OtherUntaintedObject", 
-            String.Join("|", sArr),
-            () => String.Join("|", sArr));
+            System.String.Join("|", sArr),
+            () => System.String.Join("|", sArr));
     }
 
     [Fact]
@@ -441,8 +441,8 @@ public void GivenStringJoinIndexWithBoth_WhenJoin_ResultIsOk()
     {
         string[] sArr = new string[] { TaintedString, UntaintedString, OtherUntaintedString };
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString", 
-            String.Join("|", sArr, 0, 2),
-            () => String.Join("|", sArr, 0, 2));
+            System.String.Join("|", sArr, 0, 2),
+            () => System.String.Join("|", sArr, 0, 2));
     }
 
     [Fact]
@@ -450,8 +450,8 @@ public void GivenStringJoinIndexWithTwoTainted_WhenJoin_ResultIsOk()
     {
         string[] sArr = new string[] { TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString };
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:",
-            String.Join("|", sArr, 0, 3),
-            () => String.Join("|", sArr, 0, 3));
+            System.String.Join("|", sArr, 0, 3),
+            () => System.String.Join("|", sArr, 0, 3));
     }
 
     [Fact]
@@ -459,8 +459,8 @@ public void GivenStringJoinIndexWithTwoUntainted_WhenJoin_ResultIsOk()
     {
         string[] sArr = new string[] { UntaintedString, TaintedString, OtherUntaintedString, OtherUntaintedString };
         AssertTaintedFormatWithOriginalCallCheck("UntaintedString|:+-TaintedString-+:|OtherUntaintedString",
-            String.Join("|", sArr, 0, 3),
-            () => String.Join("|", sArr, 0, 3));
+            System.String.Join("|", sArr, 0, 3),
+            () => System.String.Join("|", sArr, 0, 3));
     }
 
     [Fact]
@@ -468,36 +468,36 @@ public void GivenStringJoinIndexWithTwoTaintedAndTwoUntainted_WhenJoin_ResultIsO
     {
         string[] sArr = new string[] { TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString, OtherUntaintedString };
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:|OtherUntaintedString",
-            String.Join("|", sArr, 0, 4),
-            () => String.Join("|", sArr, 0, 4));
+            System.String.Join("|", sArr, 0, 4),
+            () => System.String.Join("|", sArr, 0, 4));
     }
 
     [Fact]
     public void GivenStringJoinIndexWithTwoTaintedAndTwoUntaintedChunk_WhenJoin_ResultIsOk()
     {
         string[] sArr = new string[] { TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString, OtherUntaintedString };
-        AssertTaintedFormatWithOriginalCallCheck(":+-OtherTaintedString-+:|OtherUntaintedString", String.Join("|", sArr, 2, 2), () => String.Join("|", sArr, 2, 2));
+        AssertTaintedFormatWithOriginalCallCheck(":+-OtherTaintedString-+:|OtherUntaintedString", System.String.Join("|", sArr, 2, 2), () => System.String.Join("|", sArr, 2, 2));
     }
 
     [Fact]
     public void GivenStringJoinListWithBoth_WhenJoin_ResultIsOk()
     {
         List<string> list = new List<string>() { TaintedString, UntaintedString };
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString", String.Join("|", list), () => String.Join("|", list));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString", System.String.Join("|", list), () => System.String.Join("|", list));
     }
 
     [Fact]
     public void GivenStringJoinListWithTwoTainted_WhenJoin_ResultIsOk()
     {
         List<string> list = new List<string>() { TaintedString, UntaintedString, OtherTaintedString };
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:", String.Join("|", list), () => String.Join("|", list));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:", System.String.Join("|", list), () => System.String.Join("|", list));
     }
 
     [Fact]
     public void GivenStringJoinListWithTwoUntainted_WhenJoin_ResultIsOk()
     {
         List<string> list = new List<string>() { UntaintedString, TaintedString, OtherUntaintedString };
-        AssertTaintedFormatWithOriginalCallCheck("UntaintedString|:+-TaintedString-+:|OtherUntaintedString", String.Join("|", list), () => String.Join("|", list));
+        AssertTaintedFormatWithOriginalCallCheck("UntaintedString|:+-TaintedString-+:|OtherUntaintedString", System.String.Join("|", list), () => System.String.Join("|", list));
     }
 
     [Fact]
@@ -505,8 +505,8 @@ public void GivenStringJoinListWithTwoTaintedAndTwoUntainted_WhenJoin_ResultIsOk
     {
         List<string> list = new List<string>() { TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString };
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:|UntaintedString|:+-OtherTaintedString-+:|OtherUntaintedString", 
-            String.Join("|", list), 
-            () => String.Join("|", list));
+            System.String.Join("|", list), 
+            () => System.String.Join("|", list));
     }
 
     [Fact]
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringMaxRangesTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringMaxRangesTests.cs
similarity index 98%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringMaxRangesTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringMaxRangesTests.cs
index c7b2f5b3d078..b6711874fc03 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringMaxRangesTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringMaxRangesTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class StringMaxRangesTests : InstrumentationTestsBase
 {
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringPadTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringPadTests.cs
similarity index 80%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringPadTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringPadTests.cs
index e61627551575..ec51dd86fcb6 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringPadTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringPadTests.cs
@@ -2,7 +2,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class StringPadTests : InstrumentationTestsBase
 {
@@ -33,8 +33,8 @@ public void GivenATaintedObject_WhenCallingPadLeft_ResultIsTainted2()
     public void GivenATaintedObject_WhenCallingPadLeft_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck("    :+-TaintedString-+:UntaintedString", 
-            String.Concat(TaintedString, UntaintedString).PadLeft(32)
-            , () => String.Concat(TaintedString, UntaintedString).PadLeft(32));
+            System.String.Concat(TaintedString, UntaintedString).PadLeft(32)
+            , () => System.String.Concat(TaintedString, UntaintedString).PadLeft(32));
     }
 
     [Fact]
@@ -47,16 +47,16 @@ public void GivenATaintedObject_WhenCallingPadLeft_ResultIsTainted4()
     public void GivenATaintedObject_WhenCallingPadLeft_ResultIsTainted5()
     {
         AssertTaintedFormatWithOriginalCallCheck("****:+-TaintedString-+:UntaintedString",
-            String.Concat(TaintedString, UntaintedString).PadLeft(32, '*'), 
-            () => String.Concat(TaintedString, UntaintedString).PadLeft(32, '*'));
+            System.String.Concat(TaintedString, UntaintedString).PadLeft(32, '*'), 
+            () => System.String.Concat(TaintedString, UntaintedString).PadLeft(32, '*'));
     }
 
     [Fact]
     public void GivenATaintedObject_WhenCallingPadLeft_ResultIsTainted6()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString",
-            String.Concat(TaintedString, UntaintedString).PadLeft(2, '*'),
-            () => String.Concat(TaintedString, UntaintedString).PadLeft(2, '*'));
+            System.String.Concat(TaintedString, UntaintedString).PadLeft(2, '*'),
+            () => System.String.Concat(TaintedString, UntaintedString).PadLeft(2, '*'));
     }
 
     [Fact]
@@ -94,8 +94,8 @@ public void GivenATaintedObject_WhenCallingPadRight_ResultIsTainted2()
     public void GivenATaintedObject_WhenCallingPadRight_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString    ",
-            String.Concat(TaintedString, UntaintedString).PadRight(32), 
-            () => String.Concat(TaintedString, UntaintedString).PadRight(32));
+            System.String.Concat(TaintedString, UntaintedString).PadRight(32), 
+            () => System.String.Concat(TaintedString, UntaintedString).PadRight(32));
     }
 
     [Fact]
@@ -108,8 +108,8 @@ public void GivenATaintedObject_WhenCallingPadRight_ResultIsTainted4()
     public void GivenATaintedObject_WhenCallingPadRight_ResultIsTainted5()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString****",
-            String.Concat(TaintedString, UntaintedString).PadRight(32, '*'),
-            () => String.Concat(TaintedString, UntaintedString).PadRight(32, '*'));
+            System.String.Concat(TaintedString, UntaintedString).PadRight(32, '*'),
+            () => System.String.Concat(TaintedString, UntaintedString).PadRight(32, '*'));
     }
 
     [Fact]
@@ -129,8 +129,8 @@ public void GivenATaintedObject_WhenCallingPadRight_ResultIsTainted7()
     public void GivenATaintedObject_WhenCallingPadRight_ResultIsTainted8()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString",
-            String.Concat(TaintedString, UntaintedString).PadRight(2, '*'),
-            () => String.Concat(TaintedString, UntaintedString).PadRight(2, '*'));
+            System.String.Concat(TaintedString, UntaintedString).PadRight(2, '*'),
+            () => System.String.Concat(TaintedString, UntaintedString).PadRight(2, '*'));
     }
 
     [Fact]
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringRemoveTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringRemoveTests.cs
similarity index 80%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringRemoveTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringRemoveTests.cs
index a8e0c345a04f..a9533b919578 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringRemoveTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringRemoveTests.cs
@@ -2,7 +2,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class StringRemoveTests : InstrumentationTestsBase
 {
     protected string TaintedString = "TaintedString";
@@ -44,7 +44,7 @@ public void GivenATaintedString_WhenRemove_ResultIsOk1()
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk2()
     {
-        string str = String.Concat(TaintedString, UntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:Untainted", str.Remove(22), () => str.Remove(22));
     }
 
@@ -57,21 +57,21 @@ public void GivenATaintedString_WhenRemove_ResultIsOk3()
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk4()
     {
-        string str = String.Concat(TaintedString, UntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-Tainted-+:UntaintedString", str.Remove(7, 6), () => str.Remove(7, 6));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk5()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-Tainted-+:String:+-OtherTaintedString-+:", str.Remove(7, 15), () => str.Remove(7, 15));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk6()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:Untainted:+-TaintedString-+:", str.Remove(22, 11), () => str.Remove(22, 11));
     }
 
@@ -102,98 +102,98 @@ public void GivenATaintedString_WhenRemove_ResultIsOk11()
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk12()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaindString-+:UntaintedString:+-OtherTaintedString-+:", str.Remove(4, 2), () => str.Remove(4, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk13()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-Tain-+:aintedString:+-OtherTaintedString-+:", str.Remove(4, 12), () => str.Remove(4, 12));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk13_2()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-Tain-+:UntaintedString:+-OtherTaintedString-+:", str.Remove(4, 9), () => str.Remove(4, 9));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk14()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:taintedString:+-OtherTaintedString-+:", str.Remove(13, 2), () => str.Remove(13, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk15()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+::+-OtherTaintedString-+:", str.Remove(13, 15), () => str.Remove(13, 15));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk16()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+::+-TaintedString-+:", str.Remove(13, 20), () => str.Remove(13, 20));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk17()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:U:+-aintedString-+:", str.Remove(14, 20), () => str.Remove(14, 20));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk18()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:U:+-OtherTaintedString-+:", str.Remove(14, 14), () => str.Remove(14, 14));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk19()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UaintedString:+-OtherTaintedString-+:", str.Remove(14, 2), () => str.Remove(14, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk20()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString:+-herTaintedString-+:", str.Remove(28, 2), () => str.Remove(28, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk21()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString", str.Remove(28, 18), () => str.Remove(28, 18));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk22()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString:+-OtrTaintedString-+:", str.Remove(30, 2), () => str.Remove(30, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk23()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString:+-Ottring-+:", str.Remove(30, 11), () => str.Remove(30, 11));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk24()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-Tai-+::+-TaintedString-+:", str.Remove(3, 30), () => str.Remove(3, 30));
     }
 
@@ -206,21 +206,21 @@ public void GivenATaintedString_WhenRemove_ResultIsOk25()
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk26()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-Ta-+:", str.Remove(2), () => str.Remove(2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk27()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:Un", str.Remove(15), () => str.Remove(15));
     }
 
     [Fact]
     public void GivenATaintedString_WhenRemove_ResultIsOk28()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:UntaintedString:+-Ot-+:", str.Remove(30), () => str.Remove(30));
     }
 
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringReplaceTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringReplaceTests.cs
similarity index 90%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringReplaceTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringReplaceTests.cs
index 367d98835e38..047b7dad5d56 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringReplaceTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringReplaceTests.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class StringReplaceTests : InstrumentationTestsBase
 {
     private string _taintedString = "TaintedString";
@@ -95,8 +95,8 @@ public void GivenAString_WhenCallingReplace_ResultIsOk9()
     public void GivenAString_WhenCallingReplace_ResultIsOk10()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => _taintedValue.Replace(String.Empty, "w"),
-            () => _taintedValue.Replace(String.Empty, "w"));
+            () => _taintedValue.Replace(System.String.Empty, "w"),
+            () => _taintedValue.Replace(System.String.Empty, "w"));
     }
 
     [Fact]
@@ -148,7 +148,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted20()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedLarge joining OtherTaintedLarge-+:",
             str.Replace("String", "Large"),
@@ -158,7 +158,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted19()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedSmall joining OtherTaintedSmall and LargeTaintedSmall-+:",
             str.Replace("String", "Small"),
@@ -177,7 +177,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte17()
     {
-        string str = String.Concat(_otherTaintedString, " joining ", _otherTaintedString);
+        string str = System.String.Concat(_otherTaintedString, " joining ", _otherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-OtherLargeString joining OtherLargeString-+:",
             str.Replace(_taintedString, _largeString),
@@ -187,7 +187,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted16()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-LargeString joining OtherLargeString-+:",
             str.Replace(_taintedString, _largeString),
@@ -197,7 +197,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted15()
     {
-        string str = String.Concat(_otherTaintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
+        string str = System.String.Concat(_otherTaintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-OtherLargeString joining OtherLargeString and LargeLargeString-+:",
             str.Replace(_taintedString, _largeString),
@@ -216,7 +216,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted13()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-XaintedString joining OtherXaintedString-+:",
             str.Replace("T", "X"),
@@ -226,7 +226,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted12()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedXtring joining OtherTaintedXtring-+:",
             str.Replace("S", "X"),
@@ -236,7 +236,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted11()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedStrinX joininX OtherTaintedStrinX-+:",
             str.Replace("g", "X"),
@@ -246,7 +246,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted410()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedXtring joining OtherTaintedXtring and LargeTaintedXtring-+:",
             str.Replace("S", "X"),
@@ -282,7 +282,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted6()
     {
-        string str = String.Concat("-", "Payload", "-", _otherTaintedString, "end");
+        string str = System.String.Concat("-", "Payload", "-", _otherTaintedString, "end");
         // if no replacement is done, string remains inmutable
         AssertTaintedFormatWithOriginalCallCheck("-Payload-:+-OtherTaintedString-+:end",
             str.Replace(@"-Payload-([A-Za-z0-9\-]+)\end", _untaintedString),
@@ -292,7 +292,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted5()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
         // if no replacement is done, string remains inmutable
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+: joining :+-OtherTaintedString-+: and :+-LargeTaintedString-+:",
@@ -303,7 +303,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted4()
     {
-        string str = String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
+        string str = System.String.Concat(_taintedString, " joining ", _otherTaintedString, " and ", _largeTaintedString);
         // if no replacement is done, string remains inmutable
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-TaintedString-+: joining :+-OtherTaintedString-+: and :+-LargeTaintedString-+:",
@@ -314,7 +314,7 @@ public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingReplaceWith2Parameters_ResultIsTainted()
     {
-        string str = String.Concat("dummy", _taintedString);
+        string str = System.String.Concat("dummy", _taintedString);
         AssertTaintedFormatWithOriginalCallCheck(
             ":+-duOtherTaintedStringTaintedString-+:",
             str.Replace("mmy", _otherTaintedString),
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringSplitTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringSplitTests.cs
similarity index 95%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringSplitTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringSplitTests.cs
index 0667c8c2ebf5..2af0f759a48b 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringSplitTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringSplitTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class StringSplitTests : InstrumentationTestsBase
 {
     private string _taintedSeparator = "i";
@@ -84,7 +84,7 @@ public void GivenATaintedObject_WhenCallingSplitWithWrongLimit_ArgumentOutOfRang
     [Fact]
     public void GivenATaintedObject_WhenCallingSplitWithCharAndIndex_ResultIsTainted3()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString);
         var expected = new string[] { _taintedString, _untaintedString };
 
         AssertEqual(expected, str.Split(new char[] { '|' }, 2));
@@ -93,7 +93,7 @@ public void GivenATaintedObject_WhenCallingSplitWithCharAndIndex_ResultIsTainted
     [Fact]
     public void GivenATaintedObject_WhenCallingSplitWithCharAndIndex_ResultIsTainted4()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
         var expected = new string[] { _taintedString, _untaintedString, _otherTaintedString + "|" + _otherUntaintedString };
 
         var result = str.Split(new char[] { '|' }, 3);
@@ -151,7 +151,7 @@ public void GivenATaintedObject_WhenCallingSplitWithCharArrayAndOptions_ResultIs
     [Fact]
     public void GivenATaintedObject_WhenCallingSplitWithCharArrayAndOptions_ResultIsTainted2()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString);
         var expected = new string[] { _taintedString, _untaintedString };
 
         var result = str.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
@@ -172,7 +172,7 @@ public void GivenATaintedObject_WhenCallingSplitWithCharArrayAndOptions_ResultIs
     [Fact]
     public void GivenATaintedObject_WhenCallingSplitWithCharArrayAndOptions_ResultIsTainted4()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
         var expected = new string[] { _taintedString, _untaintedString, _otherTaintedString, _otherUntaintedString };
 
         AssertEqual(expected, str.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries));
@@ -226,7 +226,7 @@ public void GivenATaintedObject_WhenCallingSplitWithCharAndOptions_ResultIsTaint
     [Fact]
     public void GivenATaintedObject_WhenCallingSplitWithCharArrayCountAndOptions_ResultIsTainted()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString);
         var expected = new string[] { _taintedString, _untaintedString };
         var results = str.Split(new char[] { '|' }, 2, StringSplitOptions.RemoveEmptyEntries);
         AssertEqual(expected, results);
@@ -236,7 +236,7 @@ public void GivenATaintedObject_WhenCallingSplitWithCharArrayCountAndOptions_Res
     [Fact]
     public void GivenATaintedObject_WhenCallingSplitWithCharArrayCountAndOptions_ResultIsTainted2()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
         var expected = new string[] { _taintedString, _untaintedString, _otherTaintedString + "|" + _otherUntaintedString };
         var results = str.Split(new char[] { '|' }, 3, StringSplitOptions.RemoveEmptyEntries);
         AssertEqual(expected, results);
@@ -413,7 +413,7 @@ public void GivenATaintedObject_WhenCallingSplitWithStringCountOptions_ResultIsN
 
     public void GivenATaintedObject_WhenCallingSplitWithCharAndOptions_ResultIsTainted()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString);
         var expected = new string[] { _taintedString, _untaintedString };
 
         AssertEqual(expected, str.Split('|'));
@@ -432,7 +432,7 @@ public void GivenATaintedObject_WhenCallingSplitWithCharAndOptions_ResultIsTaint
     [Fact]
     public void GivenATaintedObject_WhenCallingSplitWithCharAndOptions_ResultIsTainted3()
     {
-        var str = String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
+        var str = System.String.Concat(_taintedString, "|", _untaintedString, "|", _otherTaintedString, "|", _otherUntaintedString);
         var expected = new string[] { _taintedString, _untaintedString, _otherTaintedString, _otherUntaintedString };
 
         AssertEqual(expected, str.Split('|'));
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringSubstringTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringSubstringTests.cs
similarity index 90%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringSubstringTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringSubstringTests.cs
index 5189893b3a15..42a67c962b5a 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringSubstringTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringSubstringTests.cs
@@ -2,7 +2,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 
 public class StringSubstringTests : InstrumentationTestsBase
 {
@@ -77,42 +77,42 @@ public void GivenATaintedString_WhenSubstringIndexWithTainted_ThenResultIsTainte
     [Fact]
     public void GivenATaintedString_WhenSubstringIndexWithBoth_ThenResultIsTainted()
     {
-        string str = String.Concat(TaintedString, UntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-intedString-+:UntaintedString", str.Substring(2), () => str.Substring(2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenSubstringIndexWithBoth_ThenResultIsTainted2()
     {
-        string str = String.Concat(TaintedString, UntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-intedString-+:Un", str.Substring(2, 13), () => str.Substring(2, 13));
     }
 
     [Fact]
     public void GivenATaintedString_WhenSubstringIndexWithBothInverse_ThenResultIsTainted()
     {
-        string str = String.Concat(UntaintedString, TaintedString);
+        string str = System.String.Concat(UntaintedString, TaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-intedString-+:", str.Substring(17), () => str.Substring(17));
     }
 
     [Fact]
     public void GivenATaintedString_WhenSubstringIndexWithTwoTainted_ThenResultIsTainted()
     {
-        string str = String.Concat(String.Concat(TaintedString, UntaintedString), TaintedString);
+        string str = System.String.Concat(System.String.Concat(TaintedString, UntaintedString), TaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-intedString-+:UntaintedString:+-TaintedString-+:", str.Substring(2), () => str.Substring(2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenSubstringIndexWithTwoTaintedTwoUntainted_ThenResultIsTainted()
     {
-        string str = String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString, OtherTaintedString, OtherUntaintedString);
         AssertTaintedFormatWithOriginalCallCheck(":+-String-+:UntaintedString:+-OtherTaintedString-+:OtherUntaintedString", str.Substring(7), () => str.Substring(7));
     }
 
     [Fact]
     public void GivenATaintedString_WhenSubstringIndexTaintedBaseOutOfRange_ThenResultIsNotTainted()
     {
-        string str = String.Concat(TaintedString, UntaintedString);
+        string str = System.String.Concat(TaintedString, UntaintedString);
         string newString = str.Substring(13);
 
         Assert.Equal("UntaintedString", newString);
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringToCharArrayTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringToCharArrayTests.cs
similarity index 95%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringToCharArrayTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringToCharArrayTests.cs
index ed0935b3c35e..140ab1a21e16 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringToCharArrayTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringToCharArrayTests.cs
@@ -3,7 +3,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class StringToCharArrayTests : InstrumentationTestsBase
 {
     protected string taintedValue = "tainted";
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringTrimTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringTrimTests.cs
similarity index 94%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringTrimTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringTrimTests.cs
index e90670624f5b..0a3c9a766249 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/StringTrimTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/String/StringTrimTests.cs
@@ -3,7 +3,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class StringTrimTests : InstrumentationTestsBase
 {
     protected string taintedValue = "tainted";
@@ -37,19 +37,19 @@ public void GivenATaintedString_WhenCallingTrim_ResultIsTainted()
     [Fact]
     public void GivenATaintedString_WhenCallingTrim_ResultIsTainted2()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", String.Concat(TaintedString, "   ").Trim(), () => String.Concat(TaintedString, "   ").Trim());
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", System.String.Concat(TaintedString, "   ").Trim(), () => System.String.Concat(TaintedString, "   ").Trim());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingTrim_ResultIsTainted4()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", String.Concat(TaintedString, "\t\n\r").Trim(), () => String.Concat(TaintedString, "\t\n\r").Trim());
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", System.String.Concat(TaintedString, "\t\n\r").Trim(), () => System.String.Concat(TaintedString, "\t\n\r").Trim());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingTrim_ResultIsTainted3()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", String.Concat("   ", TaintedString).Trim(), () => String.Concat("   ", TaintedString).Trim());
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", System.String.Concat("   ", TaintedString).Trim(), () => System.String.Concat("   ", TaintedString).Trim());
     }
 
     [Fact]
@@ -101,7 +101,7 @@ public void GivenATaintedObject_WhenCallingTrimWithCharArrayParam_ResultIsTainte
     [Fact]
     public void GivenATaintedObject_WhenCallingTrimWithCharArrayParam_ResultIsTainted5()
     {
-        AssertUntaintedWithOriginalCallCheck(String.Empty,
+        AssertUntaintedWithOriginalCallCheck(System.String.Empty,
             taintedValue.Trim(new char[] { 't', 'a', 'i', 'n', 'e', 'd' }),
             () => taintedValue.Trim(new char[] { 't', 'a', 'i', 'n', 'e', 'd' }));
     }
@@ -161,7 +161,7 @@ public void GivenATaintedObject_WhenCallingTrimStartCharArray_ResultIsTainted5()
     [Fact]
     public void GivenATaintedObject_WhenCallingTrimStartWithCharArrayParam_ResultIsTainted6()
     {
-        AssertUntaintedWithOriginalCallCheck(String.Empty,
+        AssertUntaintedWithOriginalCallCheck(System.String.Empty,
             taintedValue.TrimStart(new char[] { 't', 'a', 'i', 'n', 'e', 'd' }),
             () => taintedValue.TrimStart(new char[] { 't', 'a', 'i', 'n', 'e', 'd' }));
     }
@@ -193,7 +193,7 @@ public void GivenATaintedObject_WhenCallingTrimStartNoParameters_ResultIsTainted
     [Fact]
     public void GivenATaintedObject_WhenCallingTrimEndWithCharArrayParam_ResultIsTainted5()
     {
-        AssertUntaintedWithOriginalCallCheck(String.Empty,
+        AssertUntaintedWithOriginalCallCheck(System.String.Empty,
             taintedValue.TrimEnd(new char[] { 't', 'a', 'i', 'n', 'e', 'd' }),
             () => taintedValue.TrimEnd(new char[] { 't', 'a', 'i', 'n', 'e', 'd' }));
     }
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendFormatTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendFormatTests.cs
similarity index 66%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendFormatTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendFormatTests.cs
index d6f204469c55..ffc5d0e8e70e 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendFormatTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendFormatTests.cs
@@ -1,8 +1,9 @@
-using System.Collections.Generic;
 using System.Text;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
+
+
 public class StringBuilderAppendFormatTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
@@ -44,16 +45,16 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatOneObjectFor
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatOneObjectFormatProvider_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taintedtainted-+:",
-            new StringBuilder(_taintedValue).AppendFormat("{0}", _taintedValue).ToString(),
-            () => new StringBuilder(_taintedValue).AppendFormat("{0}", _taintedValue).ToString());
+            new System.Text.StringBuilder(_taintedValue).AppendFormat("{0}", _taintedValue).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).AppendFormat("{0}", _taintedValue).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatOneParamMissing_ResultIsTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue).ToString());
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue).ToString());
     }
 
     // [AspectMethodReplace("System.Text.StringBuilder::AppendFormat(System.String,System.Object,System.Object)")]
@@ -70,8 +71,8 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatTwoObjects_R
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatTwoObjects_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taintedmyformattaintednotTainted-+:",
-            new StringBuilder(_taintedValue).AppendFormat("myformat{0}{1}", _taintedValue, _notTaintedValue).ToString(),
-            () => new StringBuilder(_taintedValue).AppendFormat("myformat{0}{1}", _taintedValue, _notTaintedValue).ToString());
+            new System.Text.StringBuilder(_taintedValue).AppendFormat("myformat{0}{1}", _taintedValue, _notTaintedValue).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).AppendFormat("myformat{0}{1}", _taintedValue, _notTaintedValue).ToString());
     }
 
     // [AspectMethodReplace("System.Text.StringBuilder::AppendFormat(System.String,System.Object,System.Object,System.Object)")]
@@ -88,8 +89,8 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatThreeObjectF
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatThreeObjectFormatProvider_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taintedtaintedeeetainted-+:",
-            new StringBuilder(_taintedValue).AppendFormat("{0}{1}{2}", _taintedValue, "eee", _taintedValue).ToString(),
-            () => new StringBuilder(_taintedValue).AppendFormat("{0}{1}{2}", _taintedValue, "eee", _taintedValue).ToString());
+            new System.Text.StringBuilder(_taintedValue).AppendFormat("{0}{1}{2}", _taintedValue, "eee", _taintedValue).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).AppendFormat("{0}{1}{2}", _taintedValue, "eee", _taintedValue).ToString());
     }
 
     // [AspectMethodReplace("System.Text.StringBuilder::AppendFormat(System.String,System.Object[])")]
@@ -98,16 +99,16 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatThreeObjectF
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatObjectArray_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-formattaintednotTainted-+:",
-            new StringBuilder(string.Empty).AppendFormat(_formatTaintedValue, new object[] { _taintedValue, _notTaintedValue }).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat(_formatTaintedValue, new object[] { _taintedValue, _notTaintedValue }).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(_formatTaintedValue, new object[] { _taintedValue, _notTaintedValue }).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(_formatTaintedValue, new object[] { _taintedValue, _notTaintedValue }).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatNottaintedObjectArray_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-myformattaintednotTainted-+:",
-            new StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString());
     }
 
     // [AspectMethodReplace("System.Text.StringBuilder::AppendFormat(System.IFormatProvider,System.String,System.Object)")]
@@ -116,16 +117,16 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatNottaintedOb
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatOneObjectFormatProviderFormatProvider_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taintedcustomformat-+:",
-            new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}", _taintedValue).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}", _taintedValue).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}", _taintedValue).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}", _taintedValue).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatFormatNull_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue).ToString());
     }
 
     // [AspectMethodReplace("System.Text.StringBuilder::AppendFormat(System.IFormatProvider,System.String,System.Object,System.Object)")]
@@ -143,24 +144,24 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatTwoObjectsFo
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatTwoObjectsFormatProvider_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-myformattaintedcustomformatnotTaintedcustomformat-+:",
-            new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", _taintedValue, _notTaintedValue).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", _taintedValue, _notTaintedValue).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", _taintedValue, _notTaintedValue).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", _taintedValue, _notTaintedValue).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatOneParamNull_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-myformattainted-+:",
-            new StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue, null).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue, null).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue, null).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat("myformat{0}{1}", _taintedValue, null).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatMoreParameters_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue, "eee").ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue, "eee").ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue, "eee").ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(null, _taintedValue, _notTaintedValue, "eee").ToString());
     }
 
     // [AspectMethodReplace("System.Text.StringBuilder::AppendFormat(System.IFormatProvider,System.String,System.Object,System.Object,System.Object)")]
@@ -169,8 +170,8 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatMoreParamete
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatThreeObjectFormatProviderFormatProvider_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taintedcustomformatTAINTED2customformattaintedcustomformat-+:",
-            new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}{1}{2}", _taintedValue, _taintedValue2, _taintedValue).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}{1}{2}", _taintedValue, _taintedValue2, _taintedValue).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}{1}{2}", _taintedValue, _taintedValue2, _taintedValue).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "{0}{1}{2}", _taintedValue, _taintedValue2, _taintedValue).ToString());
     }
 
     // [AspectMethodReplace("System.Text.StringBuilder::AppendFormat(System.IFormatProvider,System.String,System.Object[])")]
@@ -179,8 +180,8 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatThreeObjectF
     public void GivenATaintedString_WhenCallingStringBuilderAppendFormatObjectArrayFormatProvider_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-myformattaintedcustomformatnotTaintedcustomformat-+:", 
-            new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString(), 
-            () => new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString(), 
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), "myformat{0}{1}", new object[] { _taintedValue, _notTaintedValue }).ToString());
     }
 
     
@@ -193,8 +194,8 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendFormatObjectArrayF
         var composite = CompositeFormat.Parse("myformat{0}{1}");
         AssertUntaintedWithOriginalCallCheck(
             "myformattaintedcustomformatnotTaintedcustomformat",
-            new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), composite, new object[] { _taintedValue, _notTaintedValue }).ToString(),
-            () => new StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), composite, new object[] { _taintedValue, _notTaintedValue }).ToString());
+            new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), composite, new object[] { _taintedValue, _notTaintedValue }).ToString(),
+            () => new System.Text.StringBuilder(string.Empty).AppendFormat(new FormatProviderForTest(), composite, new object[] { _taintedValue, _notTaintedValue }).ToString());
     }
 #endif
 }
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendJoin.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendJoin.cs
similarity index 71%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendJoin.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendJoin.cs
index c86c96f3d57a..3a4f8e22cd3d 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendJoin.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendJoin.cs
@@ -1,8 +1,8 @@
 #if NETCOREAPP3_1_OR_GREATER
 using System.Collections.Generic;
-using System.Text;
 using Xunit;
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 
 public class StringBuilderAppendJoin : InstrumentationTestsBase
 {
@@ -22,24 +22,24 @@ public StringBuilderAppendJoin()
     public void GivenAStringBuilderTainted_WhenAppendJoinStringString_ThenResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted.untainted-+:", 
-            new StringBuilder().AppendJoin(".", new string[] { _taintedValue, _untaintedString }),
-            () => new StringBuilder().AppendJoin(".", new string[] { _taintedValue, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin(".", new string[] { _taintedValue, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new string[] { _taintedValue, _untaintedString }));
     }
 
     [Fact]
     public void GivenAStringBuilderTainted_WhenAppendJoinStringString_ThenResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untainted.tainted-+:",
-            new StringBuilder().AppendJoin(".", new string[] { _untaintedString, _taintedValue }),
-            () => new StringBuilder().AppendJoin(".", new string[] { _untaintedString, _taintedValue }));
+            new System.Text.StringBuilder().AppendJoin(".", new string[] { _untaintedString, _taintedValue }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new string[] { _untaintedString, _taintedValue }));
     }
 
     [Fact]
     public void GivenAStringBuilderNotTainted_WhenAppendJoinStringString_ThenResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder().AppendJoin(".", new string[] { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin(".", new string[] { _untaintedString, _untaintedString }));
+            () => new System.Text.StringBuilder().AppendJoin(".", new string[] { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new string[] { _untaintedString, _untaintedString }));
     }
 
     [Fact]
@@ -78,8 +78,8 @@ public void GivenAStringBuilderTainted_WhenAppendJoinStringString_ThenResultIsNo
     public void GivenAStringBuilderTainted_WhenAppendJoinStringString_ThenResultIsTainted7()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untaintedtainteduntainted-+:",
-            new StringBuilder().AppendJoin(_taintedValue, new string[] { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin(_taintedValue, new string[] { _untaintedString, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin(_taintedValue, new string[] { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(_taintedValue, new string[] { _untaintedString, _untaintedString }));
     }
 
     // System.Text.StringBuilder::AppendJoin(System.String,System.Object[])
@@ -88,24 +88,24 @@ public void GivenAStringBuilderTainted_WhenAppendJoinStringString_ThenResultIsTa
     public void GivenAStringBuilderTainted_WhenAppendJoinStringObject_ThenResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted.untainted-+:",
-            new StringBuilder().AppendJoin(".", new object[] { _taintedValue, _untaintedString }),
-            () => new StringBuilder().AppendJoin(".", new object[] { _taintedValue, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin(".", new object[] { _taintedValue, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new object[] { _taintedValue, _untaintedString }));
     }
 
     [Fact]
     public void GivenAStringBuilderTainted_WhenAppendJoinStringObject_ThenResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untainted.tainted-+:",
-            new StringBuilder().AppendJoin(".", new object[] { _untaintedString, _taintedValue }),
-            () => new StringBuilder().AppendJoin(".", new object[] { _untaintedString, _taintedValue }));
+            new System.Text.StringBuilder().AppendJoin(".", new object[] { _untaintedString, _taintedValue }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new object[] { _untaintedString, _taintedValue }));
     }
 
     [Fact]
     public void GivenAStringBuilderNotTainted_WhenAppendJoinStringObject_ThenResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder().AppendJoin(".", new object[] { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin(".", new object[] { _untaintedString, _untaintedString }));
+            () => new System.Text.StringBuilder().AppendJoin(".", new object[] { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new object[] { _untaintedString, _untaintedString }));
     }
 
     [Fact]
@@ -144,8 +144,8 @@ public void GivenAStringBuilderTainted_WhenAppendJoinStringObject_ThenResultIsNo
     public void GivenAStringBuilderTainted_WhenAppendJoinStringObject_ThenResultIsTainted7()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untaintedtainteduntainted-+:",
-            new StringBuilder().AppendJoin(_taintedValue, new object[] { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin(_taintedValue, new object[] { _untaintedString, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin(_taintedValue, new object[] { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(_taintedValue, new object[] { _untaintedString, _untaintedString }));
     }
 
     // System.Text.StringBuilder::AppendJoin(System.String,System.Collections.Generic.IEnumerable`1<!!0>)
@@ -154,24 +154,24 @@ public void GivenAStringBuilderTainted_WhenAppendJoinStringObject_ThenResultIsTa
     public void GivenAStringBuilderTainted_WhenAppendJoinStringIEnumerable_ThenResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted.untainted-+:",
-            new StringBuilder().AppendJoin(".", new List<object> { _taintedValue, _untaintedString }),
-            () => new StringBuilder().AppendJoin(".", new List<object> { _taintedValue, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin(".", new List<object> { _taintedValue, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new List<object> { _taintedValue, _untaintedString }));
     }
 
     [Fact]
     public void GivenAStringBuilderTainted_WhenAppendJoinStringIEnumerable_ThenResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untainted.tainted-+:",
-            new StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _taintedValue }),
-            () => new StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _taintedValue }));
+            new System.Text.StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _taintedValue }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _taintedValue }));
     }
 
     [Fact]
     public void GivenAStringBuilderNotTainted_WhenAppendJoinStringIEnumerable_ThenResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _untaintedString }));
+            () => new System.Text.StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(".", new List<object> { _untaintedString, _untaintedString }));
     }
 
     [Fact]
@@ -210,8 +210,8 @@ public void GivenAStringBuilderTainted_WhenAppendJoinStringIEnumerable_ThenResul
     public void GivenAStringBuilderTainted_WhenAppendJoinStringIEnumerable_ThenResultIsTainted7()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untaintedtainteduntainted-+:",
-            new StringBuilder().AppendJoin(_taintedValue, new List<object> { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin(_taintedValue, new List<object> { _untaintedString, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin(_taintedValue, new List<object> { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin(_taintedValue, new List<object> { _untaintedString, _untaintedString }));
     }
 
     // System.Text.StringBuilder::AppendJoin(System.Char,System.Char[])
@@ -220,24 +220,24 @@ public void GivenAStringBuilderTainted_WhenAppendJoinStringIEnumerable_ThenResul
     public void GivenAStringBuilderTainted_WhenAppendJoinCharString_ThenResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted.untainted-+:",
-            new StringBuilder().AppendJoin('.', new string[] { _taintedValue, _untaintedString }),
-            () => new StringBuilder().AppendJoin('.', new string[] { _taintedValue, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin('.', new string[] { _taintedValue, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new string[] { _taintedValue, _untaintedString }));
     }
 
     [Fact]
     public void GivenAStringBuilderTainted_WhenAppendJoinCharString_ThenResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untainted.tainted-+:",
-            new StringBuilder().AppendJoin('.', new string[] { _untaintedString, _taintedValue }),
-            () => new StringBuilder().AppendJoin('.', new string[] { _untaintedString, _taintedValue }));
+            new System.Text.StringBuilder().AppendJoin('.', new string[] { _untaintedString, _taintedValue }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new string[] { _untaintedString, _taintedValue }));
     }
 
     [Fact]
     public void GivenAStringBuilderNotTainted_WhenAppendJoinCharString_ThenResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder().AppendJoin('.', new string[] { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin('.', new string[] { _untaintedString, _untaintedString }));
+            () => new System.Text.StringBuilder().AppendJoin('.', new string[] { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new string[] { _untaintedString, _untaintedString }));
     }
 
     [Fact]
@@ -278,24 +278,24 @@ public void GivenAStringBuilderTainted_WhenAppendJoinCharString_ThenResultIsNotT
     public void GivenAStringBuilderTainted_WhenAppendJoinCharObject_ThenResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted.untainted-+:",
-            new StringBuilder().AppendJoin('.', new object[] { _taintedValue, _untaintedString }),
-            () => new StringBuilder().AppendJoin('.', new object[] { _taintedValue, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin('.', new object[] { _taintedValue, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new object[] { _taintedValue, _untaintedString }));
     }
 
     [Fact]
     public void GivenAStringBuilderTainted_WhenAppendJoinCharObject_ThenResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untainted.tainted-+:",
-            new StringBuilder().AppendJoin('.', new object[] { _untaintedString, _taintedValue }),
-            () => new StringBuilder().AppendJoin('.', new object[] { _untaintedString, _taintedValue }));
+            new System.Text.StringBuilder().AppendJoin('.', new object[] { _untaintedString, _taintedValue }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new object[] { _untaintedString, _taintedValue }));
     }
 
     [Fact]
     public void GivenAStringBuilderNotTainted_WhenAppendJoinCharObject_ThenResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder().AppendJoin('.', new object[] { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin('.', new object[] { _untaintedString, _untaintedString }));
+            () => new System.Text.StringBuilder().AppendJoin('.', new object[] { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new object[] { _untaintedString, _untaintedString }));
     }
 
     [Fact]
@@ -318,30 +318,30 @@ public void GivenAStringBuilderTainted_WhenAppendJoinCharObject_ThenResultIsNotT
     public void GivenAStringBuilderTainted_WhenAppendJoinCharIEnumerable_ThenResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted.untainted-+:",
-            new StringBuilder().AppendJoin('.', new List<object> { _taintedValue, _untaintedString }),
-            () => new StringBuilder().AppendJoin('.', new List<object> { _taintedValue, _untaintedString }));
+            new System.Text.StringBuilder().AppendJoin('.', new List<object> { _taintedValue, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new List<object> { _taintedValue, _untaintedString }));
     }
 
     [Fact]
     public void GivenAStringBuilderTainted_WhenAppendJoinCharIEnumerable_ThenResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-untainted.tainted-+:",
-            new StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _taintedValue }),
-            () => new StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _taintedValue }));
+            new System.Text.StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _taintedValue }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _taintedValue }));
     }
 
     [Fact]
     public void GivenAStringBuilderNotTainted_WhenAppendJoinCharIEnumerable_ThenResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _untaintedString }),
-            () => new StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _untaintedString }));
+            () => new System.Text.StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _untaintedString }),
+            () => new System.Text.StringBuilder().AppendJoin('.', new List<object> { _untaintedString, _untaintedString }));
     }
 
     [Fact]
     public void GivenAStringBuilderTainted_WhenAppendJoinCharIEnumerable_ThenResultIsTainted3()
     {
-        var st = new StringBuilder("test").AppendJoin('.', new List<object> { _untaintedString, _untaintedString });
+        var st = new System.Text.StringBuilder("test").AppendJoin('.', new List<object> { _untaintedString, _untaintedString });
 
         AssertTaintedFormatWithOriginalCallCheck(":+-testuntainted.untainted-+:",
             GetTaintedStringBuilder("test").AppendJoin('.', new List<object> { _untaintedString, _untaintedString }),
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendTests.cs
similarity index 60%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendTests.cs
index 8a953835a383..9542182f7c92 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderAppendTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderAppendTests.cs
@@ -1,14 +1,14 @@
 using System;
-using System.Text;
 using Xunit;
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 
 public class StringBuilderAppendTests : InstrumentationTestsBase
 {
     protected string taintedValue = "tainted";
     protected string taintedValue2 = "TAINTED2";
-    StringBuilder TaintedStringBuilder = new StringBuilder("TaintedStringBuilder");
-    StringBuilder TaintedStringBuilder2 = new StringBuilder("TaintedStringBuilder");
+    System.Text.StringBuilder TaintedStringBuilder = new System.Text.StringBuilder("TaintedStringBuilder");
+    System.Text.StringBuilder TaintedStringBuilder2 = new System.Text.StringBuilder("TaintedStringBuilder");
     string TaintedString = "TaintedString";
     string UntaintedString = "UntaintedString";
     char[] TaintedCharArray = "TaintedString".ToCharArray();
@@ -29,7 +29,7 @@ public StringBuilderAppendTests()
     [Fact]
     public void GivenAStringBuilder_WhenAppendBasic_ThenResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", new StringBuilder().Append(TaintedString), () => new StringBuilder().Append(TaintedString));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", new System.Text.StringBuilder().Append(TaintedString), () => new System.Text.StringBuilder().Append(TaintedString));
     }
 
     [Fact]
@@ -55,39 +55,39 @@ public void GivenAStringBuilder_WhenStringBuilderAppendBasicWithBoth_ThenResultI
     [Fact]
     public void GivenATaintedString_WhenCallingStringEmptyBuilderAppendAppendAppend_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:post", new StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString(), () => new StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString());
+        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:post", new System.Text.StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString(), () => new System.Text.StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString());
     }
 
     [Fact]
     public void Given2TaintedStrings_WhenCallingStringBuilderManyAppends_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:middle:+-TAINTED2-+:post", new StringBuilder().Append("pre").Append(taintedValue).Append("middle").Append(taintedValue2).Append("post").ToString(), () => new StringBuilder().Append("pre").Append(taintedValue).Append("middle").Append(taintedValue2).Append("post").ToString());
+        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:middle:+-TAINTED2-+:post", new System.Text.StringBuilder().Append("pre").Append(taintedValue).Append("middle").Append(taintedValue2).Append("post").ToString(), () => new System.Text.StringBuilder().Append("pre").Append(taintedValue).Append("middle").Append(taintedValue2).Append("post").ToString());
     }
 
     [Fact]
     public void GivenATaintedStringBuilder_WhenAppendNull_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new StringBuilder(taintedValue).Append((string)null).ToString(), () => new StringBuilder(taintedValue).Append((string)null).ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new System.Text.StringBuilder(taintedValue).Append((string)null).ToString(), () => new System.Text.StringBuilder(taintedValue).Append((string)null).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppend_ResultIsTainted14()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(taintedValue).Append((string)null).ToString(),
-            () => new StringBuilder(taintedValue).Append((string)null).ToString());
+            new System.Text.StringBuilder(taintedValue).Append((string)null).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append((string)null).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringEmptyBuilderAppendAppendAppendToString_ResultIsTainted2()
     {
-        AssertTainted(new StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString().ToString());
+        AssertTainted(new System.Text.StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString().ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringEmptyBuilderAppendAppendAppendToString_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:post", new StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString().ToString(), () => new StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString().ToString());
+        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:post", new System.Text.StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString().ToString(), () => new System.Text.StringBuilder().Append("pre").Append(taintedValue).Append("post").ToString().ToString());
     }
 
     [Fact]
@@ -99,8 +99,8 @@ public void GivenATaintedString_WhenCallingParamStringBuilder_ResultIsTainted()
     private void auxMethod(string a1, string a2, string a3, string a4, string a5, string a6)
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:123456",
-            new StringBuilder().Append(taintedValue + a1 + a2 + a3 + a4 + a5 + a6),
-            () => new StringBuilder().Append(taintedValue + a1 + a2 + a3 + a4 + a5 + a6));
+            new System.Text.StringBuilder().Append(taintedValue + a1 + a2 + a3 + a4 + a5 + a6),
+            () => new System.Text.StringBuilder().Append(taintedValue + a1 + a2 + a3 + a4 + a5 + a6));
     }
 
     // System.Text.StringBuilder::Append(System.Text.StringBuilder)
@@ -108,18 +108,18 @@ private void auxMethod(string a1, string a2, string a3, string a4, string a5, st
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilder_ResultIsTainted()
     {
-        var sb2 = new StringBuilder(taintedValue);
+        var sb2 = new System.Text.StringBuilder(taintedValue);
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append(sb2).ToString(),
-            () => new StringBuilder(taintedValue).Append(sb2).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(sb2).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(sb2).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilder_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(taintedValue).Append((StringBuilder)null).ToString(),
-            () => new StringBuilder(taintedValue).Append((StringBuilder)null).ToString());
+            new System.Text.StringBuilder(taintedValue).Append((System.Text.StringBuilder)null).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append((System.Text.StringBuilder)null).ToString());
     }
 
     // System.Text.StringBuilder::Append(System.String,System.Int32,System.Int32)
@@ -130,7 +130,7 @@ public void GivenAStringBuilder_WhenStringBuilderAppendIndex_ThenResultIsTainted
         int start = 0;
         int count = 5;
 
-        AssertTaintedFormatWithOriginalCallCheck(":+-Taint-+:", new StringBuilder().Append(TaintedString, start, count), () => new StringBuilder().Append(TaintedString, start, count));
+        AssertTaintedFormatWithOriginalCallCheck(":+-Taint-+:", new System.Text.StringBuilder().Append(TaintedString, start, count), () => new System.Text.StringBuilder().Append(TaintedString, start, count));
     }
 
     [Fact]
@@ -169,52 +169,52 @@ public void GivenAStringBuilder_WhenStringBuilderAppendIndexWithBoth()
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringIndexes_ResultIsTainted7()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append(taintedValue, 0, taintedValue.Length).ToString(),
-            () => new StringBuilder(taintedValue).Append(taintedValue, 0, taintedValue.Length).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(taintedValue, 0, taintedValue.Length).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(taintedValue, 0, taintedValue.Length).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringIndexes_ResultIsTainted8()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-ain-+:",
-            new StringBuilder(taintedValue).Append(taintedValue, 1, 3).ToString(),
-            () => new StringBuilder(taintedValue).Append(taintedValue, 1, 3).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(taintedValue, 1, 3).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(taintedValue, 1, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringEmptyBuilderAppendAppendAppendWithParams_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("re:+-aint-+:po", new StringBuilder().Append("pre", 1, 2).Append(taintedValue, 1, 4).Append("post", 0, 2).ToString(), () => new StringBuilder().Append("pre", 1, 2).Append(taintedValue, 1, 4).Append("post", 0, 2).ToString());
+        AssertTaintedFormatWithOriginalCallCheck("re:+-aint-+:po", new System.Text.StringBuilder().Append("pre", 1, 2).Append(taintedValue, 1, 4).Append("post", 0, 2).ToString(), () => new System.Text.StringBuilder().Append("pre", 1, 2).Append(taintedValue, 1, 4).Append("post", 0, 2).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilder_ResultIsTainted9()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue, 1, 377).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue, 1, 377).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringIndexes_ResultIsTainted10()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue, 1, -377).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue, 1, -377).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringIndexes_ResultIsTainted11()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue, 100, 3).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue, 100, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringIndexes_ResultIsTainted12()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue, -100, 3).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue, -100, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringIndexes_ResultIsTainted13()
     {
-        Assert.Throws<ArgumentNullException>(() => new StringBuilder(taintedValue).Append((string)null, 1, 3).ToString());
+        Assert.Throws<ArgumentNullException>(() => new System.Text.StringBuilder(taintedValue).Append((string)null, 1, 3).ToString());
     }
 
     // System.Text.StringBuilder::Append(System.Text.StringBuilder,System.Int32,System.Int32)
@@ -225,46 +225,46 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendStringIndexes_Resu
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), 0, taintedValue.Length).ToString(),
-            () => new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), 0, taintedValue.Length).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), 0, taintedValue.Length).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), 0, taintedValue.Length).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-ain-+:",
-            new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), 1, 3).ToString(),
-            () => new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), 1, 3).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), 1, 3).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), 1, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted3()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), 1, 377).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), 1, 377).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted4()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), 1, -377).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), 1, -377).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted5()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), 100, 3).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), 100, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted6()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(new StringBuilder(taintedValue), -100, 3).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(new System.Text.StringBuilder(taintedValue), -100, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted16()
     {
-        Assert.Throws<ArgumentNullException>(() => new StringBuilder(taintedValue).Append((StringBuilder)null, 1, 3).ToString());
+        Assert.Throws<ArgumentNullException>(() => new System.Text.StringBuilder(taintedValue).Append((System.Text.StringBuilder)null, 1, 3).ToString());
     }
 #endif
 
@@ -274,46 +274,46 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndex
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 0, taintedValue.Length).ToString(),
-            () => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 0, taintedValue.Length).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 0, taintedValue.Length).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 0, taintedValue.Length).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-ain-+:",
-            new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, 3).ToString(),
-            () => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, 3).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, 3).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_ExceptionIsThrown()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, 377).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, 377).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_ExceptionIsThrown2()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, -377).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 1, -377).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_ExceptionIsThrown3()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 100, 3).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), 100, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_ExceptionIsThrown4()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), -100, 3).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray(), -100, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_ExceptionIsThrown5()
     {
-        Assert.Throws<ArgumentNullException>(() => new StringBuilder(taintedValue).Append((char[])null, 1, 3).ToString());
+        Assert.Throws<ArgumentNullException>(() => new System.Text.StringBuilder(taintedValue).Append((char[])null, 1, 3).ToString());
     }
 
     // System.Text.StringBuilder::Append(System.Object)
@@ -322,53 +322,53 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendCharArrayIndexes_E
     public void GivenATaintedString_WhenCallingStringBuilderAppendObject_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append(new StructForStringTest(taintedValue)).ToString(),
-            () => new StringBuilder(taintedValue).Append(new StructForStringTest(taintedValue)).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(new StructForStringTest(taintedValue)).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(new StructForStringTest(taintedValue)).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendObject_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append(new ClassForStringTest(taintedValue)).ToString(),
-            () => new StringBuilder(taintedValue).Append(new ClassForStringTest(taintedValue)).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(new ClassForStringTest(taintedValue)).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(new ClassForStringTest(taintedValue)).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendObject_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(taintedValue).Append((object)null).ToString(),
-            () => new StringBuilder(taintedValue).Append((object)null).ToString());
+            new System.Text.StringBuilder(taintedValue).Append((object)null).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append((object)null).ToString());
     }
 
     [Fact]
     public void GivenAStringBuilder_WhenAppendTaintedObject_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:", new StringBuilder("pre").Append((object)taintedValue).ToString(), () => new StringBuilder("pre").Append((object)taintedValue).ToString());
+        AssertTaintedFormatWithOriginalCallCheck("pre:+-tainted-+:", new System.Text.StringBuilder("pre").Append((object)taintedValue).ToString(), () => new System.Text.StringBuilder("pre").Append((object)taintedValue).ToString());
     }
 
     [Fact]
     public void GivenATaintedStringBuilder_WhenAppendObject_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:post", new StringBuilder(taintedValue).Append((object)"post").ToString(), () => new StringBuilder(taintedValue).Append((object)"post").ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:post", new System.Text.StringBuilder(taintedValue).Append((object)"post").ToString(), () => new System.Text.StringBuilder(taintedValue).Append((object)"post").ToString());
     }
 
     [Fact]
     public void GivenATaintedStringBuilder_WhenAppendObject_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(taintedValue).Append((object)null),
-            () => new StringBuilder(taintedValue).Append((object)null));
+            new System.Text.StringBuilder(taintedValue).Append((object)null),
+            () => new System.Text.StringBuilder(taintedValue).Append((object)null));
     }
 
     [Fact]
     public void GivenATaintedStringBuilder_WhenAppendObject_ResultIsTainted3()
     {
-        var sb2 = new StringBuilder(taintedValue);
+        var sb2 = new System.Text.StringBuilder(taintedValue);
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append((object) sb2).ToString(),
-            () => new StringBuilder(taintedValue).Append((object) sb2).ToString());
+            new System.Text.StringBuilder(taintedValue).Append((object) sb2).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append((object) sb2).ToString());
     }
 
     // System.Text.StringBuilder::Append(System.Char[])
@@ -376,13 +376,13 @@ public void GivenATaintedStringBuilder_WhenAppendObject_ResultIsTainted3()
     [Fact]
     public void GivenATaintedStringBuilder_WhenAppendCharArray_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:", new StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString(), () => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:", new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString(), () => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString());
     }
 
     [Fact]
     public void GivenAStringBuilder_WhenStringBuilderAppendChars_ThenResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", new StringBuilder().Append(TaintedCharArray), () => new StringBuilder().Append(TaintedCharArray));
+        AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:", new System.Text.StringBuilder().Append(TaintedCharArray), () => new System.Text.StringBuilder().Append(TaintedCharArray));
     }
 
     [Fact]
@@ -413,16 +413,16 @@ public void GivenAStringBuilder_WhenStringBuilderAppendCharsWithBoth_ThenResultI
     public void GivenATaintedString_WhenCallingStringBuilderAppendCharArray_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+::+-tainted-+:",
-            new StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString(),
-            () => new StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString());
+            new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append(taintedValue.ToCharArray()).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndexes_ResultIsTainted18()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(taintedValue).Append((char[])null).ToString(),
-            () => new StringBuilder(taintedValue).Append((char[])null).ToString());
+            new System.Text.StringBuilder(taintedValue).Append((char[])null).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append((char[])null).ToString());
     }
 
     // System.Text.StringBuilder::AppendLine(System.String)
@@ -430,7 +430,7 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendStringBuilderIndex
     [Fact]
     public void GivenAStringBuilder_WhenStringBuilderAppendLineBasic_ThenResultIsTainted()
     {
-        StringBuilder strb = new StringBuilder();
+        var strb = new System.Text.StringBuilder();
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedString-+:" + Environment.NewLine, strb.AppendLine(TaintedString), () => strb.AppendLine(TaintedString));
     }
 
@@ -461,19 +461,19 @@ public void GivenAStringBuilder_WhenStringBuilderAppendLineBasicWithBoth_ThenRes
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendLine_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:" + Environment.NewLine, new StringBuilder(taintedValue).AppendLine().ToString(), () => new StringBuilder(taintedValue).AppendLine().ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:" + Environment.NewLine, new System.Text.StringBuilder(taintedValue).AppendLine().ToString(), () => new System.Text.StringBuilder(taintedValue).AppendLine().ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendLineString_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:rrr" + Environment.NewLine, new StringBuilder(taintedValue).AppendLine("rrr").ToString(), () => new StringBuilder(taintedValue).AppendLine("rrr").ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:rrr" + Environment.NewLine, new System.Text.StringBuilder(taintedValue).AppendLine("rrr").ToString(), () => new System.Text.StringBuilder(taintedValue).AppendLine("rrr").ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderAppendLineNull_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:" + Environment.NewLine, new StringBuilder(taintedValue).AppendLine(null).ToString(), () => new StringBuilder(taintedValue).AppendLine(null).ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:" + Environment.NewLine, new System.Text.StringBuilder(taintedValue).AppendLine(null).ToString(), () => new System.Text.StringBuilder(taintedValue).AppendLine(null).ToString());
     }
 
     // Not covered by aspects
@@ -482,22 +482,22 @@ public void GivenATaintedString_WhenCallingStringBuilderAppendLineNull_ResultIsT
     public void GivenATaintedStringBuilder_WhenAppendChar_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:wwww",
-            new StringBuilder(taintedValue).Append('w', 4).ToString(),
-            () => new StringBuilder(taintedValue).Append('w', 4).ToString());
+            new System.Text.StringBuilder(taintedValue).Append('w', 4).ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append('w', 4).ToString());
     }
 
     [Fact]
     public void GivenATaintedStringBuilder_WhenAppendChar_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:w",
-            new StringBuilder(taintedValue).Append('w').ToString(),
-            () => new StringBuilder(taintedValue).Append('w').ToString());
+            new System.Text.StringBuilder(taintedValue).Append('w').ToString(),
+            () => new System.Text.StringBuilder(taintedValue).Append('w').ToString());
     }
 
     [Fact]
     public void GivenATaintedStringBuilder_WhenAppendChar_ResultIsTainted3()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(taintedValue).Append('w', -4).ToString());
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(taintedValue).Append('w', -4).ToString());
     }
 
     [Fact]
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderBasicTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderBasicTests.cs
similarity index 59%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderBasicTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderBasicTests.cs
index 8a21b608b02f..04be470109d0 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderBasicTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderBasicTests.cs
@@ -1,12 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Reflection;
-using System.Text;
-using Dapper;
 using FluentAssertions;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 public class StringBuilderBasicTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
@@ -23,49 +20,49 @@ public StringBuilderBasicTests()
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilder_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new StringBuilder(_taintedValue), () => new StringBuilder(_taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new System.Text.StringBuilder(_taintedValue), () => new System.Text.StringBuilder(_taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilder_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-tainted-+:UntaintedString",
-            new StringBuilder(_untaintedString + _taintedValue + _untaintedString),
-            () => new StringBuilder(_untaintedString + _taintedValue + _untaintedString));
+            new System.Text.StringBuilder(_untaintedString + _taintedValue + _untaintedString),
+            () => new System.Text.StringBuilder(_untaintedString + _taintedValue + _untaintedString));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilder_ResultIsNotTainted3()
     {
         AssertUntaintedWithOriginalCallCheck("UntaintedString",
-            new StringBuilder(_untaintedString),
-            () => new StringBuilder(_untaintedString));
+            new System.Text.StringBuilder(_untaintedString),
+            () => new System.Text.StringBuilder(_untaintedString));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilder_ResultIsNotTainted4()
     {
-        AssertUntaintedWithOriginalCallCheck(string.Empty, new StringBuilder(null), () => new StringBuilder(null));
+        AssertUntaintedWithOriginalCallCheck(string.Empty, new System.Text.StringBuilder(null), () => new System.Text.StringBuilder(null));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilder_ResultIsTainted2()
     {
-        new StringBuilder(null).ToString().Should().Be(String.Empty);
+        new System.Text.StringBuilder(null).ToString().Should().Be(System.String.Empty);
     }
 
     [Fact]
     public void GivenANotTaintedString_WhenCallingNewStringBuilder_ResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_notTaintedValue).ToString(), 
-            () => new StringBuilder(_notTaintedValue).ToString());
+            () => new System.Text.StringBuilder(_notTaintedValue).ToString(), 
+            () => new System.Text.StringBuilder(_notTaintedValue).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilderToString_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new StringBuilder(_taintedValue).ToString(), () => new StringBuilder(_taintedValue).ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new System.Text.StringBuilder(_taintedValue).ToString(), () => new System.Text.StringBuilder(_taintedValue).ToString());
     }
 
     [Fact]
@@ -79,16 +76,16 @@ public void GivenATaintedString_WhenCallingLocalStringBuilderToString_ResultIsTa
         string a6 = "6";
 
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:123456",
-            new StringBuilder(_taintedValue + a1 + a2 + a3 + a4 + a5 + a6).ToString(),
-            () => new StringBuilder(_taintedValue + a1 + a2 + a3 + a4 + a5 + a6).ToString());
+            new System.Text.StringBuilder(_taintedValue + a1 + a2 + a3 + a4 + a5 + a6).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue + a1 + a2 + a3 + a4 + a5 + a6).ToString());
     }
 
     [Fact]
     public void GivenANotTaintedString_WhenCallingNewStringBuilderToString_ResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_notTaintedValue).ToString(), 
-            () => new StringBuilder(_notTaintedValue).ToString());
+            () => new System.Text.StringBuilder(_notTaintedValue).ToString(), 
+            () => new System.Text.StringBuilder(_notTaintedValue).ToString());
     }
 
     // System.Text.StringBuilder::.ctor(System.String,System.Int32)
@@ -96,55 +93,55 @@ public void GivenANotTaintedString_WhenCallingNewStringBuilderToString_ResultIsN
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacity_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new StringBuilder(_taintedValue, 100), () => new StringBuilder(_taintedValue, 100));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new System.Text.StringBuilder(_taintedValue, 100), () => new System.Text.StringBuilder(_taintedValue, 100));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacity_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck("UntaintedString:+-tainted-+:UntaintedString",
-            new StringBuilder(_untaintedString + _taintedValue + _untaintedString, 100),
-            () => new StringBuilder(_untaintedString + _taintedValue + _untaintedString, 100));
+            new System.Text.StringBuilder(_untaintedString + _taintedValue + _untaintedString, 100),
+            () => new System.Text.StringBuilder(_untaintedString + _taintedValue + _untaintedString, 100));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacity_ResultIsNotTainted3()
     {
         AssertUntaintedWithOriginalCallCheck("UntaintedString",
-            new StringBuilder(_untaintedString, 100),
-            () => new StringBuilder(_untaintedString, 100));
+            new System.Text.StringBuilder(_untaintedString, 100),
+            () => new System.Text.StringBuilder(_untaintedString, 100));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacity_ResultIsNotTainted4()
     {
-        AssertUntaintedWithOriginalCallCheck(string.Empty, new StringBuilder(null, 3), () => new StringBuilder(null, 3));
+        AssertUntaintedWithOriginalCallCheck(string.Empty, new System.Text.StringBuilder(null, 3), () => new System.Text.StringBuilder(null, 3));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilderWithMaxLenght_ResultIsTainted3()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new StringBuilder(_taintedValue, 500).ToString(), () => new StringBuilder(_taintedValue, 500).ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new System.Text.StringBuilder(_taintedValue, 500).ToString(), () => new System.Text.StringBuilder(_taintedValue, 500).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilderWithMaxLenght_ResultIsTainted4()
     {
-        new StringBuilder(null, 500).ToString().Should().Be(String.Empty);
+        new System.Text.StringBuilder(null, 500).ToString().Should().Be(System.String.Empty);
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilderWithWrongMaxLenght_ArgumentOutOfRangeException()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue, -500));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue, -500));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacity_ResultIsNotTainted5()
     {
         AssertUntaintedWithOriginalCallCheck("UntaintedString",
-            new StringBuilder(_untaintedString, 1),
-            () => new StringBuilder(_untaintedString, 1));
+            new System.Text.StringBuilder(_untaintedString, 1),
+            () => new System.Text.StringBuilder(_untaintedString, 1));
     }
 
     // System.Text.StringBuilder::.ctor(System.String,System.Int32,System.Int32,System.Int32)
@@ -152,73 +149,73 @@ public void GivenATaintedString_WhenCreateStringBuilderCapacity_ResultIsNotTaint
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new StringBuilder(_taintedValue, 0, 7, 10), () => new StringBuilder(_taintedValue));
+        AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", new System.Text.StringBuilder(_taintedValue, 0, 7, 10), () => new System.Text.StringBuilder(_taintedValue));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-in-+:",
-            new StringBuilder(_taintedValue, 2, 2, 10),
-            () => new StringBuilder(_taintedValue, 2, 2, 10));
+            new System.Text.StringBuilder(_taintedValue, 2, 2, 10),
+            () => new System.Text.StringBuilder(_taintedValue, 2, 2, 10));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck("intedString:+-tain-+:",
-            new StringBuilder(_untaintedString + _taintedValue + _untaintedString, 4, 15, 22),
-            () => new StringBuilder(_untaintedString + _taintedValue + _untaintedString, 4, 15, 22));
+            new System.Text.StringBuilder(_untaintedString + _taintedValue + _untaintedString, 4, 15, 22),
+            () => new System.Text.StringBuilder(_untaintedString + _taintedValue + _untaintedString, 4, 15, 22));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ResultIsNotTainted3()
     {
         AssertUntaintedWithOriginalCallCheck("ta",
-            new StringBuilder(_untaintedString, 2, 2, 2),
-            () => new StringBuilder(_untaintedString, 2, 2, 2));
+            new System.Text.StringBuilder(_untaintedString, 2, 2, 2),
+            () => new System.Text.StringBuilder(_untaintedString, 2, 2, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ExceptionIsThrown()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(null, 2, 2, 2));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(null, 2, 2, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ExceptionIsThrown2()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue, -1, 3, 3));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue, -1, 3, 3));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ExceptionIsThrown3()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue, 1, -3, 3));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue, 1, -3, 3));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ExceptionIsThrown4()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue, 1, 3, -3));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue, 1, 3, -3));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ExceptionIsThrown5()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue, 1, 300, 3));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue, 1, 300, 3));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCreateStringBuilderCapacityOffsets_ExceptionIsThrown6()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue, 100, 3, 3));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue, 100, 3, 3));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilderWithSubString_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-inte-+:", new StringBuilder(_taintedValue, 2, 4, 100).ToString(), () => new StringBuilder(_taintedValue, 2, 4, 100).ToString());
+        AssertTaintedFormatWithOriginalCallCheck(":+-inte-+:", new System.Text.StringBuilder(_taintedValue, 2, 4, 100).ToString(), () => new System.Text.StringBuilder(_taintedValue, 2, 4, 100).ToString());
     }
 
     // System.Text.StringBuilder::ToString(System.Int32,System.Int32)
@@ -227,46 +224,46 @@ public void GivenATaintedString_WhenCallingNewStringBuilderWithSubString_ResultI
     public void GivenATaintedString_WhenCallingStringBuilderToString_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-ta-+:",
-            new StringBuilder(_taintedValue).ToString(0, 2),
-            () => new StringBuilder(_taintedValue).ToString(0, 2));
+            new System.Text.StringBuilder(_taintedValue).ToString(0, 2),
+            () => new System.Text.StringBuilder(_taintedValue).ToString(0, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderToString_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-in-+:",
-            new StringBuilder(_taintedValue).ToString(2, 2),
-            () => new StringBuilder(_taintedValue).ToString(2, 2));
+            new System.Text.StringBuilder(_taintedValue).ToString(2, 2),
+            () => new System.Text.StringBuilder(_taintedValue).ToString(2, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderToString_ResultIsTainted3()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue).ToString(-1, 2));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue).ToString(-1, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderToString_ResultIsTainted4()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue).ToString(1, -2));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue).ToString(1, -2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderToString_ResultIsTainted5()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue).ToString(1, 332));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue).ToString(1, 332));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilderWithWrongSubString_ArgumentOutOfRangeException6()
     {
-        Assert.Throws<ArgumentOutOfRangeException>(() => new StringBuilder(_taintedValue).ToString(200, 2));
+        Assert.Throws<ArgumentOutOfRangeException>(() => new System.Text.StringBuilder(_taintedValue).ToString(200, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingNewStringBuilderToString2Params_ResultIsTainted()
     {
-        AssertTaintedFormatWithOriginalCallCheck(":+-int-+:", new StringBuilder(_taintedValue).ToString(2, 3), () => new StringBuilder(_taintedValue).ToString(2, 3));
+        AssertTaintedFormatWithOriginalCallCheck(":+-int-+:", new System.Text.StringBuilder(_taintedValue).ToString(2, 3), () => new System.Text.StringBuilder(_taintedValue).ToString(2, 3));
     }
 
     // Ranges validation
@@ -274,8 +271,8 @@ public void GivenATaintedString_WhenCallingNewStringBuilderToString2Params_Resul
     [Fact]
     public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk()
     {
-        var stringBuilder = new StringBuilder().Append(_taintedValue);
-        MethodInfo replaceMethod = typeof(StringBuilder).GetMethod("Replace", new Type[] {typeof(string), typeof(string) });
+        var stringBuilder = new System.Text.StringBuilder().Append(_taintedValue);
+        MethodInfo replaceMethod = typeof(System.Text.StringBuilder).GetMethod("Replace", new Type[] {typeof(string), typeof(string) });
         replaceMethod.Invoke(stringBuilder, new object[] { _taintedValue, "a" });
         var mystring = stringBuilder.ToString();
         ValidateRanges(mystring);
@@ -284,8 +281,8 @@ public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk()
     [Fact]
     public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk2()
     {
-        var stringBuilder = new StringBuilder().Append(_taintedValue + _taintedValue);
-        MethodInfo replaceMethod = typeof(StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
+        var stringBuilder = new System.Text.StringBuilder().Append(_taintedValue + _taintedValue);
+        MethodInfo replaceMethod = typeof(System.Text.StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
         replaceMethod.Invoke(stringBuilder, new object[] { _taintedValue + _taintedValue, _taintedValue });
         var mystring = stringBuilder.ToString();
         ValidateRanges(mystring);
@@ -294,13 +291,13 @@ public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk2()
     [Fact]
     public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk3()
     {
-        var stringBuilder = new StringBuilder(_taintedValue);
+        var stringBuilder = new System.Text.StringBuilder(_taintedValue);
         for (int i = 0; i < 100; i++)
         {
             stringBuilder.Append(_taintedValue);
         }
 
-        MethodInfo replaceMethod = typeof(StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
+        MethodInfo replaceMethod = typeof(System.Text.StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
         replaceMethod.Invoke(stringBuilder, new object[] { _taintedValue, string.Empty});
 
         stringBuilder.Append(_taintedValue);
@@ -319,8 +316,8 @@ public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk3()
     [Fact]
     public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk4()
     {
-        var stringBuilder = new StringBuilder().Append("aw" + _taintedValue);
-        MethodInfo replaceMethod = typeof(StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
+        var stringBuilder = new System.Text.StringBuilder().Append("aw" + _taintedValue);
+        MethodInfo replaceMethod = typeof(System.Text.StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
         replaceMethod.Invoke(stringBuilder, new object[] { "wtainted" , string.Empty});
         var mystring = stringBuilder.ToString();
         ValidateRanges(mystring);
@@ -329,8 +326,8 @@ public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk4()
     [Fact]
     public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk5()
     {
-        var stringBuilder = new StringBuilder().Append("aw" + _taintedValue + _taintedValue);
-        MethodInfo replaceMethod = typeof(StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
+        var stringBuilder = new System.Text.StringBuilder().Append("aw" + _taintedValue + _taintedValue);
+        MethodInfo replaceMethod = typeof(System.Text.StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
         replaceMethod.Invoke(stringBuilder, new object[] { "wtainted", string.Empty });
         var mystring = stringBuilder.ToString();
         ValidateRanges(mystring);
@@ -340,8 +337,8 @@ public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk5()
     [Fact]
     public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk6()
     {
-        var stringBuilder = new StringBuilder().Append(_taintedValue + "aw" + _taintedValue);
-        MethodInfo replaceMethod = typeof(StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
+        var stringBuilder = new System.Text.StringBuilder().Append(_taintedValue + "aw" + _taintedValue);
+        MethodInfo replaceMethod = typeof(System.Text.StringBuilder).GetMethod("Replace", new Type[] { typeof(string), typeof(string) });
         replaceMethod.Invoke(stringBuilder, new object[] { "wtainted", string.Empty });
         var mystring = stringBuilder.ToString();
         ValidateRanges(mystring);
@@ -353,7 +350,7 @@ public void GivenAStringBuilder_WhenUsingNotCoveredMethod_RangesAreOk6()
     [Fact]
     public void GivenATaintedString_WhenChangingLength_ResultIsTainted()
     {
-        var stringBuilder = new StringBuilder(_taintedValue);
+        var stringBuilder = new System.Text.StringBuilder(_taintedValue);
         stringBuilder.Length = 2;
         FormatTainted(stringBuilder.ToString()).Should().Be(":+-ta-+:");
     }
@@ -361,7 +358,7 @@ public void GivenATaintedString_WhenChangingLength_ResultIsTainted()
     [Fact]
     public void GivenATaintedString_WhenChangingLength_ResultIsTainted2()
     {
-        var stringBuilder = new StringBuilder(_taintedValue);
+        var stringBuilder = new System.Text.StringBuilder(_taintedValue);
         stringBuilder.Length = 10;
         AssertTainted(stringBuilder);
     }
@@ -369,7 +366,7 @@ public void GivenATaintedString_WhenChangingLength_ResultIsTainted2()
     [Fact]
     public void GivenATaintedString_WhenChangingLength_ResultIsTainted4()
     {
-        var stringBuilder = new StringBuilder(_taintedValue);
+        var stringBuilder = new System.Text.StringBuilder(_taintedValue);
         Assert.Throws<ArgumentOutOfRangeException>(() => stringBuilder.Length = -1);
     }
 }
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderCopyToTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderCopyToTests.cs
similarity index 64%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderCopyToTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderCopyToTests.cs
index 60dbd5eefe51..fdeb7c39266d 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderCopyToTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderCopyToTests.cs
@@ -1,11 +1,12 @@
-using System.Text;
 using Xunit;
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 
 public class StringBuilderCopyToTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
 
+
     public StringBuilderCopyToTests()
     {
         AddTainted(_taintedValue);
@@ -15,7 +16,7 @@ public StringBuilderCopyToTests()
     public void GivenATaintedString_WhenCallingCopyTo_ResultIsTainted()
     {
         char[] result = new char[20];
-        new StringBuilder(_taintedValue).CopyTo(0, result, 0, 3);
+        new System.Text.StringBuilder(_taintedValue).CopyTo(0, result, 0, 3);
         AssertTainted(result);
     }
 
@@ -30,8 +31,8 @@ public void GivenATaintedString_WhenCallingCopyToWrongArguments_ArgumentOutOfRan
     {
         char[] result = new char[20];
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).CopyTo(sourceIndex, result, destinationIndex, count), 
-            () => new StringBuilder(_taintedValue).CopyTo(sourceIndex, result, destinationIndex, count));
+            () => new System.Text.StringBuilder(_taintedValue).CopyTo(sourceIndex, result, destinationIndex, count), 
+            () => new System.Text.StringBuilder(_taintedValue).CopyTo(sourceIndex, result, destinationIndex, count));
     }
 
     [Fact]
@@ -40,8 +41,8 @@ public void GivenATaintedString_WhenCallingCopyToWrongArguments_ArgumentNullExce
         char[] result = null;
 
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).CopyTo(0, result, 1, 1),
-            () => new StringBuilder(_taintedValue).CopyTo(0, result, 1, 1));
+            () => new System.Text.StringBuilder(_taintedValue).CopyTo(0, result, 1, 1),
+            () => new System.Text.StringBuilder(_taintedValue).CopyTo(0, result, 1, 1));
     }
 }
 
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderInsertTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderInsertTests.cs
similarity index 70%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderInsertTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderInsertTests.cs
index 0bc220a69134..07ec9fc488de 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderInsertTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderInsertTests.cs
@@ -1,13 +1,12 @@
 using System.Text;
 using Xunit;
-
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 public class StringBuilderInsertTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
     private string _taintedValue2 = "TAINTED2";
     private string _untaintedString = "UntaintedString";
-    private StringBuilder _taintedStringBuilder = new StringBuilder("TaintedStringBuilder");
+    private System.Text.StringBuilder _taintedStringBuilder = new System.Text.StringBuilder("TaintedStringBuilder");
     private string _taintedString = "TaintedString";
     private char[] _untaintedCharArray = "UntaintedCharArray".ToCharArray();
     private char[] _taintedCharArray = "TaintedString".ToCharArray();
@@ -27,8 +26,8 @@ public StringBuilderInsertTests()
     public void GivenATaintedString_WhenCallingStringBuilderInsertNullString_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (string)null).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (string)null).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (string)null).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (string)null).ToString());
     }
 
     [Fact]
@@ -36,8 +35,8 @@ public void GivenANullString_WhenCallingStringBuilderInsertObject_ResultIsNotTai
     {
         int index = 2;
         AssertUntaintedWithOriginalCallCheck(
-            () => ((StringBuilder)null).Insert(index, _untaintedString),
-            () => ((StringBuilder)null).Insert(index, _untaintedString));
+            () => ((System.Text.StringBuilder)null).Insert(index, _untaintedString),
+            () => ((System.Text.StringBuilder)null).Insert(index, _untaintedString));
     }
 
     [Fact]
@@ -99,16 +98,16 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTai
     public void GivenATaintedString_WhenCallingStringBuilderInsertString_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:www:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, "www").ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, "www").ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, "www").ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, "www").ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderInsertStringTainted_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+::+-TAINTED2-+::+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, _taintedValue2).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, _taintedValue2).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.String,System.Int32)
@@ -121,24 +120,24 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertStringAndCount_Res
         string expected, int index, string value, int count)
     {
         AssertTaintedFormatWithOriginalCallCheck(expected,
-            new StringBuilder(_taintedValue).Insert(index, value, count).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(index, value, count).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(index, value, count).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(index, value, count).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderInsertStringTaintedAndCount1_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+::+-TAINTED2-+::+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, _taintedValue2, 1).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, _taintedValue2, 1).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2, 1).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2, 1).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderInsertStringTaintedAndCount_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+::+-TAINTED2-+::+-TAINTED2-+::+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, _taintedValue2, 2).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, _taintedValue2, 2).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2, 2).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2, 2).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Char)
@@ -147,8 +146,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertStringTaintedAndCo
     public void GivenATaintedString_WhenCallingStringBuilderInsertChar_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:d:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, 'd').ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, 'd').ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, 'd').ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, 'd').ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Char[])
@@ -157,40 +156,40 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertChar_ResultIsTaint
     public void GivenATaintedString_WhenCallingStringBuilderInsertCharArray_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:er:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, new char[] { 'e', 'r' }).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, new char[] { 'e', 'r' }).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, new char[] { 'e', 'r' }).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, new char[] { 'e', 'r' }).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayEmpty_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(_taintedValue).Insert(3, new char[] { }).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, new char[] { }).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, new char[] { }).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, new char[] { }).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayNull_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (char[])null).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (char[])null).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (char[])null).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (char[])null).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayTainted_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+::+-TAINTED2-+::+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray()).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray()).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray()).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray()).ToString());
     }
 
     [Fact]
     //[ExpectedException(typeof(ArgumentOutOfRangeException))]
     public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayBadIndex_ArgumentOutOfRangeException()
     {
-        AssertUntaintedWithOriginalCallCheck(() => new StringBuilder(_taintedValue).Insert(-3, new char[] { 'e', 'r' }),
-            () => new StringBuilder(_taintedValue).Insert(-3, new char[] { 'e', 'r' }));
+        AssertUntaintedWithOriginalCallCheck(() => new System.Text.StringBuilder(_taintedValue).Insert(-3, new char[] { 'e', 'r' }),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(-3, new char[] { 'e', 'r' }));
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Char[],System.Int32,System.Int32)
@@ -199,8 +198,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayBadIndex_
     public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayTaintedAndCount_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+::+-NTE-+::+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), 3, 3).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), 3, 3).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), 3, 3).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), 3, 3).ToString());
     }
 
     [Theory]
@@ -211,8 +210,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayTaintedAn
     public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayTaintedAndWrongIndex_ArgumentOutOfRangeException(int startIndex, int charCount)
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), startIndex, charCount),
-            () => new StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), startIndex, charCount));
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), startIndex, charCount),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, _taintedValue2.ToCharArray(), startIndex, charCount));
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Int32)
@@ -220,8 +219,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertCharArrayTaintedAn
     [Fact]
     public void StringBuilder_Insert_Int_With_Untainted()
     {
-        var check = new StringBuilder("TaintedStringBuilder");
-        var tainted = new StringBuilder("TaintedStringBuilder");
+        var check = new System.Text.StringBuilder("TaintedStringBuilder");
+        var tainted = new System.Text.StringBuilder("TaintedStringBuilder");
         AddTainted(tainted);
 
         AssertTaintedFormatWithOriginalCallCheck("10:+-TaintedStringBuilder-+:",
@@ -233,8 +232,8 @@ public void StringBuilder_Insert_Int_With_Untainted()
     public void GivenATaintedString_WhenCallingStringBuilderInsertInt_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:12:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, 12).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (int)12).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, 12).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (int)12).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Int64)
@@ -251,8 +250,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTai
     public void GivenATaintedString_WhenCallingStringBuilderInsertLong_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:12:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (long)12).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (long)12).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (long)12).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (long)12).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Single)
@@ -270,8 +269,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTai
     public void GivenATaintedString_WhenCallingStringBuilderInsertfloat_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:33:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (float)33).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (float)33).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (float)33).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (float)33).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Double)
@@ -300,8 +299,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTai
     public void GivenATaintedString_WhenCallingStringBuilderInsertdecimal_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:33:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (decimal)33).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (decimal)33).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (decimal)33).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (decimal)33).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.UInt16)
@@ -319,8 +318,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTai
     public void GivenATaintedString_WhenCallingStringBuilderInsertushort_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:33:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (ushort)33).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (ushort)33).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (ushort)33).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (ushort)33).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.UInt32)
@@ -338,8 +337,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTai
     public void GivenATaintedString_WhenCallingStringBuilderInsertuint_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:33:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (uint)33).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (uint)33).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (uint)33).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (uint)33).ToString());
     }
     // test System.Text.StringBuilder::Insert(System.Int32,System.UInt64)
 
@@ -368,8 +367,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTai
     public void GivenATaintedString_WhenCallingStringBuilderInsertsbyte_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:33:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (sbyte)33).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (sbyte)33).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (sbyte)33).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (sbyte)33).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Byte)
@@ -378,8 +377,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertsbyte_ResultIsTain
     public void GivenATaintedString_WhenCallingStringBuilderInsertByte_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:12:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (byte)12).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (byte)12).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (byte)12).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (byte)12).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Int16)
@@ -388,8 +387,8 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertByte_ResultIsTaint
     public void GivenATaintedString_WhenCallingStringBuilderInsertshort_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:33:+-nted-+:",
-            new StringBuilder(_taintedValue).Insert(3, (short)33).ToString(),
-            () => new StringBuilder(_taintedValue).Insert(3, (short)33).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (short)33).ToString(),
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (short)33).ToString());
     }
 
     // test System.Text.StringBuilder::Insert(System.Int32,System.Object)
@@ -398,15 +397,15 @@ public void GivenATaintedString_WhenCallingStringBuilderInsertshort_ResultIsTain
     public void GivenATaintedString_WhenCallingStringBuilderInsertObject_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+:www:+-nted-+:", 
-            new StringBuilder(_taintedValue).Insert(3, (object)"www").ToString(), 
-            () => new StringBuilder(_taintedValue).Insert(3, (object)"www").ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (object)"www").ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (object)"www").ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderInsertObjectTainted_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tai-+::+-TAINTED2-+::+-nted-+:", 
-            new StringBuilder(_taintedValue).Insert(3, (object)_taintedValue2).ToString(), 
-            () => new StringBuilder(_taintedValue).Insert(3, (object)_taintedValue2).ToString());
+            new System.Text.StringBuilder(_taintedValue).Insert(3, (object)_taintedValue2).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Insert(3, (object)_taintedValue2).ToString());
     }
 }
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderMaxRangesTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderMaxRangesTests.cs
similarity index 95%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderMaxRangesTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderMaxRangesTests.cs
index 6a39bd633ea8..66ff53613645 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderMaxRangesTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderMaxRangesTests.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 
 public class StringBuilderMaxRanges : InstrumentationTestsBase
 {
@@ -21,7 +21,7 @@ public void GivenATaintedObject_WithNotMaxedOutRanges_WhenCallingAppend_ResultTa
         var testString9 = AddTaintedString("9");
         var testString10 = AddTaintedString("10");
 
-        var sb = new StringBuilder();
+        var sb = new System.Text.StringBuilder();
         sb.Append(testString1);
         sb.Append(UntaintedString);
         sb.Append(testString2);
@@ -63,7 +63,7 @@ public void GivenATaintedObject_WithMaxedOutRanges_WhenCallingAppend_ResultTaint
         var testString10 = AddTaintedString("10");
         var testString11 = AddTaintedString("11");
 
-        var sb = new StringBuilder();
+        var sb = new System.Text.StringBuilder();
         sb.Append(testString1);
         sb.Append(UntaintedString);
         sb.Append(testString2);
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderRemoveTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderRemoveTests.cs
similarity index 74%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderRemoveTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderRemoveTests.cs
index a5241cd99184..e49d660cdae7 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderRemoveTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderRemoveTests.cs
@@ -1,11 +1,12 @@
 using System.Text;
 using Xunit;
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 
 public class StringBuilderRemoveTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
-    //private StringBuilder _taintedStringBuilder = new StringBuilder("TaintedStringBuilder");
+    //private StringBuilder _taintedStringBuilder = new System.Text.StringBuilder("TaintedStringBuilder");
     private string _taintedString = "TaintedString";
     private string _untaintedString = "UntaintedString";
 
@@ -19,8 +20,8 @@ public StringBuilderRemoveTests()
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTainted()
     {
-        var check = new StringBuilder("TaintedStringBuilder");
-        var tainted = new StringBuilder("TaintedStringBuilder");
+        var check = new System.Text.StringBuilder("TaintedStringBuilder");
+        var tainted = new System.Text.StringBuilder("TaintedStringBuilder");
         AddTainted(tainted);
 
         AssertTaintedFormatWithOriginalCallCheck(":+-TaintedBuilder-+:", 
@@ -31,8 +32,8 @@ public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTa
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTainted2()
     {
-        var check = new StringBuilder("TaintedStringBuilder");
-        var tainted = new StringBuilder("TaintedStringBuilder");
+        var check = new System.Text.StringBuilder("TaintedStringBuilder");
+        var tainted = new System.Text.StringBuilder("TaintedStringBuilder");
         AddTainted(tainted);
 
         tainted.Append(_untaintedString);
@@ -46,8 +47,8 @@ public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTa
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTainted3()
     {
-        var check = new StringBuilder("TaintedStringBuilder");
-        var tainted = new StringBuilder("TaintedStringBuilder");
+        var check = new System.Text.StringBuilder("TaintedStringBuilder");
+        var tainted = new System.Text.StringBuilder("TaintedStringBuilder");
         AddTainted(tainted);
 
         tainted.Append(_taintedString);
@@ -61,8 +62,8 @@ public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTa
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTainted4()
     {
-        var check = new StringBuilder("TaintedStringBuilder");
-        var tainted = new StringBuilder("TaintedStringBuilder");
+        var check = new System.Text.StringBuilder("TaintedStringBuilder");
+        var tainted = new System.Text.StringBuilder("TaintedStringBuilder");
         AddTainted(tainted);
 
         tainted.Append(_untaintedString).Append(_taintedString);
@@ -76,8 +77,8 @@ public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTa
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTainted5()
     {
-        var check = new StringBuilder("TaintedStringBuilder");
-        var tainted = new StringBuilder("TaintedStringBuilder");
+        var check = new System.Text.StringBuilder("TaintedStringBuilder");
+        var tainted = new System.Text.StringBuilder("TaintedStringBuilder");
         AddTainted(tainted);
 
         tainted.Append(_untaintedString).Append(_taintedString);
@@ -108,16 +109,16 @@ public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTa
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTainted8()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taid-+:", 
-            new StringBuilder(_taintedValue).Remove(3, 3).ToString(), 
-            () => new StringBuilder(_taintedValue).Remove(3, 3).ToString());
+            new System.Text.StringBuilder(_taintedValue).Remove(3, 3).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Remove(3, 3).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTainted9()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taid-+:abc", 
-            new StringBuilder(_taintedValue).Append("abc").Remove(3, 3).ToString(), 
-            () => new StringBuilder(_taintedValue).Append("abc").Remove(3, 3).ToString());
+            new System.Text.StringBuilder(_taintedValue).Append("abc").Remove(3, 3).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Append("abc").Remove(3, 3).ToString());
     }
 
     [Theory]
@@ -128,8 +129,8 @@ public void GivenATaintedString_WhenCallingStringBuilderRemoveTainted_ResultIsTa
     public void GivenATaintedString_WhenCallingStringBuilderRemoveTaintedWrongAnguments_ArgumentOutOfRangeException(int index1, int index2)
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Remove(index1, index2), 
-            () => new StringBuilder(_taintedValue).Remove(index1, index2));
+            () => new System.Text.StringBuilder(_taintedValue).Remove(index1, index2), 
+            () => new System.Text.StringBuilder(_taintedValue).Remove(index1, index2));
     }
 }
 
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderReplaceTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderReplaceTests.cs
similarity index 64%
rename from tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderReplaceTests.cs
rename to tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderReplaceTests.cs
index 9da71eee6e86..0104a65dff93 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/StringBuilder/StringBuilderReplaceTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Propagation/StringBuilder/StringBuilderReplaceTests.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringBuilderPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.StringBuilder;
 public class StringBuilderReplaceTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
@@ -85,56 +85,56 @@ public void TestReplace()
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTainted_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-TainTed-+:", 
-            new StringBuilder(_taintedValue).Replace('t', 'T').ToString(), 
-            () => new StringBuilder(_taintedValue).Replace('t', 'T').ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace('t', 'T').ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T').ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexCount_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainTed-+:", 
-            new StringBuilder(_taintedValue).Replace('t', 'T', 2, 5).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace('t', 'T', 2, 5).ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', 2, 5).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', 2, 5).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexCount_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taintEd-+:", 
-            new StringBuilder(_taintedValue).Replace('e', 'E', 2, 5).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace('e', 'E', 2, 5).ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace('e', 'E', 2, 5).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('e', 'E', 2, 5).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexCount_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainted-+:", 
-            new StringBuilder(_taintedValue).Replace('e', 'E', 2, 0).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace('e', 'E', 2, 0).ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace('e', 'E', 2, 0).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('e', 'E', 2, 0).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexCount_ResultIsTainted4()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taintEd-+:", 
-            new StringBuilder(_taintedValue).Replace('e', 'E').ToString(), 
-            () => new StringBuilder(_taintedValue).Replace('e', 'E').ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace('e', 'E').ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('e', 'E').ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexCountWrongArguments_ArgumentOutOfRangeException()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace('t', 'T', -2, 2), 
-            () => new StringBuilder(_taintedValue).Replace('t', 'T', -2, 2));
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', -2, 2), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', -2, 2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexCountWrongArguments_ArgumentOutOfRangeException2()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace('t', 'T', 200, 2), 
-            () => new StringBuilder(_taintedValue).Replace('t', 'T', 200, 2));
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', 200, 2), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', 200, 2));
     }
 
     [Fact]
@@ -142,48 +142,48 @@ public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexC
     public void GivenATaintedString_WhenCallingStringBuilderReplaceCharTaintedIndexCountWrongArguments_ArgumentOutOfRangeException3()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace('t', 'T', 2, -2), 
-            () => new StringBuilder(_taintedValue).Replace('t', 'T', 2, -2));
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', 2, -2), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace('t', 'T', 2, -2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTainted_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-TainTed-+:", 
-            new StringBuilder(_taintedValue).Replace("t", "T").ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("t", "T").ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace("t", "T").ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T").ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTainted_ResultIsTainted3()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-TTTainTTTed-+:", 
-            new StringBuilder(_taintedValue).Replace("t", "TTT").ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("t", "TTT").ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace("t", "TTT").ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "TTT").ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTainted_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-taiNted-+:", 
-            new StringBuilder(_taintedValue).Replace("n", "N").ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("n", "N").ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace("n", "N").ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("n", "N").ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCount_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainTed-+:", 
-            new StringBuilder(_taintedValue).Replace("t", "T", 2, 5).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("t", "T", 2, 5).ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace("t", "T", 2, 5).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T", 2, 5).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCount_ResultIsTainted2()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-tainTTTed-+:", 
-            new StringBuilder(_taintedValue).Replace("t", "TTT", 2, 5).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("t", "TTT", 2, 5).ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace("t", "TTT", 2, 5).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "TTT", 2, 5).ToString());
     }
 
     [Fact]
@@ -191,8 +191,8 @@ public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedInde
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCountWrongArguments_ArgumentOutOfRangeException()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace("t", "T", -2, 2).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("t", "T", -2, 2).ToString());
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T", -2, 2).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T", -2, 2).ToString());
     }
 
     [Fact]
@@ -200,40 +200,40 @@ public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedInde
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCountWrongArguments_ArgumentOutOfRangeException2()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace("t", "T", 200, 2).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("t", "T", 200, 2).ToString());
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T", 200, 2).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T", 200, 2).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringNotTaintedWithTainted_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-NoTAINTED2TainTAINTED2ed-+:", 
-            new StringBuilder(_notTaintedValue).Replace("t", _taintedValue2).ToString(), 
-            () => new StringBuilder(_notTaintedValue).Replace("t", _taintedValue2).ToString());
+            new System.Text.StringBuilder(_notTaintedValue).Replace("t", _taintedValue2).ToString(), 
+            () => new System.Text.StringBuilder(_notTaintedValue).Replace("t", _taintedValue2).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringNotTaintedWithTaintedIndexCount_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-NoTAINTED2Tainted-+:", 
-            new StringBuilder(_notTaintedValue).Replace("t", _taintedValue2, 2, 5).ToString(), 
-            () => new StringBuilder(_notTaintedValue).Replace("t", _taintedValue2, 2, 5).ToString());
+            new System.Text.StringBuilder(_notTaintedValue).Replace("t", _taintedValue2, 2, 5).ToString(), 
+            () => new System.Text.StringBuilder(_notTaintedValue).Replace("t", _taintedValue2, 2, 5).ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringNotTaintedWithTaintedPattern_ResultIsTainted()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-NotTtttinted-+:",
-            new StringBuilder(_notTaintedValue).Replace(_taintedValue.Substring(1, 1), "ttt").ToString(), 
-            () => new StringBuilder(_notTaintedValue).Replace(_taintedValue.Substring(1, 1), "ttt").ToString());
+            new System.Text.StringBuilder(_notTaintedValue).Replace(_taintedValue.Substring(1, 1), "ttt").ToString(), 
+            () => new System.Text.StringBuilder(_notTaintedValue).Replace(_taintedValue.Substring(1, 1), "ttt").ToString());
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringNotTaintedWithNotTaintedPattern_ResultIsNotTainted()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_notTaintedValue).Replace(_notTaintedValue.Substring(1), "ttt").ToString(),
-            () => new StringBuilder(_notTaintedValue).Replace(_notTaintedValue.Substring(1), "ttt").ToString());
+            () => new System.Text.StringBuilder(_notTaintedValue).Replace(_notTaintedValue.Substring(1), "ttt").ToString(),
+            () => new System.Text.StringBuilder(_notTaintedValue).Replace(_notTaintedValue.Substring(1), "ttt").ToString());
     }
 
     [Fact]
@@ -241,8 +241,8 @@ public void GivenATaintedString_WhenCallingStringBuilderReplaceStringNotTaintedW
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCountWrongArguments_ArgumentOutOfRangeException3()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace("t", "T", 2, -2), 
-            () => new StringBuilder(_taintedValue).Replace("t", "T", 2, -2));
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T", 2, -2), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", "T", 2, -2));
     }
 
     [Fact]
@@ -250,8 +250,8 @@ public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedInde
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCountWrongArguments_ArgumentNullException()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace((string)null, "T", 2, 2), 
-            () => new StringBuilder(_taintedValue).Replace((string)null, "T", 2, 2));
+            () => new System.Text.StringBuilder(_taintedValue).Replace((string)null, "T", 2, 2), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace((string)null, "T", 2, 2));
     }
 
     [Fact]
@@ -259,16 +259,16 @@ public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedInde
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCountWrongArguments_ArgumentOutOfRangeException5()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace("t", (string)null, 2, -2), 
-            () => new StringBuilder(_taintedValue).Replace("t", (string)null, 2, -2));
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", (string)null, 2, -2), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", (string)null, 2, -2));
     }
 
     [Fact]
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCountWrongArguments_ArgumentOutOfRangeException6()
     {
         AssertTaintedFormatWithOriginalCallCheck(":+-ained-+:", 
-            new StringBuilder(_taintedValue).Replace("t", (string)null).ToString(), 
-            () => new StringBuilder(_taintedValue).Replace("t", (string)null).ToString());
+            new System.Text.StringBuilder(_taintedValue).Replace("t", (string)null).ToString(), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace("t", (string)null).ToString());
     }
 
     [Fact]
@@ -276,7 +276,7 @@ public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedInde
     public void GivenATaintedString_WhenCallingStringBuilderReplaceStringTaintedIndexCountWrongArguments_ArgumentNullException2()
     {
         AssertUntaintedWithOriginalCallCheck(
-            () => new StringBuilder(_taintedValue).Replace((string)null, "T"), 
-            () => new StringBuilder(_taintedValue).Replace((string)null, "T"));
+            () => new System.Text.StringBuilder(_taintedValue).Replace((string)null, "T"), 
+            () => new System.Text.StringBuilder(_taintedValue).Replace((string)null, "T"));
     }
 }
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Samples.InstrumentedTests.csproj b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Samples.InstrumentedTests.csproj
index dca88942d555..9179ebf681c8 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Samples.InstrumentedTests.csproj
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Samples.InstrumentedTests.csproj
@@ -56,7 +56,7 @@
 
   <ItemGroup>
     <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/SSRF/UrlEscapeTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/SSRF/UrlEscapeTests.cs
index c5f5935073b9..cb1474f2c094 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/SSRF/UrlEscapeTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/SSRF/UrlEscapeTests.cs
@@ -4,7 +4,7 @@
 using System.Web;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class UrlEscapeTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
diff --git a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/Xss/HtmlEscapeTests.cs b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/Xss/HtmlEscapeTests.cs
index 4bdc8d381fa0..631f3f2b2d08 100644
--- a/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/Xss/HtmlEscapeTests.cs
+++ b/tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/Xss/HtmlEscapeTests.cs
@@ -2,7 +2,7 @@
 using System.Web;
 using Xunit;
 
-namespace Samples.InstrumentedTests.Iast.Vulnerabilities.StringPropagation;
+namespace Samples.InstrumentedTests.Iast.Propagation.String;
 public class HtmlEscapeTests : InstrumentationTestsBase
 {
     private string _taintedValue = "tainted";
diff --git a/tracer/test/test-applications/integrations/Samples.MSTestTests/Samples.MSTestTests.csproj b/tracer/test/test-applications/integrations/Samples.MSTestTests/Samples.MSTestTests.csproj
index 1f6ee8764e6f..5e2eda6a7e44 100644
--- a/tracer/test/test-applications/integrations/Samples.MSTestTests/Samples.MSTestTests.csproj
+++ b/tracer/test/test-applications/integrations/Samples.MSTestTests/Samples.MSTestTests.csproj
@@ -13,6 +13,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.7.1">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="MSTest.TestAdapter" Version="$(ApiVersion)" />
     <PackageReference Include="MSTest.TestFramework" Version="$(ApiVersion)" />
   </ItemGroup>
diff --git a/tracer/test/test-applications/integrations/Samples.MSTestTests2/Samples.MSTestTests2.csproj b/tracer/test/test-applications/integrations/Samples.MSTestTests2/Samples.MSTestTests2.csproj
index 61c066db91d7..9b0912e03be1 100644
--- a/tracer/test/test-applications/integrations/Samples.MSTestTests2/Samples.MSTestTests2.csproj
+++ b/tracer/test/test-applications/integrations/Samples.MSTestTests2/Samples.MSTestTests2.csproj
@@ -15,11 +15,23 @@
     <When Condition="'$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'netcoreapp3.0'">
       <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+        <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+        <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+        <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.11.0">
+          <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+        </PackageReference>
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+        <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+        <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+        <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.9.0">
+          <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+        </PackageReference>
       </ItemGroup>
     </Otherwise>
   </Choose>
diff --git a/tracer/test/test-applications/integrations/Samples.MSTestTestsRetries/Samples.MSTestTestsRetries.csproj b/tracer/test/test-applications/integrations/Samples.MSTestTestsRetries/Samples.MSTestTestsRetries.csproj
index fc3a76d7868e..33bca75e336a 100644
--- a/tracer/test/test-applications/integrations/Samples.MSTestTestsRetries/Samples.MSTestTestsRetries.csproj
+++ b/tracer/test/test-applications/integrations/Samples.MSTestTestsRetries/Samples.MSTestTestsRetries.csproj
@@ -13,6 +13,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.7.1">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="MSTest.TestAdapter" Version="$(ApiVersion)" />
     <PackageReference Include="MSTest.TestFramework" Version="$(ApiVersion)" />
   </ItemGroup>
diff --git a/tracer/test/test-applications/integrations/Samples.Microsoft.Data.Sqlite/Samples.Microsoft.Data.Sqlite.csproj b/tracer/test/test-applications/integrations/Samples.Microsoft.Data.Sqlite/Samples.Microsoft.Data.Sqlite.csproj
index 09f49358be57..73bed48e8902 100644
--- a/tracer/test/test-applications/integrations/Samples.Microsoft.Data.Sqlite/Samples.Microsoft.Data.Sqlite.csproj
+++ b/tracer/test/test-applications/integrations/Samples.Microsoft.Data.Sqlite/Samples.Microsoft.Data.Sqlite.csproj
@@ -6,6 +6,10 @@
     <!-- Required to build multiple projects with the same Configuration|Platform -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <!-- Ignore unnecessary warning: Found version-specific or distribution-specific runtime 
+     identifier(s): alpine-x64. Affected libraries: SQLitePCLRaw.lib.e_sqlite3. In .NET 8.0 and higher,
+     assets for version-specific and distribution-specific runtime identifiers will not be found by default.  -->
+    <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
 
   </PropertyGroup>
 
diff --git a/tracer/test/test-applications/integrations/Samples.MongoDB/Program.cs b/tracer/test/test-applications/integrations/Samples.MongoDB/Program.cs
index ebb2037c3010..5d67ab62092a 100644
--- a/tracer/test/test-applications/integrations/Samples.MongoDB/Program.cs
+++ b/tracer/test/test-applications/integrations/Samples.MongoDB/Program.cs
@@ -71,8 +71,11 @@ public static void Main(string[] args)
                 newDocument.Add("largeKey",  largeTagValue);
                 
                 Run(collection, newDocument);
+#if MONGODB_2_2 || MONGODB_2_7 || MONGODB_2_15
+                // Not available in <2.2.0
                 collection.FindSync(newDocument).FirstOrDefault();
-                
+#endif
+
 #if MONGODB_2_2 && !MONGODB_2_15
                 WireProtocolExecuteIntegrationTest(client);
 #endif
diff --git a/tracer/test/test-applications/integrations/Samples.NUnitTests/Samples.NUnitTests.csproj b/tracer/test/test-applications/integrations/Samples.NUnitTests/Samples.NUnitTests.csproj
index 746108432ccf..42dd270e9cae 100644
--- a/tracer/test/test-applications/integrations/Samples.NUnitTests/Samples.NUnitTests.csproj
+++ b/tracer/test/test-applications/integrations/Samples.NUnitTests/Samples.NUnitTests.csproj
@@ -18,11 +18,23 @@
   <ItemGroup Condition="'$(ApiVersion)'&lt;'4.0.0'">
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0"/>
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.5.0">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(ApiVersion)'&gt;='4.0.0'">
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1"/>
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.7.1">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/tracer/test/test-applications/integrations/Samples.NUnitTestsRetries/Samples.NUnitTestsRetries.csproj b/tracer/test/test-applications/integrations/Samples.NUnitTestsRetries/Samples.NUnitTestsRetries.csproj
index 746108432ccf..42dd270e9cae 100644
--- a/tracer/test/test-applications/integrations/Samples.NUnitTestsRetries/Samples.NUnitTestsRetries.csproj
+++ b/tracer/test/test-applications/integrations/Samples.NUnitTestsRetries/Samples.NUnitTestsRetries.csproj
@@ -18,11 +18,23 @@
   <ItemGroup Condition="'$(ApiVersion)'&lt;'4.0.0'">
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0"/>
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.5.0">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(ApiVersion)'&gt;='4.0.0'">
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1"/>
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.7.1">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/tracer/test/test-applications/integrations/Samples.Selenium/Samples.Selenium.csproj b/tracer/test/test-applications/integrations/Samples.Selenium/Samples.Selenium.csproj
index 8fbfbb00caae..2b8609bc72f0 100644
--- a/tracer/test/test-applications/integrations/Samples.Selenium/Samples.Selenium.csproj
+++ b/tracer/test/test-applications/integrations/Samples.Selenium/Samples.Selenium.csproj
@@ -30,14 +30,14 @@
 
   <ItemGroup>
     <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="ci.runsettings">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
-  <Target Name="CodeCoverageFixTarget" AfterTargets="Build">
+  <Target Name="CodeCoverageFixTarget" AfterTargets="Build" Condition="'$(TargetFramework)' != '' AND '$(ManuallyCopyCodeCoverageFiles)' != 'false'  ">
     <Message Importance="High" Text="Fixing Code Coverage" />
 
     <!-- Running a target in Microsoft.CodeCoverage.targets to copy the code coverage assemblies to the publish folder -->
diff --git a/tracer/test/test-applications/integrations/Samples.XUnitTests/Samples.XUnitTests.csproj b/tracer/test/test-applications/integrations/Samples.XUnitTests/Samples.XUnitTests.csproj
index 815ae06784f8..d2b426e3d10e 100644
--- a/tracer/test/test-applications/integrations/Samples.XUnitTests/Samples.XUnitTests.csproj
+++ b/tracer/test/test-applications/integrations/Samples.XUnitTests/Samples.XUnitTests.csproj
@@ -23,6 +23,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="$(MicrosoftTestSDKVersion)">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
+
     <PackageReference Include="xunit" Version="$(ApiVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(VsAdapterApiVersion)">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -36,11 +43,11 @@
 
   <ItemGroup>
     <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
-  <Target Name="CodeCoverageFixTarget" AfterTargets="Build" Condition=" '$(OS)' == 'Windows_NT' AND '$(TargetFramework)' != '' ">
+  <Target Name="CodeCoverageFixTarget" AfterTargets="Build" Condition=" '$(TargetFramework)' != '' AND '$(ManuallyCopyCodeCoverageFiles)' != 'false' ">
     <Message Importance="High" Text="Fixing Code Coverage: $(TargetFramework)" />
     <CallTarget Targets="ComputeFilesToPublish" />
     <CallTarget Targets="CopyCoverletDataCollectorFiles" />
diff --git a/tracer/test/test-applications/integrations/Samples.XUnitTestsRetries/Samples.XUnitTestsRetries.csproj b/tracer/test/test-applications/integrations/Samples.XUnitTestsRetries/Samples.XUnitTestsRetries.csproj
index 815ae06784f8..66a414a2a9a9 100644
--- a/tracer/test/test-applications/integrations/Samples.XUnitTestsRetries/Samples.XUnitTestsRetries.csproj
+++ b/tracer/test/test-applications/integrations/Samples.XUnitTestsRetries/Samples.XUnitTestsRetries.csproj
@@ -23,6 +23,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <!-- Microsoft.NET.Test.Sdk implicitly references Microsoft.TestPlatform.TestHost, but that -->
+    <!-- includes Windows-specific testhost that mean that you can't use a built project on all -->
+    <!-- platforms. By excluding this, we use the same dll on all platforms instead -->
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="$(MicrosoftTestSDKVersion)">
+      <ExcludeAssets>build;buildtransitive</ExcludeAssets>
+    </PackageReference>
+
     <PackageReference Include="xunit" Version="$(ApiVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(VsAdapterApiVersion)">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -36,11 +43,11 @@
 
   <ItemGroup>
     <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
-  <Target Name="CodeCoverageFixTarget" AfterTargets="Build" Condition=" '$(OS)' == 'Windows_NT' AND '$(TargetFramework)' != '' ">
+  <Target Name="CodeCoverageFixTarget" AfterTargets="Build" Condition=" '$(TargetFramework)' != '' AND '$(ManuallyCopyCodeCoverageFiles)' != 'false'  ">
     <Message Importance="High" Text="Fixing Code Coverage: $(TargetFramework)" />
     <CallTarget Targets="ComputeFilesToPublish" />
     <CallTarget Targets="CopyCoverletDataCollectorFiles" />
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Controllers/HomeController.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Controllers/HomeController.cs
deleted file mode 100644
index e8daefe6be4d..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Controllers/HomeController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Net.Mime;
-
-#pragma warning disable ASP0019 // warning ASP0019: Use IHeaderDictionary.Append or the indexer to append or set headers. IDictionary.Add will throw an ArgumentException when attempting to add a duplicate key
-namespace Samples.Security.AspNetCore5.Controllers.DatabaseIntegration
-{
-    public class HomeController : Controller
-    {
-        private readonly ILogger<HomeController> _logger;
-
-        public HomeController(ILogger<HomeController> logger)
-        {
-            _logger = logger;
-        }
-
-        public IActionResult Index()
-        {   
-            ViewBag.ProfilerAttached = SampleHelpers.IsProfilerAttached();
-            ViewBag.TracerAssemblyLocation = SampleHelpers.GetTracerAssemblyLocation();
-
-            var envVars = SampleHelpers.GetDatadogEnvironmentVariables();
-
-            Response.Headers.Add("x-content-type-options", "nosniff");
-            return View(envVars.ToList());
-        }
-
-        public IActionResult Privacy() => View();
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Controllers/IastController.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Controllers/IastController.cs
deleted file mode 100644
index f24c76390739..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Controllers/IastController.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Common;
-using System.Data.SqlClient;
-using System.Data.SQLite;
-using System.Diagnostics;
-using System.DirectoryServices;
-using System.Drawing.Drawing2D;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Mail;
-using System.Reflection;
-using System.Runtime.Versioning;
-using System.Security.Cryptography;
-using System.Text;
-#if NETCOREAPP3_0_OR_GREATER
-using System.Text.Json;
-#endif
-using System.Threading.Tasks;
-using System.Xml;
-using System.Xml.Linq;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Data.Sqlite;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Primitives;
-using MongoDB.Bson;
-using MongoDB.Driver;
-using MySql.Data.MySqlClient;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Npgsql;
-using Oracle.ManagedDataAccess.Client;
-using Samples.Security.Data;
-
-#pragma warning disable ASP0019 // warning ASP0019: Use IHeaderDictionary.Append or the indexer to append or set headers. IDictionary.Add will throw an ArgumentException when attempting to add a duplicate key
-namespace Samples.Security.AspNetCore5.Controllers.DatabaseIntegration
-{
-
-    public class XContentTypeOptionsAttribute : ActionFilterAttribute
-    {
-        public override void OnResultExecuting(ResultExecutingContext filterContext)
-        {
-            if (!filterContext.HttpContext.Request.Path.Value.Contains("XContentTypeHeaderMissing"))
-            {
-                filterContext.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff");
-            }
-
-            base.OnResultExecuting(filterContext);
-        }
-    }
-
-    [XContentTypeOptionsAttribute]
-    [Route("[controller]")]
-    [ApiController]
-    public class IastController : Controller
-    {
-        private static SQLiteConnection _dbConnectionSystemData = null;
-        private static SqliteConnection _dbConnectionSystemDataMicrosoftData = null;
-        private static SqlConnection _dbConnectionSystemDataSqlClient = null;
-        private static NpgsqlConnection _dbConnectionNpgsql = null;
-        private static MySqlConnection _dbConnectionMySql = null;
-        private static OracleConnection _dbConnectionOracle = null;
-
-        public IActionResult Index()
-        {
-            return Content("Ok\n");
-        }
-
-        private static SQLiteConnection DbConnectionSystemData
-        {
-            get { return _dbConnectionSystemData ??= IastControllerHelper.CreateSystemDataDatabase(); }
-        }
-        
-        private static SqliteConnection DbConnectionMicrosoftData
-        {
-            get { return _dbConnectionSystemDataMicrosoftData ??= IastControllerHelper.CreateMicrosoftDataDatabase(); }
-        }
-
-        private static NpgsqlConnection DbConnectionNpgsql
-        {
-            get { return _dbConnectionNpgsql ??= IastControllerHelper.CreatePostgresDatabase(); }
-        }
-
-        private static SqlConnection DbConnectionSystemDataSqlClient
-        {
-            get { return _dbConnectionSystemDataSqlClient ??= IastControllerHelper.CreateSqlServerDatabase(); }
-        }
-
-        private static MySqlConnection DbConnectionMySql
-        {
-            get { return _dbConnectionMySql ??= IastControllerHelper.CreateMySqlDatabase(); }
-        }
-
-        private static OracleConnection DbConnectionOracle
-        {
-            get { return _dbConnectionOracle ??= IastControllerHelper.CreateOracleDatabase(); }
-        }
-
-        [HttpGet("StoredXss")]
-        [Route("StoredXss")]
-        public IActionResult StoredXss(string database = null)
-        {
-            var db = GetDbConnectionFromName(database);
-
-            var param = GetDbValue(db);
-            ViewData["XSS"] = param + "<b>More Text</b>";
-            return View("Xss");
-        }
-
-        [HttpGet("StoredXssEscaped")]
-        [Route("StoredXssEscaped")]
-        public IActionResult StoredXssEscaped(string database = null)
-        {
-            var db = GetDbConnectionFromName(database);
-
-            var param = GetDbValue(db);
-            var escapedText = System.Net.WebUtility.HtmlEncode($"System.Net.WebUtility.HtmlEncode({param})") + Environment.NewLine
-                            + System.Web.HttpUtility.HtmlEncode($"System.Web.HttpUtility.HtmlEncode({param})") + Environment.NewLine;
-            ViewData["XSS"] = escapedText;
-            return View("Xss");
-        }
-
-
-        [HttpGet("StoredSqli")]
-        [Route("StoredSqli")]
-        public IActionResult StoredSqli(string database = null)
-        {
-            try
-            {
-
-                var db = GetDbConnectionFromName(database);
-
-                var details = GetDbValue(db, "Michael");
-                var taintedQuery = "SELECT name from Persons where Details = '" + details + "'";
-
-                var name = db switch
-                {
-                    SQLiteConnection connection => new SQLiteCommand(taintedQuery, connection).ExecuteScalar(),
-                    SqliteConnection sqliteConnection => new SqliteCommand(taintedQuery, sqliteConnection).ExecuteScalar(),
-                    SqlConnection connection => new SqlCommand(taintedQuery, connection).ExecuteScalar(),
-                    NpgsqlConnection connection => new NpgsqlCommand(taintedQuery, connection).ExecuteScalar(),
-                    MySqlConnection connection => new MySqlCommand(taintedQuery, connection).ExecuteScalar(),
-                    OracleConnection connection => new OracleCommand(taintedQuery, connection).ExecuteScalar(),
-                    _ => null
-                };
-
-                return Content($"Result: " + name);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex);
-                return StatusCode(500);
-            }
-        }
-
-        private static IDbConnection GetDbConnectionFromName(string database)
-        {
-            IDbConnection db =
-                database switch
-                {
-                    "System.Data.SQLite" => DbConnectionSystemData,
-                    "System.Data.SqlClient" => DbConnectionSystemDataSqlClient,
-                    "Microsoft.Data.Sqlite" => DbConnectionMicrosoftData,
-                    "Npgsql" => DbConnectionNpgsql,
-                    "MySql.Data" => DbConnectionMySql,
-                    "Oracle" => DbConnectionOracle,
-                    null => DbConnectionSystemData,
-                    _ => throw new Exception($"unknown db type: {database}")
-                };
-            return db;
-        }
-
-        private static string GetDbValue(IDbConnection db, string name = "Name1")
-        {
-            var taintedQuery = $"SELECT Details from Persons where name = '{name}'";
-
-            using IDataReader reader = db switch
-            {
-                SQLiteConnection connection => new SQLiteCommand(taintedQuery, connection).ExecuteReader(),
-                SqliteConnection connection => new SqliteCommand(taintedQuery, connection).ExecuteReader(),
-                SqlConnection connection => new SqlCommand(taintedQuery, connection).ExecuteReader(),
-                NpgsqlConnection connection => new NpgsqlCommand(taintedQuery, connection).ExecuteReader(),
-                MySqlConnection connection => new MySqlCommand(taintedQuery, connection).ExecuteReader(),
-                OracleConnection connection => new OracleCommand(taintedQuery, connection).ExecuteReader(),
-                _ => throw new ArgumentException("Invalid db connection")
-            };
-
-            reader.Read();
-            var res = reader.GetString(0);
-            return res;
-        }
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/ApplicationDbContext.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/ApplicationDbContext.cs
deleted file mode 100644
index 7e57cad144dd..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/ApplicationDbContext.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#if NET7_0_OR_GREATER
-using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace Samples.Security.AspNetCore5.Data.DatabaseIntegration
-{
-    public class ApplicationDbContext : IdentityDbContext
-    {
-        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
-            : base(options)
-        {
-        }
-    }
-}
-#endif
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/DatabaseHelper.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/DatabaseHelper.cs
deleted file mode 100644
index 70a9c65d8dcb..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/DatabaseHelper.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Data;
-using System.Linq;
-using System.Data.SqlClient;
-using System.Dynamic;
-using System.IO;
-using Microsoft.Data.Sqlite;
-using Microsoft.Extensions.Configuration;
-
-namespace Samples.Security.AspNetCore5.Data.DatabaseIntegration
-{
-    public static class DatabaseHelper
-    {
-        public const string dbName = "Samples.AspNetCore5";
-        public static SqliteConnection GetConnectionForDb(string connectionString) => new(connectionString);
-        public static void CreateAndFeedDatabase(string connectionString)
-        {
-            var cmdText = $"select * from master.dbo.sysdatabases where name='{dbName}'";
-            using var sqlConnection = new SqlConnection(connectionString);
-            sqlConnection.Open();
-            using var sqlCmd = new SqlCommand(cmdText, sqlConnection);
-            var reader = sqlCmd.ExecuteReader();
-            reader.Read();
-            var dbExists = reader.HasRows;
-            sqlConnection.Close();
-            if (!dbExists)
-            {
-                string script = File.ReadAllText(Path.Combine(@"Data", "createdb.sql"));
-                {
-                    using var connection = new SqlConnection(connectionString);
-                    var myCommand = new SqlCommand(script, connection);
-                    connection.Open();
-                    myCommand.ExecuteNonQuery();
-                    connection.Close();
-                }
-                script = File.ReadAllText(Path.Combine(@"Data", "database.sql"));
-                {
-                    using var connection = new SqlConnection(connectionString);
-                    var myCommand = new SqlCommand(script, connection);
-                    connection.Open();
-                    myCommand.ExecuteNonQuery();
-                    connection.Close();
-                }
-            }
-        }
-        
-        
-        public static IImmutableList<dynamic> SelectDynamic(IConfiguration configuration, string query)
-        {
-            var connString = configuration.GetDefaultConnectionString();
-            using var conn = GetConnectionForDb(connString);
-            conn!.Open();
-            using var cmd = conn.CreateCommand();
-            cmd.CommandText = query;
-            cmd.CommandType = CommandType.Text;
-            using var reader = cmd.ExecuteReader();
-
-            var names = Enumerable.Range(0, reader.FieldCount).Select(reader.GetName).ToList();
-            var result = reader.Cast<IDataRecord>().Select(record =>
-            {
-                var expando = new ExpandoObject() as IDictionary<string, object>;
-                foreach (var name in names)
-                {
-                    expando[name] = record[name];
-                }
-
-                return expando as dynamic;
-            }).ToImmutableList();
-            conn.Close();
-            return result;
-        }
-        
-        public static int ExecuteNonQuery(IConfiguration configuration, string query)
-        {
-            var connString = configuration.GetDefaultConnectionString();
-            using var conn = GetConnectionForDb(connString);
-            conn!.Open();
-            using var cmd = conn.CreateCommand();
-            cmd.CommandText = query;
-            cmd.CommandType = CommandType.Text;
-            var result = cmd.ExecuteNonQuery();
-            conn.Close();
-            return result;
-        }
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/IastControllerHelper.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/IastControllerHelper.cs
deleted file mode 100644
index 7a848af625e4..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/IastControllerHelper.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-using System;
-using System.Data.SqlClient;
-using System.Data.SQLite;
-using System.Linq;
-using System.Text;
-using MySql.Data.MySqlClient;
-using Npgsql;
-#if !NETFRAMEWORK
-using Oracle.ManagedDataAccess.Client;
-using Microsoft.Data.Sqlite;
-#endif
-
-namespace Samples.Security.Data
-{
-    public static class IastControllerHelper
-    {
-        private static readonly string[] SqlServerTables =
-            [
-                "CREATE TABLE Persons (Id uniqueidentifier NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
-                @"CREATE TABLE Books(Id uniqueidentifier NOT NULL,Title nvarchar(500) NOT NULL,Price numeric(18, 2) NULL,ISBN nvarchar(50) NULL,	Pages int NOT NULL,    Author nvarchar(500) NOT NULL,    Editorial nvarchar(50) NULL,	Prologue nvarchar(4000) NULL,	Format int NULL)",
-            ];
-
-        private static readonly string[] PostgresTables =
-            [
-                "DROP TABLE IF EXISTS Persons, Books;",
-                "CREATE TABLE Persons (Id uuid NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
-                @"CREATE TABLE Books(Id uuid NOT NULL,Title varchar(500) NOT NULL,Price numeric(18, 2) NULL,ISBN varchar(50) NULL,	Pages int NOT NULL,    Author varchar(500) NOT NULL,    Editorial varchar(50) NULL,	Prologue varchar(4000) NULL,	Format int NULL)",
-            ];
-
-        private static readonly string[] MySqlTables =
-        [
-            "DROP TABLE IF EXISTS Persons, Books;",
-            "CREATE TABLE Persons (Id char(36) NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
-            @"CREATE TABLE Books(Id char(36) NOT NULL,Title varchar(500) NOT NULL,Price numeric(18, 2) NULL,ISBN varchar(50) NULL,	Pages int NOT NULL,    Author varchar(500) NOT NULL,    Editorial varchar(50) NULL,	Prologue varchar(4000) NULL,	Format int NULL)",
-        ];
-
-        private static readonly string[] OracleTables =
-        [
-            "DROP TABLE IF EXISTS Persons",
-            "CREATE TABLE Persons (Id char(40) NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(2000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
-        ];
-
-        private static readonly string[] SqliteTables =
-        [
-            "CREATE TABLE Persons (Id NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
-            @"CREATE TABLE Books(Id NOT NULL,Title nvarchar(500) NOT NULL,Price numeric(18, 2) NULL,ISBN nvarchar(50) NULL,	Pages int NOT NULL,    Author nvarchar(500) NOT NULL,    Editorial nvarchar(50) NULL,	Prologue nvarchar(4000) NULL,	Format int NULL)",
-        ];
-
-        private static readonly string[] PopulateCommands =
-        [
-            "INSERT INTO Persons(Id, Name, Surname, Gender, Email, FlattedAddress, Mobile, NIF, Phone, PostalCode, Details, CityIniqueId, CountryUniqueId, ImagePath) VALUES ('D305C1EB-B72E-4340-B5BA-A19D0105A6C2', 'Michael', 'Smith',   'Female    ', 'Michael.Smith@gmail.com', 'Mountain Avenue 55', '650214751', '50099554L', '918084525', '28341', 'Details', NULL, NULL, '~/Images/Antonio.jpg')",
-            "INSERT INTO Persons(Id, Name, Surname, Gender, Email, FlattedAddress, Mobile, NIF, Phone, PostalCode, Details, CityIniqueId, CountryUniqueId, ImagePath) VALUES('D305C1EB-B72E-4340-B5BA-A19D0105A6C3', 'Vicent', 'Monet',     'Female    ', 'Jerome.Monet@gmail.com', 'Rua Paris 77', '650213223', '50088741K', '914652532', '28026', 'Not Defined', NULL, NULL, NULL)",
-            "INSERT INTO Persons(Id, Name, Surname, Gender, Email, FlattedAddress, Mobile, NIF, Phone, PostalCode, Details, CityIniqueId, CountryUniqueId, ImagePath) VALUES('D305C1EB-B72E-4340-B5BA-A19D0105A6C4', 'Santiago', 'Sanchez', '0         ', 'santiago.sanchez@gmail.com', 'Avda. de las cortes Nº4', '621236651', '58966221F', '938256232', '30360', 'Not Defined', NULL, NULL, NULL)",
-            "INSERT INTO Persons(Id, Name, Surname, Gender, Email, FlattedAddress, Mobile, NIF, Phone, PostalCode, Details, CityIniqueId, CountryUniqueId, ImagePath) VALUES('f46eeae9-8c15-401c-abaa-a49f9727a84c', 'Vladimir', 'Ivanov',  'Female    ', 'Vladimir.Ivanov@gmail.com', 'Green Avenue 99', '657253124', '50042111', '918084562', '26451', 'Not Defined', NULL, NULL, NULL)",
-            "INSERT INTO Persons(Id, Name, Surname, Gender, Email, FlattedAddress, Mobile, NIF, Phone, PostalCode, Details, CityIniqueId, CountryUniqueId, ImagePath) VALUES('D305C1EB-B72E-4340-B5BA-A19D0105A6C1', 'Name1', 'Surname1',   'Female    ', 'name1.surname1@gmail.com', 'Address1', 'Mob1', 'N1', 'Phone1', 'Zip1', '<script language=''javascript'' type=''text/javascript''>alert(''Stored XSS attack'');</script>', NULL, NULL, NULL)",
-            "INSERT INTO Books (Id, Title, Price, ISBN, Pages, Author, Editorial, Prologue, Format) VALUES ('026decfd-bba3-4aa8-85d4-1c71ffcfe8e9', 'CLR via C#', CAST(50.00 AS Decimal(18, 2)), '0735669954', 894, ' Jeffrey Richter', 'Microsoft Press', 'bla bla bla', 0)"
-        ];
-
-        public static OracleConnection CreateOracleDatabase()
-        {
-            var host = Environment.GetEnvironmentVariable("ORACLE_HOST") ?? "localhost";
-            var cstringBuilder = new OracleConnectionStringBuilder();
-            cstringBuilder.DataSource = $"{host}:1521/FREE";
-            cstringBuilder.UserID = "system";
-            cstringBuilder.Password = "testpassword";
-
-            var connection = new OracleConnection(cstringBuilder.ConnectionString);
-            connection.Open();
-
-            foreach (var command in OracleTables)
-            {
-                new OracleCommand(command, connection).ExecuteNonQuery();
-            }
-            foreach (var command in PopulateCommands.Take(5))
-            {
-                new OracleCommand(command, connection).ExecuteNonQuery();
-            }
-
-            return connection;
-        }
-
-        public static MySqlConnection CreateMySqlDatabase()
-        {
-            var connectionString = Environment.GetEnvironmentVariable("MYSQL_CONNECTION_STRING");
-
-            if (connectionString == null)
-            {
-                var host = Environment.GetEnvironmentVariable("MYSQL_HOST") ?? "localhost";
-                var port = Environment.GetEnvironmentVariable("MYSQL_PORT") ?? "3307";
-                connectionString = $"server={host};user=mysqldb;password=mysqldb;port={port};database=world";
-            }
-
-            var connection = new MySqlConnection(connectionString);
-            connection.Open();
-
-            foreach (var command in MySqlTables)
-            {
-                new MySqlCommand(command, connection).ExecuteNonQuery();
-            }
-            foreach (var command in PopulateCommands)
-            {
-                new MySqlCommand(command, connection).ExecuteNonQuery();
-            }
-
-            return connection;
-        }
-
-        public static NpgsqlConnection CreatePostgresDatabase()
-        {
-            // assumes the postgres docker image is running...
-            var connectionString = Environment.GetEnvironmentVariable("POSTGRES_CONNECTION_STRING");
-
-            if (connectionString == null)
-            {
-                var host = Environment.GetEnvironmentVariable("POSTGRES_HOST") ?? "localhost";
-                connectionString = $"Host={host};Username=postgres;Password=postgres;Database=postgres";
-            }
-            var connection = new NpgsqlConnection(connectionString);
-            connection.Open();
-
-            foreach (var command in PostgresTables)
-            {
-                new NpgsqlCommand(command, connection).ExecuteNonQuery();
-            }
-            foreach (var command in PopulateCommands)
-            {
-                new NpgsqlCommand(command, connection).ExecuteNonQuery();
-            }
-
-            return connection;
-        }
-
-        public static SqlConnection CreateSqlServerDatabase()
-        {
-            // assumes the sqlserver docker image is running...
-            var connectionString = Environment.GetEnvironmentVariable("SQLSERVER_CONNECTION_STRING") ??
-                                   @"Server=localhost;User Id=sa;Password=Strong!Passw0rd;";
-
-            int numAttempts = 3;
-            for (int i = 0; i < numAttempts; i++)
-            {
-                SqlConnection connection = null;
-                try
-                {
-                    connection =new SqlConnection(connectionString);
-                    connection.Open();
-
-                    foreach (var command in SqlServerTables)
-                    {
-                        new SqlCommand(command, connection).ExecuteNonQuery();
-                    }
-                    foreach (var command in PopulateCommands)
-                    {
-                        new SqlCommand(command, connection).ExecuteNonQuery();
-                    }
-                    return connection;
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e);
-                    connection?.Dispose();
-                }
-
-            }
-
-            throw new Exception($"Unable to open connection to connection string {connectionString} after {numAttempts} attempts");
-        }
-
-        public static SQLiteConnection CreateSystemDataDatabase()
-        {
-            var builderSystemData = new SQLiteConnectionStringBuilder { DataSource = ":memory:" };
-            var connSystemData = builderSystemData.ConnectionString;
-            if (string.IsNullOrEmpty(connSystemData))
-            {
-                throw new Exception("Cannot create sqlite database using System.Data.SQLite.");
-            }
-            
-            var dbConnectionSystemData = new SQLiteConnection(connSystemData);
-            dbConnectionSystemData.Open();
-
-            foreach (var command in SqliteTables)
-            {
-                new SQLiteCommand(command, dbConnectionSystemData).ExecuteReader();
-            }
-            foreach (var command in PopulateCommands)
-            {
-                new SQLiteCommand(command, dbConnectionSystemData).ExecuteReader();
-            }
-
-            return dbConnectionSystemData;
-        }
-        
-        #if !NETFRAMEWORK
-        public static SqliteConnection CreateMicrosoftDataDatabase()
-        {
-            var builderMicrosoftData = new SqliteConnectionStringBuilder { DataSource = ":memory:" };
-            var connMicrosoftData = builderMicrosoftData.ConnectionString;
-            if (string.IsNullOrEmpty(connMicrosoftData))
-            {
-                throw new Exception("Cannot create sqlite database using Microsoft.Data.Sqlite.");
-            }
-            
-            var dbConnectionMicrosoftData = new SqliteConnection(connMicrosoftData);
-            dbConnectionMicrosoftData.Open();
-            
-            foreach (var command in SqliteTables)
-            {
-                new SqliteCommand(command, dbConnectionMicrosoftData).ExecuteReader();
-            }
-            foreach (var command in PopulateCommands)
-            {
-                new SqliteCommand(command, dbConnectionMicrosoftData).ExecuteReader();
-            }
-            
-            return dbConnectionMicrosoftData;
-        }
-        #endif
-
-        public static string ToFormattedString(Exception ex)
-        {
-            var message = new StringBuilder();
-            if (ex != null)
-            {
-                message.AppendFormat("Name:       {0}", ex.GetType().FullName);
-                message.Append(Environment.NewLine);
-                message.AppendFormat("Message:    {0}", GetFullMessage(ex));
-                message.Append(Environment.NewLine);
-                message.AppendFormat("StackTrace: {0}", ex.StackTrace);
-                message.Append(Environment.NewLine);
-            }
-            return message.ToString();
-        }
-
-        public static string GetFullMessage(Exception err)
-        {
-            string res = "";
-            while (err != null)
-            {
-                res += err.Message + " ";
-                err = err.InnerException;
-            }
-            return res;
-        }
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/app.db b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/app.db
deleted file mode 100644
index fabb0e55f510..000000000000
Binary files a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/app.db and /dev/null differ
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/createdb.sql b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/createdb.sql
deleted file mode 100644
index 42adbea2a01e..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/createdb.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-USE [master]
-/****** Object:  Database [Samples.AspNetCore5]    Script Date: 5/20/2021 5:18:35 PM ******/
-CREATE DATABASE [Samples.AspNetCore5]   
- CONTAINMENT = NONE
-
-ALTER DATABASE [Samples.AspNetCore5] SET COMPATIBILITY_LEVEL = 130
-
-begin
-EXEC [Samples.AspNetCore5].[dbo].[sp_fulltext_database] @action = 'enable'
-end
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/database.sql b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/database.sql
deleted file mode 100644
index 7842ad1f3a4c..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Data/database.sql
+++ /dev/null
@@ -1,249 +0,0 @@
-ALTER DATABASE [Samples.AspNetCore5] SET ANSI_NULL_DEFAULT OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET ANSI_NULLS OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET ANSI_PADDING OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET ANSI_WARNINGS OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET ARITHABORT OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET AUTO_CLOSE ON 
-
-ALTER DATABASE [Samples.AspNetCore5] SET AUTO_SHRINK OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET AUTO_UPDATE_STATISTICS ON 
-
-ALTER DATABASE [Samples.AspNetCore5] SET CURSOR_CLOSE_ON_COMMIT OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET CURSOR_DEFAULT  GLOBAL 
-
-ALTER DATABASE [Samples.AspNetCore5] SET CONCAT_NULL_YIELDS_NULL OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET NUMERIC_ROUNDABORT OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET QUOTED_IDENTIFIER OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET RECURSIVE_TRIGGERS OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET  ENABLE_BROKER 
-
-ALTER DATABASE [Samples.AspNetCore5] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET DATE_CORRELATION_OPTIMIZATION OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET TRUSTWORTHY OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET ALLOW_SNAPSHOT_ISOLATION OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET PARAMETERIZATION SIMPLE 
-
-ALTER DATABASE [Samples.AspNetCore5] SET READ_COMMITTED_SNAPSHOT ON 
-
-ALTER DATABASE [Samples.AspNetCore5] SET HONOR_BROKER_PRIORITY OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET RECOVERY SIMPLE 
-
-ALTER DATABASE [Samples.AspNetCore5] SET  MULTI_USER 
-
-ALTER DATABASE [Samples.AspNetCore5] SET PAGE_VERIFY CHECKSUM  
-
-ALTER DATABASE [Samples.AspNetCore5] SET DB_CHAINING OFF 
-
-ALTER DATABASE [Samples.AspNetCore5] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) 
-
-ALTER DATABASE [Samples.AspNetCore5] SET TARGET_RECOVERY_TIME = 60 SECONDS 
-
-ALTER DATABASE [Samples.AspNetCore5] SET DELAYED_DURABILITY = DISABLED 
-
-ALTER DATABASE [Samples.AspNetCore5] SET QUERY_STORE = OFF
-
-USE [Samples.AspNetCore5]
-
-ALTER DATABASE SCOPED CONFIGURATION SET LEGACY_CARDINALITY_ESTIMATION = OFF;
-
-ALTER DATABASE SCOPED CONFIGURATION SET MAXDOP = 0;
-
-ALTER DATABASE SCOPED CONFIGURATION SET PARAMETER_SNIFFING = ON;
-
-ALTER DATABASE SCOPED CONFIGURATION SET QUERY_OPTIMIZER_HOTFIXES = OFF;
-
-USE [Samples.AspNetCore5]
-
-/****** Object:  Table [dbo].[AspNetRoles]    Script Date: 5/20/2021 5:18:35 PM ******/
-SET ANSI_NULLS ON
-
-SET QUOTED_IDENTIFIER ON
-
-CREATE TABLE [dbo].[AspNetRoles](
-	[Id] [nvarchar](128) NOT NULL,
-	[Name] [nvarchar](256) NOT NULL,
- CONSTRAINT [PK_dbo.AspNetRoles] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-/****** Object:  Table [dbo].[AspNetUserClaims]    Script Date: 5/20/2021 5:18:35 PM ******/
-SET ANSI_NULLS ON
-
-SET QUOTED_IDENTIFIER ON
-
-CREATE TABLE [dbo].[AspNetUserClaims](
-	[Id] [int] IDENTITY(1,1) NOT NULL,
-	[UserId] [nvarchar](128) NOT NULL,
-	[ClaimType] [nvarchar](max) NULL,
-	[ClaimValue] [nvarchar](max) NULL,
- CONSTRAINT [PK_dbo.AspNetUserClaims] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-/****** Object:  Table [dbo].[AspNetUserLogins]    Script Date: 5/20/2021 5:18:35 PM ******/
-SET ANSI_NULLS ON
-
-SET QUOTED_IDENTIFIER ON
-
-CREATE TABLE [dbo].[AspNetUserLogins](
-	[LoginProvider] [nvarchar](128) NOT NULL,
-	[ProviderKey] [nvarchar](128) NOT NULL,
-	[UserId] [nvarchar](128) NOT NULL,
- CONSTRAINT [PK_dbo.AspNetUserLogins] PRIMARY KEY CLUSTERED 
-(
-	[LoginProvider] ASC,
-	[ProviderKey] ASC,
-	[UserId] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-/****** Object:  Table [dbo].[AspNetUserRoles]    Script Date: 5/20/2021 5:18:35 PM ******/
-SET ANSI_NULLS ON
-
-SET QUOTED_IDENTIFIER ON
-
-CREATE TABLE [dbo].[AspNetUserRoles](
-	[UserId] [nvarchar](128) NOT NULL,
-	[RoleId] [nvarchar](128) NOT NULL,
- CONSTRAINT [PK_dbo.AspNetUserRoles] PRIMARY KEY CLUSTERED 
-(
-	[UserId] ASC,
-	[RoleId] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-/****** Object:  Table [dbo].[AspNetUsers]    Script Date: 5/20/2021 5:18:35 PM ******/
-SET ANSI_NULLS ON
-
-SET QUOTED_IDENTIFIER ON
-
-CREATE TABLE [dbo].[AspNetUsers](
-	[Id] [nvarchar](128) NOT NULL,
-	[Email] [nvarchar](256) NULL,
-	[EmailConfirmed] [bit] NOT NULL,
-	[PasswordHash] [nvarchar](max) NULL,
-	[SecurityStamp] [nvarchar](max) NULL,
-	[PhoneNumber] [nvarchar](max) NULL,
-	[PhoneNumberConfirmed] [bit] NOT NULL,
-	[TwoFactorEnabled] [bit] NOT NULL,
-	[LockoutEndDateUtc] [datetime] NULL,
-	[LockoutEnabled] [bit] NOT NULL,
-	[AccessFailedCount] [int] NOT NULL,
-	[UserName] [nvarchar](256) NOT NULL,
- CONSTRAINT [PK_dbo.AspNetUsers] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-/****** Object:  Table [dbo].[Post]    Script Date: 5/20/2021 5:18:35 PM ******/
-SET ANSI_NULLS ON
-
-SET QUOTED_IDENTIFIER ON
-
-CREATE TABLE [dbo].[Post](
-	[PostId] [int] IDENTITY(1,1) NOT NULL,
-	[Title] [nvarchar](max) NULL,
-	[Body] [nvarchar](max) NULL,
- CONSTRAINT [PK_dbo.Post] PRIMARY KEY CLUSTERED 
-(
-	[PostId] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-SET ANSI_PADDING ON
-
-/****** Object:  Index [RoleNameIndex]    Script Date: 5/20/2021 5:18:35 PM ******/
-CREATE UNIQUE NONCLUSTERED INDEX [RoleNameIndex] ON [dbo].[AspNetRoles]
-(
-	[Name] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-SET ANSI_PADDING ON
-
-/****** Object:  Index [IX_UserId]    Script Date: 5/20/2021 5:18:35 PM ******/
-CREATE NONCLUSTERED INDEX [IX_UserId] ON [dbo].[AspNetUserClaims]
-(
-	[UserId] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-SET ANSI_PADDING ON
-
-/****** Object:  Index [IX_UserId]    Script Date: 5/20/2021 5:18:35 PM ******/
-CREATE NONCLUSTERED INDEX [IX_UserId] ON [dbo].[AspNetUserLogins]
-(
-	[UserId] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-SET ANSI_PADDING ON
-
-/****** Object:  Index [IX_RoleId]    Script Date: 5/20/2021 5:18:35 PM ******/
-CREATE NONCLUSTERED INDEX [IX_RoleId] ON [dbo].[AspNetUserRoles]
-(
-	[RoleId] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-SET ANSI_PADDING ON
-
-/****** Object:  Index [IX_UserId]    Script Date: 5/20/2021 5:18:35 PM ******/
-CREATE NONCLUSTERED INDEX [IX_UserId] ON [dbo].[AspNetUserRoles]
-(
-	[UserId] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-SET ANSI_PADDING ON
-
-/****** Object:  Index [UserNameIndex]    Script Date: 5/20/2021 5:18:35 PM ******/
-CREATE UNIQUE NONCLUSTERED INDEX [UserNameIndex] ON [dbo].[AspNetUsers]
-(
-	[UserName] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-ALTER TABLE [dbo].[AspNetUserClaims]  WITH CHECK ADD  CONSTRAINT [FK_dbo.AspNetUserClaims_dbo.AspNetUsers_UserId] FOREIGN KEY([UserId])
-REFERENCES [dbo].[AspNetUsers] ([Id])
-ON DELETE CASCADE
-
-ALTER TABLE [dbo].[AspNetUserClaims] CHECK CONSTRAINT [FK_dbo.AspNetUserClaims_dbo.AspNetUsers_UserId]
-
-ALTER TABLE [dbo].[AspNetUserLogins]  WITH CHECK ADD  CONSTRAINT [FK_dbo.AspNetUserLogins_dbo.AspNetUsers_UserId] FOREIGN KEY([UserId])
-REFERENCES [dbo].[AspNetUsers] ([Id])
-ON DELETE CASCADE
-
-ALTER TABLE [dbo].[AspNetUserLogins] CHECK CONSTRAINT [FK_dbo.AspNetUserLogins_dbo.AspNetUsers_UserId]
-
-ALTER TABLE [dbo].[AspNetUserRoles]  WITH CHECK ADD  CONSTRAINT [FK_dbo.AspNetUserRoles_dbo.AspNetRoles_RoleId] FOREIGN KEY([RoleId])
-REFERENCES [dbo].[AspNetRoles] ([Id])
-ON DELETE CASCADE
-
-ALTER TABLE [dbo].[AspNetUserRoles] CHECK CONSTRAINT [FK_dbo.AspNetUserRoles_dbo.AspNetRoles_RoleId]
-
-ALTER TABLE [dbo].[AspNetUserRoles]  WITH CHECK ADD  CONSTRAINT [FK_dbo.AspNetUserRoles_dbo.AspNetUsers_UserId] FOREIGN KEY([UserId])
-REFERENCES [dbo].[AspNetUsers] ([Id])
-ON DELETE CASCADE
-
-ALTER TABLE [dbo].[AspNetUserRoles] CHECK CONSTRAINT [FK_dbo.AspNetUserRoles_dbo.AspNetUsers_UserId]
-
-USE [master]
-
-ALTER DATABASE [Samples.AspNetCore5] SET  READ_WRITE 
-
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Extensions.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Extensions.cs
deleted file mode 100644
index 97918ea412d1..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Extensions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Configuration;
-using System.Runtime.InteropServices;
-using Microsoft.Extensions.Configuration;
-
-namespace Samples.Security
-{
-    public static class Extensions
-    {
-        public static string GetDefaultConnectionString(this IConfiguration configuration)
-        {
-            return configuration.GetConnectionString("DefaultConnection") ?? $"Data Source={System.IO.Path.Combine("Data", "app.db")}";
-        }
-
-        public static bool ShouldUseSqlLite(this IConfiguration configuration)
-        {
-            // sql lite provider doesn't seem to be working on centos / alpine / arm64 but works in wsl/ubuntu 20... 
-            var useSqlLiteDefault = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-            return configuration.GetValue("UseSqlite", useSqlLiteDefault);
-        }
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Program.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Program.cs
deleted file mode 100644
index 29fa01e7967f..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Program.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Samples.Security.AspNetCore5.DatabaseIntegration
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Properties/launchSettings.json b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Properties/launchSettings.json
deleted file mode 100644
index dbc554f43c39..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Properties/launchSettings.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DD_APPSEC_ENABLED": "true",
-        "DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED": "true",
-        "DD_APPSEC_BLOCKING_ENABLED": "false",
-        "DD_DOTNET_TRACER_HOME": "c:\\code\\dd-trace-dotnet\\shared\\bin\\monitoring-home",
-        "CORECLR_ENABLE_PROFILING": "1",
-        "CORECLR_PROFILER": "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}",
-        "CORECLR_PROFILER_PATH_32": "c:\\code\\dd-trace-dotnet\\shared\\bin\\monitoring-home\\win-x86\\Datadog.Tracer.Native.dll",
-        "CORECLR_PROFILER_PATH_64": "c:\\code\\dd-trace-dotnet\\shared\\bin\\monitoring-home\\win-x64\\Datadog.Tracer.Native.dll",
-        "DD_VERSION": "1.0.0",
-        "DD_TRACE_HEADER_TAGS": "sample.correlation.identifier, Server",
-        "DD_IAST_ENABLED": "true",
-        "DD_IAST_DEDUPLICATION_ENABLED": "false",
-        "DD_TRACE_DEBUG": "1"
-      },
-      "nativeDebugging": true,
-      "use64Bit": true
-    },
-    "Samples.Security.AspNetCore5": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DD_APPSEC_ENABLED": "true",
-        "DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED": "true",
-        "DD_APPSEC_BLOCKING_ENABLED": "true",
-        "DD_APPSEC_RASP_ENABLED": "true",
-        "DD_DOTNET_TRACER_HOME": "c:\\code\\dd-trace-dotnet\\\\shared\\bin\\monitoring-home\\",
-        "CORECLR_ENABLE_PROFILING": "1",
-        "CORECLR_PROFILER": "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}",
-        "CORECLR_PROFILER_PATH_32": "c:\\code\\dd-trace-dotnet\\\\shared\\bin\\monitoring-home\\win-x86\\Datadog.Tracer.Native.dll",
-        "CORECLR_PROFILER_PATH_64": "c:\\code\\dd-trace-dotnet\\\\shared\\bin\\monitoring-home\\win-x64\\Datadog.Tracer.Native.dll",
-        "CORECLR_PROFILER_PATH_ARM64": "c:\\code\\dd-trace-dotnet\\\\shared\\bin\\monitoring-home\\win-arm64\\Datadog.Tracer.Native.dll",
-        "DD_VERSION": "1.0.0",
-        "DD_TRACE_HEADER_TAGS": "sample.correlation.identifier, Server",
-        "DD_TRACE_DEBUG": "1",
-        "DD_SERVICE": "Samples.Security.Netcore5",
-        "DD_ENV": "asm-samples",
-        "DD_IAST_ENABLED": "true",
-        "DD_IAST_DEDUPLICATION_ENABLED": "false",
-        "DD_IAST_VULNERABILITIES_PER_REQUEST": "100",
-        "DD_IAST_REQUEST_SAMPLING": "100",
-        "DD_IAST_MAX_CONCURRENT_REQUESTS": "1",
-        "DD_WRITE_INSTRUMENTATION_TO_DISK": "false",
-        "DD_API_SECURITY_ENABLED": "true",
-        "DD_API_SECURITY_MAX_CONCURRENT_REQUESTS": "100"
-      },
-      "Logging": {
-        "LogLevel": {
-          "Default": "Warning",
-          "Microsoft": "Warning",
-          "Microsoft.Hosting.Lifetime": "Warning"
-        }
-      },
-      "nativeDebugging": true,
-      "use64Bit": false,
-      "applicationUrl": "http://localhost:5458"
-    },
-    "Linux": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DD_DOTNET_TRACER_HOME": "$(SolutionDir)tracer/bin/tracer-home",
-        "CORECLR_ENABLE_PROFILING": "1",
-        "CORECLR_PROFILER": "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}",
-        "CORECLR_PROFILER_PATH": "$(SolutionDir)shared/bin/monitoring-home/tracerDatadog.Trace.ClrProfiler.Native.so",
-        "DD_VERSION": "1.0.0",
-        "DD_TRACE_HEADER_TAGS": "sample.correlation.identifier, Server",
-        "DD_TRACE_DEBUG": "0"
-      },
-      "Logging": {
-        "LogLevel": {
-          "Default": "Info",
-          "Microsoft": "Info",
-          "Microsoft.Hosting.Lifetime": "Info"
-        }
-      },
-      "nativeDebugging": true,
-      "use64Bit": true,
-      "applicationUrl": "http://localhost:5458"
-    },
-    "OSX": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DD_DOTNET_TRACER_HOME": "$(SolutionDir)shared/bin/monitoring-home",
-        "CORECLR_ENABLE_PROFILING": "1",
-        "CORECLR_PROFILER": "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}",
-        "CORECLR_PROFILER_PATH": "$(SolutionDir)shared/bin/monitoring-home/osx/Datadog.Trace.ClrProfiler.Native.dylib",
-        "DD_VERSION": "1.0.0",
-        "DD_TRACE_HEADER_TAGS": "sample.correlation.identifier, Server",
-        "DD_TRACE_DEBUG": "1",
-        "DD_SERVICE" : "Samples.Security.AspNetCore5.OSX",
-        "DD_ENV": "asm-samples",
-        "DD_APPSEC_ENABLED": "true",
-        "DD_APPSEC_BLOCKING_ENABLED": "true",
-        "DD_IAST_ENABLED": "true",
-        "DD_IAST_DEDUPLICATION_ENABLED": "false",
-        "DD_IAST_VULNERABILITIES_PER_REQUEST": "100",
-        "DD_IAST_REQUEST_SAMPLING": "100",
-        "DD_IAST_MAX_CONCURRENT_REQUESTS": "1"
-      },
-      "Logging": {
-        "LogLevel": {
-          "Default": "Warning",
-          "Microsoft": "Warning",
-          "Microsoft.Hosting.Lifetime": "Warning"
-        }
-      },
-      "nativeDebugging": true,
-      "use64Bit": true,
-      "applicationUrl": "http://localhost:5458"
-    }
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:5458/",
-      "sslPort": 44320
-    }
-  }
-}
\ No newline at end of file
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Samples.Security.AspNetCore5.DatabaseIntegration.csproj b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Samples.Security.AspNetCore5.DatabaseIntegration.csproj
deleted file mode 100644
index c34a2dc1a369..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Samples.Security.AspNetCore5.DatabaseIntegration.csproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <RequiresDockerDependency>All</RequiresDockerDependency>
-    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
-    <NoWarn>$(NoWarn);NU1605</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>None</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MessagePack" Version="1.9.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.5" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.8.0" />
-    <PackageReference Include="Moq" Version="4.16.0" />
-    <PackageReference Include="MySql.Data" Version="8.0.30" />
-    <PackageReference Include="NHibernate" Version="5.5.0" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.6.1" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.5" />
-    <PackageReference Include="SQLitePCLRaw.core" Version="2.1.5" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.117" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\..\..\src\Datadog.Trace.Annotations\TraceAttribute.cs" Link="TraceAttribute.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Data\database.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Data\app.db">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="blocking-template1.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="blocking-template2.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0" />
-    <PackageReference Update="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
-    <PackageReference Update="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
-    <PackageReference Update="SQLitePCLRaw.core" Version="2.1.10" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
-    <PackageReference Update="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6-*" />
-    <PackageReference Update="SQLitePCLRaw.core" Version="2.1.6-*" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.5" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">
-    <PackageReference Include="System.DirectoryServices" Version="5.0.0" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="5.0.0" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="5.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='net9.0' OR '$(TargetFramework)'=='net8.0' OR'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.0" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="6.0.0" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="6.0.0" />
-  </ItemGroup>
-</Project>
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Startup.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Startup.cs
deleted file mode 100644
index 7ae8d5bfc28f..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Startup.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-#if NET7_0_OR_GREATER
-using Microsoft.EntityFrameworkCore;
-#endif
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Hosting;
-using SQLitePCL;
-
-namespace Samples.Security.AspNetCore5.DatabaseIntegration
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        private IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddRazorPages();
-            services.AddControllersWithViews();
-
-            if (int.TryParse(Environment.GetEnvironmentVariable("IAST_TEST_SESSION_IDLE_TIMEOUT"), out var parsed))
-            {
-                services.AddSession(
-                    options =>
-                    {
-                        options.IdleTimeout = TimeSpan.FromMinutes(parsed);
-                    });
-            }
-            else
-            {
-                services.AddSession();
-            }
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseStaticFiles();
-            
-            // Directory listing leak vulnerability on request path /Iast/directory_listing_leak
-            if (Environment.GetEnvironmentVariable("IAST_TEST_ENABLE_DIRECTORY_LISTING_REQUEST_PATH") == "true")
-            {
-                app.UseDirectoryBrowser(new DirectoryBrowserOptions
-                {
-                    RequestPath = "/Iast/directory_listing_leak",
-                    FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory()))
-                });
-            }
-            
-            // Directory listing leak vulnerability on whole app
-            if (Environment.GetEnvironmentVariable("IAST_TEST_ENABLE_DIRECTORY_LISTING_WHOLE_APP") == "true")
-            {
-                app.UseDirectoryBrowser();
-            }
-            
-            // Directory listing leak vulnerability on string path /Iast/directory_listing_leak
-            if (Environment.GetEnvironmentVariable("IAST_TEST_ENABLE_DIRECTORY_LISTING_STRING_PATH") == "true")
-            {
-                app.UseDirectoryBrowser("/Iast/directory_listing_leak");
-            }
-
-            app.UseSession();
-            app.UseRouting();
-
-            app.UseAuthorization();
-            app.UseAuthentication();
-            app.Map(
-                "/alive-check",
-                builder =>
-                {
-                    builder.Run(
-                        async context =>
-                        {
-                            await context.Response.WriteAsync("Yes");
-                        });
-                });
-
-            app.Map(
-                "/shutdown",
-                builder =>
-                {
-                    builder.Run(
-                        async context =>
-                        {
-                            await context.Response.WriteAsync("Shutting down");
-                            _ = Task.Run(() => builder.ApplicationServices.GetService<IHostApplicationLifetime>().StopApplication());
-                        });
-                });
-
-            app.Use(
-                async (context, next) =>
-                {
-                    // make sure if we go into this middleware after blocking has happened that it s not a second request issued by the developerhandlingpage middleware! if it s that no worries it s another request, not the attack one., its  a redirect.
-                    // await context.Response.WriteAsync("do smth before all");
-                    await next.Invoke();
-                });
-
-
-            app.UseEndpoints(
-                endpoints =>
-                {
-                    endpoints.MapControllerRoute(
-                        name: "default",
-                        pattern: "{controller=Home}/{action=Index}/{id?}");
-
-                    endpoints.MapRazorPages();
-                });
-        }
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Home/Index.cshtml b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Home/Index.cshtml
deleted file mode 100644
index 20a791544056..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Home/Index.cshtml
+++ /dev/null
@@ -1,125 +0,0 @@
-@model List<KeyValuePair<string, string>>
-
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<script>
-    window.post = function (url, data) {
-        let fullUrl = window.location + url;
-        console.log(fullUrl);
-        return fetch(url, { method: "POST", headers: { 'Content-Type': 'application/json' }, body: data });
-    }
-
-    window.postData = function () {
-        post("/data", "arg=database()");
-    }
-
-    window.postJson2 = function (url, data) {
-        let fullUrl = window.location + url;
-        console.log(fullUrl);
-        return fetch(url, { 
-            method: "POST", 
-            headers: { 
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }, 
-            body: data
-        });
-    }
-    
-    window.getWithHeaders = function (url, headers) {
-        return fetch(url, { method: 'GET', headers: headers, credentials: 'same-origin' });
-    }
-
-    window.GetCookieData = function (cookie1, cookie2, url) {
-        document.cookie = cookie1;
-        document.cookie = cookie2;
-        return fetch(url, { method: 'GET',headers: {'Content-Type': 'application/json'}, credentials: 'same-origin'});
-    }
-
-        window.GetCookieHeaderData = function (cookie, headerName, headerValue, headerName2, headerValue2, url) {
-        document.cookie = cookie;
-        let headers = {
-            'Content-Type': 'application/json',
-            [headerName]: headerValue,
-            [headerName2]: headerValue2
-        };
-        return fetch(url, { method: 'GET', headers: headers, credentials: 'same-origin' });
-    }
-
-</script>
-
-<div>
-    <h1>Welcome to .Net Core Weblog</h1>
-
-    <p>Use this version for testing database dependencies (or other docker dependencies)</p>
-
-    <div>@System.IO.Directory.GetCurrentDirectory()</div>
-
-
-	<div><a href="/Iast/StoredXss/">GET /Iast/StoredXss </a></div>
-
-	<div><a href="/Iast/StoredXssEscaped/">GET /Iast/StoredXssEscaped with INJECTION</a></div>
-
-	<div><a href="/Iast/StoredSqli/">GET /Iast/StoredSqli </a></div>
-    
-    <div>
-        @Html.Raw(Context.Request.Query["q"])
-    </div>
-
-    <div>&nbsp;</div>
-
-</div>
-
-<div class="container">
-    <table class="table table-striped table-hover">
-        <tbody>
-            <tr>
-                <th scope="row">Runtime</th>
-                <td>@(System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription)</td>
-            </tr>
-            <tr>
-                <th scope="row">Process architecture</th>
-                <td>@(System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture)</td>
-            </tr>
-            <tr>
-                <th scope="row">Profiler attached</th>
-                <td>@ViewBag.ProfilerAttached</td>
-            </tr>
-            <tr>
-                <th scope="row">Datadog.Trace.dll path</th>
-                <td>@(ViewBag.TracerAssemblyLocation ?? "(not found)")</td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
-<div class="container">
-    <div>Environment Variables:</div>
-    <table class="table table-striped table-hover">
-        <thead>
-            <tr>
-                <th scope="col">Name</th>
-                <th scope="col">Value</th>
-            </tr>
-        </thead>
-        <tbody>
-            @if (Model.Any())
-            {
-                foreach (var envVar in Model)
-                {
-                    <tr>
-                        <th scope="row">@envVar.Key</th>
-                        <td>@envVar.Value</td>
-                    </tr>
-                }
-            }
-            else
-            {
-                <tr>
-                    <td colspan="2">(empty)</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-</div>
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Home/Privacy.cshtml b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Home/Privacy.cshtml
deleted file mode 100644
index af4fb195a3c9..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Home/Privacy.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-@{
-    ViewData["Title"] = "Privacy Policy";
-}
-<h1>@ViewData["Title"]</h1>
-
-<p>Use this page to detail your site's privacy policy.</p>
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Email.cshtml b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Email.cshtml
deleted file mode 100644
index 364447b89350..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Email.cshtml
+++ /dev/null
@@ -1,115 +0,0 @@
-@{
-    Layout = null;
-}
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Subscribe to Newsletter</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            background-color: #f4f4f4;
-            margin: 0;
-            padding: 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: 100vh;
-        }
-
-        .container {
-            background-color: #fff;
-            padding: 20px;
-            border-radius: 8px;
-            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-            max-width: 500px;
-            width: 100%;
-        }
-
-        h1 {
-            margin-bottom: 20px;
-        }
-
-        form {
-            display: flex;
-            flex-direction: column;
-        }
-
-        label {
-            margin-bottom: 5px;
-        }
-
-        input[type="text"],
-        input[type="email"] {
-            padding: 8px;
-            margin-bottom: 15px;
-            border: 1px solid #ccc;
-            border-radius: 4px;
-            width: 100%;
-            box-sizing: border-box;
-        }
-
-        .smtp-table {
-            margin-top: 20px;
-            width: 100%;
-            border-collapse: collapse;
-        }
-
-            .smtp-table td {
-                padding: 8px;
-                border: 1px solid #ccc;
-            }
-
-        button {
-            padding: 10px;
-            background-color: #4CAF50;
-            color: white;
-            border: none;
-            border-radius: 4px;
-            cursor: pointer;
-        }
-
-            button:hover {
-                background-color: #45a049;
-            }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>Please, subscribe to our newsletter</h1>
-        <form asp-controller="Iast" asp-action="SendEmailSmtpData" method="get">
-            <label for="name">Name:</label>
-            <input type="text" id="name" name="name" value="John" required />
-
-            <label for="lastname">Last name:</label>
-            <input type="text" id="lastname" name="lastname" value="Doe" required />
-
-            <label for="email">Email:</label>
-            <input type="email" id="email" name="email" value="test@fakemail2322.com" required />
-
-            <button type="submit">Subscribe</button>
-
-            <h2>SMTP Configuration</h2>
-            <table class="smtp-table">
-                <tr>
-                    <td><label for="smtpUsername">SMTP Username:</label></td>
-                    <td><input type="text" id="smtpUsername" name="smtpUsername" value="admin@fakemail2322.com" /></td>
-                </tr>
-                <tr>
-                    <td><label for="smtpPassword">SMTP Password:</label></td>
-                    <td><input type="password" id="smtpPassword" name="smtpPassword" value="qwerty" /></td>
-                </tr>
-                <tr>
-                    <td><label for="smtpserver">SMTP Server:</label></td>
-                    <td><input type="text" id="smtpserver" name="smtpserver" value="smtp-fakemail2322.com" /></td>
-                </tr>
-                <tr>
-                    <td><label for="smtpPort">SMTP Port:</label></td>
-                    <td><input type="text" id="smtpPort" name="smtpPort" value="587" /></td>
-                </tr>
-            </table>
-        </form>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Email.cshtml.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Email.cshtml.cs
deleted file mode 100644
index e809538a1f2c..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Email.cshtml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace Samples.Security.AspNetCore5.Views.Iast
-{
-    public class EmailModel : PageModel
-    {
-        public void OnGet()
-        {
-        }
-    }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Xss.cshtml b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Xss.cshtml
deleted file mode 100644
index 6db5becb62a7..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Iast/Xss.cshtml
+++ /dev/null
@@ -1,57 +0,0 @@
-@*<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>*@
-
-
-<html>
-
-  <head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    
-    <title>Datadog Sample Project</title>
-  </head>
-  
-<body>
-
-	<!-- Page Content -->
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-12 text-center">
-          <ul class="list-unstyled">
-          <h1 class="mt-5">XSS</h1>
-          
-          <p class="lead">
-			Cross-site Scripting (XSS) attacks are a type of injection in which malicious scripts are injected into otherwise benign and trusted websites.
-		 </p>
-		   <p class="lead">
-			In particular Reflected XSS occurs when vulnerable parts can be injected in the response from the server. Many client MVC frameworks include protections against XSS attacks but they are not fully protected.
-		</p>
-		   <p class="lead">
-			Stored XSS occurs when vulnerable parts coming from database can be injected in the JSON response from the server.
-		</p>
-		<p class="lead">
-			XSS attacks occur when an attacker uses a web application to send malicious code, generally in the form of a browser-side script, to a different end user. Flaws that allow these attacks to succeed are quite widespread and occur anywhere a web application uses input from a user within the output it generates without validating or encoding it. An attacker can use XSS to send a malicious script to an unsuspecting user. The end user's browser has no way of knowing that the script should not be trusted and will execute the script. Because it thinks the script came from a trusted source, the malicious script can access any cookies, session tokens, or other sensitive information retained by the browser and used with that site. These scripts can even rewrite the content of the HTML page.
-         </p>      
-            
-          </ul>
-        </div>
-      </div>
-    </div>
-
-	<div class="form-group">
-		<p>
-			<label>RAW Value : </label>
-			<label>@Html.Raw(ViewData["XSS"])</label>
-		</p>
-		<p>
-			<label>Escaped Value : </label>
-			<label>@Html.Label(ViewData["XSS"].ToString())</label>
-		</p>
-	</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Shared/_Layout.cshtml b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Shared/_Layout.cshtml
deleted file mode 100644
index 15d76640a809..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/Shared/_Layout.cshtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>@ViewData["Title"] - Samples.AspNetCore AspSec Weblog</title>
-</head>
-<body>
-<header>
-    <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
-        <div class="container">
-            <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Samples.AspNetCore AspSec Weblog</a>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
-                    aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-            <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                <ul class="navbar-nav flex-grow-1">
-                    <li class="nav-item">
-                        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-</header>
-<div class="container">
-    <main role="main" class="pb-3">
-        @RenderBody()
-    </main>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/_ViewImports.cshtml b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/_ViewImports.cshtml
deleted file mode 100644
index 1a6c0b1ba57b..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/_ViewImports.cshtml
+++ /dev/null
@@ -1,2 +0,0 @@
-@using Samples.Security.AspNetCore5
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/_ViewStart.cshtml b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/_ViewStart.cshtml
deleted file mode 100644
index a5f10045db97..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
-    Layout = "_Layout";
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/appsettings.Development.json b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/appsettings.Development.json
deleted file mode 100644
index 8983e0fc1c5e..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/appsettings.Development.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  }
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/appsettings.json b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/appsettings.json
deleted file mode 100644
index 0698549df121..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/appsettings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ConnectionStrings": {
-    "DefaultConnection": "Data Source=Data\\app.db"
-  },
-  "AllowedHosts": "*",
-  "CreateDb": false
-}
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/web.config b/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/web.config
deleted file mode 100644
index 9c4699add55a..000000000000
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5.DatabaseIntegration/web.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <location path="." inheritInChildApplications="false">
-    <system.webServer>
-      <handlers>
-        <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
-      </handlers>
-
-      <!-- Set in applicationHost.config instead -->
-      <!-- <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\stdout" hostingModel="%LAUNCHER_HOSTING_MODEL%" /> -->
-    </system.webServer>
-  </location>
-</configuration>
\ No newline at end of file
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Controllers/IastController.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Controllers/IastController.cs
index 645f4a72defe..861e9632931d 100644
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Controllers/IastController.cs
+++ b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Controllers/IastController.cs
@@ -33,6 +33,11 @@
 using MongoDB.Driver;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+#if NETCOREAPP3_0_OR_GREATER
+using MySql.Data.MySqlClient;
+using Npgsql;
+using Oracle.ManagedDataAccess.Client;
+#endif
 using Samples.Security.Data;
 
 #pragma warning disable ASP0019 // warning ASP0019: Use IHeaderDictionary.Append or the indexer to append or set headers. IDictionary.Add will throw an ArgumentException when attempting to add a duplicate key
@@ -76,6 +81,11 @@ public class IastController : Controller
         private static SqliteConnection _dbConnectionSystemDataMicrosoftData = null;
         private static SqlConnection _dbConnectionSystemDataSqlClient = null;
         private static IMongoDatabase _mongoDb = null;
+#if NETCOREAPP3_0_OR_GREATER
+        private static NpgsqlConnection _dbConnectionNpgsql = null;
+        private static MySqlConnection _dbConnectionMySql = null;
+        private static OracleConnection _dbConnectionOracle = null;
+#endif
 
         public IActionResult Index()
         {
@@ -87,11 +97,138 @@ private static SQLiteConnection DbConnectionSystemData
             get { return _dbConnectionSystemData ??= IastControllerHelper.CreateSystemDataDatabase(); }
         }
         
+        private static SqliteConnection DbConnectionMicrosoftData
+        {
+            get { return _dbConnectionSystemDataMicrosoftData ??= IastControllerHelper.CreateMicrosoftDataDatabase(); }
+        }
+        
         private static SqliteConnection DbConnectionSystemDataMicrosoftData
         {
             get { return _dbConnectionSystemDataMicrosoftData ??= IastControllerHelper.CreateMicrosoftDataDatabase(); }
         }
 
+        private static SqlConnection DbConnectionSystemDataSqlClient
+        {
+            get { return _dbConnectionSystemDataSqlClient ??= IastControllerHelper.CreateSqlServerDatabase(); }
+        }
+
+#if NETCOREAPP3_0_OR_GREATER
+        private static NpgsqlConnection DbConnectionNpgsql
+        {
+            get { return _dbConnectionNpgsql ??= IastControllerHelper.CreatePostgresDatabase(); }
+        }
+
+        private static MySqlConnection DbConnectionMySql
+        {
+            get { return _dbConnectionMySql ??= IastControllerHelper.CreateMySqlDatabase(); }
+        }
+
+        private static OracleConnection DbConnectionOracle
+        {
+            get { return _dbConnectionOracle ??= IastControllerHelper.CreateOracleDatabase(); }
+        }
+
+#endif
+        [HttpGet("StoredXss")]
+        [Route("StoredXss")]
+        public IActionResult StoredXss(string database = null)
+        {
+            var db = GetDbConnectionFromName(database);
+
+            var param = GetDbValue(db);
+            ViewData["XSS"] = param + "<b>More Text</b>";
+            return View("Xss");
+        }
+
+        [HttpGet("StoredXssEscaped")]
+        [Route("StoredXssEscaped")]
+        public IActionResult StoredXssEscaped(string database = null)
+        {
+            var db = GetDbConnectionFromName(database);
+
+            var param = GetDbValue(db);
+            var escapedText = System.Net.WebUtility.HtmlEncode($"System.Net.WebUtility.HtmlEncode({param})") + Environment.NewLine
+                            + System.Web.HttpUtility.HtmlEncode($"System.Web.HttpUtility.HtmlEncode({param})") + Environment.NewLine;
+            ViewData["XSS"] = escapedText;
+            return View("Xss");
+        }
+
+
+        [HttpGet("StoredSqli")]
+        [Route("StoredSqli")]
+        public IActionResult StoredSqli(string database = null)
+        {
+            try
+            {
+
+                var db = GetDbConnectionFromName(database);
+
+                var details = GetDbValue(db, "Michael");
+                var taintedQuery = "SELECT name from Persons where Details = '" + details + "'";
+
+                var name = db switch
+                {
+                    SQLiteConnection connection => new SQLiteCommand(taintedQuery, connection).ExecuteScalar(),
+                    SqliteConnection sqliteConnection => new SqliteCommand(taintedQuery, sqliteConnection).ExecuteScalar(),
+                    SqlConnection connection => new SqlCommand(taintedQuery, connection).ExecuteScalar(),
+#if NETCOREAPP3_0_OR_GREATER
+                    NpgsqlConnection connection => new NpgsqlCommand(taintedQuery, connection).ExecuteScalar(),
+                    MySqlConnection connection => new MySqlCommand(taintedQuery, connection).ExecuteScalar(),
+                    OracleConnection connection => new OracleCommand(taintedQuery, connection).ExecuteScalar(),
+#endif
+                    _ => null
+                };
+
+                return Content($"Result: " + name);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+                return StatusCode(500);
+            }
+        }
+
+        private static IDbConnection GetDbConnectionFromName(string database)
+        {
+            IDbConnection db =
+                database switch
+                {
+                    "System.Data.SQLite" => DbConnectionSystemData,
+                    "System.Data.SqlClient" => DbConnectionSystemDataSqlClient,
+                    "Microsoft.Data.Sqlite" => DbConnectionMicrosoftData,
+#if NETCOREAPP3_0_OR_GREATER
+                    "Npgsql" => DbConnectionNpgsql,
+                    "MySql.Data" => DbConnectionMySql,
+                    "Oracle" => DbConnectionOracle,
+#endif
+                    null => DbConnectionSystemData,
+                    _ => throw new Exception($"unknown db type: {database}")
+                };
+            return db;
+        }
+
+        private static string GetDbValue(IDbConnection db, string name = "Name1")
+        {
+            var taintedQuery = $"SELECT Details from Persons where name = '{name}'";
+
+            using IDataReader reader = db switch
+            {
+                SQLiteConnection connection => new SQLiteCommand(taintedQuery, connection).ExecuteReader(),
+                SqliteConnection connection => new SqliteCommand(taintedQuery, connection).ExecuteReader(),
+                SqlConnection connection => new SqlCommand(taintedQuery, connection).ExecuteReader(),
+#if NETCOREAPP3_0_OR_GREATER
+                NpgsqlConnection connection => new NpgsqlCommand(taintedQuery, connection).ExecuteReader(),
+                MySqlConnection connection => new MySqlCommand(taintedQuery, connection).ExecuteReader(),
+                OracleConnection connection => new OracleCommand(taintedQuery, connection).ExecuteReader(),
+#endif
+                _ => throw new ArgumentException("Invalid db connection")
+            };
+
+            reader.Read();
+            var res = reader.GetString(0);
+            return res;
+        }
+
         [HttpGet("HardcodedSecrets")]
         [Route("HardcodedSecrets")]
         public IActionResult HardcodedSecrets()
@@ -1162,23 +1299,6 @@ public ActionResult DatabaseSourceInjection(string host, bool injectOnlyDatabase
             return Content(result, "text/html");
         }
 
-        private static string GetDbValue(IDbConnection db, string name = "Name1")
-        {
-            var taintedQuery = $"SELECT Details from Persons where name = '{name}'";
-
-            using IDataReader reader = db switch
-            {
-                SQLiteConnection connection => new SQLiteCommand(taintedQuery, connection).ExecuteReader(),
-                SqliteConnection connection => new SqliteCommand(taintedQuery, connection).ExecuteReader(),
-                _ => throw new ArgumentException("Invalid db connection")
-            };
-
-            reader.Read();
-            var res = reader.GetString(0);
-            return res;
-        }
-
-
         [HttpGet("Print")]
         public ActionResult PrintReport(
         [FromQuery] bool Encrypt,
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Data/IastControllerHelper.cs b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Data/IastControllerHelper.cs
index d6a4a8456498..74f04b04cabf 100644
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Data/IastControllerHelper.cs
+++ b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Data/IastControllerHelper.cs
@@ -1,14 +1,47 @@
 using System;
+using System.Data.SqlClient;
 using System.Data.SQLite;
+using System.Linq;
 using System.Text;
 #if NETCOREAPP
 using Microsoft.Data.Sqlite;
 #endif
+#if NETCOREAPP3_0_OR_GREATER
+using MySql.Data.MySqlClient;
+using Npgsql;
+using Oracle.ManagedDataAccess.Client;
+#endif
 
 namespace Samples.Security.Data
 {
     public static class IastControllerHelper
     {
+        private static readonly string[] SqlServerTables =
+            [
+                "CREATE TABLE Persons (Id uniqueidentifier NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
+                @"CREATE TABLE Books(Id uniqueidentifier NOT NULL,Title nvarchar(500) NOT NULL,Price numeric(18, 2) NULL,ISBN nvarchar(50) NULL,	Pages int NOT NULL,    Author nvarchar(500) NOT NULL,    Editorial nvarchar(50) NULL,	Prologue nvarchar(4000) NULL,	Format int NULL)",
+            ];
+
+        private static readonly string[] PostgresTables =
+            [
+                "DROP TABLE IF EXISTS Persons, Books;",
+                "CREATE TABLE Persons (Id uuid NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
+                @"CREATE TABLE Books(Id uuid NOT NULL,Title varchar(500) NOT NULL,Price numeric(18, 2) NULL,ISBN varchar(50) NULL,	Pages int NOT NULL,    Author varchar(500) NOT NULL,    Editorial varchar(50) NULL,	Prologue varchar(4000) NULL,	Format int NULL)",
+            ];
+
+        private static readonly string[] MySqlTables =
+        [
+            "DROP TABLE IF EXISTS Persons, Books;",
+            "CREATE TABLE Persons (Id char(36) NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
+            @"CREATE TABLE Books(Id char(36) NOT NULL,Title varchar(500) NOT NULL,Price numeric(18, 2) NULL,ISBN varchar(50) NULL,	Pages int NOT NULL,    Author varchar(500) NOT NULL,    Editorial varchar(50) NULL,	Prologue varchar(4000) NULL,	Format int NULL)",
+        ];
+
+        private static readonly string[] OracleTables =
+        [
+            "DROP TABLE IF EXISTS Persons",
+            "CREATE TABLE Persons (Id char(40) NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(2000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
+        ];
+
         private static readonly string[] SqliteTables =
         [
             "CREATE TABLE Persons (Id NOT NULL,Name varchar(50) NOT NULL,Surname varchar(50) NULL,Gender char(10) NULL,Email varchar(50) NULL,FlattedAddress varchar(500) NULL,Mobile varchar(50) NULL,NIF varchar(50) NULL,Phone varchar(50) NULL,PostalCode varchar(50) NULL,Details varchar(5000) NULL,CityIniqueId varchar(50) NULL,CountryUniqueId varchar(50) NULL,ImagePath varchar(500) NULL)",
@@ -25,6 +58,119 @@ public static class IastControllerHelper
             "INSERT INTO Books (Id, Title, Price, ISBN, Pages, Author, Editorial, Prologue, Format) VALUES ('026decfd-bba3-4aa8-85d4-1c71ffcfe8e9', 'CLR via C#', CAST(50.00 AS Decimal(18, 2)), '0735669954', 894, ' Jeffrey Richter', 'Microsoft Press', 'bla bla bla', 0)"
         ];
 
+#if NETCOREAPP3_0_OR_GREATER
+        public static OracleConnection CreateOracleDatabase()
+        {
+            var host = Environment.GetEnvironmentVariable("ORACLE_HOST") ?? "localhost";
+            var cstringBuilder = new OracleConnectionStringBuilder();
+            cstringBuilder.DataSource = $"{host}:1521/FREE";
+            cstringBuilder.UserID = "system";
+            cstringBuilder.Password = "testpassword";
+
+            var connection = new OracleConnection(cstringBuilder.ConnectionString);
+            connection.Open();
+
+            foreach (var command in OracleTables)
+            {
+                new OracleCommand(command, connection).ExecuteNonQuery();
+            }
+            foreach (var command in PopulateCommands.Take(5))
+            {
+                new OracleCommand(command, connection).ExecuteNonQuery();
+            }
+
+            return connection;
+        }
+
+        public static MySqlConnection CreateMySqlDatabase()
+        {
+            var connectionString = Environment.GetEnvironmentVariable("MYSQL_CONNECTION_STRING");
+
+            if (connectionString == null)
+            {
+                var host = Environment.GetEnvironmentVariable("MYSQL_HOST") ?? "localhost";
+                var port = Environment.GetEnvironmentVariable("MYSQL_PORT") ?? "3307";
+                connectionString = $"server={host};user=mysqldb;password=mysqldb;port={port};database=world";
+            }
+
+            var connection = new MySqlConnection(connectionString);
+            connection.Open();
+
+            foreach (var command in MySqlTables)
+            {
+                new MySqlCommand(command, connection).ExecuteNonQuery();
+            }
+            foreach (var command in PopulateCommands)
+            {
+                new MySqlCommand(command, connection).ExecuteNonQuery();
+            }
+
+            return connection;
+        }
+
+        public static NpgsqlConnection CreatePostgresDatabase()
+        {
+            // assumes the postgres docker image is running...
+            var connectionString = Environment.GetEnvironmentVariable("POSTGRES_CONNECTION_STRING");
+
+            if (connectionString == null)
+            {
+                var host = Environment.GetEnvironmentVariable("POSTGRES_HOST") ?? "localhost";
+                connectionString = $"Host={host};Username=postgres;Password=postgres;Database=postgres";
+            }
+            var connection = new NpgsqlConnection(connectionString);
+            connection.Open();
+
+            foreach (var command in PostgresTables)
+            {
+                new NpgsqlCommand(command, connection).ExecuteNonQuery();
+            }
+            foreach (var command in PopulateCommands)
+            {
+                new NpgsqlCommand(command, connection).ExecuteNonQuery();
+            }
+
+            return connection;
+        }
+
+#endif
+
+        public static SqlConnection CreateSqlServerDatabase()
+        {
+            // assumes the sqlserver docker image is running...
+            var connectionString = Environment.GetEnvironmentVariable("SQLSERVER_CONNECTION_STRING") ??
+                                   @"Server=localhost;User Id=sa;Password=Strong!Passw0rd;";
+
+            int numAttempts = 3;
+            for (int i = 0; i < numAttempts; i++)
+            {
+                SqlConnection connection = null;
+                try
+                {
+                    connection = new SqlConnection(connectionString);
+                    connection.Open();
+
+                    foreach (var command in SqlServerTables)
+                    {
+                        new SqlCommand(command, connection).ExecuteNonQuery();
+                    }
+                    foreach (var command in PopulateCommands)
+                    {
+                        new SqlCommand(command, connection).ExecuteNonQuery();
+                    }
+                    return connection;
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                    connection?.Dispose();
+                }
+
+            }
+
+            throw new Exception($"Unable to open connection to connection string {connectionString} after {numAttempts} attempts");
+        }
+
         public static SQLiteConnection CreateSystemDataDatabase()
         {
             var builderSystemData = new SQLiteConnectionStringBuilder { DataSource = ":memory:" };
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Properties/launchSettings.json b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Properties/launchSettings.json
index bc20953d1a5b..7bf9f9749f74 100644
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Properties/launchSettings.json
+++ b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Properties/launchSettings.json
@@ -106,7 +106,8 @@
         "DD_IAST_DEDUPLICATION_ENABLED": "false",
         "DD_IAST_VULNERABILITIES_PER_REQUEST": "100",
         "DD_IAST_REQUEST_SAMPLING": "100",
-        "DD_IAST_MAX_CONCURRENT_REQUESTS": "1"
+        "DD_IAST_MAX_CONCURRENT_REQUESTS": "1",
+        "COMPLUS_ForceEnc": "1"
       },
       "Logging": {
         "LogLevel": {
diff --git a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Samples.Security.AspNetCore5.csproj b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Samples.Security.AspNetCore5.csproj
index 29e35cb55e58..f606b0773ec6 100644
--- a/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Samples.Security.AspNetCore5.csproj
+++ b/tracer/test/test-applications/security/Samples.Security.AspNetCore5/Samples.Security.AspNetCore5.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
+    <RequiresDockerDependency>Mixed</RequiresDockerDependency>
     <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
diff --git a/tracer/test/test-applications/security/aspnet/Samples.Security.WebApi/Controllers/AsmController.cs b/tracer/test/test-applications/security/aspnet/Samples.Security.WebApi/Controllers/AsmController.cs
new file mode 100644
index 000000000000..d7ff982ede90
--- /dev/null
+++ b/tracer/test/test-applications/security/aspnet/Samples.Security.WebApi/Controllers/AsmController.cs
@@ -0,0 +1,16 @@
+using System.Web.Http;
+using Samples.AspNetMvc5.Models;
+
+namespace Samples.Security.WebApi.Controllers
+{
+    public class AsmController : ApiController
+    {
+        [AcceptVerbs("GET")]
+        [Route("api/asm/injectedheader")]
+        public string InjectedHeader()
+        {
+            System.Web.HttpContext.Current.Response.AddHeader("X-Test", "dummy_rule");
+            return "Header injected!";
+        }
+    }
+}
diff --git a/tracer/test/test-applications/security/aspnet/Samples.Security.WebApi/Samples.Security.WebApi.csproj b/tracer/test/test-applications/security/aspnet/Samples.Security.WebApi/Samples.Security.WebApi.csproj
index 13fbba4878a4..c134f2c79e48 100644
--- a/tracer/test/test-applications/security/aspnet/Samples.Security.WebApi/Samples.Security.WebApi.csproj
+++ b/tracer/test/test-applications/security/aspnet/Samples.Security.WebApi/Samples.Security.WebApi.csproj
@@ -165,6 +165,7 @@
     </Compile>
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
+    <Compile Include="Controllers\AsmController.cs" />
     <Compile Include="Controllers\IastController.cs" />
     <Compile Include="Controllers\LandingController.cs" />
     <Compile Include="Controllers\UserController.cs" />
diff --git a/tracer/tools/PipelineMonitor/PipelineMonitor.csproj b/tracer/tools/PipelineMonitor/PipelineMonitor.csproj
index 30eacaf0f8f2..01839fd90214 100644
--- a/tracer/tools/PipelineMonitor/PipelineMonitor.csproj
+++ b/tracer/tools/PipelineMonitor/PipelineMonitor.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Datadog.Trace" Version="3.7.0" />
+      <PackageReference Include="Datadog.Trace" Version="3.8.0" />
     </ItemGroup>
 
 </Project>