diff --git a/.editorconfig b/.editorconfig
index 36fed434ac..605730dcbe 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+charset = utf-8 # supposed to get rid of the BOM issue
 
 ###############################
 # .NET Coding Conventions     #
diff --git a/.github/workflows/all_solutions.yml b/.github/workflows/all_solutions.yml
index c4f73d0852..fa650933b0 100644
--- a/.github/workflows/all_solutions.yml
+++ b/.github/workflows/all_solutions.yml
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -151,7 +151,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -193,7 +193,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -254,7 +254,8 @@ jobs:
           Logging.MaxSamplesStored, 
           Logging.MetricsAndForwarding, 
           Logging.ZeroMaxSamplesStored,
-          Owin, 
+          Owin,
+          MassTransit, 
           ReJit.NetCore, 
           ReJit.NetFramework, 
           RequestHandling, 
@@ -281,7 +282,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -391,12 +392,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -490,7 +491,7 @@ jobs:
         shell: powershell
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -596,13 +597,13 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -663,13 +664,13 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -716,7 +717,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/assignproj.yml b/.github/workflows/assignproj.yml
index aad074413b..92f155666f 100644
--- a/.github/workflows/assignproj.yml
+++ b/.github/workflows/assignproj.yml
@@ -16,7 +16,7 @@ jobs:
     name: Assign to One Project
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
diff --git a/.github/workflows/awslambda_release.yml b/.github/workflows/awslambda_release.yml
index 614b745747..ea5e9e72d7 100644
--- a/.github/workflows/awslambda_release.yml
+++ b/.github/workflows/awslambda_release.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -109,7 +109,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/build_profiler.yml b/.github/workflows/build_profiler.yml
index f17711c02e..331272aa05 100644
--- a/.github/workflows/build_profiler.yml
+++ b/.github/workflows/build_profiler.yml
@@ -2,6 +2,11 @@ name: Build and Package Profiler
 
 on:
   # run this workflow on a push to any branch other than main or a feature branch
+  #
+  # NOTE: On a push, only the build jobs will execute; the NuGet jobs will not run. 
+  #       Manually run this workflow on your branch when you want it to update the
+  #       NuGet package and create a PR to update the package version reference in 
+  #       Home.csproj.
   push:
     branches-ignore:
       - main
@@ -63,13 +68,13 @@ jobs:
       profiler_src: ${{ steps.filter.outputs.profiler_src }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -97,7 +102,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -176,7 +181,7 @@ jobs:
       #     egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -223,12 +228,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -303,7 +308,7 @@ jobs:
   
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -366,7 +371,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
@@ -375,7 +380,7 @@ jobs:
           sudo apt-get install -y xmlstarlet
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/check_modified_files.yml b/.github/workflows/check_modified_files.yml
index fdccdd603e..dd98f3fc35 100644
--- a/.github/workflows/check_modified_files.yml
+++ b/.github/workflows/check_modified_files.yml
@@ -22,12 +22,12 @@ jobs:
           non-workflow-files-changed: ${{ steps.filter.outputs.non-workflow-files-changed }}
         steps:
           - name: Harden Runner
-            uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+            uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
             with:
               disable-sudo: true
               egress-policy: audit
           - name: Checkout
-            uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+            uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
             with:
               fetch-depth: 0
           - name: Verify which files were modified
diff --git a/.github/workflows/deploy_agent.yml b/.github/workflows/deploy_agent.yml
index 7915c1c72a..a4fa875158 100644
--- a/.github/workflows/deploy_agent.yml
+++ b/.github/workflows/deploy_agent.yml
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
@@ -258,7 +258,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/deploy_awslambda.yml b/.github/workflows/deploy_awslambda.yml
index e893b1e8c0..3fd0de1a0b 100644
--- a/.github/workflows/deploy_awslambda.yml
+++ b/.github/workflows/deploy_awslambda.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit 
 
diff --git a/.github/workflows/deploy_siteextension.yml b/.github/workflows/deploy_siteextension.yml
index c7c98f2528..77618d8d64 100644
--- a/.github/workflows/deploy_siteextension.yml
+++ b/.github/workflows/deploy_siteextension.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit 
 
diff --git a/.github/workflows/get_release_checksums.yml b/.github/workflows/get_release_checksums.yml
index 90f2e2ae33..fea0bbad86 100644
--- a/.github/workflows/get_release_checksums.yml
+++ b/.github/workflows/get_release_checksums.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit 
 
diff --git a/.github/workflows/markdowncheck.yml b/.github/workflows/markdowncheck.yml
index 51cd3f97b1..5d791c478f 100644
--- a/.github/workflows/markdowncheck.yml
+++ b/.github/workflows/markdowncheck.yml
@@ -22,11 +22,11 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit # Leave it audit mode
 
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       
       - uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368 # v1
         with:
diff --git a/.github/workflows/multiverse_run.yml b/.github/workflows/multiverse_run.yml
index b820da8b6d..5a438e4922 100644
--- a/.github/workflows/multiverse_run.yml
+++ b/.github/workflows/multiverse_run.yml
@@ -36,12 +36,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit 
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -102,7 +102,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit 
 
@@ -112,7 +112,7 @@ jobs:
           dotnet-version: '3.1.100'
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: 'gh-pages'
           fetch-depth: 0
diff --git a/.github/workflows/nuget_slack_notifications.yml b/.github/workflows/nuget_slack_notifications.yml
index 569455cb6d..cdf36aae44 100644
--- a/.github/workflows/nuget_slack_notifications.yml
+++ b/.github/workflows/nuget_slack_notifications.yml
@@ -33,12 +33,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit # Leave it audit mode
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/post_deploy_agent.yml b/.github/workflows/post_deploy_agent.yml
index 7ce67c585c..e982c2f439 100644
--- a/.github/workflows/post_deploy_agent.yml
+++ b/.github/workflows/post_deploy_agent.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: false
           egress-policy: audit
@@ -65,13 +65,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -106,13 +106,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -132,13 +132,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -161,13 +161,13 @@ jobs:
       
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/publish_release_notes.yml b/.github/workflows/publish_release_notes.yml
index 804082b003..c0414d1491 100644
--- a/.github/workflows/publish_release_notes.yml
+++ b/.github/workflows/publish_release_notes.yml
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
@@ -64,12 +64,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
       
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
       
@@ -81,7 +81,7 @@ jobs:
 
       - name: Set Docs PR Branch Name
         run: |
-          cleaned_branch=$(echo "10.13.0" | sed 's/\./-/g')
+          cleaned_branch=$(echo "${{ github.event.inputs.agent_version }}" | sed 's/\./-/g')
           echo "branch_name=dotnet-release-$cleaned_branch"
           echo "branch_name=dotnet-release-$cleaned_branch" >> $GITHUB_ENV
         shell: bash
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 7ea69d391e..de9f2de1d4 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -14,12 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
-      - uses: google-github-actions/release-please-action@4c5670f886fe259db4d11222f7dff41c1382304d # v3.7.12
+      - uses: google-github-actions/release-please-action@db8f2c60ee802b3748b512940dde88eabd7b7e01 # v3.7.13
         with:
           release-type: go
           changelog-path: src/Agent/CHANGELOG.md
diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml
index d0b31353bf..3670459efd 100644
--- a/.github/workflows/repolinter.yml
+++ b/.github/workflows/repolinter.yml
@@ -31,21 +31,21 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Test Default Branch
         id: default-branch
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const data = await github.rest.repos.get(context.repo)
             return data.data && data.data.default_branch === context.ref.split('/').slice(-1)[0]
       - name: Checkout Self
         if: ${{ steps.default-branch.outputs.result == 'true' }}
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Run Repolinter
         if: ${{ steps.default-branch.outputs.result == 'true' }}
         uses: newrelic/repolinter-action@3f4448f855c351e9695b24524a4111c7847b84cb # v1.7.0
diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
index d424b7ab99..8aea20352f 100644
--- a/.github/workflows/run_integration_tests.yml
+++ b/.github/workflows/run_integration_tests.yml
@@ -44,7 +44,7 @@ jobs:
       unbounded-tests-matrix: ${{ steps.configure_unbounded_tests_matrix.outputs.matrix }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit 
 
@@ -55,7 +55,7 @@ jobs:
             namespaces="[ 'AgentFeatures', 'AgentLogs', 'AgentMetrics', 'Api', 'AppDomainCaching', 'AspNetCore', 'BasicInstrumentation', 'CatInbound', 'CatOutbound', 'CodeLevelMetrics', 'Configuration', \
           'CSP', 'CustomAttributes', 'CustomInstrumentation', 'DataTransmission', 'DistributedTracing', 'Errors', 'HttpClientInstrumentation', 'InfiniteTracing', 'Logging.ContextData', \
           'Logging.HsmAndCsp', 'Logging.LocalDecoration', 'Logging.LogLevelDetection', 'Logging.MaxSamplesStored', 'Logging.MetricsAndForwarding', 'Logging.ZeroMaxSamplesStored', \
-          'Owin', 'ReJit.NetCore', 'ReJit.NetFramework', 'RequestHandling', 'RequestHeadersCapture.AspNet', 'RequestHeadersCapture.AspNetCore', 'RequestHeadersCapture.EnvironmentVariables', \
+          'Owin', 'MassTransit', 'ReJit.NetCore', 'ReJit.NetFramework', 'RequestHandling', 'RequestHeadersCapture.AspNet', 'RequestHeadersCapture.AspNetCore', 'RequestHeadersCapture.EnvironmentVariables', \
           'RequestHeadersCapture.Owin', 'RequestHeadersCapture.WCF', 'RestSharp', 'WCF.Client.IIS.ASPDisabled', 'WCF.Client.IIS.ASPEnabled', 'WCF.Client.Self', \
           'WCF.Service.IIS.ASPDisabled', 'WCF.Service.IIS.ASPEnabled', 'WCF.Service.Self' ]"
           else
@@ -100,7 +100,7 @@ jobs:
       
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -228,7 +228,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/run_linux_smoke_tests.yml b/.github/workflows/run_linux_smoke_tests.yml
index cea59fed7d..9f2a64e8d8 100644
--- a/.github/workflows/run_linux_smoke_tests.yml
+++ b/.github/workflows/run_linux_smoke_tests.yml
@@ -42,7 +42,7 @@ jobs:
   
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit
           
@@ -50,7 +50,7 @@ jobs:
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
     
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml
index 69a909f314..7f66e6e3e5 100644
--- a/.github/workflows/run_unit_tests.yml
+++ b/.github/workflows/run_unit_tests.yml
@@ -43,7 +43,7 @@ jobs:
       test_results_path: tests\TestResults
 
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8d0f4f7511..504704c874 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,18 +32,18 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif
diff --git a/.github/workflows/set_community_label.yml b/.github/workflows/set_community_label.yml
index 2b5e1a7944..1c3cd46ced 100644
--- a/.github/workflows/set_community_label.yml
+++ b/.github/workflows/set_community_label.yml
@@ -15,7 +15,7 @@ jobs:
       issues: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: audit
diff --git a/.github/workflows/siteextension_release.yml b/.github/workflows/siteextension_release.yml
index e1d98fe47f..3d1e2ac1d7 100644
--- a/.github/workflows/siteextension_release.yml
+++ b/.github/workflows/siteextension_release.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
           
diff --git a/.github/workflows/stale_issue.yml b/.github/workflows/stale_issue.yml
index 092fafd88c..8dfba89669 100644
--- a/.github/workflows/stale_issue.yml
+++ b/.github/workflows/stale_issue.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
         disable-sudo: true
         egress-policy: audit
diff --git a/.github/workflows/stale_pr.yml b/.github/workflows/stale_pr.yml
index 6bc245972d..8719000daf 100644
--- a/.github/workflows/stale_pr.yml
+++ b/.github/workflows/stale_pr.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
         disable-sudo: true
         egress-policy: audit
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0244118664..82ce7d91d4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -77,7 +77,3 @@ Keep in mind that when you submit your Pull Request, you'll need to sign the CLA
 
 For more information about CLAs, please check out Alex Russell’s excellent post,
 [“Why Do I Need to Sign This?”](https://infrequently.org/2008/06/why-do-i-need-to-sign-this/).
-
-## Slack
-
-We host a public Slack with a dedicated channel for contributors and maintainers of open source projects hosted by New Relic.  If you are contributing to this project, you're welcome to request access to the #oss-contributors channel in the newrelicusers.slack.com workspace.  To request access, please use this [link](https://join.slack.com/t/newrelicusers/shared_invite/zt-1ayj69rzm-~go~Eo1whIQGYnu3qi15ng).
diff --git a/FullAgent.sln b/FullAgent.sln
index ccbb75dde6..7667953b58 100644
--- a/FullAgent.sln
+++ b/FullAgent.sln
@@ -162,11 +162,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Home", "src\Agent\NewRelic\
 		{00B0CD4C-D7DE-4243-8185-79A912E48291} = {00B0CD4C-D7DE-4243-8185-79A912E48291}
 		{0962EF35-B457-479E-9A7A-EC43F9EC7180} = {0962EF35-B457-479E-9A7A-EC43F9EC7180}
 		{0C3E92D7-F16C-4575-9CBB-EB7349A4C5E2} = {0C3E92D7-F16C-4575-9CBB-EB7349A4C5E2}
+		{0DC126D1-E782-4A41-BA3E-393083F08627} = {0DC126D1-E782-4A41-BA3E-393083F08627}
 		{10B2665A-B898-49F7-8BCA-2511872B0902} = {10B2665A-B898-49F7-8BCA-2511872B0902}
 		{1593CA23-F7EC-42F2-A915-F5D5B18F8C6B} = {1593CA23-F7EC-42F2-A915-F5D5B18F8C6B}
 		{203A8EA4-A0F2-4139-B02E-9B0F2B39C107} = {203A8EA4-A0F2-4139-B02E-9B0F2B39C107}
 		{22274460-3222-4474-B679-19E1F27A2CC3} = {22274460-3222-4474-B679-19E1F27A2CC3}
 		{230CDE78-9D21-4D10-9C4B-E00C88B8B021} = {230CDE78-9D21-4D10-9C4B-E00C88B8B021}
+		{270A9CC8-8031-49F4-A380-1389E7517DB7} = {270A9CC8-8031-49F4-A380-1389E7517DB7}
 		{279F8AD0-C959-476F-BD58-3581D9A33238} = {279F8AD0-C959-476F-BD58-3581D9A33238}
 		{2E6CF650-CB50-453D-830A-D00F0540FC2C} = {2E6CF650-CB50-453D-830A-D00F0540FC2C}
 		{2FB30555-65A4-43D7-82AA-56BF203D3A96} = {2FB30555-65A4-43D7-82AA-56BF203D3A96}
@@ -191,6 +193,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Home", "src\Agent\NewRelic\
 		{B65A0C00-100D-4F27-BAC7-6B8A9FC7619D} = {B65A0C00-100D-4F27-BAC7-6B8A9FC7619D}
 		{C51E44B7-ADC9-4EDA-AAAE-F6307180A3EB} = {C51E44B7-ADC9-4EDA-AAAE-F6307180A3EB}
 		{C60C1767-A73A-4A9E-BAF1-D3463C7CEFEC} = {C60C1767-A73A-4A9E-BAF1-D3463C7CEFEC}
+		{D4F48A7F-F3D3-4303-921D-BF7FE34B7118} = {D4F48A7F-F3D3-4303-921D-BF7FE34B7118}
 		{D6E22195-EE69-4320-B08B-E68229FB69AB} = {D6E22195-EE69-4320-B08B-E68229FB69AB}
 		{D9428449-3E4B-4723-A8AA-1191315C7AAD} = {D9428449-3E4B-4723-A8AA-1191315C7AAD}
 		{E10BF2F9-D5CA-4330-8169-ED30D861697E} = {E10BF2F9-D5CA-4330-8169-ED30D861697E}
@@ -198,6 +201,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Home", "src\Agent\NewRelic\
 		{EC34F023-223D-432F-9401-9C3ED1B75DE4} = {EC34F023-223D-432F-9401-9C3ED1B75DE4}
 		{EFFD9051-E3AC-4266-9AF6-7ECC74C032BD} = {EFFD9051-E3AC-4266-9AF6-7ECC74C032BD}
 		{F889CE37-934F-48F2-A105-6C19CE292D37} = {F889CE37-934F-48F2-A105-6C19CE292D37}
+		{F921A316-A8D2-4992-B894-69A3B5CA34E3} = {F921A316-A8D2-4992-B894-69A3B5CA34E3}
 		{FA3ABF45-6DAB-47DC-B886-06BBEFE4292F} = {FA3ABF45-6DAB-47DC-B886-06BBEFE4292F}
 	EndProjectSection
 EndProject
@@ -215,6 +219,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchangeRedis2Plus", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elasticsearch", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\Elasticsearch\Elasticsearch.csproj", "{D9428449-3E4B-4723-A8AA-1191315C7AAD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MassTransit", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\MassTransit\MassTransit.csproj", "{0DC126D1-E782-4A41-BA3E-393083F08627}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MassTransitLegacy", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\MassTransitLegacy\MassTransitLegacy.csproj", "{F921A316-A8D2-4992-B894-69A3B5CA34E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kafka", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\Kafka\Kafka.csproj", "{270A9CC8-8031-49F4-A380-1389E7517DB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore6Plus", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\AspNetCore6Plus\AspNetCore6Plus.csproj", "{D4F48A7F-F3D3-4303-921D-BF7FE34B7118}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -445,6 +456,22 @@ Global
 		{D9428449-3E4B-4723-A8AA-1191315C7AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9428449-3E4B-4723-A8AA-1191315C7AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9428449-3E4B-4723-A8AA-1191315C7AAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DC126D1-E782-4A41-BA3E-393083F08627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DC126D1-E782-4A41-BA3E-393083F08627}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DC126D1-E782-4A41-BA3E-393083F08627}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DC126D1-E782-4A41-BA3E-393083F08627}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F921A316-A8D2-4992-B894-69A3B5CA34E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F921A316-A8D2-4992-B894-69A3B5CA34E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F921A316-A8D2-4992-B894-69A3B5CA34E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F921A316-A8D2-4992-B894-69A3B5CA34E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{270A9CC8-8031-49F4-A380-1389E7517DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{270A9CC8-8031-49F4-A380-1389E7517DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{270A9CC8-8031-49F4-A380-1389E7517DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{270A9CC8-8031-49F4-A380-1389E7517DB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4F48A7F-F3D3-4303-921D-BF7FE34B7118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4F48A7F-F3D3-4303-921D-BF7FE34B7118}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4F48A7F-F3D3-4303-921D-BF7FE34B7118}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4F48A7F-F3D3-4303-921D-BF7FE34B7118}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -514,6 +541,10 @@ Global
 		{3D69B4C9-FD16-461F-95AF-6FCA6EAA914E} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
 		{EC34F023-223D-432F-9401-9C3ED1B75DE4} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
 		{D9428449-3E4B-4723-A8AA-1191315C7AAD} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
+		{0DC126D1-E782-4A41-BA3E-393083F08627} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
+		{F921A316-A8D2-4992-B894-69A3B5CA34E3} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
+		{270A9CC8-8031-49F4-A380-1389E7517DB7} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
+		{D4F48A7F-F3D3-4303-921D-BF7FE34B7118} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8B98070-6B8E-403C-A07F-A3F2E4A3A3D0}
diff --git a/README.md b/README.md
index 6b9431a212..66158a9c09 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The New Relic Lambda Tracer is an OpenTracing Tracer implementation specifically
 ## Installation
 
 <!-- markdown-link-check-disable-next-line -->
-The latest released binaries for the .NET Agent can be found either [here](http://download.newrelic.com/dot_net_agent/latest_release/) or on [NuGet.org](https://www.nuget.org/profiles/newrelic).
+The latest released binaries for the .NET Agent can be found either [here](https://download.newrelic.com/dot_net_agent/latest_release/) or on [NuGet.org](https://www.nuget.org/profiles/newrelic).
 
 See our [agent installation documentation](https://docs.newrelic.com/docs/agents/net-agent/installation/introduction-net-agent-install) to understand which of these files are appropriate for your application type and hosting environment.
 
@@ -71,5 +71,5 @@ To [all contributors](https://github.com/newrelic/newrelic-dotnet-agent/graphs/c
 the [New Relic .NET agent](https://opensource.newrelic.com/projects/newrelic/newrelic-dotnet-agent).
 
 ## License
-The .NET Agent is licensed under the [Apache 2.0](http://apache.org/licenses/LICENSE-2.0.txt) License.
+The .NET Agent is licensed under the [Apache 2.0](https://apache.org/licenses/LICENSE-2.0.txt) License.
 The .NET Agent also uses source code from third-party libraries. You can find full details on which libraries are used and the terms under which they are licensed in the third-party notices document.
diff --git a/build/ArtifactBuilder/CoreAgentComponents.cs b/build/ArtifactBuilder/CoreAgentComponents.cs
index 24a3f20e09..a0eda2adaa 100644
--- a/build/ArtifactBuilder/CoreAgentComponents.cs
+++ b/build/ArtifactBuilder/CoreAgentComponents.cs
@@ -55,6 +55,10 @@ protected override void CreateAgentComponents()
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.StackExchangeRedis.dll",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.StackExchangeRedis2Plus.dll",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.NServiceBus.dll",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransit.dll",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.dll",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.Kafka.dll",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.AspNetCore6Plus.dll",
             };
 
             var wrapperXmls = new[]
@@ -74,6 +78,10 @@ protected override void CreateAgentComponents()
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.StackExchangeRedis.Instrumentation.xml",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.StackExchangeRedis2Plus.Instrumentation.xml",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.NServiceBus.Instrumentation.xml",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransit.Instrumentation.xml",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.Instrumentation.xml",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.Kafka.Instrumentation.xml",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.AspNetCore6Plus.Instrumentation.xml",
             };
 
             ExtensionXsd = $@"{SourceHomeBuilderPath}\extensions\extension.xsd";
diff --git a/build/ArtifactBuilder/FrameworkAgentComponents.cs b/build/ArtifactBuilder/FrameworkAgentComponents.cs
index 0f00a87c9a..8a5c4bdba9 100644
--- a/build/ArtifactBuilder/FrameworkAgentComponents.cs
+++ b/build/ArtifactBuilder/FrameworkAgentComponents.cs
@@ -63,7 +63,10 @@ protected override void CreateAgentComponents()
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.WebOptimization.dll",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.WebServices.dll",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.AspNetCore.dll",
-                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.Owin.dll"
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.Owin.dll",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransit.dll",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.dll",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.Kafka.dll",
             };
 
             var wrapperXmls = new[]
@@ -99,6 +102,9 @@ protected override void CreateAgentComponents()
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.WebOptimization.Instrumentation.xml",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.WebServices.Instrumentation.xml",
                 $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.Misc.Instrumentation.xml",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransit.Instrumentation.xml",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.Instrumentation.xml",
+                $@"{SourceHomeBuilderPath}\extensions\NewRelic.Providers.Wrapper.Kafka.Instrumentation.xml",
             };
 
             ExtensionXsd = $@"{SourceHomeBuilderPath}\extensions\extension.xsd";
diff --git a/build/build_home.ps1 b/build/build_home.ps1
index c7a1871d0d..c338c1f274 100644
--- a/build/build_home.ps1
+++ b/build/build_home.ps1
@@ -83,6 +83,15 @@ if ($melNetCorePath = Resolve-Path "$wrappersRootDir\MicrosoftExtensionsLogging\
     $netFrameworkWrapperHash.Add($dllObject, $xmlObject)
 }
 
+# AspNetCore6Plus is built to target .net 6, but we'll copy it to the netstandard folder 
+if ($aspNetCore6PlusPath = Resolve-Path "$wrappersRootDir\AspNetCore6Plus\bin\$Configuration\net6.0") {
+    $dllObject = Get-ChildItem -File -Path "$aspNetCore6PlusPath" -Filter NewRelic.Providers.Wrapper.AspNetCore6Plus.dll
+    $xmlObject = Get-ChildItem -File -Path "$aspNetCore6PlusPath" -Filter Instrumentation.xml
+    $netstandard20WrapperHash.Add($dllObject, $xmlObject)
+}
+
+
+
 $netFrameworkStorageArray = @()
 $netstandard20StorageArray = @()
 
diff --git a/deploy/linux/deploy_scripts/s3-index/README.md b/deploy/linux/deploy_scripts/s3-index/README.md
index b12cd3745f..7e93757cb6 100644
--- a/deploy/linux/deploy_scripts/s3-index/README.md
+++ b/deploy/linux/deploy_scripts/s3-index/README.md
@@ -27,7 +27,7 @@ GOPATH=$(pwd) go run src/indexer/main.go
 
 The AWS configuration in `~/.aws` will be used, or environment variables can be
 set. More details are at the
-[AWS Go documentation](http://docs.aws.amazon.com/sdk-for-go/api/).
+[AWS Go documentation](https://docs.aws.amazon.com/sdk-for-go/api/).
 
 If you go the environment variable route, you'll need to set `AWS_REGION`
 (probably to `us-east-1`), `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
diff --git a/licenses/LICENSE b/licenses/LICENSE
index f49a4e16e6..cda8001f8d 100644
--- a/licenses/LICENSE
+++ b/licenses/LICENSE
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/licenses/LICENSE.rtf b/licenses/LICENSE.rtf
index fbb3c971df..0e4e6d2b79 100644
--- a/licenses/LICENSE.rtf
+++ b/licenses/LICENSE.rtf
@@ -3,7 +3,7 @@
 {\*\generator Riched20 10.0.22621}\viewkind4\uc1 
 \pard\fs16\lang1033                                  Apache License\par
                            Version 2.0, January 2004\par
-                        {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs16\par
+                        {{\field{\*\fldinst{HYPERLINK https://www.apache.org/licenses/ }}{\fldrslt{https://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs16\par
 \par
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
 \par
@@ -195,7 +195,7 @@
    you may not use this file except in compliance with the License.\par
    You may obtain a copy of the License at\par
 \par
-       {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs16\par
+       {{\field{\*\fldinst{HYPERLINK https://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{https://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs16\par
 \par
    Unless required by applicable law or agreed to in writing, software\par
    distributed under the License is distributed on an "AS IS" BASIS,\par
diff --git a/licenses/LICENSE.txt b/licenses/LICENSE.txt
index f49a4e16e6..cda8001f8d 100644
--- a/licenses/LICENSE.txt
+++ b/licenses/LICENSE.txt
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE b/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE
index f49a4e16e6..cda8001f8d 100644
--- a/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE
+++ b/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE.txt b/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE.txt
index f49a4e16e6..cda8001f8d 100644
--- a/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE.txt
+++ b/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/LICENSE.txt
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/THIRD_PARTY_NOTICES.txt b/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/THIRD_PARTY_NOTICES.txt
index 981cc6b6ff..862dc4961f 100644
--- a/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/THIRD_PARTY_NOTICES.txt
+++ b/licenses/NewRelic.OpenTracing.AmazonLambda.Tracer/THIRD_PARTY_NOTICES.txt
@@ -14,7 +14,7 @@ which is released under the following license(s):
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -206,7 +206,7 @@ which is released under the following license(s):
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -247,7 +247,7 @@ which is released under the following license(s):
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -439,7 +439,7 @@ which is released under the following license(s):
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/licenses/THIRD_PARTY_NOTICES.txt b/licenses/THIRD_PARTY_NOTICES.txt
index 1457260337..253e04e1b1 100644
--- a/licenses/THIRD_PARTY_NOTICES.txt
+++ b/licenses/THIRD_PARTY_NOTICES.txt
@@ -123,210 +123,175 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----------------------------------------------------------------
 
-This product includes 'Log4net' (http://logging.apache.org/log4net), which 
-is released under the following license(s):
+This product includes 'Serilog' (https://github.com/serilog/serilog), which is released under the following license(s):
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
- 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- 
-   1. Definitions.
- 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
- 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
- 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
- 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
- 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
- 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
- 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
- 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
- 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
- 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
- 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
- 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
- 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
- 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
- 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
- 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
- 
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
- 
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
- 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
- 
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
- 
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
- 
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
- 
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
- 
-   END OF TERMS AND CONDITIONS
- 
-   APPENDIX: How to apply the Apache License to your work.
- 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
- 
-   Copyright [yyyy] [name of copyright owner]
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
- 
-       http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Apache License
+Version 2.0, January 2004
+https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
 
 ----------------------------------------------------------------
 
@@ -339,7 +304,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -375,7 +340,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----------------------------------------------------------------
 
-This product includes 'RapidXml' (http://rapidxml.sourceforge.net/), which 
+This product includes 'RapidXml' (https://rapidxml.sourceforge.net/), which 
 is released under the following license(s):
 
 The MIT License
@@ -403,7 +368,7 @@ IN THE SOFTWARE.
 
 ----------------------------------------------------------------
 
-This product includes 'SharpZLib' (http://www.icsharpcode.net/opensource/sharpziplib), 
+This product includes 'SharpZLib' (https://github.com/icsharpcode/SharpZipLib), 
 which is released under the following license(s):
 
 Copyright © 2000-2018 SharpZipLib Contributors
@@ -464,7 +429,7 @@ Unless otherwise noted, the source code here is covered by the following license
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+        https://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -530,7 +495,7 @@ which is released under the following license(s):
 
                                 Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -766,7 +731,7 @@ which is released under the following license(s):
 
 Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -958,7 +923,7 @@ Apache License
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -974,7 +939,7 @@ which is released under the following license(s):
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -1195,7 +1160,7 @@ which are released under the following license(s):
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
diff --git a/samples/README.md b/samples/README.md
deleted file mode 100644
index 1b146291fd..0000000000
--- a/samples/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# New Relic .NET Agent Code Samples
-
-This is a collection of working code samples demonstrating how to use the .NET Agent in a variety of scenarios, designed to help
-you get up and running with the New Relic .NET Agent. 
-
-For more information, refer to the [Introduction to New Relic for .NET](https://docs.newrelic.com/docs/apm/agents/net-agent/getting-started/introduction-new-relic-net/) documentation.
\ No newline at end of file
diff --git a/samples/console/ConsoleSample.csproj b/samples/console/ConsoleSample.csproj
deleted file mode 100644
index ee4d072f53..0000000000
--- a/samples/console/ConsoleSample.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>default</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageReference Include="NewRelic.Agent" Version="*"/>
-    <PackageReference Include="NewRelic.Agent.Api" Version="*"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/console/Program.cs b/samples/console/Program.cs
deleted file mode 100644
index 271b968513..0000000000
--- a/samples/console/Program.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace ConsoleSample;
-
-public class Program
-{
-    public static async Task Main(string[] args)
-    {
-        // create an IHost instance and add a hosted service to it
-        var host = Host.CreateDefaultBuilder(args)
-            .ConfigureServices(services =>
-                {
-                    services.AddHostedService<Worker>();
-                })
-            .Build();
-
-        var logger = host.Services.GetService(typeof(ILogger<Program>)) as ILogger<Program>;
-
-        // run the hosted service until the application is terminated
-        logger!.LogInformation("Hello world!");
-        await host.RunAsync();
-        logger!.LogInformation("Goodbye world!");
-    }
-}
diff --git a/samples/console/README.md b/samples/console/README.md
deleted file mode 100644
index d0fa0270af..0000000000
--- a/samples/console/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# New Relic .NET Agent Sample - Console (.NET 7)
-
-## Overview
-This sample demonstrates a .NET 7 Console app, using the `NewRelic.Agent` [NuGet package](https://www.nuget.org/packages/NewRelic.Agent).
-
-## To run this sample:
-1. Edit `runSample.ps1` and replace `<your-new-relic-license-key>` with your New Relic license key.
-2. Start a Powershell terminal window and navigate to the `samples\console` folder, then run:
-    ```
-    .\runSample.ps1
-    ```
-3. Log in to your New Relic account and look for the `ConsoleSample` app on the APM Summary page (it can take a few minutes).
-4. You can view the logs generated by the New Relic .NET Agent by navigating to the `bin\debug\net7.0\newrelic\logs` folder.
-
-## For more help
-Refer to the [.NET Agent Documentation](https://docs.newrelic.com/install/dotnet) if you need further guidance.
\ No newline at end of file
diff --git a/samples/console/Worker.cs b/samples/console/Worker.cs
deleted file mode 100644
index 74557c34bc..0000000000
--- a/samples/console/Worker.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using NewRelic.Api.Agent;
-
-namespace ConsoleSample;
-
-public class Worker : BackgroundService
-{
-    private readonly ILogger<Worker> _logger;
-    private readonly HttpClient _httpClient;
-
-    public Worker(ILogger<Worker> logger)
-    {
-        _logger = logger;
-        _httpClient = new HttpClient();
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        try
-        {
-            _logger.LogInformation("Worker service is executing");
-            while (!stoppingToken.IsCancellationRequested)
-            {
-                await GetTheWeatherAsync();
-
-                _logger.LogInformation("Chilling for a few seconds...");
-                await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
-            }
-        }
-        finally
-        {
-            _logger.LogInformation("Worker service is terminating");
-        }
-    }
-
-    public override void Dispose()
-    {
-        _httpClient.Dispose();
-    }
-
-    /// <summary>
-    /// Call an open API service to get the weather for Portland, OR.
-    /// Using the [Transaction] attribute ensures that this method is instrumented by the .NET Agent
-    /// </summary>
-    /// <returns></returns>
-    [Transaction]
-    private async Task GetTheWeatherAsync()
-    {
-        try
-        {
-            _logger.LogInformation("Getting the weather forecast for Portland, OR");
-            var response = await _httpClient.GetStringAsync(
-                "https://api.open-meteo.com/v1/forecast?latitude=45.5234&longitude=-122.6762&hourly=temperature_2m&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch&timezone=America%2FLos_Angeles&forecast_days=1");
-
-            _logger.LogInformation("Here's the forecast: {Forecast}", response);
-        }
-        catch (Exception e)
-        {
-            _logger.LogError(e, "Unexpected exception calling HttpClient.GetStringAsync()");
-        }
-    }
-}
diff --git a/samples/console/runSample.ps1 b/samples/console/runSample.ps1
deleted file mode 100644
index 7d71624501..0000000000
--- a/samples/console/runSample.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# set the required environment variables for the .NET Agent
-$env:CORECLR_ENABLE_PROFILING=1
-$env:CORECLR_PROFILER="{36032161-FFC0-4B61-B559-F6C5D41BAE5A}"
-$env:CORECLR_PROFILER_PATH="$PWD\bin\release\net7.0\newrelic\NewRelic.Profiler.dll"
-$env:CORECLR_NEWRELIC_HOME="$PWD\bin\release\net7.0\newrelic"
-$env:NEW_RELIC_LICENSE_KEY="<your-new-relic-license-key>" # *** Replace with your license key! *** 
-$env:NEW_RELIC_APP_NAME="ConsoleSample"
-
-# run the sample
-dotnet run -c Release
\ No newline at end of file
diff --git a/samples/docker/alpine/Controllers/WeatherForecastController.cs b/samples/docker/alpine/Controllers/WeatherForecastController.cs
deleted file mode 100644
index dd95fb2e47..0000000000
--- a/samples/docker/alpine/Controllers/WeatherForecastController.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace DockerSample.Controllers;
-
-[ApiController]
-[Route("[controller]")]
-public class WeatherForecastController : ControllerBase
-{
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
-
-    private readonly ILogger<WeatherForecastController> _logger;
-
-    public WeatherForecastController(ILogger<WeatherForecastController> logger)
-    {
-        _logger = logger;
-    }
-
-    [HttpGet(Name = "GetWeatherForecast")]
-    public IEnumerable<WeatherForecast> Get()
-    {
-        return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-        {
-            Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-            TemperatureC = Random.Shared.Next(-20, 55),
-            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-        })
-        .ToArray();
-    }
-}
diff --git a/samples/docker/alpine/Dockerfile b/samples/docker/alpine/Dockerfile
deleted file mode 100644
index d64eafc74b..0000000000
--- a/samples/docker/alpine/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
-WORKDIR /app
-EXPOSE 80
-ENV ASPNETCORE_URLS=http://+:80
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build 
-
-WORKDIR /src
-COPY . ./
-RUN dotnet restore
-RUN dotnet publish -c Release -o /app/publish
-
-FROM base AS final
-
-# download and install the New Relic .NET Agent using the tarball for the latest agent release
-# To use a specific version instead, modify the wget and tar commands to reference the full path to the 
-# dotnet agent version tarball you want to use instead of the wildcard specification
-# 
-# the agent is installed at /usr/local/new-relic-dotnet-agent
-RUN apk update && apk add --no-cache wget tar \
-    && wget https://download.newrelic.com/dot_net_agent/latest_release -A '*amd64.tar.gz' -r \
-    && tar -xzf download.newrelic.com/dot_net_agent/latest_release/*.tar.gz -C /usr/local \ 
-    && rm -rf download.newrelic.com
-
-# Enable the agent
-ENV CORECLR_ENABLE_PROFILING=1 \
-CORECLR_PROFILER={36032161-FFC0-4B61-B559-F6C5D41BAE5A} \
-CORECLR_NEWRELIC_HOME=/usr/local/newrelic-dotnet-agent \
-CORECLR_PROFILER_PATH=/usr/local/newrelic-dotnet-agent/libNewRelicProfiler.so \
-NEW_RELIC_LICENSE_KEY=<your-new-relic-license-key> \
-NEW_RELIC_APP_NAME=weather-forecast-alpine \
-NEWRELIC_LOG_DIRECTORY=/app/logs
-
-WORKDIR /app
-COPY --from=build /app/publish .
-
-ENTRYPOINT ["dotnet", "WeatherForecast.dll"]
diff --git a/samples/docker/alpine/Program.cs b/samples/docker/alpine/Program.cs
deleted file mode 100644
index 48863a6d6c..0000000000
--- a/samples/docker/alpine/Program.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();
diff --git a/samples/docker/alpine/README.md b/samples/docker/alpine/README.md
deleted file mode 100644
index 3e1c0009f2..0000000000
--- a/samples/docker/alpine/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# New Relic .NET Agent Sample - Docker (Alpine)
-
-## Overview
-This sample demonstrates running a .NET 7 Web API in an Alpine-based Docker container. The sample application is just the "default" application created 
-by running `dotnet new webapi`.
-
-The two important parts of this sample are installation of the New Relic .NET Agent and setting the required environment variables to enable the .NET Agent
-to load and instrument the sample app. Refer to `Dockerfile` for details.
-
-## To run this sample:
-1. Edit `Dockerfile` and replace `<your-new-relic-license-key>` with your New Relic license key.
-2. Open a command prompt (or Powershell) and run:
-     ```
-     docker build . -t dotnet-agent-alpine
-     docker run -d --name dotnet-agent-alpine -p 8080:80 dotnet-agent-alpine
-     ```
-3. Generate some traffic to the app by visiting http://localhost:8080/WeatherForecast
-4. Log in to your New Relic account and look for the `weather-forecast-alpine` app on the APM Summary page (it can take a few minutes).
-5. You can view the logs generated by the New Relic .NET Agent by viewing the `/app/logs` folder in the Docker container.
-
-## For more help
-Refer to the [.NET Agent Documentation](https://docs.newrelic.com/install/dotnet) if you need further guidance.
\ No newline at end of file
diff --git a/samples/docker/alpine/WeatherForecast.cs b/samples/docker/alpine/WeatherForecast.cs
deleted file mode 100644
index 14bef184f1..0000000000
--- a/samples/docker/alpine/WeatherForecast.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace DockerSample;
-
-public class WeatherForecast
-{
-    public DateOnly Date { get; set; }
-
-    public int TemperatureC { get; set; }
-
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-    public string? Summary { get; set; }
-}
diff --git a/samples/docker/alpine/WeatherForecast.csproj b/samples/docker/alpine/WeatherForecast.csproj
deleted file mode 100644
index a4f7357fc0..0000000000
--- a/samples/docker/alpine/WeatherForecast.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>default</LangVersion>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.10" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/samples/docker/centos/.dockerignore b/samples/docker/centos/.dockerignore
deleted file mode 100644
index 3729ff0cd1..0000000000
--- a/samples/docker/centos/.dockerignore
+++ /dev/null
@@ -1,25 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
\ No newline at end of file
diff --git a/samples/docker/centos/Controllers/WeatherForecastController.cs b/samples/docker/centos/Controllers/WeatherForecastController.cs
deleted file mode 100644
index dd95fb2e47..0000000000
--- a/samples/docker/centos/Controllers/WeatherForecastController.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace DockerSample.Controllers;
-
-[ApiController]
-[Route("[controller]")]
-public class WeatherForecastController : ControllerBase
-{
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
-
-    private readonly ILogger<WeatherForecastController> _logger;
-
-    public WeatherForecastController(ILogger<WeatherForecastController> logger)
-    {
-        _logger = logger;
-    }
-
-    [HttpGet(Name = "GetWeatherForecast")]
-    public IEnumerable<WeatherForecast> Get()
-    {
-        return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-        {
-            Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-            TemperatureC = Random.Shared.Next(-20, 55),
-            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-        })
-        .ToArray();
-    }
-}
diff --git a/samples/docker/centos/Dockerfile b/samples/docker/centos/Dockerfile
deleted file mode 100644
index 6cfc90f2fb..0000000000
--- a/samples/docker/centos/Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM quay.io/centos/centos:stream9 AS base
-WORKDIR /app
-EXPOSE 80
-ENV ASPNETCORE_URLS=http://+:80
-
-# build using the Debian-based .NET SDK image
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build 
-
-WORKDIR /src
-COPY . ./
-RUN dotnet restore
-RUN dotnet publish -c Release -o /app/publish 
-
-FROM base AS final
-
-# install asp.netcore
-RUN dnf install aspnetcore-runtime-7.0 -y
-
-# install wget
-RUN yum -y update && yum -y install wget
-
-# download and install the New Relic .NET Agent using the rpm package for the latest agent release
-# To use a specific version instead, modify the wget and rpm commands to reference the full path to the 
-# dotnet agent version rpm file you want to use instead of the wildcard specification
-# 
-# the agent is installed at /usr/local/new-relic-dotnet-agent
-RUN wget https://download.newrelic.com/dot_net_agent/latest_release -A '*.x86_64.rpm' -r \
-    && rpm -i download.newrelic.com/dot_net_agent/latest_release/*.x86_64.rpm \
-    && rm -rf download.newrelic.com
-
-# Enable the agent
-ENV CORECLR_ENABLE_PROFILING=1 \
-CORECLR_PROFILER={36032161-FFC0-4B61-B559-F6C5D41BAE5A} \
-CORECLR_NEWRELIC_HOME=/usr/local/newrelic-dotnet-agent \
-CORECLR_PROFILER_PATH=/usr/local/newrelic-dotnet-agent/libNewRelicProfiler.so \
-NEW_RELIC_LICENSE_KEY=<your-new-relic-license-key> \
-NEW_RELIC_APP_NAME=weather-forecast-centos \
-NEWRELIC_LOG_DIRECTORY=/app/logs
-
-WORKDIR /app
-COPY --from=build /app/publish .
-
-ENTRYPOINT ["dotnet", "WeatherForecast.dll"]
\ No newline at end of file
diff --git a/samples/docker/centos/Program.cs b/samples/docker/centos/Program.cs
deleted file mode 100644
index 48863a6d6c..0000000000
--- a/samples/docker/centos/Program.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();
diff --git a/samples/docker/centos/README.md b/samples/docker/centos/README.md
deleted file mode 100644
index 3b7acbe793..0000000000
--- a/samples/docker/centos/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# New Relic .NET Agent Sample - Docker (Centos)
-
-## Overview
-
-This sample demonstrates running a .NET 7 Web API in a Centos-based Docker container. The sample application is just the "default" application created 
-by running `dotnet new webapi`.
-
-The two important parts of this sample are installation of the New Relic .NET Agent and setting the required environment variables to enable the .NET Agent
-to load and instrument the sample app. Refer to `Dockerfile` for details.
-
-## To run this sample:
-1. Edit `Dockerfile` and replace `<your-new-relic-license-key>` with your New Relic license key .
-2. Open a command prompt (or Powershell) and run:
-     ```
-     docker build . -t dotnet-agent-centos
-     docker run -d --name dotnet-agent-centos -p 8080:80 dotnet-agent-centos
-     ```
-3. Generate some traffic to the app by visiting http://localhost:8080/WeatherForecast
-4. Log in to your New Relic account and look for the `weather-forecast-centos` app on the APM Summary page (it can take a few minutes).
-5. You can view the logs generated by the New Relic .NET Agent by viewing the `/app/logs` folder in the Docker container.
-
-## For more help
-Refer to the [.NET Agent Documentation](https://docs.newrelic.com/install/dotnet) if you need further guidance.
\ No newline at end of file
diff --git a/samples/docker/centos/WeatherForecast.cs b/samples/docker/centos/WeatherForecast.cs
deleted file mode 100644
index 14bef184f1..0000000000
--- a/samples/docker/centos/WeatherForecast.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace DockerSample;
-
-public class WeatherForecast
-{
-    public DateOnly Date { get; set; }
-
-    public int TemperatureC { get; set; }
-
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-    public string? Summary { get; set; }
-}
diff --git a/samples/docker/centos/WeatherForecast.csproj b/samples/docker/centos/WeatherForecast.csproj
deleted file mode 100644
index a4f7357fc0..0000000000
--- a/samples/docker/centos/WeatherForecast.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>default</LangVersion>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.10" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/samples/docker/centos/appsettings.Development.json b/samples/docker/centos/appsettings.Development.json
deleted file mode 100644
index 0c208ae918..0000000000
--- a/samples/docker/centos/appsettings.Development.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
diff --git a/samples/docker/ubuntu/.dockerignore b/samples/docker/ubuntu/.dockerignore
deleted file mode 100644
index 3729ff0cd1..0000000000
--- a/samples/docker/ubuntu/.dockerignore
+++ /dev/null
@@ -1,25 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
\ No newline at end of file
diff --git a/samples/docker/ubuntu/Controllers/WeatherForecastController.cs b/samples/docker/ubuntu/Controllers/WeatherForecastController.cs
deleted file mode 100644
index dd95fb2e47..0000000000
--- a/samples/docker/ubuntu/Controllers/WeatherForecastController.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace DockerSample.Controllers;
-
-[ApiController]
-[Route("[controller]")]
-public class WeatherForecastController : ControllerBase
-{
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
-
-    private readonly ILogger<WeatherForecastController> _logger;
-
-    public WeatherForecastController(ILogger<WeatherForecastController> logger)
-    {
-        _logger = logger;
-    }
-
-    [HttpGet(Name = "GetWeatherForecast")]
-    public IEnumerable<WeatherForecast> Get()
-    {
-        return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-        {
-            Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-            TemperatureC = Random.Shared.Next(-20, 55),
-            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-        })
-        .ToArray();
-    }
-}
diff --git a/samples/docker/ubuntu/Dockerfile b/samples/docker/ubuntu/Dockerfile
deleted file mode 100644
index b5457b75a4..0000000000
--- a/samples/docker/ubuntu/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy AS base
-WORKDIR /app
-EXPOSE 80
-ENV ASPNETCORE_URLS=http://+:80
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy AS build 
-
-WORKDIR /src
-COPY . ./
-RUN dotnet restore
-RUN dotnet publish -c Release -o /app/publish
-
-FROM base AS final
-
-# download and install the latest version of the New Relic .NET Agent via the apt package manager
-# the agent is installed at /usr/local/new-relic-dotnet-agent
-RUN apt-get update && apt-get install -y wget ca-certificates gnupg \
-&& echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list \
-&& wget https://download.newrelic.com/548C16BF.gpg \
-&& apt-key add 548C16BF.gpg \
-&& apt-get update \
-&& apt-get install -y newrelic-dotnet-agent \
-&& rm -rf /var/lib/apt/lists/*
-
-# Enable the agent
-ENV CORECLR_ENABLE_PROFILING=1 \
-CORECLR_PROFILER={36032161-FFC0-4B61-B559-F6C5D41BAE5A} \
-CORECLR_NEWRELIC_HOME=/usr/local/newrelic-dotnet-agent \
-CORECLR_PROFILER_PATH=/usr/local/newrelic-dotnet-agent/libNewRelicProfiler.so \
-NEW_RELIC_LICENSE_KEY=<your-new-relic-license-key> \
-NEW_RELIC_APP_NAME=weather-forecast-ubuntu \
-NEWRELIC_LOG_DIRECTORY=/app/logs
-
-WORKDIR /app
-COPY --from=build /app/publish .
-
-ENTRYPOINT ["dotnet", "WeatherForecast.dll"]
diff --git a/samples/docker/ubuntu/Program.cs b/samples/docker/ubuntu/Program.cs
deleted file mode 100644
index 48863a6d6c..0000000000
--- a/samples/docker/ubuntu/Program.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();
diff --git a/samples/docker/ubuntu/README.md b/samples/docker/ubuntu/README.md
deleted file mode 100644
index 14954442e2..0000000000
--- a/samples/docker/ubuntu/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# New Relic .NET Agent Sample - Docker (Ubuntu or Debian)
-
-## Overview
-
-This sample demonstrates running a .NET 7 Web API in a Ubuntu-based Docker container. The sample application is just the "default" application created 
-by running `dotnet new webapi`.
-
-The two important parts of this sample are installation of the New Relic .NET Agent and setting the required environment variables to enable the .NET Agent
-to load and instrument the sample app. Refer to `Dockerfile` for details.
-
-Note that this sample uses a Ubuntu-based Docker image; you could use a Debian-based image also, by changing the tag on the two `FROM` lines in
-`Dockerfile` to reference `7.0` (or `7.0-bullseye-slim`). No other changes required are required.
-
-## To run this sample:
-1. Edit `Dockerfile` and replace `<your-new-relic-license-key>` with your New Relic license key.
-2. Open a command prompt (or Powershell) and run:
-     ```
-     docker build . -t dotnet-agent-ubuntu
-     docker run -d --name dotnet-agent-ubuntu -p 8080:80 dotnet-agent-ubuntu
-     ```
-3. Generate some traffic to the app by visiting http://localhost:8080/WeatherForecast
-4. Log in to your New Relic account and look for the `weather-forecast-ubuntu` app on the APM Summary page (it can take a few minutes).
-5. You can view the logs generated by the New Relic .NET Agent by viewing the `/app/logs` folder in the Docker container.
-
-## For more help
-Refer to the [.NET Agent Documentation](https://docs.newrelic.com/install/dotnet) if you need further guidance.
\ No newline at end of file
diff --git a/samples/docker/ubuntu/WeatherForecast.cs b/samples/docker/ubuntu/WeatherForecast.cs
deleted file mode 100644
index 14bef184f1..0000000000
--- a/samples/docker/ubuntu/WeatherForecast.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace DockerSample;
-
-public class WeatherForecast
-{
-    public DateOnly Date { get; set; }
-
-    public int TemperatureC { get; set; }
-
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-    public string? Summary { get; set; }
-}
diff --git a/samples/docker/ubuntu/WeatherForecast.csproj b/samples/docker/ubuntu/WeatherForecast.csproj
deleted file mode 100644
index a4f7357fc0..0000000000
--- a/samples/docker/ubuntu/WeatherForecast.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>default</LangVersion>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.10" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/samples/docker/ubuntu/appsettings.json b/samples/docker/ubuntu/appsettings.json
deleted file mode 100644
index 10f68b8c8b..0000000000
--- a/samples/docker/ubuntu/appsettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
diff --git a/src/Agent/CHANGELOG.md b/src/Agent/CHANGELOG.md
index 0291fff2d2..23718bca1d 100644
--- a/src/Agent/CHANGELOG.md
+++ b/src/Agent/CHANGELOG.md
@@ -4,6 +4,41 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [10.19.2](https://github.com/newrelic/newrelic-dotnet-agent/compare/v10.19.1...v10.19.2) (2023-11-09)
+
+
+### Fixes
+
+* ASP.NET Core 6+ browser agent injection is disabled by default. ([e571ac1](https://github.com/newrelic/newrelic-dotnet-agent/commit/e571ac1094a86b6717a0d356432e067727f25130))
+
+## [10.19.1](https://github.com/newrelic/newrelic-dotnet-agent/compare/v10.19.0...v10.19.1) (2023-11-08)
+
+
+### Fixes
+
+* Add defensive coding and exception handling during ASP.NET Core 6+ browser injection. ([#2035](https://github.com/newrelic/newrelic-dotnet-agent/issues/2035)) ([#2038](https://github.com/newrelic/newrelic-dotnet-agent/issues/2038)) ([5ddd0ea](https://github.com/newrelic/newrelic-dotnet-agent/commit/5ddd0ea6cd196da5a9aa4b00a8c097c111211251))
+
+## [10.19.0](https://github.com/newrelic/newrelic-dotnet-agent/compare/v10.18.0...v10.19.0) (2023-11-07)
+
+
+### New features
+
+* Add a supportability metric (Supportability/Logging/Forwarding/Empty) when an "empty" log event is not forwarded. Resolves [#1472](https://github.com/newrelic/newrelic-dotnet-agent/issues/1472) ([1db5335](https://github.com/newrelic/newrelic-dotnet-agent/commit/1db5335d2ada4e6e1a9b1da7f406a3e9fc1ef8e3))
+* Add automatic browser agent injection for ASP.NET Core v6+ web applications. ([14c6bb1](https://github.com/newrelic/newrelic-dotnet-agent/commit/14c6bb15030e1744bdd85a46610c1fc269bb58c4))
+* Add automatic instrumentation for ASP.NET Core v6+ Razor Pages. ([14c6bb1](https://github.com/newrelic/newrelic-dotnet-agent/commit/14c6bb15030e1744bdd85a46610c1fc269bb58c4))
+* Add automatic instrumentation of MassTransit clients v7.1.0 and newer. [#1282](https://github.com/newrelic/newrelic-dotnet-agent/issues/1282) ([3b79002](https://github.com/newrelic/newrelic-dotnet-agent/commit/3b790029242d92abf6c766af81715ab474c2384c))
+* Add new span attributes to more closely match OTel spec. This includes server.address and server.port for database calls, and thread.id where appropriate. ([9500d4d](https://github.com/newrelic/newrelic-dotnet-agent/commit/9500d4d52fe583015799bdb02e9b2585b3769b6f))
+* Allow forwarding of logs where context data is present but the message and exception are missing. Previously, logs with no message or exception were not forwarded, even if they held context data. ([1db5335](https://github.com/newrelic/newrelic-dotnet-agent/commit/1db5335d2ada4e6e1a9b1da7f406a3e9fc1ef8e3))
+* Enable auto-instrumentation for Confluent.Kafka versions 1.4.0 to 2.x.x. ([#1990](https://github.com/newrelic/newrelic-dotnet-agent/issues/1990)) ([9f8d22f](https://github.com/newrelic/newrelic-dotnet-agent/commit/9f8d22fc383020bcee20c12bc2b3321c345ba8d9))
+* Update RabbitMQ instrumentation to capture more message consumption scenarios. ([3b79002](https://github.com/newrelic/newrelic-dotnet-agent/commit/3b790029242d92abf6c766af81715ab474c2384c))
+
+
+### Fixes
+
+* Ensure log lines are written to the audit log file when audit logging is enabled. ([#2028](https://github.com/newrelic/newrelic-dotnet-agent/issues/2028)) ([#2029](https://github.com/newrelic/newrelic-dotnet-agent/issues/2029)) ([c6b940d](https://github.com/newrelic/newrelic-dotnet-agent/commit/c6b940d1c51e79acfa918504bf3adbfbb3e379e5))
+* Fix a segfault when using sendDataOnExit with Linux on Docker. ([#2018](https://github.com/newrelic/newrelic-dotnet-agent/issues/2018)) ([3ac75a0](https://github.com/newrelic/newrelic-dotnet-agent/commit/3ac75a0073bee60859475d3fa1f08e8edfe932ee))
+* Reduce exception logging on CallVendorApi failures. Resolves [#2005](https://github.com/newrelic/newrelic-dotnet-agent/issues/2005) ([#2006](https://github.com/newrelic/newrelic-dotnet-agent/issues/2006)) ([bf4102b](https://github.com/newrelic/newrelic-dotnet-agent/commit/bf4102b75ef4bc036ba4c5ae8f1da2ad12cbe1be))
+
 ## [10.18.0](https://github.com/newrelic/newrelic-dotnet-agent/compare/v10.17.0...v10.18.0) (2023-10-17)
 
 
diff --git a/src/Agent/MsiInstaller/Installer/Product.wxs b/src/Agent/MsiInstaller/Installer/Product.wxs
index 68e5daedf2..032c0e0787 100644
--- a/src/Agent/MsiInstaller/Installer/Product.wxs
+++ b/src/Agent/MsiInstaller/Installer/Product.wxs
@@ -465,6 +465,15 @@ SPDX-License-Identifier: Apache-2.0
       <Component Id="ElasticsearchWrapperComponent" Guid="{9C233889-69DD-4B8B-A1A6-ABAC6E27A716}">
         <File Id="ElasticsearchWrapperFile" Name="NewRelic.Providers.Wrapper.Elasticsearch.dll" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.Elasticsearch.dll"/>
       </Component>
+      <Component Id="MassTransitWrapperComponent" Guid="{E133AC42-B96B-46E5-BB9B-0E001AB6EC73}">
+        <File Id="MassTransitWrapperFile" Name="NewRelic.Providers.Wrapper.MassTransit.dll" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.MassTransit.dll"/>
+      </Component>
+      <Component Id="MassTransitLegacyWrapperComponent" Guid="{E44779CC-4C76-4AB1-9CE3-5C225A7202FB}">
+        <File Id="MassTransitLegacyWrapperFile" Name="NewRelic.Providers.Wrapper.MassTransitLegacy.dll" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.dll"/>
+      </Component>
+      <Component Id="KafkaWrapperComponent" Guid="{BE97F5F5-A392-48A0-8888-B2973EA09490}">
+        <File Id="KafkaWrapperFile" Name="NewRelic.Providers.Wrapper.Kafka.dll" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.Kafka.dll"/>
+      </Component>
 
       <!-- Reference libraries -->
       <Component Id="NewRelicCoreReferenceComponent" Guid="{C196ED1E-0FBA-4D36-9C34-E969B0C9E8C9}">
@@ -520,10 +529,22 @@ SPDX-License-Identifier: Apache-2.0
       </Component>
       <Component Id="CoreNServiceBusWrapperComponent" Guid="{E315AE98-119D-4E46-BACB-C28CF6016C19}">
         <File Id="CoreNServiceBusWrapperFile" Name="NewRelic.Providers.Wrapper.NServiceBus.dll" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.NServiceBus.dll"/>
-      </Component>  
+      </Component>
       <Component Id="CoreElasticsearchWrapperComponent" Guid="{531A713C-B46C-41C8-8B21-49CBD4C0A459}">
         <File Id="CoreElasticsearchWrapperFile" Name="NewRelic.Providers.Wrapper.Elasticsearch.dll" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.Elasticsearch.dll"/>
       </Component>
+      <Component Id="CoreMassTransitWrapperComponent" Guid="{9E905BC4-D844-4E9C-AC2E-560C837CDDB8}">
+        <File Id="CoreMassTransitWrapperFile" Name="NewRelic.Providers.Wrapper.MassTransit.dll" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.MassTransit.dll"/>
+      </Component>
+      <Component Id="CoreMassTransitLegacyWrapperComponent" Guid="{8E94ECF6-B1A8-4D83-BDE8-71055FA33C34}">
+        <File Id="CoreMassTransitLegacyWrapperFile" Name="NewRelic.Providers.Wrapper.MassTransitLegacy.dll" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.dll"/>
+      </Component>
+      <Component Id="CoreKafkaWrapperComponent" Guid="{6CA6D5A4-A204-4B04-A6B5-13D8B3E736C2}">
+        <File Id="CoreKafkaWrapperFile" Name="NewRelic.Providers.Wrapper.Kafka.dll" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.Kafka.dll"/>
+      </Component>
+      <Component Id="CoreAspNetCore6PlusWrapperComponent" Guid="{3B7C5E60-BA9D-4B1C-8B16-B16025B075C0}">
+        <File Id="CoreAspNetCore6PlusWrapperFile" Name="NewRelic.Providers.Wrapper.AspNetCore6Plus.dll" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.AspNetCore6Plus.dll"/>
+      </Component>
 
       <!-- Reference libraries -->
       <Component Id="CoreNewRelicCoreReferenceComponent" Guid="{DD2BE979-7D4B-47EA-9FBE-F6B381D70E0B}">
@@ -629,6 +650,15 @@ SPDX-License-Identifier: Apache-2.0
       <Component Id="ElasticsearchInstrumentationComponent" Guid="{42D85537-D0AB-44EB-8BE5-4B2EEB26DE91}">
         <File Id="ElasticsearchInstrumentationFile" Name="NewRelic.Providers.Wrapper.Elasticsearch.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.Elasticsearch.Instrumentation.xml"/>
       </Component>
+      <Component Id="MassTransitInstrumentationComponent" Guid="{D8DBC7D6-0337-4441-A5BB-C6670300144A}">
+        <File Id="MassTransitInstrumentationFile" Name="NewRelic.Providers.Wrapper.MassTransit.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.MassTransit.Instrumentation.xml"/>
+      </Component>
+      <Component Id="MassTransitLegacyInstrumentationComponent" Guid="{FAD302C1-07BE-4770-85E4-F6EE25E287F3}">
+        <File Id="MassTransitLegacyInstrumentationFile" Name="NewRelic.Providers.Wrapper.MassTransitLegacy.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.Instrumentation.xml"/>
+      </Component>
+      <Component Id="KafkaInstrumentationComponent" Guid="{9FC86A0E-CACD-4DA8-84F8-20997C904913}">
+        <File Id="KafkaInstrumentationFile" Name="NewRelic.Providers.Wrapper.Kafka.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)\extensions\NewRelic.Providers.Wrapper.Kafka.Instrumentation.xml"/>
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="CoreNewRelic.Agent.Extensions.Instrumentation" Directory="CoreExtensionsFolder">
@@ -677,6 +707,18 @@ SPDX-License-Identifier: Apache-2.0
       <Component Id="CoreElasticsearchInstrumentationComponent" Guid="{02EFBFF6-9DA8-4138-A03F-E9502B631A76}">
         <File Id="CoreElasticsearchInstrumentationFile" Name="NewRelic.Providers.Wrapper.Elasticsearch.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.Elasticsearch.Instrumentation.xml"/>
       </Component>
+      <Component Id="CoreMassTransitInstrumentationComponent" Guid="{7420F63A-BEC7-47E4-A8B3-B81A270DBEB9}">
+        <File Id="CoreMassTransitInstrumentationFile" Name="NewRelic.Providers.Wrapper.MassTransit.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.MassTransit.Instrumentation.xml"/>
+      </Component>
+      <Component Id="CoreMassTransitLegacyInstrumentationComponent" Guid="{A55ED281-B7FA-4BBC-B760-47495EB19BC1}">
+        <File Id="CoreMassTransitLegacyInstrumentationFile" Name="NewRelic.Providers.Wrapper.MassTransitLegacy.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.MassTransitLegacy.Instrumentation.xml"/>
+      </Component>
+      <Component Id="CoreKafkaInstrumentationComponent" Guid="{B2C4F83B-A339-4DBD-B8C4-760C8F72F9FC}">
+        <File Id="CoreKafkaInstrumentationFile" Name="NewRelic.Providers.Wrapper.Kafka.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.Kafka.Instrumentation.xml"/>
+      </Component>
+      <Component Id="CoreAspNetCore6PlusInstrumentationComponent" Guid="{1CC1E672-5AA5-4F6F-A736-748EA556653A}">
+        <File Id="CoreAspNetCore6PlusInstrumentationFile" Name="NewRelic.Providers.Wrapper.AspNetCore6Plus.Instrumentation.xml" KeyPath="yes" Source="$(var.HomeFolderPath)_coreclr\extensions\NewRelic.Providers.Wrapper.AspNetCore6Plus.Instrumentation.xml"/>
+      </Component>
     </ComponentGroup>
 
     <!-- Extensions XSD-->
diff --git a/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj b/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj
index 170eafef7e..e892920743 100644
--- a/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj
+++ b/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Agent/NewRelic/Agent/Core/Agent.cs b/src/Agent/NewRelic/Agent/Core/Agent.cs
index e9e5f7291a..966b98251a 100644
--- a/src/Agent/NewRelic/Agent/Core/Agent.cs
+++ b/src/Agent/NewRelic/Agent/Core/Agent.cs
@@ -28,8 +28,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Mime;
+using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace NewRelic.Agent.Core
 {
@@ -118,6 +121,11 @@ public ITransaction CreateTransaction(MessageBrokerDestinationType destinationTy
             return CreateTransaction(TransactionName.ForBrokerTransaction(destinationType, brokerVendorName, destination), true, wrapperOnCreate ?? NoOpWrapperOnCreate);
         }
 
+        public ITransaction CreateKafkaTransaction(MessageBrokerDestinationType destinationType, string brokerVendorName, string destination, Action wrapperOnCreate)
+        {
+            return CreateTransaction(TransactionName.ForKafkaBrokerTransaction(destinationType, brokerVendorName, destination), true, wrapperOnCreate ?? NoOpWrapperOnCreate);
+        }
+
         public ITransaction CreateTransaction(bool isWeb, string category, string transactionDisplayName, bool doNotTrackAsUnitOfWork, Action wrapperOnCreate)
         {
             if (transactionDisplayName == null)
@@ -300,6 +308,28 @@ public Stream TryGetStreamInjector(Stream stream, Encoding encoding, string cont
                 return null;
             }
 
+            var script = TryGetRUMScriptInternal(contentType, requestPath);
+            return script == null ? null : new BrowserMonitoringStreamInjector(() => script, stream, encoding);
+        }
+
+        public async Task TryInjectBrowserScriptAsync(string contentType, string requestPath, byte[] buffer, Stream baseStream)
+        {
+            var transaction = _transactionService.GetCurrentInternalTransaction();
+
+            var script = TryGetRUMScriptInternal(contentType, requestPath);
+            var rumBytes = script == null ? null : Encoding.UTF8.GetBytes(script);
+
+            if (rumBytes == null)
+            {
+                transaction.LogFinest("Skipping RUM Injection: No script was available.");
+                await baseStream.WriteAsync(buffer, 0, buffer.Length);
+            }
+            else
+                await BrowserScriptInjectionHelper.InjectBrowserScriptAsync(buffer, baseStream, rumBytes, transaction);
+        }
+
+        private string TryGetRUMScriptInternal(string contentType, string requestPath)
+        {
             if (contentType == null)
             {
                 return null;
@@ -327,19 +357,13 @@ public Stream TryGetStreamInjector(Stream stream, Encoding encoding, string cont
                 // Once the transaction name is used for RUM it must be frozen
                 transaction.CandidateTransactionName.Freeze(TransactionNameFreezeReason.AutoBrowserScriptInjection);
                 var script = _browserMonitoringScriptMaker.GetScript(transaction, null);
-                if (script == null)
-                {
-                    return null;
-                }
 
-                return new BrowserMonitoringStreamInjector(() => script, stream, encoding);
+                return script;
             }
             catch (Exception ex)
             {
                 Log.Error(ex, "RUM: Failed to build Browser Monitoring agent script");
-                {
-                    return null;
-                }
+                return null;
             }
         }
 
@@ -401,11 +425,21 @@ public IStackExchangeRedisCache StackExchangeRedisCache
             set { _stackExchangeRedisCache = value; }
         }
 
-        public void RecordSupportabilityMetric(string metricName, int count)
+        public void RecordSupportabilityMetric(string metricName, long count = 1)
         {
             _agentHealthReporter.ReportSupportabilityCountMetric(metricName, count);
         }
 
+        public void RecordCountMetric(string metricName, long count = 1)
+        {
+            _agentHealthReporter.ReportCountMetric(metricName, count);
+        }
+
+        public void RecordByteMetric(string metricName, long totalBytes, long? exclusiveBytes = null)
+        {
+            _agentHealthReporter.ReportByteMetric(metricName, totalBytes, exclusiveBytes);
+        }
+
         public void RecordLogMessage(string frameworkName, object logEvent, Func<object, DateTime> getTimestamp, Func<object, object> getLevel, Func<object, string> getLogMessage, Func<object, Exception> getLogException, Func<object, Dictionary<string, object>> getContextData, string spanId, string traceId)
         {
             _agentHealthReporter.ReportLogForwardingFramework(frameworkName);
@@ -439,14 +473,15 @@ public void RecordLogMessage(string frameworkName, object logEvent, Func<object,
 
                 var logMessage = getLogMessage(logEvent);
                 var logException = getLogException(logEvent);
+                var logContextData = _configurationService.Configuration.ContextDataEnabled ? getContextData(logEvent) : null;
 
-                // exit quickly if the message and exception are missing
-                if (string.IsNullOrWhiteSpace(logMessage) && logException is null)
+                // exit quickly if the message, exception and context data are missing
+                if (string.IsNullOrWhiteSpace(logMessage) && logException is null && (logContextData is null || logContextData.Count == 0))
                 {
+                    _agentHealthReporter.ReportLoggingEventsEmpty();
                     return;
                 }
 
-                var logContextData = _configurationService.Configuration.ContextDataEnabled ? getContextData(logEvent) : null;
                 var timestamp = getTimestamp(logEvent).ToUnixTimeMilliseconds();
 
                 LogEventWireModel logEventWireModel;
diff --git a/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs b/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs
index 4653fc7324..5fd9304549 100644
--- a/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs
+++ b/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs
@@ -107,6 +107,19 @@ private void ReportSupportabilityGaugeMetric(string metricName, float value)
             TrySend(metric);
         }
 
+        public void ReportCountMetric(string metricName, long count)
+        {
+            var metric = _metricBuilder.TryBuildCountMetric(metricName, count);
+            TrySend(metric);
+        }
+        public void ReportByteMetric(string metricName, long totalBytes, long? exclusiveBytes = null)
+        {
+            var metric = _metricBuilder.TryBuildByteMetric(metricName, totalBytes, exclusiveBytes);
+            TrySend(metric);
+        }
+
+
+
         public void ReportDotnetVersion()
         {
 #if NETFRAMEWORK
@@ -571,6 +584,11 @@ public void ReportLogForwardingEnabledWithFramework(string logFramework)
             _loggingForwardingEnabledWithFrameworksReported.TryAdd(logFramework, false);
         }
 
+        public void ReportLoggingEventsEmpty(int count = 1)
+        {
+            ReportSupportabilityCountMetric(MetricNames.SupportabilityLoggingEventEmpty);
+        }
+
         public void CollectLoggingMetrics()
         {
             var totalCount = 0;
@@ -677,6 +695,7 @@ private void CollectOneTimeMetrics()
             ReportLogForwardingConfiguredValues();
             ReportIfAppDomainCachingDisabled();
             ReportInfiniteTracingOneTimeMetrics();
+            ReportIfLoggingDisabled();
         }
 
         public void CollectMetrics()
@@ -811,5 +830,17 @@ protected override void OnConfigurationUpdated(ConfigurationUpdateSource configu
             // Some one time metrics are reporting configured values, so we want to re-report them if the configuration changed
             _oneTimeMetricsCollected = false;
         }
+
+        private void ReportIfLoggingDisabled()
+        {
+            if (!_configuration.LoggingEnabled)
+            {
+                ReportSupportabilityCountMetric(MetricNames.SupportabilityLoggingDisabled);
+            }
+            if (Log.FileLoggingHasFailed)
+            {
+                ReportSupportabilityCountMetric(MetricNames.SupportabilityLoggingFatalError);
+            }
+        }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/AgentHealth/IAgentHealthReporter.cs b/src/Agent/NewRelic/Agent/Core/AgentHealth/IAgentHealthReporter.cs
index f1567dceff..23eed86cf7 100644
--- a/src/Agent/NewRelic/Agent/Core/AgentHealth/IAgentHealthReporter.cs
+++ b/src/Agent/NewRelic/Agent/Core/AgentHealth/IAgentHealthReporter.cs
@@ -129,6 +129,7 @@ public interface IAgentHealthReporter : IOutOfBandMetricSource
         void ReportAgentInfo();
 
         void ReportSupportabilityCountMetric(string metricName, long count = 1);
+        void ReportCountMetric(string metricName, long count = 1);
 
         void ReportInfiniteTracingSpanResponseError();
         void ReportInfiniteTracingSpanEventsSeen(long count = 1);
@@ -148,5 +149,7 @@ public interface IAgentHealthReporter : IOutOfBandMetricSource
         void ReportLoggingEventsDropped(int droppedCount);
         void ReportLogForwardingFramework(string logFramework);
         void ReportLogForwardingEnabledWithFramework(string logFramework);
+        void ReportByteMetric(string metricName, long totalBytes, long? exclusiveBytes = null);
+        void ReportLoggingEventsEmpty(int count = 1);
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/AgentManager.cs b/src/Agent/NewRelic/Agent/Core/AgentManager.cs
index c42363611d..d0e3ae8753 100644
--- a/src/Agent/NewRelic/Agent/Core/AgentManager.cs
+++ b/src/Agent/NewRelic/Agent/Core/AgentManager.cs
@@ -220,6 +220,8 @@ private void LogInitialized()
                     "NEW_RELIC_LOG",
                     "NEWRELIC_PROFILER_LOG_DIRECTORY",
                     "NEWRELIC_LOG_LEVEL",
+                    "NEW_RELIC_LOG_ENABLED",
+                    "NEW_RELIC_LOG_CONSOLE",
                     "NEW_RELIC_LABELS",
                     "NEW_RELIC_PROXY_HOST",
                     "NEW_RELIC_PROXY_URI_PATH",
@@ -370,6 +372,7 @@ private void Shutdown(bool cleanShutdown)
 
                 if (cleanShutdown)
                 {
+                    Log.Debug("Agent is connected, executing a clean shutdown.");
                     EventBus<PreCleanShutdownEvent>.Publish(new PreCleanShutdownEvent());
                     EventBus<CleanShutdownEvent>.Publish(new CleanShutdownEvent());
                 }
diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs
index cc83b495e3..43053e6704 100644
--- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs
+++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs
@@ -43,7 +43,11 @@ public interface IAttributeDefinitions
         AttributeDefinition<float, double> DatabaseDuration { get; }
         AttributeDefinition<string, string> DbCollection { get; }
         AttributeDefinition<string, string> DbInstance { get; }
+        AttributeDefinition<string, string> DbOperation { get; }
+        AttributeDefinition<string, string> DbServerAddress { get; }
+        AttributeDefinition<long, long> DbServerPort { get; }
         AttributeDefinition<string, string> DbStatement { get; }
+        AttributeDefinition<string, string> DbSystem { get; }
         AttributeDefinition<string, string> DistributedTraceId { get; }
         AttributeDefinition<TimeSpan, double> Duration { get; }
         AttributeDefinition<bool, bool> IsErrorExpected { get; }
@@ -91,6 +95,8 @@ public interface IAttributeDefinitions
         AttributeDefinition<string, string> RequestUri { get; }
         AttributeDefinition<int?, string> ResponseStatus { get; }
         AttributeDefinition<bool, bool> Sampled { get; }
+        AttributeDefinition<string, string> ServerAddress { get; }
+        AttributeDefinition<long, long> ServerPort { get; }
         AttributeDefinition<SpanCategory, string> SpanCategory { get; }
         AttributeDefinition<string, string> SpanErrorClass { get; }
         AttributeDefinition<string, string> SpanErrorMessage { get; }
@@ -102,6 +108,7 @@ public interface IAttributeDefinitions
         AttributeDefinition<string, string> SyntheticsMonitorIdForTraces { get; }
         AttributeDefinition<string, string> SyntheticsResourceId { get; }
         AttributeDefinition<string, string> SyntheticsResourceIdForTraces { get; }
+        AttributeDefinition<long, long> ThreadId { get; }
         AttributeDefinition<DateTime, long> Timestamp { get; }
         AttributeDefinition<DateTime, long> TimestampForError { get; }
         AttributeDefinition<TimeSpan, double> TotalTime { get; }
@@ -476,6 +483,12 @@ public AttributeDefinition<TypeAttributeValue, string> GetTypeAttribute(TypeAttr
                 .AppliesTo(AttributeDestinations.SpanEvent)
                 .Build(_attribFilter));
 
+        private AttributeDefinition<long, long> _threadId;
+        public AttributeDefinition<long, long> ThreadId => _threadId ?? (_threadId =
+            AttributeDefinitionBuilder.CreateLong("thread.id", AttributeClassification.Intrinsics)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .Build(_attribFilter));
+
         private AttributeDefinition<string, string> _component;
         public AttributeDefinition<string, string> Component => _component ?? (_component =
             AttributeDefinitionBuilder.CreateString("component", AttributeClassification.Intrinsics)
@@ -513,6 +526,18 @@ public AttributeDefinition<TypeAttributeValue, string> GetTypeAttribute(TypeAttr
                 .AppliesTo(AttributeDestinations.SpanEvent)
                 .Build(_attribFilter));
 
+        private AttributeDefinition<string, string> _dbSystem;
+        public AttributeDefinition<string, string> DbSystem => _dbSystem ?? (_dbSystem =
+            AttributeDefinitionBuilder.CreateString("db.system", AttributeClassification.AgentAttributes)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .Build(_attribFilter));
+
+        private AttributeDefinition<string, string> _dbOperation;
+        public AttributeDefinition<string, string> DbOperation => _dbOperation ?? (_dbOperation =
+            AttributeDefinitionBuilder.CreateString("db.operation", AttributeClassification.AgentAttributes)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .Build(_attribFilter));
+
         private AttributeDefinition<string, string> _dbCollection;
         public AttributeDefinition<string, string> DbCollection => _dbCollection ?? (_dbCollection =
             AttributeDefinitionBuilder.CreateString("db.collection", AttributeClassification.AgentAttributes)
@@ -546,7 +571,31 @@ public AttributeDefinition<TypeAttributeValue, string> GetTypeAttribute(TypeAttr
 
         private AttributeDefinition<string, string> _httpMethod;
         public AttributeDefinition<string, string> HttpMethod => _httpMethod ?? (_httpMethod =
-            AttributeDefinitionBuilder.CreateString("http.method", AttributeClassification.AgentAttributes)
+            AttributeDefinitionBuilder.CreateString("http.request.method", AttributeClassification.AgentAttributes)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .Build(_attribFilter));
+
+        private AttributeDefinition<string, string> _serverAddress;
+        public AttributeDefinition<string, string> ServerAddress => _serverAddress ?? (_serverAddress =
+            AttributeDefinitionBuilder.CreateString("server.address", AttributeClassification.Intrinsics)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .Build(_attribFilter));
+
+        private AttributeDefinition<long, long> _serverPort;
+        public AttributeDefinition<long, long> ServerPort => _serverPort ?? (_serverPort =
+            AttributeDefinitionBuilder.CreateLong("server.port", AttributeClassification.Intrinsics)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .Build(_attribFilter));
+
+        private AttributeDefinition<string, string> _dbServerAddress;
+        public AttributeDefinition<string, string> DbServerAddress => _dbServerAddress ?? (_dbServerAddress =
+            AttributeDefinitionBuilder.CreateString("server.address", AttributeClassification.AgentAttributes)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .Build(_attribFilter));
+
+        private AttributeDefinition<long, long> _dbServerPort;
+        public AttributeDefinition<long, long> DbServerPort => _dbServerPort ?? (_dbServerPort =
+            AttributeDefinitionBuilder.CreateLong("server.port", AttributeClassification.AgentAttributes)
                 .AppliesTo(AttributeDestinations.SpanEvent)
                 .Build(_attribFilter));
 
diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs
index 5e4db37f88..6ddf958c89 100644
--- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs
+++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs
@@ -477,56 +477,4 @@ private bool SetValueImplInternal(AttributeValue attribVal)
             }
         }
     }
-
-    public class NoOpAttributeValueCollection : IAttributeValueCollection
-    {
-        public AttributeDestinations[] TargetModelTypes { get; } = new[] { AttributeDestinations.None };
-        public AttributeDestinations TargetModelTypesAsFlags => AttributeDestinations.None;
-
-        public bool IsImmutable => false;
-
-        public int Count => 0;
-
-        private static IEnumerable<IAttributeValue> _emptyAttribValues = new List<IAttributeValue>();
-        private static IDictionary<string, object> _emptyAttribDic = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
-
-        public void MakeImmutable()
-        {
-        }
-
-        public IEnumerable<IAttributeValue> GetAttributeValues(AttributeClassification classification)
-        {
-            return _emptyAttribValues;
-        }
-
-        public void AddRange(IAttributeValueCollection fromCollection)
-        {
-            return;
-        }
-
-        public bool TrySetValue<TInput, TOutput>(AttributeDefinition<TInput, TOutput> attribDef, TOutput value)
-        {
-            return false;
-        }
-
-        public bool TrySetValue<TInput, TOutput>(AttributeDefinition<TInput, TOutput> attribDef, Lazy<object> lazyImpl)
-        {
-            return false;
-        }
-
-        public bool TrySetValue(IAttributeValue attrib)
-        {
-            return false;
-        }
-
-        public IDictionary<string, object> GetAttributeValuesDic(AttributeClassification classification)
-        {
-            return _emptyAttribDic;
-        }
-
-        public IDictionary<string, object> GetAllAttributeValuesDic()
-        {
-            return _emptyAttribDic;
-        }
-    }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionHelper.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionHelper.cs
new file mode 100644
index 0000000000..7b76a3c841
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionHelper.cs
@@ -0,0 +1,49 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.IO;
+using System.Threading.Tasks;
+using NewRelic.Agent.Api;
+
+namespace NewRelic.Agent.Core.BrowserMonitoring
+{
+    public static class BrowserScriptInjectionHelper
+    {
+        /// <summary>
+        /// Determine where to inject the RUM script and write the buffer to the base stream.
+        /// </summary>
+        /// <param name="buffer">UTF-8 encoded buffer representing the current page</param>
+        /// <param name="baseStream"></param>
+        /// <param name="rumBytes"></param>
+        /// <param name="transaction"></param>
+        /// <returns></returns>
+        public static async Task InjectBrowserScriptAsync(byte[] buffer, Stream baseStream, byte[] rumBytes, ITransaction transaction)
+        {
+            var index = BrowserScriptInjectionIndexHelper.TryFindInjectionIndex(buffer);
+
+            if (index == -1)
+            {
+                // not found, can't inject anything
+                transaction?.LogFinest("Skipping RUM Injection: No suitable location found to inject script.");
+                await baseStream.WriteAsync(buffer, 0, buffer.Length);
+                return;
+            }
+
+            transaction?.LogFinest($"Injecting RUM script at byte index {index}.");
+
+            if (index < buffer.Length) // validate index is less than buffer length
+            {
+                // Write everything up to the insertion index
+                await baseStream.WriteAsync(buffer, 0, index);
+
+                // Write the RUM script
+                await baseStream.WriteAsync(rumBytes, 0, rumBytes.Length);
+
+                // Write the rest of the doc, starting after the insertion index
+                await baseStream.WriteAsync(buffer, index, buffer.Length - index);
+            }
+            else
+                transaction?.LogFinest($"Skipping RUM Injection: Insertion index was invalid.");
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionIndexHelper.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionIndexHelper.cs
new file mode 100644
index 0000000000..6f2482f133
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionIndexHelper.cs
@@ -0,0 +1,137 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using NewRelic.Core.Logging;
+
+namespace NewRelic.Agent.Core.BrowserMonitoring
+{
+    internal static class BrowserScriptInjectionIndexHelper
+    {
+
+        private static readonly Regex XUaCompatibleFilter = new Regex(@"(<\s*meta[^>]+http-equiv[\s]*=[\s]*['""]x-ua-compatible['""][^>]*>)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.IgnoreCase);
+        private static readonly Regex CharsetFilter = new Regex(@"(<\s*meta[^>]+charset\s*=[^>]*>)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.IgnoreCase);
+
+        /// <summary>
+        /// Returns the index into the (UTF-8 encoded) buffer where the RUM script should be injected, or -1 if no suitable location is found
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Specification for Javascript insertion: https://newrelic.atlassian.net/wiki/spaces/eng/pages/50299103/BAM+Agent+Auto-Instrumentation
+        /// </remarks>
+        public static int TryFindInjectionIndex(byte[] content)
+        {
+            try
+            {
+                var contentAsString = Encoding.UTF8.GetString(content);
+
+                var openingHeadTagIndex = FindFirstOpeningHeadTag(contentAsString);
+
+                // No <HEAD> tag. Attempt to insert before <BODY> tag (not a great fallback option).
+                if (openingHeadTagIndex == -1)
+                {
+                    return FindIndexBeforeBodyTag(content, contentAsString);
+                }
+
+                // Since we have a head tag (top of 'page'), search for <X_UA_COMPATIBLE> and for <CHARSET> tags in Head section
+                var xUaCompatibleFilterMatch = XUaCompatibleFilter.Match(contentAsString, openingHeadTagIndex);
+                var charsetFilterMatch = CharsetFilter.Match(contentAsString, openingHeadTagIndex);
+
+                // Try to find </HEAD> tag. (It's okay if we don't find it!)
+                var closingHeadTagIndex = contentAsString.IndexOf("</head>", StringComparison.InvariantCultureIgnoreCase);
+
+                // Find which of the two tags occurs latest (if at all) and ensure that at least
+                // one of the matches occurs prior to the closing head tag
+                if ((xUaCompatibleFilterMatch.Success || charsetFilterMatch.Success) &&
+                    (xUaCompatibleFilterMatch.Index < closingHeadTagIndex || charsetFilterMatch.Index < closingHeadTagIndex))
+                {
+                    var match = charsetFilterMatch;
+                    if (xUaCompatibleFilterMatch.Index > charsetFilterMatch.Index)
+                    {
+                        match = xUaCompatibleFilterMatch;
+                    }
+
+                    // find the index just after the end of the regex match in the UTF-8 buffer
+                    var contentSubString = contentAsString.Substring(match.Index, match.Length);
+                    var utf8HeadMatchIndex = IndexOfByteArray(content, contentSubString, out var substringBytesLength);
+
+                    return utf8HeadMatchIndex + substringBytesLength;
+                }
+
+                // found opening head tag but no meta tags, insert immediately after the opening head tag
+                // Find first '>' after the opening head tag, which will be end of head opening tag.
+                var indexOfEndHeadOpeningTag = contentAsString.IndexOf('>', openingHeadTagIndex);
+
+                // The <HEAD> tag may be malformed or simply be another type of tag, if so do not use it
+                if (!(indexOfEndHeadOpeningTag > openingHeadTagIndex))
+                    return -1;
+
+                // Get the whole open HEAD tag string
+                var headOpeningTag = contentAsString.Substring(openingHeadTagIndex, (indexOfEndHeadOpeningTag - openingHeadTagIndex) + 1);
+                var utf8HeadOpeningTagIndex = IndexOfByteArray(content, headOpeningTag, out var headOpeningTagBytesLength);
+                return utf8HeadOpeningTagIndex + headOpeningTagBytesLength;
+            }
+            catch (Exception e)
+            {
+                Log.LogMessage(LogLevel.Error, e, "Unexpected exception in TryFindInjectionIndex().");
+                return -1;
+            }
+        }
+
+        private static int FindIndexBeforeBodyTag(byte[] content, string contentAsString)
+        {
+            const string bodyOpenTag = "<body";
+
+            var indexOfBodyTag = contentAsString.IndexOf(bodyOpenTag, StringComparison.InvariantCultureIgnoreCase);
+            if (indexOfBodyTag < 0)
+                return -1;
+
+            // find the body tag start index in the UTF-8 buffer
+            var bodyFromContent = contentAsString.Substring(indexOfBodyTag, bodyOpenTag.Length);
+            var utf8BodyTagIndex = IndexOfByteArray(content, bodyFromContent, out _);
+            return utf8BodyTagIndex;
+        }
+
+        private static int FindFirstOpeningHeadTag(string content)
+        {
+            int indexOpeningHead = -1;
+
+            var indexTemp = content.IndexOf("<head", StringComparison.InvariantCultureIgnoreCase);
+            if (indexTemp < 0)
+                return -1;
+
+            if (content[indexTemp + 5] == '>' || content[indexTemp + 5] == ' ')
+            {
+                indexOpeningHead = indexTemp;
+            }
+
+            return indexOpeningHead;
+        }
+
+        /// <summary>
+        /// Returns an index into a byte array to find a string in the byte array.
+        /// Exact match using the encoding provided or UTF-8 by default.
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="stringToFind"></param>
+        /// <param name="stringToFindBytesLength"></param>
+        /// <param name="encoding"></param>
+        /// <returns></returns>
+        private static int IndexOfByteArray(byte[] buffer, string stringToFind, out int stringToFindBytesLength, Encoding encoding = null)
+        {
+            stringToFindBytesLength = 0;
+            encoding ??= Encoding.UTF8;
+
+            if (buffer.Length == 0 || string.IsNullOrEmpty(stringToFind))
+                return -1;
+
+            var stringToFindBytes = encoding.GetBytes(stringToFind);
+            stringToFindBytesLength = stringToFindBytes.Length;
+
+            return buffer.AsSpan().IndexOf(stringToFindBytes);
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Core/Config/Configuration.cs b/src/Agent/NewRelic/Agent/Core/Config/Configuration.cs
index 7f0227d26f..9048e75d6b 100644
--- a/src/Agent/NewRelic/Agent/Core/Config/Configuration.cs
+++ b/src/Agent/NewRelic/Agent/Core/Config/Configuration.cs
@@ -1284,6 +1284,7 @@ public virtual configurationApplication Clone()
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:newrelic-config")]
     public partial class configurationLog
     {
+        private bool enabledField;
         
         private string levelField;
         
@@ -1300,6 +1301,7 @@ public partial class configurationLog
         /// </summary>
         public configurationLog()
         {
+            this.enabledField = true;
             this.levelField = "info";
             this.consoleField = false;
             this.auditLogField = false;
@@ -1358,6 +1360,20 @@ public bool console
                 this.consoleField = value;
             }
         }
+
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.ComponentModel.DefaultValueAttribute(true)]
+        public bool enabled
+        {
+            get
+            {
+                return this.enabledField;
+            }
+            set
+            {
+                this.enabledField = value;
+            }
+        }
         
         [System.Xml.Serialization.XmlAttributeAttribute()]
         [System.ComponentModel.DefaultValueAttribute(false)]
diff --git a/src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd b/src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd
index 843e175d07..5a5c6e0afd 100644
--- a/src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd
+++ b/src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd
@@ -313,6 +313,14 @@
                             </xs:annotation>
                         </xs:attribute>
 
+                        <xs:attribute name="enabled" type="xs:boolean" default="true">
+                            <xs:annotation>
+                                <xs:documentation>
+                                    If this is false, no attempts will be made to write to a log file. This is primarily used for installations on read-only file systems.
+                                </xs:documentation>
+                            </xs:annotation>
+                        </xs:attribute>
+                        
                         <xs:attribute name="directory" type="xs:string" use="optional">
                             <xs:annotation>
                                 <xs:documentation>
diff --git a/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs b/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs
index 8c019aa85f..2353f7b1f9 100644
--- a/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs
+++ b/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs
@@ -59,6 +59,7 @@ private static string InternalGetAppDomainAppPath()
 
         public static Func<string, bool> FileExists = File.Exists;
         public static Func<string, string> PathGetDirectoryName = Path.GetDirectoryName;
+        public static Func<string, string> GetEnvironmentVar = System.Environment.GetEnvironmentVariable;
 
         private static string InternalGetNewRelicHome()
         {
@@ -522,6 +523,10 @@ public string LogLevel
         {
             get
             {
+                if (!Enabled)
+                {
+                    return "off";
+                }
                 // Environment variable or log.level from config...
                 return (AgentInstallConfiguration.NewRelicLogLevel
                     ?? this.level).ToUpper();
@@ -559,7 +564,7 @@ public string GetFullLogFileName()
 
         private string GetLogFileName()
         {
-            string name = System.Environment.GetEnvironmentVariable("NEW_RELIC_LOG");
+            string name = ConfigurationLoader.GetEnvironmentVar("NEW_RELIC_LOG");
             if (name != null)
             {
                 return Strings.SafeFileName(name);
@@ -594,11 +599,46 @@ private string GetLogFileName()
             return "newrelic_agent_" + Strings.SafeFileName(name) + ".log";
         }
 
+        private bool GetOverride(string name, bool fallback)
+        {
+            var val = ConfigurationLoader.GetEnvironmentVar(name);
+
+            if (val != null)
+            {
+                val = val.ToLower();
+            }
+
+            if (bool.TryParse(val, out var parsedValue))
+            {
+                return parsedValue;
+            }
+
+            if ("0" == val)
+            {
+                return false;
+            }
+
+            if ("1" == val)
+            {
+                return true;
+            }
+
+            return fallback;
+        }
+
         public bool Console
         {
             get
             {
-                return console;
+                return GetOverride("NEW_RELIC_LOG_CONSOLE", console);
+            }
+        }
+
+        public bool Enabled
+        {
+            get
+            {
+                return GetOverride("NEW_RELIC_LOG_ENABLED", enabled);
             }
         }
 
diff --git a/src/Agent/NewRelic/Agent/Core/Config/ILogConfig.cs b/src/Agent/NewRelic/Agent/Core/Config/ILogConfig.cs
index 8b072cbdd8..cfc9d6a150 100644
--- a/src/Agent/NewRelic/Agent/Core/Config/ILogConfig.cs
+++ b/src/Agent/NewRelic/Agent/Core/Config/ILogConfig.cs
@@ -5,6 +5,8 @@ namespace NewRelic.Agent.Core.Config
 {
     public interface ILogConfig
     {
+        bool Enabled { get; }
+
         string LogLevel { get; }
 
         string GetFullLogFileName();
diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs b/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs
index 18283fce97..51398dea50 100644
--- a/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs
+++ b/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs
@@ -64,7 +64,7 @@ private void OnConfigurationDeserialized(ConfigurationDeserializedEvent configur
         private static void UpdateLogLevel(configuration localConfiguration)
         {
             Log.Info("The log level was updated to {0}", localConfiguration.LogConfig.LogLevel);
-            LoggerBootstrapper.UpdateLoggingLevel(localConfiguration.LogConfig.LogLevel);
+            LoggerBootstrapper.SetLoggingLevel(localConfiguration.LogConfig.LogLevel);
         }
 
         private void OnServerConfigurationUpdated(ServerConfigurationUpdatedEvent serverConfigurationUpdatedEvent)
diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs b/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs
index e874bba867..5904a62a1e 100644
--- a/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs
+++ b/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs
@@ -2085,7 +2085,6 @@ private void UpdateDiagnosticsAgentTimingSettings()
             _diagnosticsCaptureAgentTimingFrequency = configFreq;
         }
 
-
         private bool? _forceSynchronousTimingCalculationHttpClient;
         public bool ForceSynchronousTimingCalculationHttpClient
         {
@@ -2097,6 +2096,17 @@ public bool ForceSynchronousTimingCalculationHttpClient
             }
         }
 
+        private bool? _enableAspNetCore6PlusBrowserInjection;
+        public bool EnableAspNetCore6PlusBrowserInjection
+        {
+            get
+            {
+                return _enableAspNetCore6PlusBrowserInjection.HasValue
+                    ? _enableAspNetCore6PlusBrowserInjection.Value
+                    : (_enableAspNetCore6PlusBrowserInjection = TryGetAppSettingAsBoolWithDefault("EnableAspNetCore6PlusBrowserInjection", false)).Value;
+            }
+        }
+
         private TimeSpan? _metricsHarvestCycleOverride = null;
         public TimeSpan MetricsHarvestCycle
         {
@@ -2765,6 +2775,8 @@ public bool CodeLevelMetricsEnabled
 
         #endregion
 
+        public bool LoggingEnabled => _localConfiguration.log.Enabled;
+
         private const bool CaptureTransactionTraceAttributesDefault = true;
         private const bool CaptureErrorCollectorAttributesDefault = true;
         private const bool CaptureBrowserMonitoringAttributesDefault = false;
diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/ReportedConfiguration.cs b/src/Agent/NewRelic/Agent/Core/Configuration/ReportedConfiguration.cs
index e572357954..68103d8683 100644
--- a/src/Agent/NewRelic/Agent/Core/Configuration/ReportedConfiguration.cs
+++ b/src/Agent/NewRelic/Agent/Core/Configuration/ReportedConfiguration.cs
@@ -575,6 +575,9 @@ public ReportedConfiguration(IConfiguration configuration)
         [JsonProperty("agent.force_synchronous_timing_calculation_for_http_client")]
         public bool ForceSynchronousTimingCalculationHttpClient => _configuration.ForceSynchronousTimingCalculationHttpClient;
 
+        [JsonProperty("agent.enable_asp_net_core_6plus_browser_injection")]
+        public bool EnableAspNetCore6PlusBrowserInjection => _configuration.EnableAspNetCore6PlusBrowserInjection;
+
         [JsonProperty("agent.exclude_new_relic_header")]
         public bool ExcludeNewrelicHeader => _configuration.ExcludeNewrelicHeader;
 
@@ -644,6 +647,9 @@ public ReportedConfiguration(IConfiguration configuration)
         [JsonProperty("stackexchangeredis_cleanup.cycle")]
         public TimeSpan StackExchangeRedisCleanupCycle => _configuration.StackExchangeRedisCleanupCycle;
 
+        [JsonProperty("agent.logging_enabled")]
+        public bool LoggingEnabled => _configuration.LoggingEnabled;
+
         public IReadOnlyDictionary<string, string> GetAppSettings()
         {
             return _configuration.GetAppSettings();
diff --git a/src/Agent/NewRelic/Agent/Core/Core.csproj b/src/Agent/NewRelic/Agent/Core/Core.csproj
index d0a8c083bd..5c9a4fc510 100644
--- a/src/Agent/NewRelic/Agent/Core/Core.csproj
+++ b/src/Agent/NewRelic/Agent/Core/Core.csproj
@@ -38,8 +38,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Serilog" Version="2.12.0" />
-    <PackageReference Include="Serilog.Expressions" Version="3.4.1" />
+    <PackageReference Include="Serilog" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
@@ -93,24 +92,23 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'NewRelic.Core'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'NewRelic.Parsing'" />
+      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Autofac'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Google.Protobuf'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Grpc.Core.Api'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Autofac'" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Grpc.Core'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'ICSharpCode.SharpZipLib'" />
+      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'NewRelic.Core'" />
+      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'NewRelic.Parsing'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Expressions'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Async'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Console'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Debug'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.EventLog'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.File'" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Grpc.Core'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'System.ValueTuple'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'System.Memory'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'System.Runtime.CompilerServices.Unsafe'" />
@@ -123,20 +121,11 @@
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Microsoft.Extensions.Logging.Abstractions'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Grpc.Net.Common'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Grpc.Net.Client'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Expressions'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Async'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Console'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Debug'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.EventLog'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.File'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'ICSharpCode.SharpZipLib'" />
     </ItemGroup>
 
     <PropertyGroup>
-      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'net462'">20</ILRepackIncludeCount>
-      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'netstandard2.0'">17</ILRepackIncludeCount>
+      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'net462'">19</ILRepackIncludeCount>
+      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'netstandard2.0'">16</ILRepackIncludeCount>
     </PropertyGroup>
 
     <Error Text="ILRepack of $(AssemblyName) ($(TargetFramework)) failed. A dependency is missing. Expected $(ILRepackIncludeCount) dependencies but found @(ILRepackInclude-&gt;Count())." Condition="@(ILRepackInclude-&gt;Count()) != $(ILRepackIncludeCount)" />
diff --git a/src/Agent/NewRelic/Agent/Core/Logging/AuditLog.cs b/src/Agent/NewRelic/Agent/Core/Logging/AuditLog.cs
index 67319423bd..dfd84775e5 100644
--- a/src/Agent/NewRelic/Agent/Core/Logging/AuditLog.cs
+++ b/src/Agent/NewRelic/Agent/Core/Logging/AuditLog.cs
@@ -12,7 +12,7 @@ public static class AuditLog
         // a lazy ILogger instance that injects an "Audit" property
         private static Lazy<ILogger> _lazyAuditLogger = LazyAuditLogger();
 
-        public static bool IsAuditLogEnabled { get; set; } //setter is public only for unit tests, not expected to be use anywhere else
+        public static bool IsAuditLogEnabled { get; set; } 
 
         // for unit tests only
         public static void ResetLazyLogger()
@@ -38,16 +38,12 @@ public static void Log(string message)
 
         public static LoggerConfiguration IncludeOnlyAuditLog(this LoggerConfiguration loggerConfiguration)
         {
-            IsAuditLogEnabled = true; // set a flag so Log() can short-circuit when audit log is not enabled
-
-            return loggerConfiguration.Filter.ByIncludingOnly($"{LogLevelExtensions.AuditLevel} is not null");
+            return loggerConfiguration.Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey(LogLevelExtensions.AuditLevel));
         }
 
         public static LoggerConfiguration ExcludeAuditLog(this LoggerConfiguration loggerConfiguration)
         {
-            IsAuditLogEnabled = false; // set a flag so Log() can short-circuit when audit log is not enabled
-
-            return loggerConfiguration.Filter.ByIncludingOnly($"{LogLevelExtensions.AuditLevel} is null");
+            return loggerConfiguration.Filter.ByIncludingOnly(logEvent => !logEvent.Properties.ContainsKey(LogLevelExtensions.AuditLevel));
         }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs b/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs
index 71c27ae57f..3c2ddd3141 100644
--- a/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs
+++ b/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs
@@ -7,10 +7,8 @@
 using System.Text;
 using Serilog;
 using Serilog.Core;
-using Serilog.Formatting;
 using Logger = NewRelic.Agent.Core.Logging.Logger;
 using NewRelic.Agent.Core.Logging;
-using Serilog.Templates;
 using Serilog.Events;
 #if NETSTANDARD2_0
 using System.Runtime.InteropServices;
@@ -25,22 +23,20 @@ public static class LoggerBootstrapper
         //private static ILayout AuditLogLayout = new PatternLayout("%utcdate{yyyy-MM-dd HH:mm:ss,fff} NewRelic %level: %message\r\n");
         //private static ILayout FileLogLayout = new PatternLayout("%utcdate{yyyy-MM-dd HH:mm:ss,fff} NewRelic %6level: [pid: %property{pid}, tid: %property{threadid}] %message\r\n");
 
-        private static ExpressionTemplate AuditLogLayout = new ExpressionTemplate("{UtcDateTime(@t):yyyy-MM-dd HH:mm:ss,fff} NewRelic Audit: {@m}\n");
-        private static ExpressionTemplate FileLogLayout = new ExpressionTemplate("{UtcDateTime(@t):yyyy-MM-dd HH:mm:ss,fff} NewRelic {NRLogLevel,6}: [pid: {pid}, tid: {tid}] {@m}\n{@x}");
+        private const string AuditLogLayout = "{UTCTimestamp} NewRelic Audit: {Message:l}\n";
+
+        private const string FileLogLayout = "{UTCTimestamp} NewRelic {NRLogLevel,6}: [pid: {pid}, tid: {tid}] {Message:l}\n{Exception:l}";
 
         private static LoggingLevelSwitch _loggingLevelSwitch = new LoggingLevelSwitch();
 
         private static InMemorySink _inMemorySink = new InMemorySink();
 
-        public static void UpdateLoggingLevel(string newLogLevel)
-        {
-            _loggingLevelSwitch.MinimumLevel = newLogLevel.MapToSerilogLogLevel();
-        }
+        public static void SetLoggingLevel(string newLogLevel) => _loggingLevelSwitch.MinimumLevel = newLogLevel.MapToSerilogLogLevel();
 
         public static void Initialize()
         {
             var startupLoggerConfig = new LoggerConfiguration()
-                .Enrich.With(new ThreadIdEnricher(), new ProcessIdEnricher(), new NrLogLevelEnricher())
+                .Enrich.With(new ThreadIdEnricher(), new ProcessIdEnricher(), new NrLogLevelEnricher(), new UTCTimestampEnricher())
                 .MinimumLevel.Information()
                 .ConfigureInMemoryLogSink()
                 .ConfigureEventLogSink();
@@ -55,12 +51,14 @@ public static void Initialize()
         /// <remarks>This should only be called once, as soon as you have a valid config.</remarks>
         public static void ConfigureLogger(ILogConfig config)
         {
-            SetupLogLevel(config);
+            SetLoggingLevel(config.LogLevel);
+
+            AuditLog.IsAuditLogEnabled = config.IsAuditLogEnabled;
 
             var loggerConfig = new LoggerConfiguration()
                 .MinimumLevel.ControlledBy(_loggingLevelSwitch)
+                .Enrich.With(new ThreadIdEnricher(), new ProcessIdEnricher(), new NrLogLevelEnricher(), new UTCTimestampEnricher())
                 .ConfigureAuditLogSink(config)
-                .Enrich.With(new ThreadIdEnricher(), new ProcessIdEnricher(), new NrLogLevelEnricher())
                 .ConfigureFileSink(config)
                 .ConfigureDebugSink();
 
@@ -77,6 +75,8 @@ public static void ConfigureLogger(ILogConfig config)
             Log.Logger = configuredLogger;
 
             NewRelic.Core.Logging.Log.Initialize(new Logger());
+
+            Log.Logger.Information("Log level set to {0}", config.LogLevel);
         }
 
         private static void EchoInMemoryLogsToConfiguredLogger(ILogger configuredLogger)
@@ -89,12 +89,6 @@ private static void EchoInMemoryLogsToConfiguredLogger(ILogger configuredLogger)
             _inMemorySink.Dispose();
         }
 
-        /// <summary>
-        /// Sets the log level for logger to either the level provided by the config or an public default.
-        /// </summary>
-        /// <param name="config">The LogConfig to look for the level setting in.</param>
-        private static void SetupLogLevel(ILogConfig config) => _loggingLevelSwitch.MinimumLevel = config.LogLevel.MapToSerilogLogLevel();
-
         private static LoggerConfiguration ConfigureInMemoryLogSink(this LoggerConfiguration loggerConfiguration)
         {
             // formatter not needed since this will be pushed to other sinks for output.
@@ -165,7 +159,7 @@ private static LoggerConfiguration ConfigureDebugSink(this LoggerConfiguration l
                 {
                     configuration
                         .ExcludeAuditLog()
-                        .WriteTo.Debug(FileLogLayout);
+                        .WriteTo.Debug(outputTemplate: FileLogLayout);
                 });
 #endif
             return loggerConfiguration;
@@ -182,7 +176,7 @@ private static LoggerConfiguration ConfigureConsoleSink(this LoggerConfiguration
                     {
                         configuration
                             .ExcludeAuditLog()
-                            .WriteTo.Console(FileLogLayout);
+                            .WriteTo.Console(outputTemplate: FileLogLayout);
                     })
                 );
         }
@@ -194,6 +188,10 @@ private static LoggerConfiguration ConfigureConsoleSink(this LoggerConfiguration
         /// <param name="config">The configuration for the appender.</param>
         private static LoggerConfiguration ConfigureFileSink(this LoggerConfiguration loggerConfiguration, ILogConfig config)
         {
+            if (!config.Enabled)
+            {
+                return loggerConfiguration;
+            }
             string logFileName = config.GetFullLogFileName();
 
             try
@@ -214,6 +212,7 @@ private static LoggerConfiguration ConfigureFileSink(this LoggerConfiguration lo
                 Log.Logger.Warning(ex, "Unexpected exception when configuring file sink.");
 
                 // Fallback to the event log sink if we cannot setup a file logger.
+                NewRelic.Core.Logging.Log.FileLoggingHasFailed = true;
                 Log.Logger.Warning("Falling back to EventLog sink.");
                 loggerConfiguration.ConfigureEventLogSink();
             }
@@ -226,7 +225,7 @@ private static LoggerConfiguration ConfigureFileSink(this LoggerConfiguration lo
         /// </summary>
         private static LoggerConfiguration ConfigureAuditLogSink(this LoggerConfiguration loggerConfiguration, ILogConfig config)
         {
-            if (!config.IsAuditLogEnabled) return loggerConfiguration;
+            if (!config.IsAuditLogEnabled || !config.Enabled) return loggerConfiguration;
 
             string logFileName = config.GetFullLogFileName().Replace(".log", "_audit.log");
 
@@ -246,9 +245,9 @@ private static LoggerConfiguration ConfigureAuditLogSink(this LoggerConfiguratio
         /// </summary>
         /// <param name="loggerConfiguration"></param>
         /// <param name="fileName">The name of the file this appender will write to.</param>
-        /// <param name="textFormatter"></param>
+        /// <param name="outputFormat"></param>
         /// <remarks>This does not call appender.ActivateOptions or add the appender to the logger.</remarks>
-        private static LoggerConfiguration ConfigureRollingLogSink(this LoggerConfiguration loggerConfiguration, string fileName, ITextFormatter textFormatter)
+        private static LoggerConfiguration ConfigureRollingLogSink(this LoggerConfiguration loggerConfiguration, string fileName, string outputFormat)
         {
             // check that the log file is accessible
             try
@@ -270,7 +269,7 @@ private static LoggerConfiguration ConfigureRollingLogSink(this LoggerConfigurat
                 return loggerConfiguration
                     .WriteTo
                     .File(path: fileName,
-                            formatter: textFormatter,
+                            outputTemplate:outputFormat,
                             fileSizeLimitBytes: 50 * 1024 * 1024,
                             encoding: Encoding.UTF8,
                             rollOnFileSizeLimit: true,
diff --git a/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs
index ae48b788fb..361e7d74b9 100644
--- a/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs
+++ b/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs
@@ -10,6 +10,7 @@ namespace NewRelic.Agent.Core
     /// <summary>
     /// Maps serilog log level to corresponding "legacy" log4net loglevel and adds the mapped value as a property named NRLogLevel
     /// </summary>
+    [NrExcludeFromCodeCoverage]
     internal class NrLogLevelEnricher : ILogEventEnricher
     {
         [NrExcludeFromCodeCoverage]
diff --git a/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs
index c5171e9c7f..bc2cffc980 100644
--- a/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs
+++ b/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs
@@ -8,14 +8,21 @@
 
 namespace NewRelic.Agent.Core
 {
+    /// <summary>
+    /// Adds a pid property to the log event containing the current process id
+    /// </summary>
     [NrExcludeFromCodeCoverage]
     internal class ProcessIdEnricher : ILogEventEnricher
     {
         private static int _pid = new ProcessStatic().GetCurrentProcess().Id;
 
+        private static LogEventProperty _prop;
+
         public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
         {
-            logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty("pid", _pid));
+            _prop ??= propertyFactory.CreateProperty("pid", _pid);
+
+            logEvent.AddPropertyIfAbsent(_prop);
         }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs
index 5fbc34b31e..197e4878db 100644
--- a/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs
+++ b/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs
@@ -8,13 +8,21 @@
 
 namespace NewRelic.Agent.Core
 {
+    /// <summary>
+    /// Adds a tid property to the log event containing the current managed thread id
+    /// </summary>
     [NrExcludeFromCodeCoverage]
     internal class ThreadIdEnricher : ILogEventEnricher
     {
+
+        private static readonly ThreadLocal<LogEventProperty> _tidProperty = new ThreadLocal<LogEventProperty>();
+
         public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
         {
-            logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty(
-                "tid", Thread.CurrentThread.ManagedThreadId));
+            if (!_tidProperty.IsValueCreated)
+                _tidProperty.Value = propertyFactory.CreateProperty("tid", Thread.CurrentThread.ManagedThreadId);
+
+            logEvent.AddPropertyIfAbsent(_tidProperty.Value);
         }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/Logging/UTCTimestampEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/UTCTimestampEnricher.cs
new file mode 100644
index 0000000000..91eef8bfb4
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Core/Logging/UTCTimestampEnricher.cs
@@ -0,0 +1,24 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using NewRelic.Core.CodeAttributes;
+using Serilog.Core;
+using Serilog.Events;
+
+namespace NewRelic.Agent.Core
+{
+    /// <summary>
+    /// Formats the current UTC time for logging in the agent
+    /// </summary>
+    [NrExcludeFromCodeCoverage]
+    public class UTCTimestampEnricher : ILogEventEnricher
+    {
+        public const string UTCTimestampPropertyName = "UTCTimestamp";
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+        {
+            logEvent.AddPropertyIfAbsent(propertyFactory.CreateProperty(UTCTimestampPropertyName,
+                $"{DateTimeOffset.UtcNow:yyy-MM-dd HH:mm:ss,fff}"));
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs b/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs
index d8ba354edf..8e9bba92b1 100644
--- a/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs
+++ b/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs
@@ -160,6 +160,7 @@ public static class MetricNames
         public const string OtherTransactionPrefix = "OtherTransaction";
         public const string WebTransactionPrefix = "WebTransaction";
         public const string SupportabilityPayloadsDroppedDueToMaxPayloadLimitPrefix = Supportability + PathSeparator + "DotNet/Collector" + PathSeparator + "MaxPayloadSizeLimit";
+        public const string KafkaMessageBrokerConsume = "Consume";
 
         public static readonly char PathSeparatorChar = PathSeparator[0];
         public static readonly char[] PathSeparatorCharArray = { PathSeparatorChar };
@@ -199,6 +200,7 @@ static MetricNames()
                 });
         }
 
+        
         public static MetricName GetCustom(string suffix)
         {
             return MetricName.Create(Custom, suffix);
@@ -357,6 +359,7 @@ public enum MessageBrokerAction
         public const string MessageBrokerNamed = "Named";
         public const string MessageBrokerTemp = "Temp";
         public const string Msmq = "MSMQ";
+        public const string Serialization = "Serialization";
 
         public static MetricName GetMessageBroker(MessageBrokerDestinationType type, MessageBrokerAction action,
             string vendor, string queueName)
@@ -367,6 +370,14 @@ public static MetricName GetMessageBroker(MessageBrokerDestinationType type, Mes
                 : MetricName.Create(MessageBrokerPrefix, vendor, normalizedType, action, MessageBrokerTemp);
         }
 
+        public static MetricName GetMessageBrokerSerialization(MessageBrokerDestinationType type, MessageBrokerAction action,
+            string vendor, string queueName, string kind)
+        {
+            var normalizedType = NormalizeMessageBrokerDestinationTypeForMetricName(type);
+            return MetricName.Create(MessageBrokerPrefix, vendor, normalizedType, action, MessageBrokerNamed, queueName, Serialization, kind);
+
+        }
+
         private static MessageBrokerDestinationType NormalizeMessageBrokerDestinationTypeForMetricName(
             MessageBrokerDestinationType type)
         {
@@ -383,6 +394,14 @@ private static MessageBrokerDestinationType NormalizeMessageBrokerDestinationTyp
             return type;
         }
 
+        private const string KakfaTopic = "Topic";
+        private const string KakfaReceived = "Received";
+        private const string KakfaMessages = "Messages";
+        public static MetricName GetKafkaMessagesReceivedPerConsume(string topic)
+        {
+            return MetricName.Create(Message, "Kafka", KakfaTopic, MessageBrokerNamed, topic, KakfaReceived, KakfaMessages);
+        }
+
         #endregion MessageBroker
 
         #region Datastore
@@ -814,6 +833,9 @@ public static string GetSupportabilityInstallType(string installType)
         // AppDomain caching disabled
         public const string SupportabilityAppDomainCachingDisabled = "Supportability/DotNET/AppDomainCaching/Disabled";
 
+        public const string SupportabilityLoggingDisabled = "Supportability/DotNET/AgentLogging/Disabled";
+        public const string SupportabilityLoggingFatalError = "Supportability/DotNET/AgentLogging/DisabledDueToError";
+
         #endregion Supportability
 
         #region Distributed Trace Metrics
@@ -1045,6 +1067,7 @@ public static string GetPerDestinationAreaDataUsageMetricName(string destination
         public const string SupportabilityLoggingEventsSent = SupportabilityLoggingEventsPs + Forwarding + PathSeparator + "Sent";
         public const string SupportabilityLoggingEventsCollected = SupportabilityLoggingEventsPs + Forwarding + PathSeparator + "Seen";
         public const string SupportabilityLoggingEventsDropped = SupportabilityLoggingEventsPs + Forwarding + PathSeparator + "Dropped";
+        public const string SupportabilityLoggingEventEmpty = SupportabilityLoggingEventsPs + Forwarding + PathSeparator + "Empty";
 
         public static string GetLoggingMetricsLinesBySeverityName(string logLevel)
         {
diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs
index e46a1c189c..1d050f48ea 100644
--- a/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs
+++ b/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs
@@ -18,7 +18,7 @@ protected virtual bool Enabled
         {
             get
             {
-                return !_configuration.DisableSamplers;
+                return !_configuration.DisableSamplers && !Agent.IsAgentShuttingDown;
             }
         }
 
diff --git a/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs b/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs
index 636669d57d..680a87baba 100644
--- a/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs
+++ b/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs
@@ -23,7 +23,7 @@ namespace NewRelic.Agent.Core.Segments
 {
     public class DatastoreSegmentData : AbstractSegmentData, IDatastoreSegmentData
     {
-        private readonly static ConnectionInfo EmptyConnectionInfo = new ConnectionInfo(null, null, null);
+        private readonly static ConnectionInfo EmptyConnectionInfo = new ConnectionInfo(null, null, null, null);
 
         public override SpanCategory SpanCategory => SpanCategory.Datastore;
 
@@ -31,7 +31,10 @@ public class DatastoreSegmentData : AbstractSegmentData, IDatastoreSegmentData
         public DatastoreVendor DatastoreVendorName => _parsedSqlStatement.DatastoreVendor;
         public string Model => _parsedSqlStatement.Model;
         public string CommandText { get; set; }
+        public string Vendor => _connectionInfo.Vendor;
         public string Host => _connectionInfo.Host;
+        public int? Port => _connectionInfo.Port;
+        public string PathOrId => _connectionInfo.PathOrId;
         public string PortPathOrId => _connectionInfo.PortPathOrId;
         public string DatabaseName => _connectionInfo.DatabaseName;
         public Func<object> GetExplainPlanResources { get; set; }
@@ -219,10 +222,18 @@ public override void SetSpanTypeSpecificAttributes(SpanAttributeValueCollection
                 AttribDefs.DbCollection.TrySetValue(attribVals, _parsedSqlStatement.Model);
             }
 
+            AttribDefs.DbSystem.TrySetValue(attribVals, Vendor);
             AttribDefs.DbInstance.TrySetValue(attribVals, DatabaseName);
+            AttribDefs.DbOperation.TrySetValue(attribVals, Operation);
             AttribDefs.PeerAddress.TrySetValue(attribVals, $"{Host}:{PortPathOrId}");
-            AttribDefs.PeerHostname.TrySetValue(attribVals, Host);
             AttribDefs.SpanKind.TrySetDefault(attribVals);
+            // peer.hostname and server.address must match
+            AttribDefs.PeerHostname.TrySetValue(attribVals, Host);
+            AttribDefs.DbServerAddress.TrySetValue(attribVals, Host);
+            if (Port != null)
+            {
+                AttribDefs.DbServerPort.TrySetValue(attribVals, Port.Value);
+            }
         }
 
         public void SetConnectionInfo(ConnectionInfo connInfo)
diff --git a/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs b/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs
index 82337c2079..7c085c6b0f 100644
--- a/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs
+++ b/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs
@@ -93,6 +93,8 @@ public override void SetSpanTypeSpecificAttributes(SpanAttributeValueCollection
             AttribDefs.Component.TrySetValue(attribVals, _segmentState.TypeName);
             AttribDefs.SpanKind.TrySetDefault(attribVals);
             AttribDefs.HttpStatusCode.TrySetValue(attribVals, _httpStatusCode);   //Attrib handles null
+            AttribDefs.ServerAddress.TrySetValue(attribVals, Uri.Host);
+            AttribDefs.ServerPort.TrySetValue(attribVals, Uri.Port);
         }
 
         public override string GetTransactionTraceName()
diff --git a/src/Agent/NewRelic/Agent/Core/Segments/MessageBrokerSerializationSegmentData.cs b/src/Agent/NewRelic/Agent/Core/Segments/MessageBrokerSerializationSegmentData.cs
new file mode 100644
index 0000000000..92a8a56a53
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Core/Segments/MessageBrokerSerializationSegmentData.cs
@@ -0,0 +1,77 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Collections.Generic;
+using NewRelic.Agent.Core.Aggregators;
+using NewRelic.Agent.Core.Metrics;
+using NewRelic.Agent.Core.Time;
+using static NewRelic.Agent.Core.WireModels.MetricWireModel;
+using NewRelic.Agent.Configuration;
+
+namespace NewRelic.Agent.Core.Segments
+{
+    public class MessageBrokerSerializationSegmentData : AbstractSegmentData
+    {
+
+        private const string TransactionGuidSegmentParameterKey = "transaction_guid";
+
+        public string Vendor { get; set; }
+
+        public string Destination { get; set; }
+
+        public MetricNames.MessageBrokerDestinationType DestinationType { get; set; }
+
+        public MetricNames.MessageBrokerAction Action { get; set; }
+
+        public string Kind { get; set; }
+
+
+        public MessageBrokerSerializationSegmentData(string vendor, string destination, MetricNames.MessageBrokerDestinationType destinationType, MetricNames.MessageBrokerAction action, string kind)
+        {
+            Vendor = vendor;
+            Destination = destination;
+            DestinationType = destinationType;
+            Action = action;
+            Kind = kind;
+        }
+
+        public override bool IsCombinableWith(AbstractSegmentData otherData)
+        {
+            var otherTypedSegment = otherData as MessageBrokerSerializationSegmentData;
+            if (otherTypedSegment == null)
+                return false;
+
+            if (!Vendor.Equals(otherTypedSegment.Vendor))
+                return false;
+
+            if (!Destination.Equals(otherTypedSegment.Destination))
+                return false;
+
+            if (DestinationType != otherTypedSegment.DestinationType)
+                return false;
+
+            if (Action != otherTypedSegment.Action)
+                return false;
+
+            if (!Kind.Equals(otherTypedSegment.Kind))
+                return false;
+
+            return true;
+        }
+
+        public override string GetTransactionTraceName()
+        {
+            return MetricNames.GetMessageBrokerSerialization(DestinationType, Action, Vendor, Destination, Kind).ToString();
+        }
+
+        public override void AddMetricStats(Segment segment, TimeSpan durationOfChildren, TransactionMetricStatsCollection txStats, IConfigurationService configService)
+        {
+            var duration = segment.Duration.Value;
+            var exclusiveDuration = TimeSpanMath.Max(TimeSpan.Zero, duration - durationOfChildren);
+
+            MetricBuilder.TryBuildMessageBrokerSerializationSegmentMetric(Vendor, Destination, DestinationType, Action, Kind, duration, exclusiveDuration, txStats);
+
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Core/Segments/NoOpSegment.cs b/src/Agent/NewRelic/Agent/Core/Segments/NoOpSegment.cs
index 4a2892d3bd..5e1a5181ac 100644
--- a/src/Agent/NewRelic/Agent/Core/Segments/NoOpSegment.cs
+++ b/src/Agent/NewRelic/Agent/Core/Segments/NoOpSegment.cs
@@ -50,6 +50,7 @@ public ISegmentExperimental MakeLeaf()
         }
 
         public void RemoveSegmentFromCallStack() { }
+        public void SetMessageBrokerDestination(string destination) { }
 
         public ISegmentExperimental SetSegmentData(ISegmentData segmentData)
         {
diff --git a/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs b/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs
index 8588a72c96..1c75d82df8 100644
--- a/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs
+++ b/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs
@@ -53,6 +53,7 @@ public Segment(ITransactionSegmentState transactionSegmentState, MethodCallData
             Data.AttachSegmentDataState(this);
             Combinable = false;
             IsLeaf = false;
+            IsAsync = methodCallData.IsAsync;
         }
 
         /// <summary>
@@ -75,6 +76,7 @@ public Segment(ITransactionSegmentState transactionSegmentState, MethodCallData
             Data.AttachSegmentDataState(this);
             Combinable = false;
             IsLeaf = true;
+            IsAsync = methodCallData.IsAsync;
         }
 
         /// <summary>
@@ -105,6 +107,7 @@ public Segment(TimeSpan relativeStartTime, TimeSpan? duration, Segment segment,
             }
 
             SpanId = segment.SpanId;
+            IsAsync = segment.IsAsync;
         }
 
         public bool IsDone
@@ -207,6 +210,15 @@ public void RemoveSegmentFromCallStack()
             _transactionSegmentState.CallStackPop(this);
         }
 
+        public void SetMessageBrokerDestination(string destination)
+        {
+            if (SegmentData is MessageBrokerSegmentData)
+            {
+                var messageBrokerSegmentData = SegmentData as MessageBrokerSegmentData;
+                messageBrokerSegmentData!.Destination = destination;
+            }
+        }
+
         private const long NoEndTime = -1;
         internal static NoOpSegment NoOpSegment = new NoOpSegment();
         protected readonly static IEnumerable<KeyValuePair<string, object>> EmptyImmutableParameters = new KeyValuePair<string, object>[0];
@@ -229,6 +241,8 @@ public void RemoveSegmentFromCallStack()
         /// </summary>
         public int ThreadId { get; private set; }
 
+        public bool IsAsync { get; private set; }
+
         // used to set the ["unfinished"] parameter, not for real-time state of segment
         public bool Unfinished { get; private set; }
 
@@ -335,6 +349,11 @@ public SpanAttributeValueCollection GetAttributeValues()
                 AttribDefs.CodeFunction.TrySetValue(attribValues, codeFunction);
             }
 
+            if (!IsAsync)
+            {
+                AttribDefs.ThreadId.TrySetValue(attribValues, ThreadId);
+            }
+
             Data.SetSpanTypeSpecificAttributes(attribValues);
 
             return attribValues;
@@ -400,7 +419,7 @@ public Segment CreateSimilar(TimeSpan newRelativeStartTime, TimeSpan newDuration
 
         public string ToStringForFinestLogging()
         {
-            return $"Id={UniqueId},ParentId={ParentUniqueId?.ToString() ?? "Root"},Name={Data.GetTransactionTraceName()},IsLeaf={IsLeaf},Combinable={Combinable},MethodCallData={MethodCallData}";
+            return $"Id={UniqueId},ParentId={ParentUniqueId?.ToString() ?? "Root"},Name={GetTransactionTraceName()},IsLeaf={IsLeaf},Combinable={Combinable},MethodCallData={MethodCallData}";
         }
 
         public ISegmentExperimental SetSegmentData(ISegmentData segmentData)
@@ -441,5 +460,6 @@ public string GetCategory()
         {
             return EnumNameCache<SpanCategory>.GetName(Data.SpanCategory);
         }
+
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs b/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs
index 3ed0d62481..bf5e796aff 100644
--- a/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs
+++ b/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs
@@ -70,7 +70,7 @@ public void ExecuteEvery(Action action, TimeSpan timeBetweenExecutions, TimeSpan
                 var existingTimer = _recurringTimers.GetValueOrDefault(action);
                 if (existingTimer != null)
                 {
-                    Log.Debug("Stopping existing timer for scheduled action");
+                    Log.Debug("Stopping existing timer for scheduled action for " + action.Method.DeclaringType.FullName + "." + action.Method.Name);
                     existingTimer.Dispose();
                 }
 
diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs b/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs
index f6becb50be..d924c65787 100644
--- a/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs
+++ b/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs
@@ -81,6 +81,14 @@ public ISegment StartMessageBrokerSegment(MethodCall methodCall, MessageBrokerDe
             return Segment.NoOpSegment;
         }
 
+        public ISegment StartMessageBrokerSerializationSegment(MethodCall methodCall, MessageBrokerDestinationType destinationType, MessageBrokerAction operation, string brokerVendorName, string destinationName, string kind)
+        {
+#if DEBUG
+            Log.Finest("Skipping StartMessageBrokerSegment outside of a transaction");
+#endif
+            return Segment.NoOpSegment;
+        }
+
         public ISegment StartMethodSegment(MethodCall methodCall, string typeName, string methodName, bool isLeaf = false)
         {
 #if DEBUG
@@ -175,6 +183,11 @@ public void SetMessageBrokerTransactionName(MessageBrokerDestinationType destina
 
         }
 
+        public void SetKafkaMessageBrokerTransactionName(MessageBrokerDestinationType destinationType, string brokerVendorName, string destination = null, TransactionNamePriority priority = TransactionNamePriority.Uri)
+        {
+
+        }
+
         public void SetOtherTransactionName(string category, string name, TransactionNamePriority priority = TransactionNamePriority.Uri)
         {
 
diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs b/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs
index f48d85d5f5..aadf3123ae 100644
--- a/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs
+++ b/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs
@@ -257,6 +257,26 @@ public ISegment StartMessageBrokerSegment(MethodCall methodCall, MessageBrokerDe
             return segment;
         }
 
+        public ISegment StartMessageBrokerSerializationSegment(MethodCall methodCall, MessageBrokerDestinationType destinationType, MessageBrokerAction operation, string brokerVendorName, string destinationName, string kind)
+        {
+            if (Ignored)
+                return Segment.NoOpSegment;
+            if (brokerVendorName == null)
+                throw new ArgumentNullException("brokerVendorName");
+            if (string.IsNullOrEmpty(kind))
+                throw new ArgumentNullException("kind");
+
+
+            var segment = StartSegmentImpl(methodCall);
+            var messageBrokerSegmentData = CreateMessageBrokerSerializationSegmentData(destinationType, operation, brokerVendorName, destinationName, kind);
+
+            segment.SetSegmentData(messageBrokerSegmentData);
+
+            if (Log.IsFinestEnabled) LogFinest($"Segment start {{{segment.ToStringForFinestLogging()}}}");
+
+            return segment;
+        }
+
         public AbstractSegmentData CreateMessageBrokerSegmentData(MessageBrokerDestinationType destinationType, MessageBrokerAction operation, string brokerVendorName, string destinationName)
         {
             if (brokerVendorName == null)
@@ -268,6 +288,17 @@ public AbstractSegmentData CreateMessageBrokerSegmentData(MessageBrokerDestinati
             return new MessageBrokerSegmentData(brokerVendorName, destinationName, destType, action);
         }
 
+        public AbstractSegmentData CreateMessageBrokerSerializationSegmentData(MessageBrokerDestinationType destinationType, MessageBrokerAction operation, string brokerVendorName, string destinationName, string kind)
+        {
+            if (brokerVendorName == null)
+                throw new ArgumentNullException("brokerVendorName");
+
+            var action = AgentWrapperApiEnumToMetricNamesEnum(operation);
+            var destType = AgentWrapperApiEnumToMetricNamesEnum(destinationType);
+
+            return new MessageBrokerSerializationSegmentData(brokerVendorName, destinationName, destType, action, kind);
+        }
+
         /// <summary>
         /// This creates a Datastore segment based on data gathered using the built-in StackExchange.Redis profiling system.
         /// </summary>
@@ -332,13 +363,13 @@ private static MethodCallData GetMethodCallData(MethodCall methodCall)
             var typeName = methodCall.Method.Type.FullName ?? "[unknown]";
             var methodName = methodCall.Method.MethodName;
             var invocationTargetHashCode = RuntimeHelpers.GetHashCode(methodCall.InvocationTarget);
-            return new MethodCallData(typeName, methodName, invocationTargetHashCode);
+            return new MethodCallData(typeName, methodName, invocationTargetHashCode, methodCall.IsAsync);
         }
 
         // Used for StackExchange.Redis since we will not be instrumenting any methods when creating the many DataStore segments
         private static MethodCallData GetMethodCallData(string typeName, string methodName, int invocationTargetHashCode)
         {
-            return new MethodCallData(typeName, methodName, invocationTargetHashCode);
+            return new MethodCallData(typeName, methodName, invocationTargetHashCode, true); // assume async
         }
 
         private static MetricNames.MessageBrokerDestinationType AgentWrapperApiEnumToMetricNamesEnum(
@@ -786,6 +817,12 @@ public void SetMessageBrokerTransactionName(MessageBrokerDestinationType destina
             SetTransactionName(trxName, priority);
         }
 
+        public void SetKafkaMessageBrokerTransactionName(MessageBrokerDestinationType destinationType, string brokerVendorName, string destination = null, TransactionNamePriority priority = TransactionNamePriority.Uri)
+        {
+            var trxName = TransactionName.ForKafkaBrokerTransaction(destinationType, brokerVendorName, destination);
+            SetTransactionName(trxName, priority);
+        }
+
         public void SetOtherTransactionName(string category, string name, TransactionNamePriority priority = TransactionNamePriority.Uri)
         {
             var trxName = TransactionName.ForOtherTransaction(category, name);
diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/TransactionName.cs b/src/Agent/NewRelic/Agent/Core/Transactions/TransactionName.cs
index a2262a0a22..29edf873f8 100644
--- a/src/Agent/NewRelic/Agent/Core/Transactions/TransactionName.cs
+++ b/src/Agent/NewRelic/Agent/Core/Transactions/TransactionName.cs
@@ -66,6 +66,7 @@ public static TransactionName ForUriTransaction(string normalizedUri)
             var trxName = new TransactionName(true, MetricNames.Uri, normalizedUri);
             return trxName;
         }
+
         public static TransactionName ForBrokerTransaction(MessageBrokerDestinationType type, string vendor, string destination)
         {
             var trxName = new StringBuilder(vendor)
@@ -87,6 +88,29 @@ public static TransactionName ForBrokerTransaction(MessageBrokerDestinationType
             return new TransactionName(false, MetricNames.Message, trxName.ToString());
         }
 
+        /// <summary>
+        /// Builds a transaction name that conforms to the Kafka spec
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="vendor"></param>
+        /// <param name="destination"></param>
+        /// <returns></returns>
+        public static TransactionName ForKafkaBrokerTransaction(MessageBrokerDestinationType type, string vendor, string destination)
+        {
+            var trxName = new StringBuilder(vendor)
+                .Append(MetricNames.PathSeparator)
+                .Append(EnumNameCache<MessageBrokerDestinationType>.GetName(type))
+                .Append(MetricNames.PathSeparator)
+                .Append(MetricNames.KafkaMessageBrokerConsume)
+                .Append(MetricNames.PathSeparator)
+                .Append(MetricNames.MessageBrokerNamed)
+                .Append(MetricNames.PathSeparator);
+
+            trxName.Append(string.IsNullOrWhiteSpace(destination) ? MetricNames.MessageBrokerTemp : destination);
+
+            return new TransactionName(false, MetricNames.Message, trxName.ToString());
+        }
+
         public static TransactionName ForCustomTransaction(bool isWeb, string name, int maxLength)
         {
             // Note: In our public docs to tells users that they must prefix their metric names with "Custom/", but there's no mechanism that actually enforces this restriction, so there's no way to know whether it'll be there or not. For consistency, we'll just strip off "Custom/" if there's at all and then we know it's consistently not there.
diff --git a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs
index 926c2d282f..ffa6e4d8b4 100644
--- a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs
+++ b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs
@@ -291,6 +291,13 @@ private void GenerateAndCollectMetrics(ImmutableTransaction immutableTransaction
                 MetricBuilder.TryBuildClientApplicationMetric(referrerCrossProcessId, catResponseTime, catResponseTime, txStats);
             }
 
+            // Capture required Kafka metrics
+            if (immutableTransaction.TransactionName.Name.StartsWith("Message/Kafka/Topic/Consume/Named"))
+            {
+
+                MetricBuilder.TryBuildKafkaMessagesReceivedMetric(immutableTransaction.TransactionName.Name, 1, txStats);
+            }
+
             using (_agentTimerService.StartNew("CollectMetrics"))
             {
                 _metricAggregator.Collect(txStats);
diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs b/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs
index 6a120e7e0d..d33f1e635c 100644
--- a/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs
+++ b/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs
@@ -37,6 +37,12 @@ public static void Initialize(string installPathExtensionsDirectory)
                 { "GenericHostWebHostBuilderExtensionsWrapper",                                                     Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNetCore.dll") },
                 { "NewRelic.Providers.Wrapper.AspNetCore.InvokeActionMethodAsync",                                  Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNetCore.dll") },
 
+                { "BuildCommonServicesWrapper6Plus",                                                                Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNetCore6Plus.dll") },
+                { "GenericHostWebHostBuilderExtensionsWrapper6Plus",                                                Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNetCore6Plus.dll") },
+                { "InvokeActionMethodAsyncWrapper6Plus",                                                            Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNetCore6Plus.dll") },
+                { "ResponseCompressionBodyOnWriteWrapper",                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNetCore6Plus.dll") },
+                { "PageActionInvokeHandlerAsyncWrapper6Plus",                                                       Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNetCore6Plus.dll") },
+
                 { "ResolveAppWrapper",                                                                              Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Owin.dll") },
 
                 { "AspNet.CreateEventExecutionStepsTracer",                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.AspNet.dll") },
@@ -67,9 +73,19 @@ public static void Initialize(string installPathExtensionsDirectory)
                 { "OpenConnectionWrapperAsync",                                                                     Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Sql.dll") },
 
                 //The NewRelic.Providers.Wrapper.SerilogLogging.dll depends on the Serilog.dll; therefore, it should
-                //only be loaded by the agent when Serilog is used otherwise assembly load exception will occur.
-                { "SerilogCreateLoggerWrapper",                                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.SerilogLogging.dll") },
-                { "SerilogDispatchWrapper",                                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.SerilogLogging.dll") }
+                //only be loaded by the agent when Serilog is used otherwise an assembly load exception will occur.
+                { "SerilogCreateLoggerWrapper",                                                                      Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.SerilogLogging.dll") },
+                { "SerilogDispatchWrapper",                                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.SerilogLogging.dll") },
+
+                // Both NewRelic.Providers.Wrapper.MassTransit.dll and NewRelic.Providers.Wrapper.MassTransitLegacy.dll depend on MassTransit assemblies;
+                // therefore, they should only be loaded by the agent when MassTransit is used, otherwise assembly load exceptions will occur.
+                { "TransportConfigWrapper",                                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.MassTransit.dll") },
+                { "TransportConfigLegacyWrapper",                                                                    Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.MassTransitLegacy.dll") },
+
+              // Kafka
+                { "KafkaProducerWrapper",                                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Kafka.dll") },
+                { "KafkaSerializerWrapper",                                                                        Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Kafka.dll") },
+                { "KafkaConsumerWrapper",                                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Kafka.dll") }
             };
 
             var nonAutoReflectedAssemblies = _dynamicLoadWrapperAssemblies.Values.Distinct().ToList();
diff --git a/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs b/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs
index 3376985cc8..72bcd28d59 100644
--- a/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs
+++ b/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs
@@ -49,16 +49,19 @@ public virtual string CallVendorApi(Uri uri, string method, string vendorName, I
                     {
                         var statusCode = response.StatusCode.ToString() ?? string.Empty;
                         var statusDescription = response.StatusDescription ?? string.Empty;
-                        Log.Debug(ex, "CallVendorApi ({0}) failed with WebException with status: {1}; message: {2}", vendorName, statusCode, statusDescription);
+                        // intentionally not passing the exception parameter here
+                        Log.Debug("CallVendorApi ({0}) failed with WebException with status: {1}; message: {2}", vendorName, statusCode, statusDescription);
                     }
                     else
                     {
-                        Log.Debug(ex, "CallVendorApi ({0}) failed", vendorName);
+                        // intentionally not passing the exception parameter here
+                        Log.Debug($"CallVendorApi ({{0}}) failed: {ex.Message}", vendorName);
                     }
                 }
                 else
                 {
-                    Log.Debug(ex, "CallVendorApi ({0}) failed", vendorName);
+                    // intentionally not passing the exception parameter here
+                    Log.Debug($"CallVendorApi ({{0}}) failed: {ex.Message}", vendorName);
                 }
                 return null;
             }
diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs b/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs
index dfae95964e..1cac52661d 100644
--- a/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs
+++ b/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs
@@ -205,5 +205,8 @@ public interface IMetricBuilder
         MetricWireModel TryBuildSupportabilityLoggingEventsSentMetric(int loggingEventCount);
 
         MetricWireModel TryBuildSupportabilityLoggingEventsDroppedMetric(int droppedCount);
+
+        MetricWireModel TryBuildCountMetric(string metricName, long count);
+        MetricWireModel TryBuildByteMetric(string metricName, long totalBytes, long? exclusiveBytes = null);
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs b/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs
index f0e7d1e185..697fd299f8 100644
--- a/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs
+++ b/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs
@@ -298,6 +298,19 @@ public static void TryBuildErrorsMetrics(bool isWebTransaction, TransactionMetri
 
             #endregion
 
+            #region Kafka metrics
+
+            public static void TryBuildKafkaMessagesReceivedMetric(string transactionName, int count, TransactionMetricStatsCollection txStats)
+            {
+                var parts = transactionName.Split('/');
+                var proposedName = MetricNames.GetKafkaMessagesReceivedPerConsume(parts.Last());
+                var data = MetricDataWireModel.BuildCountData(count);
+                txStats.MergeUnscopedStats(proposedName, data);
+                txStats.MergeScopedStats(proposedName, data);
+            }
+
+            #endregion Kafka metrics
+
             #endregion Transaction builders
 
             #region Segment builders
@@ -339,6 +352,16 @@ public static void TryBuildMessageBrokerSegmentMetric(string vendor, string dest
                 txStats.MergeUnscopedStats(proposedName, data);
             }
 
+            public static void TryBuildMessageBrokerSerializationSegmentMetric(string vendor, string destination,
+                MetricNames.MessageBrokerDestinationType destinationType, MetricNames.MessageBrokerAction action, string kind,
+                TimeSpan totalTime, TimeSpan totalExclusiveTime, TransactionMetricStatsCollection txStats)
+            {
+                var proposedName = MetricNames.GetMessageBrokerSerialization(destinationType, action, vendor, destination, kind);
+                var data = MetricDataWireModel.BuildTimingData(totalTime, totalExclusiveTime);
+                txStats.MergeScopedStats(proposedName, data);
+                txStats.MergeUnscopedStats(proposedName, data);
+            }
+
             public static void TryBuildExternalSegmentMetric(string host, string method, TimeSpan totalTime,
                 TimeSpan totalExclusiveTime, TransactionMetricStatsCollection txStats, bool unscopedOnly)
             {
@@ -987,6 +1010,18 @@ public MetricWireModel TryBuildSupportabilityLoggingEventsDroppedMetric(int drop
                 return BuildMetric(_metricNameService, proposedName, null, data);
             }
 
+            public MetricWireModel TryBuildCountMetric(string metricName, long count)
+            {
+                var data = MetricDataWireModel.BuildCountData(count);
+                return BuildMetric(_metricNameService, metricName, null, data);
+            }
+
+            public MetricWireModel TryBuildByteMetric(string metricName, long totalBytes, long? exclusiveBytes)
+            {
+                var data = MetricDataWireModel.BuildByteData(totalBytes, exclusiveBytes);
+                return BuildMetric(_metricNameService, metricName, null, data);
+            }
+
             #endregion
         }
     }
diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Data/MethodCallData.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Data/MethodCallData.cs
index 4ba6c8e87e..ed95d23c0a 100644
--- a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Data/MethodCallData.cs
+++ b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Data/MethodCallData.cs
@@ -8,12 +8,14 @@ public class MethodCallData
         public readonly string TypeName;
         public readonly string MethodName;
         public readonly int InvocationTargetHashCode;
+        public readonly bool IsAsync;
 
-        public MethodCallData(string typeName, string methodName, int invocationTargetHashCode)
+        public MethodCallData(string typeName, string methodName, int invocationTargetHashCode, bool isAsync = false)
         {
             TypeName = typeName;
             MethodName = methodName;
             InvocationTargetHashCode = invocationTargetHashCode;
+            IsAsync = isAsync;
         }
 
         public override string ToString()
@@ -27,6 +29,7 @@ public override int GetHashCode()
             hash = hash * 23 + TypeName.GetHashCode();
             hash = hash * 23 + MethodName.GetHashCode();
             hash = hash * 23 + InvocationTargetHashCode;
+            hash = hash * 29 + IsAsync.GetHashCode();
             return hash;
         }
 
@@ -37,7 +40,8 @@ public override bool Equals(object obj)
                 var other = (MethodCallData)obj;
                 return InvocationTargetHashCode == other.InvocationTargetHashCode &&
                     MethodName.Equals(other.MethodName) &&
-                    TypeName.Equals(other.TypeName);
+                    TypeName.Equals(other.TypeName) &&
+                    IsAsync == other.IsAsync;
             }
             return false;
         }
diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs
index 963be1e810..5518538048 100644
--- a/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs
+++ b/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs
@@ -142,7 +142,7 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(Type type, string methodNa
                 }
             }
 
-            var methodCall = new MethodCall(instrumentedMethodInfo.Method, invocationTarget, methodArguments);
+            var methodCall = new MethodCall(instrumentedMethodInfo.Method, invocationTarget, methodArguments, instrumentedMethodInfo.IsAsync);
             var instrumentedMethodCall = new InstrumentedMethodCall(methodCall, instrumentedMethodInfo);
 
             // if the wrapper throws an exception when executing the pre-method code, make sure the wrapper isn't called again in the future
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/Experimental/IAgentExperimental.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/Experimental/IAgentExperimental.cs
index 5040635d79..4feb824928 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/Experimental/IAgentExperimental.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/Experimental/IAgentExperimental.cs
@@ -13,11 +13,25 @@ namespace NewRelic.Agent.Api.Experimental
     public interface IAgentExperimental
     {
         /// <summary>
-        /// Records a supportability metrics
+        /// Records a supportability metric
         /// </summary>
         /// <param name="metricName"></param>
-        /// <param name="count">Defaults to 1.0f</param>
-        void RecordSupportabilityMetric(string metricName, int count = 1);
+        /// <param name="count">Defaults to 1.0</param>
+        void RecordSupportabilityMetric(string metricName, long count = 1);
+
+        /// <summary>
+        /// Records a count metric with the given name
+        /// </summary>
+        /// <param name="metricName"></param>
+        /// <param name="count"></param>
+        void RecordCountMetric(string metricName, long count = 1);
+        /// <summary>
+        /// Records a byte count metric with the given name
+        /// </summary>
+        /// <param name="metricName"></param>
+        /// <param name="totalBytes"></param>
+        /// <param name="exclusiveBytes"></param>
+        void RecordByteMetric(string metricName, long totalBytes, long? exclusiveBytes = null);
 
         /// <summary>
         /// Records the log message in the transaction to later be forwarded if log forwarding is enabled.
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/IAgent.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/IAgent.cs
index 5e6dfefd10..3a1671fc26 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/IAgent.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/IAgent.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace NewRelic.Agent.Api
 {
@@ -38,6 +39,17 @@ public interface IAgent : IAgentExperimental
         /// <returns></returns>
         ITransaction CreateTransaction(MessageBrokerDestinationType destinationType, string brokerVendorName, string destination = null, Action wrapperOnCreate = null);
 
+
+        /// <summary>
+        /// Create a new transaction for processing a request, conforming to the naming requirements of the Kafka spec.
+        /// </summary>
+        /// <param name="destinationType"></param>
+        /// <param name="brokerVendorName">The name of the message broker vendor. Must not be null.</param>
+        /// <param name="destination">The destination queue of the message being handled. Can be null.</param>
+        /// <param name="onCreate">A callback that is called if a transaction is created. Can be null.</param>
+        /// <returns></returns>
+        ITransaction CreateKafkaTransaction(MessageBrokerDestinationType destinationType, string brokerVendorName, string destination = null, Action wrapperOnCreate = null);
+
         /// <summary>
         /// Create a new transaction for processing a request.
         /// </summary>
@@ -92,6 +104,19 @@ public interface IAgent : IAgentExperimental
         /// <param name="requestPath">The path of the request</param>
         Stream TryGetStreamInjector(Stream stream, Encoding encoding, string contentType, string requestPath);
 
+        /// <summary>
+        /// Used by AspNetCore6Plus, injects the RUM script if various conditions are met. Assumes (perhaps boldly) that the
+        /// page content is UTF-8 encoded.
+        /// 
+        /// This method should be called as late as possible (i.e. just before the stream is read) to ensure that the metadata passed in (encoding, contentType, etc) is no longer volatile.
+        /// </summary>
+        /// <param name="contentType">The type of content in the stream.</param>
+        /// <param name="requestPath">The path of the request</param>
+        /// <param name="buffer">A UTF-8 encoded buffer of the content for this request</param>
+        /// <param name="baseStream">The stream into which the script (and buffer) should be injected</param>
+        /// <returns></returns>
+        Task TryInjectBrowserScriptAsync(string contentType, string requestPath, byte[] buffer, Stream baseStream);
+
         /// <summary>
         /// Returns the Trace Metadata of the currently executing transaction.
         /// </summary>
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ISegment.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ISegment.cs
index 2f1bc1a24f..2a7d01ce67 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ISegment.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ISegment.cs
@@ -68,5 +68,11 @@ public interface ISegment : ISpan
         /// Removes this segment from the top of the agent's internal call stack. Should only be used for asynchronous methods. Calling EndSegment is sufficient for synchronous methods.
         /// </summary>
         void RemoveSegmentFromCallStack();
+
+        /// <summary>
+        /// Sets the Destination on SegmentData, if the data is of type MessageBrokerSegmentData
+        /// </summary>
+        /// <param name="destination"></param>
+        void SetMessageBrokerDestination(string destination);
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ITransaction.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ITransaction.cs
index fdd97e92c6..30c705cb1d 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ITransaction.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ITransaction.cs
@@ -91,6 +91,18 @@ public interface ITransaction
         /// <returns>an opaque object that will be needed when you want to end the segment.</returns>
         ISegment StartMessageBrokerSegment(MethodCall methodCall, MessageBrokerDestinationType destinationType, MessageBrokerAction operation, string brokerVendorName, string destinationName = null);
 
+        /// <summary>
+        /// Creates a segment for serializing a key or value in a message brokering system..
+        /// </summary>
+        /// <param name="methodCall">The method call that is responsible for starting this segment.</param>
+        /// <param name="destinationType"></param>
+        /// <param name="operation"></param>
+        /// <param name="brokerVendorName">Must not be null.</param>
+        /// <param name="destinationName">Can be null.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns>an opaque object that will be needed when you want to end the segment.</returns>
+        ISegment StartMessageBrokerSerializationSegment(MethodCall methodCall, MessageBrokerDestinationType destinationType, MessageBrokerAction operation, string brokerVendorName, string destinationName, string kind);
+
         /// <summary>
         /// Starts a transaction segment. Does nothing if there is no current transaction.
         /// </summary>
@@ -193,6 +205,17 @@ public interface ITransaction
         /// <exception cref="ArgumentNullException"></exception>
         void SetMessageBrokerTransactionName(MessageBrokerDestinationType destinationType, string brokerVendorName, string destination = null, TransactionNamePriority priority = TransactionNamePriority.Uri);
 
+        /// <summary>
+        /// Sets the name of the current transaction to a name in the OtherTransaction namespace which is derived from some message broker details,
+        /// conforming to the naming requirements of the Kafka spec . Does nothing if there is no current transaction.
+        /// </summary>
+        /// <param name="destinationType"></param>
+        /// <param name="brokerVendorName">The name of the message broker vendor. Must not be null.</param>
+        /// <param name="destination">The destination queue of the message being handled. Can be null.</param>
+        /// <param name="priority">The priority of the name being set. Higher priority names override lower priority names.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        void SetKafkaMessageBrokerTransactionName(MessageBrokerDestinationType destinationType, string brokerVendorName, string destination = null, TransactionNamePriority priority = TransactionNamePriority.Uri);
+
         /// <summary>
         /// Sets the name of the current transaction to a custom name in the OtherTransaction namespace.  Does nothing if there is no current transaction.
         /// </summary>
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Configuration/IConfiguration.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Configuration/IConfiguration.cs
index bfb4f99c84..8f920ad09e 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Configuration/IConfiguration.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Configuration/IConfiguration.cs
@@ -182,6 +182,7 @@ public interface IConfiguration
         string ProcessHostDisplayName { get; }
         int DatabaseStatementCacheCapacity { get; }
         bool ForceSynchronousTimingCalculationHttpClient { get; }
+        bool EnableAspNetCore6PlusBrowserInjection { get; }
         bool ExcludeNewrelicHeader { get; }
         bool ApplicationLoggingEnabled { get; }
         bool LogMetricsCollectorEnabled { get; }
@@ -204,5 +205,6 @@ public interface IConfiguration
         TimeSpan SqlTracesHarvestCycle { get; }
         TimeSpan UpdateLoadedModulesCycle { get; }
         TimeSpan StackExchangeRedisCleanupCycle { get; }
+        bool LoggingEnabled { get; }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Helpers/MassTransit.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Helpers/MassTransit.cs
new file mode 100644
index 0000000000..2e7fa3367a
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Helpers/MassTransit.cs
@@ -0,0 +1,39 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+
+
+namespace NewRelic.Agent.Extensions.Helpers
+{
+    public class MassTransitQueueData
+    {
+        public string QueueName { get; set; } = "Unknown";
+        public MessageBrokerDestinationType DestinationType { get; set; } = MessageBrokerDestinationType.Queue;
+    }
+
+    public class MassTransitHelpers
+    {
+        public static MassTransitQueueData GetQueueData(Uri sourceAddress)
+        {
+            var data = new MassTransitQueueData();
+
+            if (sourceAddress != null)
+            {
+                // rabbitmq://localhost/SomeHostname_MassTransitTest_bus_iyeoyyge44oc7yijbdp5i1opfd?temporary=true
+                var items = sourceAddress.AbsoluteUri.Split('_');
+                if (items.Length > 1)
+                {
+                    var queueData = items[items.Length - 1].Split('?');
+                    data.QueueName = queueData[0];
+                    if (queueData.Length == 2 && queueData[1] == "temporary=true")
+                    {
+                        data.DestinationType = MessageBrokerDestinationType.TempQueue;
+                    }
+                }
+            }
+            return data;
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/IConnectionInfo.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/IConnectionInfo.cs
index 4774f5767b..7b1a4bbc3e 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/IConnectionInfo.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/IConnectionInfo.cs
@@ -5,10 +5,25 @@ namespace NewRelic.Agent.Extensions.Parsing
 {
     public class ConnectionInfo
     {
-        public ConnectionInfo(string host, string portPathOrId, string databaseName, string instanceName = null)
+        public ConnectionInfo(string vendor, string host, int port, string databaseName, string instanceName = null)
         {
+            Vendor = vendor;
             Host = ValueOrUnknown(host);
-            PortPathOrId = ValueOrUnknown(portPathOrId);
+            if (port >= 0)
+            {
+                Port = port;
+            }
+            PathOrId = ValueOrUnknown(string.Empty);
+            DatabaseName = ValueOrUnknown(databaseName);
+            InstanceName = instanceName;
+        }
+
+        public ConnectionInfo(string vendor, string host, string pathOrId, string databaseName, string instanceName = null)
+        {
+            Vendor = vendor;
+            Host = ValueOrUnknown(host);
+            Port = null;
+            PathOrId = ValueOrUnknown(pathOrId);
             DatabaseName = ValueOrUnknown(databaseName);
             InstanceName = instanceName;
         }
@@ -18,8 +33,11 @@ private static string ValueOrUnknown(string value)
             return string.IsNullOrEmpty(value) ? "unknown" : value;
         }
 
+        public string Vendor { get; private set; }
         public string Host { get; private set; }
-        public string PortPathOrId { get; private set; }
+        public string PortPathOrId { get => (Port != null) ? Port.ToString() : PathOrId; }
+        public int? Port { get; private set; } = null;
+        public string PathOrId { get; private set; } = string.Empty;
         public string DatabaseName { get; private set; }
         public string InstanceName { get; private set; }
     }
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/Constants.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/Constants.cs
index cf6cbc8c7e..dbdbc5e7e4 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/Constants.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/Constants.cs
@@ -37,6 +37,7 @@ public enum WebTransactionType
         ASP,
         MVC,
         WCF,
+        Razor,
         WebAPI,
         WebService,
         MonoRail,
@@ -82,6 +83,24 @@ public enum DatastoreVendor
         Other
     }
 
+    public static class DatastoreVendorExtensions
+    {
+        // Convert our internal enum to the matching OTel "known" name for a database provider
+        public static string ToKnownName(this DatastoreVendor vendor)
+        {
+            switch (vendor)
+            {
+                case DatastoreVendor.Other:
+                    return "other_sql";
+                case DatastoreVendor.IBMDB2:
+                    return "db2";
+                // The others match our enum name
+                default:
+                    return EnumNameCache<DatastoreVendor>.GetNameToLower(vendor);
+            }
+        }
+    }
+
     public static class EnumNameCache<TEnum> // c# 7.3: where TEnum : System.Enum	
     {
         private static readonly ConcurrentDictionary<TEnum, string> Cache = new ConcurrentDictionary<TEnum, string>();
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/MethodCall.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/MethodCall.cs
index 837a120ac7..d6686b4ab3 100644
--- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/MethodCall.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Providers/Wrapper/MethodCall.cs
@@ -11,12 +11,14 @@ public class MethodCall
         public readonly Method Method;
         public readonly object InvocationTarget;
         public readonly object[] MethodArguments;
+        public readonly bool IsAsync;
 
-        public MethodCall(Method method, object invocationTarget, object[] methodArguments)
+        public MethodCall(Method method, object invocationTarget, object[] methodArguments, bool isAsync)
         {
             Method = method;
             InvocationTarget = invocationTarget;
             MethodArguments = methodArguments ?? new object[0];
+            IsAsync = isAsync;
         }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Storage/CallContext/readme.md b/src/Agent/NewRelic/Agent/Extensions/Providers/Storage/CallContext/readme.md
index b94b2e906a..34e2051c98 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Storage/CallContext/readme.md
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Storage/CallContext/readme.md
@@ -14,7 +14,7 @@ Writing data from a “true async” method creates a new copy of the `Execution
 
 This is tricky for us trying not to crash in the wild even though we don’t “support” these cases. Currently, we are wrapping data in a serializable container that won’t actually serialize the underlying data. We hope to avoid crashes but don’t intend to support cross-app domain calls or remoting.
 
-For more on the origins of this storage, see: [Implicit Async Context ("AsyncLocal")](http://blog.stephencleary.com/2013/04/implicit-async-context-asynclocal.html)
+For more on the origins of this storage, see: [Implicit Async Context ("AsyncLocal")](https://blog.stephencleary.com/2013/04/implicit-async-context-asynclocal.html)
 
 ## Segment Parenting / "Call Stack"
 
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj
index 3ab57aa37f..f86a0e51b5 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj
@@ -3,14 +3,15 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>NewRelic.Providers.Wrapper.AspNetCore</AssemblyName>
     <RootNamespace>NewRelic.Providers.Wrapper.AspNetCore</RootNamespace>
+    <Description>ASP.NET Core Wrapper Provider for New Relic .NET Agent</Description>
   </PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" />
-	</ItemGroup>
-	<ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" />
+  </ItemGroup>
+  <ItemGroup>
 		<Content Include="Instrumentation.xml">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/GenericHostWebHostBuilderExtensionsWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/GenericHostWebHostBuilderExtensionsWrapper.cs
index dcc6800454..c66cd06a46 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/GenericHostWebHostBuilderExtensionsWrapper.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/GenericHostWebHostBuilderExtensionsWrapper.cs
@@ -38,7 +38,7 @@ public static void AddStartupFilterToHostBuilder(object hostBuilder, IAgent agen
                 {
                     var typedHostBuilder = (Microsoft.Extensions.Hosting.IHostBuilder)hostBuilder;
                     typedHostBuilder.ConfigureServices(AddStartupFilter);
-
+                    
                     void AddStartupFilter(Microsoft.Extensions.Hosting.HostBuilderContext hostBuilderContext, IServiceCollection services)
                     {
                         //Forced evaluation is important. Do not remove ToList()
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/Instrumentation.xml
index 64aa0ec770..efe868d6f6 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/Instrumentation.xml
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/Instrumentation.xml
@@ -6,20 +6,20 @@ SPDX-License-Identifier: Apache-2.0
 <extension xmlns="urn:newrelic-extension">
 	<instrumentation>
 		<tracerFactory name="BuildCommonServicesWrapper">
-			<match assemblyName="Microsoft.AspNetCore.Hosting" className="Microsoft.AspNetCore.Hosting.WebHostBuilder">
+			<match assemblyName="Microsoft.AspNetCore.Hosting" className="Microsoft.AspNetCore.Hosting.WebHostBuilder" minVersion="1.0.0.0" maxVersion="6.0.0.0">
 				<exactMethodMatcher methodName="BuildCommonServices" />
 			</match>
 		</tracerFactory>
 		<tracerFactory name="GenericHostWebHostBuilderExtensionsWrapper">
-			<match assemblyName="Microsoft.AspNetCore.Hosting" className="Microsoft.Extensions.Hosting.GenericHostWebHostBuilderExtensions">
+			<match assemblyName="Microsoft.AspNetCore.Hosting" className="Microsoft.Extensions.Hosting.GenericHostWebHostBuilderExtensions" minVersion="1.0.0.0" maxVersion="6.0.0.0">
 				<exactMethodMatcher methodName="ConfigureWebHost" />
 			</match>
 		</tracerFactory>
 		<tracerFactory name="NewRelic.Providers.Wrapper.AspNetCore.InvokeActionMethodAsync">
-			<match assemblyName="Microsoft.AspNetCore.Mvc.Core" className="Microsoft.AspNetCore.Mvc.Internal.ControllerActionInvoker">
+			<match assemblyName="Microsoft.AspNetCore.Mvc.Core" className="Microsoft.AspNetCore.Mvc.Internal.ControllerActionInvoker" minVersion="1.0.0.0" maxVersion="6.0.0.0">
 				<exactMethodMatcher methodName="InvokeActionMethodAsync" />
 			</match>
-			<match assemblyName="Microsoft.AspNetCore.Mvc.Core" className="Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker">
+			<match assemblyName="Microsoft.AspNetCore.Mvc.Core" className="Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker" minVersion="1.0.0.0" maxVersion="6.0.0.0">
 				<exactMethodMatcher methodName="InvokeActionMethodAsync" />
 			</match>
 		</tracerFactory>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/WrapPipelineMiddleware.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/WrapPipelineMiddleware.cs
index 3b3c223a55..ad5bb3f7a6 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/WrapPipelineMiddleware.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/WrapPipelineMiddleware.cs
@@ -148,7 +148,7 @@ private ISegment SetupSegment(ITransaction transaction, HttpContext context)
         {
             // Seems like it would be cool to not require all of this for a segment??? 
             var method = new Method(typeof(WrapPipelineMiddleware), nameof(Invoke), nameof(context));
-            var methodCall = new MethodCall(method, this, new object[] { context });
+            var methodCall = new MethodCall(method, this, new object[] { context }, true);
 
             var segment = transaction.StartTransactionSegment(methodCall, "Middleware Pipeline");
             return segment;
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AddNewRelicStartupFilter.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AddNewRelicStartupFilter.cs
new file mode 100644
index 0000000000..e3e02620bc
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AddNewRelicStartupFilter.cs
@@ -0,0 +1,42 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using NewRelic.Agent.Api;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+
+    /// <summary>
+    /// Startup filter to add new relic elements into application pipeline.
+    /// 
+    /// This class is marked internal because it is not meant to be used by any agent dynamic type loading.
+    /// Changing to public can result in handled type load errors on console applications due to the usage of IStartupFilter
+    /// </summary>
+    internal class AddNewRelicStartupFilter : IStartupFilter
+    {
+        private readonly IAgent _agent;
+
+        public AddNewRelicStartupFilter(IAgent agent)
+        {
+            _agent = agent;
+        }
+
+        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+        {
+            return builder =>
+            {
+                builder.UseMiddleware<WrapPipelineMiddleware>(_agent);
+
+                // only inject the middleware if browser injection is enabled and the request is not a gRPC request.
+                builder.UseWhen(
+                    context => _agent.Configuration.BrowserMonitoringAutoInstrument && _agent.Configuration.EnableAspNetCore6PlusBrowserInjection && context.Request.ContentType?.ToLower() != "application/grpc",
+                    b => b.UseMiddleware<BrowserInjectionMiddleware>(_agent));
+
+                next(builder);
+            };
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AspNetCore6Plus.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AspNetCore6Plus.csproj
new file mode 100644
index 0000000000..c81b61936c
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AspNetCore6Plus.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <AssemblyName>NewRelic.Providers.Wrapper.AspNetCore6Plus</AssemblyName>
+    <RootNamespace>NewRelic.Providers.Wrapper.AspNetCore6Plus</RootNamespace>
+    <Description>ASP.NET Core 6+ Wrapper Provider for New Relic .NET Agent</Description>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Instrumentation.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RootProjectDirectory)\src\NewRelic.Core\NewRelic.Core.csproj" />
+    <ProjectReference Include="..\..\..\NewRelic.Agent.Extensions\NewRelic.Agent.Extensions.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BrowserInjectingStreamWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BrowserInjectingStreamWrapper.cs
new file mode 100644
index 0000000000..b2b1d2954b
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BrowserInjectingStreamWrapper.cs
@@ -0,0 +1,195 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Logging;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    /// <summary>
+    /// Stream wrapper that handles injecting the browser script as appropriate
+    /// </summary>
+    public class BrowserInjectingStreamWrapper : Stream
+    {
+        private readonly IAgent _agent;
+        private Stream _baseStream;
+        private HttpContext _context;
+        private bool _isContentLengthSet;
+
+        public BrowserInjectingStreamWrapper(IAgent agent, Stream baseStream, HttpContext context)
+        {
+            _agent = agent;
+            _baseStream = baseStream;
+            _context = context;
+
+            CanWrite = true;
+        }
+
+        /// <summary>
+        /// Flag gets set to true if we've captured an exception and need to disable browser injection
+        /// </summary>
+        public static bool Disabled { get; set; }
+
+        public override Task FlushAsync(CancellationToken cancellationToken)
+        {
+            if (!Disabled && !_isContentLengthSet && IsHtmlResponse())
+            {
+                if (!_context.Response.HasStarted)  // can't set headers if response has already started
+                    _context.Response.ContentLength = null;
+                _isContentLengthSet = true;
+            }
+
+            return _baseStream.FlushAsync(cancellationToken);
+        }
+
+        public override void Flush() => _baseStream.Flush();
+
+        public override int Read(byte[] buffer, int offset, int count) => _baseStream.Read(buffer, offset, count);
+
+        public override long Seek(long offset, SeekOrigin origin) => _baseStream.Seek(offset, origin);
+
+        public override void SetLength(long value)
+        {
+            _baseStream.SetLength(value);
+
+            if (!Disabled)
+                IsHtmlResponse(forceReCheck: true);
+        }
+
+        public override void Write(ReadOnlySpan<byte> buffer) => _baseStream.Write(buffer);
+
+        public override void WriteByte(byte value) => _baseStream.WriteByte(value);
+
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            // pass through without modification if we're already in the middle of injecting
+            // don't inject if the response isn't an HTML response
+            if (!Disabled && !CurrentlyInjecting() && IsHtmlResponse())
+            {
+                try
+                {
+                    // Set a flag on the context to indicate we're in the middle of injecting - prevents multiple recursions when response compression is in use
+                    StartInjecting();
+                    _agent.TryInjectBrowserScriptAsync(_context.Response.ContentType, _context.Request.Path.Value, buffer, _baseStream)
+                        .GetAwaiter().GetResult();
+                }
+                finally
+                {
+                    FinishInjecting();
+                }
+
+                return;
+            }
+
+            _baseStream?.Write(buffer, offset, count);
+        }
+
+        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) => WriteAsync(buffer.AsMemory(offset, count), cancellationToken).AsTask();
+
+        public override async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
+        {
+            // pass through without modification if we're already in the middle of injecting
+            // don't inject if the response isn't an HTML response
+            if (!Disabled && !CurrentlyInjecting() && IsHtmlResponse())
+            {
+                try
+                {
+                    // Set a flag on the context to indicate we're in the middle of injecting - prevents multiple recursions when response compression is in use
+                    StartInjecting();
+                    await _agent.TryInjectBrowserScriptAsync(_context.Response.ContentType, _context.Request.Path.Value, buffer.ToArray(), _baseStream);
+                }
+                finally
+                {
+                    FinishInjecting();
+                }
+
+                return;
+            }
+
+            if (_baseStream != null)
+                await _baseStream.WriteAsync(buffer, cancellationToken);
+        }
+
+        private const string InjectingRUM = "InjectingRUM";
+
+        private void FinishInjecting() => _context?.Items.Remove(InjectingRUM);
+        private void StartInjecting() => _context?.Items.Add(InjectingRUM, null);
+        private bool CurrentlyInjecting() => _context?.Items.ContainsKey(InjectingRUM) ?? false;
+
+        public override async ValueTask DisposeAsync()
+        {
+            _context = null;
+
+            await _baseStream.DisposeAsync();
+            _baseStream = null;
+        }
+
+        public override bool CanRead { get; }
+        public override bool CanSeek { get; }
+        public override bool CanWrite { get; }
+        public override long Length { get; }
+        public override long Position { get; set; }
+
+        private bool? _isHtmlResponse = null;
+
+        private bool IsHtmlResponse(bool forceReCheck = false)
+        {
+            try
+            {
+                if (!forceReCheck && _isHtmlResponse != null)
+                    return _isHtmlResponse.Value;
+
+                // we need to check if the active request is still valid
+                // this can fail if we're in the middle of an error response
+                // or url rewrite in which case we can't intercept
+                if (_context?.Response == null)
+                    return false;
+
+                // Requirements for script injection:
+                // * text/html response
+                // * UTF-8 formatted (either explicitly or no charset defined)
+                _isHtmlResponse =
+                    _context.Response.ContentType != null &&
+                    _context.Response.ContentType.Contains("text/html", StringComparison.OrdinalIgnoreCase) &&
+                    (_context.Response.ContentType.Contains("utf-8", StringComparison.OrdinalIgnoreCase) ||
+                     !_context.Response.ContentType.Contains("charset=", StringComparison.OrdinalIgnoreCase));
+
+                if (!_isHtmlResponse.Value)
+                {
+                    _agent.CurrentTransaction?.LogFinest($"Skipping RUM injection: Not an HTML response. ContentType is {_context.Response.ContentType}");
+                    return false;
+                }
+
+                // Make sure we force dynamic content type since we're
+                // rewriting the content - static content will set the header explicitly
+                // and fail when it doesn't match if (_isHtmlResponse.Value)
+                if (!_isContentLengthSet && _context.Response.ContentLength != null)
+                {
+                    if (!_context.Response.HasStarted) // can't set headers if response has already started
+                        _context.Response.ContentLength = null;
+                    _isContentLengthSet = true;
+                }
+            }
+            catch (Exception e)
+            {
+                LogExceptionAndDisable(e);
+            }
+
+            return _isHtmlResponse ?? false;
+        }
+
+        private void LogExceptionAndDisable(Exception e)
+        {
+            _agent.Logger.Log(Level.Error,
+                $"Unexpected exception. Browser injection will be disabled. Exception: {e.Message}: {e.StackTrace}");
+
+            Disabled = true;
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BrowserInjectionMiddleware.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BrowserInjectionMiddleware.cs
new file mode 100644
index 0000000000..4bb9b3ef28
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BrowserInjectionMiddleware.cs
@@ -0,0 +1,34 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using NewRelic.Agent.Api;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    internal class BrowserInjectionMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private readonly IAgent _agent;
+
+        public BrowserInjectionMiddleware(RequestDelegate next, IAgent agent)
+        {
+            _next = next;
+            _agent = agent;
+        }
+
+        public Task Invoke(HttpContext context)
+        {
+            if (!BrowserInjectingStreamWrapper.Disabled)
+            {
+                // wrap the response body in our stream wrapper which will inject the RUM script if appropriate
+                using var injectedResponse = new BrowserInjectingStreamWrapper(_agent, context.Response.Body, context);
+                context.Features.Set<IHttpResponseBodyFeature>(new StreamResponseBodyFeature(injectedResponse));
+            }
+
+            return _next(context);
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BuildCommonServicesWrapper6Plus.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BuildCommonServicesWrapper6Plus.cs
new file mode 100644
index 0000000000..ed78536760
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/BuildCommonServicesWrapper6Plus.cs
@@ -0,0 +1,42 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    public class BuildCommonServicesWrapper6Plus : IWrapper
+    {
+        public bool IsTransactionRequired => false;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse(nameof(BuildCommonServicesWrapper6Plus).Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            //Do nothing at start of method
+
+            return Delegates.GetDelegateFor<IServiceCollection>(onSuccess: HandleSuccess);
+
+            void HandleSuccess(IServiceCollection services)
+            {
+                //Forced evaluation is important. Do not remove ToList()
+                var startupFilters = services.Where(serviceDescriptor => serviceDescriptor.ServiceType == typeof(IStartupFilter)).ToList();
+
+                services.AddTransient<IStartupFilter>(provider => new AddNewRelicStartupFilter(agent));
+
+                foreach (var filter in startupFilters)
+                {
+                    services.Remove(filter); // Remove from early in pipeline
+                    services.Add(filter); // Add to end after our AddNewRelicStartupFilter
+                }
+            }
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/GenericHostWebHostBuilderExtensionsWrapper6Plus.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/GenericHostWebHostBuilderExtensionsWrapper6Plus.cs
new file mode 100644
index 0000000000..ea3c8a02f0
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/GenericHostWebHostBuilderExtensionsWrapper6Plus.cs
@@ -0,0 +1,53 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    public class GenericHostWebHostBuilderExtensionsWrapper6Plus : IWrapper
+    {
+        public bool IsTransactionRequired => false;
+        private static int _isNewRelicStartupFilterAdded;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse(nameof(GenericHostWebHostBuilderExtensionsWrapper6Plus).Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            AddStartupFilterToHostBuilder(instrumentedMethodCall.MethodCall.MethodArguments[0], agent);
+
+            return Delegates.NoOp;
+        }
+
+        public void AddStartupFilterToHostBuilder(object hostBuilder, IAgent agent)
+        {
+            if (0 == Interlocked.CompareExchange(ref _isNewRelicStartupFilterAdded, 1, 0))
+            {
+                var typedHostBuilder = (Microsoft.Extensions.Hosting.IHostBuilder)hostBuilder;
+                typedHostBuilder.ConfigureServices(AddStartupFilter);
+
+                void AddStartupFilter(Microsoft.Extensions.Hosting.HostBuilderContext hostBuilderContext, IServiceCollection services)
+                {
+                    //Forced evaluation is important. Do not remove ToList()
+                    var startupFilters = services.Where(serviceDescriptor => serviceDescriptor.ServiceType == typeof(IStartupFilter)).ToList();
+
+                    services.AddTransient<IStartupFilter>(provider => new AddNewRelicStartupFilter(agent));
+
+                    foreach (var filter in startupFilters)
+                    {
+                        services.Remove(filter); // Remove from early in pipeline
+                        services.Add(filter); // Add to end after our AddNewRelicStartupFilter
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/Instrumentation.xml
new file mode 100644
index 0000000000..30ba90790b
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/Instrumentation.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2020 New Relic Corporation. All rights reserved.
+SPDX-License-Identifier: Apache-2.0
+-->
+<extension xmlns="urn:newrelic-extension">
+  <instrumentation>
+    <tracerFactory name="BuildCommonServicesWrapper6Plus">
+      <match assemblyName="Microsoft.AspNetCore.Hosting" className="Microsoft.AspNetCore.Hosting.WebHostBuilder"  minVersion="6.0.0.0">
+        <exactMethodMatcher methodName="BuildCommonServices" />
+      </match>
+    </tracerFactory>
+    <tracerFactory name="GenericHostWebHostBuilderExtensionsWrapper6Plus">
+      <match assemblyName="Microsoft.AspNetCore.Hosting" className="Microsoft.Extensions.Hosting.GenericHostWebHostBuilderExtensions" minVersion="6.0.0.0">
+        <exactMethodMatcher methodName="ConfigureWebHost" />
+      </match>
+    </tracerFactory>
+    <tracerFactory name="InvokeActionMethodAsyncWrapper6Plus">
+      <match assemblyName="Microsoft.AspNetCore.Mvc.Core" className="Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker" minVersion="6.0.0.0">
+        <exactMethodMatcher methodName="InvokeActionMethodAsync" />
+      </match>
+    </tracerFactory>
+    <tracerFactory name="ResponseCompressionBodyOnWriteWrapper">
+      <match assemblyName="Microsoft.AspNetCore.ResponseCompression" className="Microsoft.AspNetCore.ResponseCompression.ResponseCompressionBody" minVersion="6.0.0.0">
+        <exactMethodMatcher methodName="OnWrite" />
+      </match>
+    </tracerFactory>
+    <tracerFactory name="PageActionInvokeHandlerAsyncWrapper6Plus">
+      <match assemblyName="Microsoft.AspNetCore.Mvc.RazorPages" className="Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker" minVersion="6.0.0.0">
+        <exactMethodMatcher methodName="InvokeHandlerMethodAsync" />
+      </match>
+    </tracerFactory>
+  </instrumentation>
+</extension>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/InvokeActionMethodAsyncWrapper6Plus.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/InvokeActionMethodAsyncWrapper6Plus.cs
new file mode 100644
index 0000000000..9a81efd8c7
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/InvokeActionMethodAsyncWrapper6Plus.cs
@@ -0,0 +1,72 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Api.Experimental;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.Reflection;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    public class InvokeActionMethodAsyncWrapper6Plus : IWrapper
+    {
+        private Func<object, ControllerContext> _getControllerContext;
+        private Func<object, ControllerContext> GetControllerContext(string typeName) { return _getControllerContext ?? (_getControllerContext = VisibilityBypasser.Instance.GenerateFieldReadAccessor<ControllerContext>("Microsoft.AspNetCore.Mvc.Core", typeName, "_controllerContext")); }
+
+        public bool IsTransactionRequired => true;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse("InvokeActionMethodAsyncWrapper6Plus".Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            if (instrumentedMethodCall.IsAsync)
+            {
+                transaction.AttachToAsync();
+            }
+
+            //handle the .NetCore 3.0 case where the namespace is Infrastructure instead of Internal.
+            var controllerContext = GetControllerContext(instrumentedMethodCall.MethodCall.Method.Type.FullName).Invoke(instrumentedMethodCall.MethodCall.InvocationTarget);
+            var actionDescriptor = controllerContext.ActionDescriptor;
+
+            var transactionName = CreateTransactionName(actionDescriptor);
+
+            transaction.SetWebTransactionName(WebTransactionType.MVC, transactionName, TransactionNamePriority.FrameworkHigh);
+
+            var controllerTypeInfo = controllerContext.ActionDescriptor.ControllerTypeInfo;
+            //Framework uses ControllerType.Action for these metrics & transactions. WebApi is Controller.Action for both
+            //Taking opinionated stance to do ControllerType.MethodName for segments. Controller/Action for transactions
+            var controllerTypeName = controllerTypeInfo.Name;
+            var methodName = controllerContext.ActionDescriptor.MethodInfo.Name;
+
+            var segment = transaction.StartMethodSegment(instrumentedMethodCall.MethodCall, controllerTypeName, methodName);
+
+            var segmentApi = segment.GetExperimentalApi();
+            segmentApi.UserCodeNamespace = controllerTypeInfo.FullName;
+            segmentApi.UserCodeFunction = methodName;
+
+            return Delegates.GetAsyncDelegateFor<Task>(agent, segment, TaskContinueWithOption.None);
+        }
+
+        private static string CreateTransactionName(ControllerActionDescriptor actionDescriptor)
+        {
+            var controllerName = actionDescriptor.ControllerName;
+            var actionName = actionDescriptor.ActionName;
+
+            var transactionName = $"{controllerName}/{actionName}";
+
+            foreach (var parameter in actionDescriptor.Parameters)
+            {
+                transactionName += "/{" + parameter.Name + "}";
+            }
+
+            return transactionName;
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/PageActionInvokeHandlerAsyncWrapper6Plus.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/PageActionInvokeHandlerAsyncWrapper6Plus.cs
new file mode 100644
index 0000000000..2e258de9e7
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/PageActionInvokeHandlerAsyncWrapper6Plus.cs
@@ -0,0 +1,70 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Api.Experimental;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.Reflection;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    public class PageActionInvokeHandlerAsyncWrapper6Plus : IWrapper
+    {
+        private static Func<object, PageContext> _getPageContext;
+
+        static PageActionInvokeHandlerAsyncWrapper6Plus()
+        {
+            _getPageContext = VisibilityBypasser.Instance.GenerateFieldReadAccessor<PageContext>("Microsoft.AspNetCore.Mvc.RazorPages",
+                "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker", "_pageContext");
+        }
+
+        public bool IsTransactionRequired => true;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse("PageActionInvokeHandlerAsyncWrapper6Plus".Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            if (instrumentedMethodCall.IsAsync)
+            {
+                transaction.AttachToAsync();
+            }
+
+            var pageContext = _getPageContext(instrumentedMethodCall.MethodCall.InvocationTarget);
+
+            var actionDescriptor = pageContext.ActionDescriptor;
+
+            var transactionName = CreateTransactionName(actionDescriptor);
+
+            transaction.SetWebTransactionName(WebTransactionType.Razor, transactionName, TransactionNamePriority.FrameworkHigh);
+
+            var actionDescriptorPageTypeInfo = actionDescriptor.PageTypeInfo;
+            var pageTypeName = actionDescriptorPageTypeInfo.Name;
+            var handlerMethodName = actionDescriptor.HandlerMethods.SingleOrDefault(m =>
+                m.HttpMethod.Equals(pageContext.HttpContext.Request.Method, StringComparison.CurrentCultureIgnoreCase))?.MethodInfo.Name;
+
+            var segment = transaction.StartMethodSegment(instrumentedMethodCall.MethodCall, pageTypeName, handlerMethodName ?? pageContext.HttpContext.Request.Method);
+
+
+            var segmentApi = segment.GetExperimentalApi();
+            segmentApi.UserCodeNamespace = actionDescriptorPageTypeInfo.FullName;
+            segmentApi.UserCodeFunction = handlerMethodName ?? "<unknown>";
+
+            return Delegates.GetAsyncDelegateFor<Task>(agent, segment, TaskContinueWithOption.None);
+        }
+
+        private static string CreateTransactionName(CompiledPageActionDescriptor actionDescriptor)
+        {
+            var transactionName = $"Pages{actionDescriptor.DisplayName}";
+
+            return transactionName;
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/ResponseCompressionBodyOnWriteWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/ResponseCompressionBodyOnWriteWrapper.cs
new file mode 100644
index 0000000000..a4de1a32d9
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/ResponseCompressionBodyOnWriteWrapper.cs
@@ -0,0 +1,66 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.Reflection;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    public class ResponseCompressionBodyOnWriteWrapper : IWrapper
+    {
+        private static readonly Func<object, Stream> _compressionStreamFieldGetter;
+        private static readonly Action<object, Stream> _compressionStreamFieldSetter;
+        private static readonly Func<object, HttpContext> _contextFieldGetter;
+
+        static ResponseCompressionBodyOnWriteWrapper()
+        {
+            _compressionStreamFieldGetter =
+                VisibilityBypasser.Instance.GenerateFieldReadAccessor<Stream>("Microsoft.AspNetCore.ResponseCompression", "Microsoft.AspNetCore.ResponseCompression.ResponseCompressionBody",
+                    "_compressionStream");
+
+            _compressionStreamFieldSetter =
+                VisibilityBypasser.Instance.GenerateFieldWriteAccessor<Stream>("Microsoft.AspNetCore.ResponseCompression", "Microsoft.AspNetCore.ResponseCompression.ResponseCompressionBody",
+                    "_compressionStream");
+
+            _contextFieldGetter =
+                VisibilityBypasser.Instance.GenerateFieldReadAccessor<HttpContext>("Microsoft.AspNetCore.ResponseCompression", "Microsoft.AspNetCore.ResponseCompression.ResponseCompressionBody",
+                    "_context");
+
+        }
+        public bool IsTransactionRequired => false;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo instrumentedMethodInfo)
+        {
+            return new CanWrapResponse("ResponseCompressionBodyOnWriteWrapper".Equals(instrumentedMethodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            return Delegates.GetDelegateFor(onSuccess: () =>
+            {
+                var context = _contextFieldGetter.Invoke(instrumentedMethodCall.MethodCall.InvocationTarget);
+
+                // only wrap the compression stream if browser injection is enabled and the request is not a gRPC request.
+                if (agent.Configuration.BrowserMonitoringAutoInstrument && agent.Configuration.EnableAspNetCore6PlusBrowserInjection && context.Request.ContentType?.ToLower() != "application/grpc")
+                {
+                    // Wrap _compressionStream and replace the current value with our wrapped version
+                    // check whether we've already wrapped the stream so we don't do it twice
+                    var currentCompressionStream = _compressionStreamFieldGetter.Invoke(instrumentedMethodCall.MethodCall.InvocationTarget);
+
+                    if (currentCompressionStream != null && currentCompressionStream.GetType() != typeof(BrowserInjectingStreamWrapper))
+                    {
+
+                        var responseWrapper = new BrowserInjectingStreamWrapper(agent, currentCompressionStream, context);
+
+                        _compressionStreamFieldSetter.Invoke(instrumentedMethodCall.MethodCall.InvocationTarget,
+                            responseWrapper);
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/WrapPipelineMiddleware.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/WrapPipelineMiddleware.cs
new file mode 100644
index 0000000000..1da7d2c001
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/WrapPipelineMiddleware.cs
@@ -0,0 +1,243 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+
+namespace NewRelic.Providers.Wrapper.AspNetCore6Plus
+{
+    /// <summary>
+    /// This middleware is intended to be injected as the first executed item 
+    /// for the ASP.NET Core pipeline. Need to be exra careful not to let any NR exceptions 
+    /// bubble out to the client application.
+    /// 
+    /// This class is marked internal because it is not meant to be used by any agent dynamic type loading.
+    /// </summary>
+    internal class WrapPipelineMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private readonly IAgent _agent;
+        private volatile bool _inspectingHttpContextForErrorsIsEnabled = true;
+
+        public WrapPipelineMiddleware(RequestDelegate next, IAgent agent)
+        {
+            _next = next;
+            _agent = agent;
+        }
+
+        public async Task Invoke(HttpContext context)
+        {
+            ITransaction transaction = null;
+            ISegment segment = null;
+
+            // Don't create a transaction in this case to avoid MGIs associated with CORS pre-flight requests
+            if ("OPTIONS".Equals(context.Request?.Method, StringComparison.OrdinalIgnoreCase))
+            {
+                _agent.Logger.Log(Agent.Extensions.Logging.Level.Finest, "Not instrumenting incoming OPTIONS request.");
+
+                await _next(context);
+                return;
+            }
+
+            try
+            {
+                transaction = SetupTransaction(context.Request);
+                transaction.AttachToAsync(); //Important that this is called from an Invoke method that has the async keyword.
+                transaction.DetachFromPrimary(); //Remove from thread-local type storage
+
+                segment = SetupSegment(transaction, context);
+                segment.AlwaysDeductChildDuration = true;
+
+                if (_agent.Configuration.AllowAllRequestHeaders)
+                {
+                    transaction.SetRequestHeaders(context.Request.Headers, context.Request.Headers.Keys, GetHeaderValue);
+                }
+                else
+                {
+                    transaction.SetRequestHeaders(context.Request.Headers, Agent.Extensions.Providers.Wrapper.Statics.DefaultCaptureHeaders, GetHeaderValue);
+                }
+
+                ProcessHeaders(context);
+
+                context.Response.OnStarting(SetOutboundTracingDataAsync);
+            }
+            catch (Exception ex)
+            {
+                _agent.SafeHandleException(ex);
+            }
+
+            try
+            {
+                await _next(context);
+                EndTransaction(segment, transaction, context, null);
+            }
+            catch (Exception ex)
+            {
+                EndTransaction(segment, transaction, context, ex);
+                throw; //throw here to maintain call stack. 
+            }
+
+            Task SetOutboundTracingDataAsync()
+            {
+                TryWriteResponseHeaders(context, transaction);
+                return Task.CompletedTask;
+            }
+        }
+
+        private string GetHeaderValue(IHeaderDictionary headers, string key)
+        {
+            return headers[key];
+        }
+
+        private void EndTransaction(ISegment segment, ITransaction transaction, HttpContext context, Exception appException)
+        {
+            try
+            {
+                var responseStatusCode = context.Response.StatusCode;
+
+                //We only keep 1 error per transaction so we are prioritizing the error that made its way
+                //all the way to our middleware over the error caught by the ExceptionHandlerMiddleware.
+                //It's possible that the 2 errors are the same under certain circumstances.
+                if (appException != null)
+                {
+                    transaction.NoticeError(appException);
+
+                    //Looks like we won't accurately notice that a 500 is going to be returned for exception cases,
+                    //because that appears to be handled at the  web host level or server (kestrel) level 
+                    responseStatusCode = 500;
+                }
+                else if (_inspectingHttpContextForErrorsIsEnabled)
+                {
+                    try
+                    {
+                        Statics.NoticeErrorFromContextIfAvailable(context, transaction);
+                    }
+                    catch (Exception e)
+                    {
+                        //We need to catch and handle exceptions here so that the transaction and segment can still end appropriately
+
+                        _inspectingHttpContextForErrorsIsEnabled = false;
+
+                        _agent.Logger.Log(Agent.Extensions.Logging.Level.Info, "Inspecting errors from the IExceptionHandlerFeature is disabled, usually because that AspNetCore feature is not available.  Debug Level logs will contain more information.");
+                        _agent.Logger.Log(Agent.Extensions.Logging.Level.Debug, $"Error when requesting IExceptionHandlerFeature: {e}");
+                    }
+                }
+
+                if (responseStatusCode >= 400)
+                {
+                    //Attempt low-priority transaction name to reduce chance of metric grouping issues.
+                    transaction.SetWebTransactionName(WebTransactionType.StatusCode, $"{responseStatusCode}", TransactionNamePriority.StatusCode);
+                }
+
+                segment.End();
+
+                transaction.SetHttpResponseStatusCode(responseStatusCode);
+                transaction.End();
+            }
+            catch (Exception ex)
+            {
+                _agent.SafeHandleException(ex);
+            }
+        }
+
+        private ISegment SetupSegment(ITransaction transaction, HttpContext context)
+        {
+            // Seems like it would be cool to not require all of this for a segment??? 
+            var method = new Method(typeof(WrapPipelineMiddleware), nameof(Invoke), nameof(context));
+            var methodCall = new MethodCall(method, this, new object[] { context }, true);
+
+            var segment = transaction.StartTransactionSegment(methodCall, "Middleware Pipeline");
+            return segment;
+        }
+
+        private ITransaction SetupTransaction(HttpRequest request)
+        {
+            var path = request.Path.Value;
+
+            // if path is empty, consider it the same as /
+            path = request.Path == PathString.Empty || path.Equals("/") ? "ROOT" : path.Substring(1);
+
+            var transaction = _agent.CreateTransaction(
+                    isWeb: true,
+                    category: EnumNameCache<WebTransactionType>.GetName(WebTransactionType.ASP),
+                    transactionDisplayName: path,
+                    doNotTrackAsUnitOfWork: true);
+
+            transaction.SetRequestMethod(request.Method);
+            transaction.SetUri(request.Path);
+
+            if (request.QueryString.HasValue)
+            {
+                var parameters = new Dictionary<string, string>();
+                foreach (var keyValuePair in request.Query)
+                {
+                    parameters.Add(keyValuePair.Key, keyValuePair.Value);
+                }
+
+                transaction.SetRequestParameters(parameters);
+            }
+
+            return transaction;
+        }
+
+        private void ProcessHeaders(HttpContext httpContext)
+        {
+            _agent.CurrentTransaction.AcceptDistributedTraceHeaders(httpContext, GetHeaderValue, TransportType.HTTP);
+
+            IEnumerable<string> GetHeaderValue(HttpContext context, string key)
+            {
+                string value = null;
+                if (key.Equals("Content-Length"))
+                {
+                    value = context.Request.ContentLength.ToString();
+                }
+                else
+                {
+                    value = context.Request.Headers[key];
+                }
+
+                return value == null ? null : new string[] { value };
+            }
+        }
+
+        private void TryWriteResponseHeaders(HttpContext httpContext, ITransaction transaction)
+        {
+            try
+            {
+                var headers = transaction.GetResponseMetadata();
+
+                foreach (var header in headers)
+                {
+                    if (header.Key != null && header.Value != null)
+                    {
+                        httpContext.Response.Headers.Add(header.Key, header.Value);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _agent.SafeHandleException(ex);
+            }
+        }
+
+        private static class Statics
+        {
+            public static void NoticeErrorFromContextIfAvailable(HttpContext context, ITransaction transaction)
+            {
+                //The IExceptionHandlerFeature type is not always available in an AspNetCore app. We need to guard its access
+                //here to prevent the middleware from crashing when this type needs to be resolved. The type needs to be
+                //fully qualified so that the middleware class does not get an error because of the using statement for
+                //Microsoft.AspNetCore.Diagnostics.
+                var exceptionHandlerFeature = context.Features.Get<Microsoft.AspNetCore.Diagnostics.IExceptionHandlerFeature>();
+                if (exceptionHandlerFeature != null)
+                {
+                    transaction.NoticeError(exceptionHandlerFeature.Error);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/ExecuteItemQueryAsyncWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/ExecuteItemQueryAsyncWrapper.cs
index d446b9c0b3..d93ab837ad 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/ExecuteItemQueryAsyncWrapper.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/ExecuteItemQueryAsyncWrapper.cs
@@ -78,7 +78,7 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
             var segment = transaction.StartDatastoreSegment(
                 instrumentedMethodCall.MethodCall,
                 new ParsedSqlStatement(DatastoreVendor.CosmosDB, model, operation),
-                connectionInfo: endpoint != null ? new ConnectionInfo(endpoint.Host, endpoint.Port.ToString(), databaseName) : new ConnectionInfo(string.Empty, string.Empty, databaseName),
+                connectionInfo: endpoint != null ? new ConnectionInfo(DatastoreVendor.CosmosDB.ToKnownName(), endpoint.Host, endpoint.Port, databaseName) : new ConnectionInfo(string.Empty, string.Empty, string.Empty, databaseName),
                 commandText : querySpec != null ? _queryGetter.Invoke(querySpec) : string.Empty,
                 isLeaf: true);
 
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/RequestInvokerHandlerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/RequestInvokerHandlerWrapper.cs
index a675c09b9d..2f081674c1 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/RequestInvokerHandlerWrapper.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/CosmosDb/RequestInvokerHandlerWrapper.cs
@@ -67,7 +67,7 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
             var segment = transaction.StartDatastoreSegment(
                 instrumentedMethodCall.MethodCall,
                 new ParsedSqlStatement(DatastoreVendor.CosmosDB, model, operation),
-                connectionInfo: endpoint != null ? new ConnectionInfo(endpoint.Host, endpoint.Port.ToString(), databaseName) : new ConnectionInfo(string.Empty, string.Empty, databaseName),
+                connectionInfo: endpoint != null ? new ConnectionInfo(DatastoreVendor.CosmosDB.ToKnownName(), endpoint.Host, endpoint.Port, databaseName) : new ConnectionInfo(string.Empty, string.Empty, string.Empty, databaseName),
                 isLeaf: true);
 
             return Delegates.GetAsyncDelegateFor<Task>(agent, segment);
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs
index e99ed18b22..da41e4cfc0 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs
@@ -66,7 +66,7 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
             }
 
             var transactionExperimental = transaction.GetExperimentalApi();
-            var datastoreSegmentData = transactionExperimental.CreateDatastoreSegmentData(new ParsedSqlStatement(DatastoreVendor.Elasticsearch, model, operation), new ConnectionInfo(string.Empty, string.Empty, string.Empty), string.Empty, null);
+            var datastoreSegmentData = transactionExperimental.CreateDatastoreSegmentData(new ParsedSqlStatement(DatastoreVendor.Elasticsearch, model, operation), new ConnectionInfo(DatastoreVendor.Elasticsearch.ToKnownName(), string.Empty, string.Empty, string.Empty), string.Empty, null);
             var segment = transactionExperimental.StartSegment(instrumentedMethodCall.MethodCall);
             segment.GetExperimentalApi().SetSegmentData(datastoreSegmentData).MakeLeaf();
 
@@ -269,7 +269,7 @@ private static void SetUriOnDatastoreSegment(ISegment segment, Uri uri)
         {
             var segmentExperimentalApi = segment.GetExperimentalApi();
             var data = segmentExperimentalApi.SegmentData as IDatastoreSegmentData;
-            data.SetConnectionInfo(new ConnectionInfo(uri.Host, uri.Port.ToString(), string.Empty));
+            data.SetConnectionInfo(new ConnectionInfo(DatastoreVendor.Elasticsearch.ToKnownName(), uri.Host, uri.Port, string.Empty));
             segmentExperimentalApi.SetSegmentData(data);
         }
 
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Instrumentation.xml
new file mode 100644
index 0000000000..e7a14a76c3
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Instrumentation.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2020 New Relic Corporation. All rights reserved.
+SPDX-License-Identifier: Apache-2.0
+-->
+<extension xmlns="urn:newrelic-extension">
+
+  <instrumentation>
+    
+    <tracerFactory name="KafkaProducerWrapper">
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Producer`2">
+        <exactMethodMatcher methodName="Produce" parameters="Confluent.Kafka.TopicPartition,Confluent.Kafka.Message`2[!0,!1],System.Action`1[Confluent.Kafka.DeliveryReport`2[!0,!1]]"/>
+        <exactMethodMatcher methodName="ProduceAsync" parameters="Confluent.Kafka.TopicPartition,Confluent.Kafka.Message`2[!0,!1],System.Threading.CancellationToken"/>
+      </match>
+    </tracerFactory>
+    
+    <tracerFactory name="KafkaConsumerWrapper">
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Consumer`2">
+        <exactMethodMatcher methodName="Consume" parameters="System.Int32"/>
+      </match>
+    </tracerFactory>
+    
+    <tracerFactory name="KafkaSerializerWrapper">
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Serializers+Utf8Serializer">
+        <exactMethodMatcher methodName="Serialize" />
+      </match>
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Serializers+NullSerializer">
+        <exactMethodMatcher methodName="Serialize" />
+      </match>
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Serializers+Int64Serializer">
+        <exactMethodMatcher methodName="Serialize" />
+      </match>
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Serializers+Int32Serializer">
+        <exactMethodMatcher methodName="Serialize" />
+      </match>
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Serializers+SingleSerializer">
+        <exactMethodMatcher methodName="Serialize" />
+      </match>
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Serializers+DoubleSerializer">
+        <exactMethodMatcher methodName="Serialize" />
+      </match>
+      <match assemblyName="Confluent.Kafka" className="Confluent.Kafka.Serializers+ByteArraySerializer">
+        <exactMethodMatcher methodName="Serialize" />
+      </match>
+    </tracerFactory>
+
+  </instrumentation>
+</extension>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Kafka.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Kafka.csproj
new file mode 100644
index 0000000000..89537e6b61
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Kafka.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <AssemblyName>NewRelic.Providers.Wrapper.Kafka</AssemblyName>
+    <RootNamespace>NewRelic.Providers.Wrapper.Kafka</RootNamespace>
+    <Description>Kafka Wrapper Provider for New Relic .NET Agent</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="Instrumentation.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Confluent.Kafka" Version="1.4.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RootProjectDirectory)\src\NewRelic.Core\NewRelic.Core.csproj" />
+    <ProjectReference Include="..\..\..\NewRelic.Agent.Extensions\NewRelic.Agent.Extensions.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaConsumerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaConsumerWrapper.cs
new file mode 100644
index 0000000000..752f556561
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaConsumerWrapper.cs
@@ -0,0 +1,156 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Collections.Concurrent;
+using System.Text;
+using Confluent.Kafka;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Api.Experimental;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.Reflection;
+
+namespace NewRelic.Providers.Wrapper.Kafka
+{
+    public class KafkaConsumerWrapper : IWrapper
+    {
+        private const string WrapperName = "KafkaConsumerWrapper";
+        private const string BrokerVendorName = "Kafka";
+
+        public bool IsTransactionRequired => false;
+
+        private static readonly ConcurrentDictionary<Type, Func<object, string>> TopicAccessorDictionary =
+            new ConcurrentDictionary<Type, Func<object, string>>();
+
+        private static readonly ConcurrentDictionary<Type, Func<object, object>> MessageAccessorDictionary =
+            new ConcurrentDictionary<Type, Func<object, object>>();
+        private static readonly ConcurrentDictionary<Type, Func<object, object>> KeyAccessorDictionary =
+            new ConcurrentDictionary<Type, Func<object, object>>();
+        private static readonly ConcurrentDictionary<Type, Func<object, object>> ValueAccessorDictionary =
+            new ConcurrentDictionary<Type, Func<object, object>>();
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse(WrapperName.Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            transaction = agent.CreateKafkaTransaction(
+                destinationType: MessageBrokerDestinationType.Topic,
+                brokerVendorName: BrokerVendorName,
+                destination: "unknown"); // placeholder since the topic name is unknown at this point
+
+            var segment = transaction.StartMessageBrokerSegment(instrumentedMethodCall.MethodCall, MessageBrokerDestinationType.Topic, MessageBrokerAction.Consume, BrokerVendorName, "unknown");
+
+            return Delegates.GetDelegateFor<object>(onSuccess: (resultAsObject) =>
+            {
+                try
+                {
+                    if (resultAsObject == null) // null is a valid return value, so we have to handle it. 
+                    {
+                        transaction.Ignore();
+                        return;
+                    }
+
+                    // result is actually ConsumeResult<TKey, TValue> - but, because of the generic parameters,
+                    // we have to reference it as object so we can use VisibilityBypasser on it
+                    var type = resultAsObject.GetType();
+
+                    // get the topic
+                    var topicAccessor = TopicAccessorDictionary.GetOrAdd(type, GetTopicAccessorFunc);
+                    string topic = topicAccessor(resultAsObject);
+
+                    // set the segment and transaction name
+                    segment.SetMessageBrokerDestination(topic);
+                    transaction.SetKafkaMessageBrokerTransactionName(MessageBrokerDestinationType.Topic, BrokerVendorName, topic);
+
+                    // get the Message.Headers property and add distributed trace headers
+                    var messageAccessor = MessageAccessorDictionary.GetOrAdd(type, GetMessageAccessorFunc);
+                    var messageAsObject = messageAccessor(resultAsObject);
+
+                    var headersSize = 0L;
+                    if (messageAsObject is MessageMetadata messageMetaData)
+                    {
+                        headersSize = GetHeadersSize(messageMetaData.Headers);
+
+                        transaction.InsertDistributedTraceHeaders(messageMetaData.Headers, DistributedTraceHeadersSetter);
+                    }
+
+                    ReportSizeMetrics(agent, transaction, topic, headersSize, messageAsObject);
+                }
+                finally
+                {
+                    // need to guarantee that the segment and transaction are terminated
+                    segment.End();
+                    transaction.End();
+                }
+            });
+        }
+
+        private static long GetHeadersSize(Headers headers)
+        {
+            var headersSize = 0L;
+            if (headers != null)
+            {
+                foreach (var header in headers)
+                {
+                    headersSize += Encoding.UTF8.GetByteCount(header.Key);
+                    headersSize += header.GetValueBytes().Length;
+                }
+            }
+            return headersSize;
+        }
+
+        private static void ReportSizeMetrics(IAgent agent, ITransaction transaction, string topic, long headersSize, object messageAsObject)
+        {
+            // get the message Key and Value properties so we can try to get their size
+            var messageType = messageAsObject.GetType();
+            var keyAccessor = KeyAccessorDictionary.GetOrAdd(messageType, GetKeyAccessorFunc);
+            var valueAccessor = ValueAccessorDictionary.GetOrAdd(messageType, GetValueAccessorFunc);
+
+            var keyAsObject = keyAccessor(messageAsObject);
+            var valueAsObject = valueAccessor(messageAsObject);
+
+            var totalSize = headersSize + TryGetSize(keyAsObject) + TryGetSize(valueAsObject);
+
+            if (totalSize > 0)
+            {
+                transaction.AddCustomAttribute("kafka.consume.byteCount", totalSize);
+            }
+
+            // Add metrics for bytes received and messages received
+            var agentExp = agent.GetExperimentalApi();
+            agentExp.RecordCountMetric($"Message/Kafka/Topic/Named/{topic}/Received/Messages", 1);
+            agentExp.RecordByteMetric($"Message/Kafka/Topic/Named/{topic}/Received/Bytes", totalSize);
+        }
+
+        private static Func<object, string> GetTopicAccessorFunc(Type t) =>
+            VisibilityBypasser.Instance.GeneratePropertyAccessor<string>(t, "Topic");
+        private static Func<object, object> GetMessageAccessorFunc(Type t) =>
+            VisibilityBypasser.Instance.GeneratePropertyAccessor<object>(t, "Message");
+        private static Func<object, object> GetKeyAccessorFunc(Type t) =>
+            VisibilityBypasser.Instance.GeneratePropertyAccessor<object>(t, "Key");
+        private static Func<object, object> GetValueAccessorFunc(Type t) =>
+            VisibilityBypasser.Instance.GeneratePropertyAccessor<object>(t, "Value");
+
+        private static void DistributedTraceHeadersSetter(Headers carrier, string key, string value)
+        {
+            carrier ??= new Headers();
+            carrier.Add(key, Encoding.ASCII.GetBytes(value));
+        }
+
+        private static long TryGetSize(object obj)
+        {
+            if (obj == null)
+                return 0;
+
+            // get the UTF8 byte count if it's a string,
+            // the array length if it's a byte array
+            // or zero if it's something else
+            return obj is string str ? Encoding.UTF8.GetByteCount(str) :
+                   obj is byte[] bytes ? bytes.Length :
+                   0;
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaProducerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaProducerWrapper.cs
new file mode 100644
index 0000000000..d454838a4c
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaProducerWrapper.cs
@@ -0,0 +1,44 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Text;
+using System.Threading.Tasks;
+using Confluent.Kafka;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.SystemExtensions;
+
+namespace NewRelic.Providers.Wrapper.Kafka
+{
+    public class KafkaProducerWrapper : IWrapper
+    {
+        private const string WrapperName = "KafkaProducerWrapper";
+        private const string BrokerVendorName = "Kafka";
+
+        public bool IsTransactionRequired => true;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse(WrapperName.Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            var topicPartition = instrumentedMethodCall.MethodCall.MethodArguments.ExtractNotNullAs<TopicPartition>(0);
+            var messageMetadata = instrumentedMethodCall.MethodCall.MethodArguments.ExtractNotNullAs<MessageMetadata>(1);
+
+            var segment = transaction.StartMessageBrokerSegment(instrumentedMethodCall.MethodCall, MessageBrokerDestinationType.Topic, MessageBrokerAction.Produce, BrokerVendorName, topicPartition.Topic);
+
+            transaction.InsertDistributedTraceHeaders(messageMetadata.Headers, DistributedTraceHeadersSetter);
+
+            return instrumentedMethodCall.MethodCall.Method.MethodName == "Produce" ? Delegates.GetDelegateFor(segment) : Delegates.GetAsyncDelegateFor<Task>(agent, segment);
+        }
+
+        private static void DistributedTraceHeadersSetter(Headers carrier, string key, string value)
+        {
+            carrier ??= new Headers();
+            carrier.Add(key, Encoding.ASCII.GetBytes(value));
+        }
+
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaSerializerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaSerializerWrapper.cs
new file mode 100644
index 0000000000..18eb3e383f
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaSerializerWrapper.cs
@@ -0,0 +1,34 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Confluent.Kafka;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+
+namespace NewRelic.Providers.Wrapper.Kafka
+{
+    public class KafkaSerializerWrapper : IWrapper
+    {
+        private const string WrapperName = "KafkaSerializerWrapper";
+
+        public bool IsTransactionRequired => true;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse(WrapperName.Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
+        {
+            // Serialize has 2 args, Deserialize has 3
+            var context = instrumentedMethodCall.MethodCall.MethodArguments.Length == 2
+                ? (SerializationContext)instrumentedMethodCall.MethodCall.MethodArguments[1]
+                : (SerializationContext)instrumentedMethodCall.MethodCall.MethodArguments[2];
+
+            // MessageBroker/Kafka/Topic/Named/{topic_name}/Serialization/Value
+            var segment = transaction.StartMessageBrokerSerializationSegment(instrumentedMethodCall.MethodCall, MessageBrokerDestinationType.Topic, MessageBrokerAction.Produce, "Kafka", context.Topic, context.Component.ToString());
+
+            return Delegates.GetDelegateFor(segment);
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/Instrumentation.xml
new file mode 100644
index 0000000000..c4568da3ca
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/Instrumentation.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2020 New Relic Corporation. All rights reserved.
+SPDX-License-Identifier: Apache-2.0
+-->
+<extension xmlns="urn:newrelic-extension">
+
+  <instrumentation>
+
+    <tracerFactory name="TransportConfigWrapper">
+
+      <match assemblyName="MassTransit" className="MassTransit.Configuration.TransportRegistrationBusFactory`1" minVersion="8.0.0">
+        <exactMethodMatcher methodName="CreateBus" />
+      </match>
+      <match assemblyName="MassTransit" className="MassTransit.BusFactoryExtensions" minVersion="8.0.0">
+        <exactMethodMatcher methodName="Build" parameters="MassTransit.IBusFactory,MassTransit.Configuration.IBusConfiguration,System.Collections.Generic.IEnumerable`1[MassTransit.ValidationResult]" />
+      </match>
+    </tracerFactory>
+
+  </instrumentation>
+</extension>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/MassTransit.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/MassTransit.csproj
new file mode 100644
index 0000000000..927a8a0adc
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/MassTransit.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <AssemblyName>NewRelic.Providers.Wrapper.MassTransit</AssemblyName>
+    <RootNamespace>NewRelic.Providers.Wrapper.MassTransit</RootNamespace>
+    <Description>MassTransit Wrapper Provider for New Relic .NET Agent</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MassTransit.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Instrumentation.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RootProjectDirectory)\src\NewRelic.Core\NewRelic.Core.csproj" />
+    <ProjectReference Include="..\..\..\NewRelic.Agent.Extensions\NewRelic.Agent.Extensions.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/NewRelicFilter.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/NewRelicFilter.cs
new file mode 100644
index 0000000000..ebec5076d5
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/NewRelicFilter.cs
@@ -0,0 +1,127 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MassTransit;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Helpers;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using MethodCall = NewRelic.Agent.Extensions.Providers.Wrapper.MethodCall;
+
+namespace NewRelic.Providers.Wrapper.MassTransit
+{
+    public class NewRelicFilter : IFilter<ConsumeContext>, IFilter<PublishContext>, IFilter<SendContext>
+    {
+        private const string SendMethodName = "Send";
+        private const string MessageBrokerVendorName = "MassTransit";
+
+        private Method _consumeMethod;
+        private Method _publishMethod;
+        private Method _sendMethod;
+
+        private Agent.Api.IAgent _agent;
+
+        public NewRelicFilter(Agent.Api.IAgent agent)
+        {
+            _agent = agent;
+        }
+
+        public void Probe(ProbeContext context)
+        {
+            context.CreateFilterScope("newrelic-scope");
+        }
+
+        public async Task Send(ConsumeContext context, IPipe<ConsumeContext> next)
+        {
+            _ = _consumeMethod ??= new Method(context.GetType(), SendMethodName,
+                context.GetType().FullName + "," + next.GetType().FullName);
+
+            var mc = new MethodCall(_consumeMethod, context, default(string[]), true);
+
+            var queueData = MassTransitHelpers.GetQueueData(context.SourceAddress);
+
+            var transaction = _agent.CreateTransaction(
+                destinationType: queueData.DestinationType,
+                brokerVendorName: MessageBrokerVendorName,
+                destination: queueData.QueueName);
+
+            transaction.AttachToAsync();
+            transaction.DetachFromPrimary();
+
+            transaction.AcceptDistributedTraceHeaders(context.Headers, GetHeaderValue, TransportType.AMQP);
+
+            var segment = transaction.StartMessageBrokerSegment(mc, MessageBrokerDestinationType.Queue, MessageBrokerAction.Consume, MessageBrokerVendorName, queueData.QueueName);
+
+            await next.Send(context);
+            segment.End();
+            transaction.End();
+
+            IEnumerable<string> GetHeaderValue(Headers carrier, string key)
+            {
+                var headers = carrier.GetAll();
+                if (headers != null)
+                {
+                    var headerValues = new List<string>();
+                    foreach (var item in headers)
+                    {
+                        if (item.Key.Equals(key, StringComparison.OrdinalIgnoreCase))
+                        {
+                            headerValues.Add(item.Value.ToString());
+                        }
+                    }
+
+                    return headerValues;
+                }
+
+                return null;
+            }
+        }
+
+        public async Task Send(PublishContext context, IPipe<PublishContext> next)
+        {
+            _ = _publishMethod ??= new Method(context.GetType(), SendMethodName,
+                context.GetType().FullName + "," + next.GetType().FullName);
+
+            var mc = new MethodCall(_publishMethod, context, default(string[]), true);
+
+            var queueData = MassTransitHelpers.GetQueueData(context.SourceAddress);
+
+            var transaction = _agent.CurrentTransaction;
+            InsertDistributedTraceHeaders(context.Headers, transaction);
+            var segment = transaction.StartMessageBrokerSegment(mc, queueData.DestinationType, MessageBrokerAction.Produce, MessageBrokerVendorName, queueData.QueueName);
+
+            await next.Send(context);
+            segment.End();
+        }
+
+        public async Task Send(SendContext context, IPipe<SendContext> next)
+        {
+            _ = _sendMethod ??= new Method(context.GetType(), SendMethodName,
+                context.GetType().FullName + "," + next.GetType().FullName);
+
+            var mc = new MethodCall(_sendMethod, context, default(string[]), true);
+
+            var queueData = MassTransitHelpers.GetQueueData(context.SourceAddress);
+
+            var transaction = _agent.CurrentTransaction;
+            InsertDistributedTraceHeaders(context.Headers, transaction);
+            var segment = transaction.StartMessageBrokerSegment(mc, queueData.DestinationType, MessageBrokerAction.Produce, MessageBrokerVendorName, queueData.QueueName);
+
+            await next.Send(context);
+            segment.End();
+        }
+
+        public static void InsertDistributedTraceHeaders(SendHeaders headers, ITransaction transaction)
+        {
+            var setHeaders = new Action<SendHeaders, string, string>((carrier, key, value) =>
+            {
+                carrier.Set(key, value);
+            });
+
+            transaction.InsertDistributedTraceHeaders(headers, setHeaders);
+        }
+
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/NewRelicPipeSpecification.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/NewRelicPipeSpecification.cs
new file mode 100644
index 0000000000..baa7fa8166
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/NewRelicPipeSpecification.cs
@@ -0,0 +1,40 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using MassTransit.Configuration;
+using MassTransit;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NewRelic.Providers.Wrapper.MassTransit
+{
+    public  class NewRelicPipeSpecification : IPipeSpecification<ConsumeContext>, IPipeSpecification<PublishContext>, IPipeSpecification<SendContext>
+    {
+        Agent.Api.IAgent _agent;
+
+        public NewRelicPipeSpecification(Agent.Api.IAgent agent)
+        {
+            _agent = agent;
+        }
+
+        public IEnumerable<ValidationResult> Validate()
+        {
+            return Enumerable.Empty<ValidationResult>();
+        }
+
+        public void Apply(IPipeBuilder<ConsumeContext> builder)
+        {
+            builder.AddFilter(new NewRelicFilter(_agent));
+        }
+
+        public void Apply(IPipeBuilder<PublishContext> builder)
+        {
+            builder.AddFilter(new NewRelicFilter(_agent));
+        }
+
+        public void Apply(IPipeBuilder<SendContext> builder)
+        {
+            builder.AddFilter(new NewRelicFilter(_agent));
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/README.md b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/README.md
new file mode 100644
index 0000000000..ced3c1a943
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/README.md
@@ -0,0 +1,5 @@
+This is the wrapper and instrumentation project for version 8.0.0 and higher of [MassTransit](https://masstransit.io/).
+
+The code in this project is nearly identical to that in the `MassTransitLegacy` project, which is for MassTransit v7. However, different MassTransit types are referenced
+in the two projects. The team decided at the time this instrumentation was introduced that eliminating the duplicate code would make things far less readable,
+and that code duplication was the lesser of two evils.
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/TransportConfigWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/TransportConfigWrapper.cs
new file mode 100644
index 0000000000..3c65cffe08
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/TransportConfigWrapper.cs
@@ -0,0 +1,38 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using MassTransit;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.SystemExtensions;
+
+namespace NewRelic.Providers.Wrapper.MassTransit
+{
+    public class TransportConfigWrapper : IWrapper
+    {
+        private const string WrapperName = "TransportConfigWrapper";
+        public bool IsTransactionRequired => false;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse(WrapperName.Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, Agent.Api.IAgent agent, ITransaction transaction)
+        {
+            // This will be run for each bus.  Each bus gets one transport.
+            // We can support more than one transport with this setup.
+            // Note that there are two instrumentation points that can get us here, and the first parameter is different for both,
+            // but they both implement IBusFactoryConfigurator, which is what we need
+            var configurator = instrumentedMethodCall.MethodCall.MethodArguments.ExtractNotNullAs<IBusFactoryConfigurator>(0);
+
+            var spec = new NewRelicPipeSpecification(agent);
+
+            configurator.ConfigurePublish(cfg => cfg.AddPipeSpecification(spec));
+            configurator.ConfigureSend(cfg => cfg.AddPipeSpecification(spec));
+            configurator.AddPipeSpecification(spec);
+
+            return Delegates.NoOp;
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml
new file mode 100644
index 0000000000..f4038c0a7a
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2020 New Relic Corporation. All rights reserved.
+SPDX-License-Identifier: Apache-2.0
+-->
+<extension xmlns="urn:newrelic-extension">
+
+  <instrumentation>
+
+    <tracerFactory name="TransportConfigLegacyWrapper">
+
+      <match assemblyName="MassTransit" className="MassTransit.Registration.TransportRegistrationBusFactory`1" minVersion="7.1.0" maxVersion="8.0.0">
+        <exactMethodMatcher methodName="CreateBus" />
+      </match>
+      <match assemblyName="MassTransit" className="MassTransit.BusFactoryExtensions" minVersion="7.1.0" maxVersion="8.0.0">
+        <exactMethodMatcher methodName="Build" parameters="MassTransit.IBusFactory,MassTransit.Configuration.IBusConfiguration,System.Collections.Generic.IEnumerable`1[GreenPipes.ValidationResult]" />
+      </match>
+    </tracerFactory>
+
+  </instrumentation>
+</extension>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/MassTransitLegacy.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/MassTransitLegacy.csproj
new file mode 100644
index 0000000000..58a82a8775
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/MassTransitLegacy.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <AssemblyName>NewRelic.Providers.Wrapper.MassTransitLegacy</AssemblyName>
+    <RootNamespace>NewRelic.Providers.Wrapper.MassTransitLegacy</RootNamespace>
+    <Description>MassTransit v7 Wrapper Provider for New Relic .NET Agent</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MassTransit" Version="7.0.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Instrumentation.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RootProjectDirectory)\src\NewRelic.Core\NewRelic.Core.csproj" />
+    <ProjectReference Include="..\..\..\NewRelic.Agent.Extensions\NewRelic.Agent.Extensions.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/NewRelicFilter.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/NewRelicFilter.cs
new file mode 100644
index 0000000000..d0c214ed44
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/NewRelicFilter.cs
@@ -0,0 +1,128 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GreenPipes;
+using MassTransit;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Helpers;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using MethodCall = NewRelic.Agent.Extensions.Providers.Wrapper.MethodCall;
+
+namespace NewRelic.Providers.Wrapper.MassTransitLegacy
+{
+    public class NewRelicFilter : IFilter<ConsumeContext>, IFilter<PublishContext>, IFilter<SendContext>
+    {
+        private const string SendMethodName = "Send";
+        private const string MessageBrokerVendorName = "MassTransit";
+
+        private Method _consumeMethod;
+        private Method _publishMethod;
+        private Method _sendMethod;
+
+        private Agent.Api.IAgent _agent;
+
+        public NewRelicFilter(Agent.Api.IAgent agent)
+        {
+            _agent = agent;
+        }
+
+        public void Probe(ProbeContext context)
+        {
+            context.CreateFilterScope("newrelic-scope");
+        }
+
+        public async Task Send(ConsumeContext context, IPipe<ConsumeContext> next)
+        {
+            _ = _consumeMethod ??= new Method(context.GetType(), SendMethodName,
+                context.GetType().FullName + "," + next.GetType().FullName);
+
+            var mc = new MethodCall(_consumeMethod, context, default(string[]), true);
+
+            var queueData = MassTransitHelpers.GetQueueData(context.SourceAddress);
+
+            var transaction = _agent.CreateTransaction(
+                destinationType: queueData.DestinationType,
+                brokerVendorName: MessageBrokerVendorName,
+                destination: queueData.QueueName);
+
+            transaction.AttachToAsync();
+            transaction.DetachFromPrimary();
+
+            transaction.AcceptDistributedTraceHeaders(context.Headers, GetHeaderValue, TransportType.AMQP);
+
+            var segment = transaction.StartMessageBrokerSegment(mc, MessageBrokerDestinationType.Queue, MessageBrokerAction.Consume, MessageBrokerVendorName, queueData.QueueName);
+
+            await next.Send(context);
+            segment.End();
+            transaction.End();
+
+            IEnumerable<string> GetHeaderValue(Headers carrier, string key)
+            {
+                var headers = carrier.GetAll();
+                if (headers != null)
+                {
+                    var headerValues = new List<string>();
+                    foreach (var item in headers)
+                    {
+                        if (item.Key.Equals(key, StringComparison.OrdinalIgnoreCase))
+                        {
+                            headerValues.Add(item.Value.ToString());
+                        }
+                    }
+
+                    return headerValues;
+                }
+
+                return null;
+            }
+        }
+
+        public async Task Send(PublishContext context, IPipe<PublishContext> next)
+        {
+            _ = _publishMethod ??= new Method(context.GetType(), SendMethodName,
+                context.GetType().FullName + "," + next.GetType().FullName);
+
+            var mc = new MethodCall(_publishMethod, context, default(string[]), true);
+
+            var queueData = MassTransitHelpers.GetQueueData(context.SourceAddress);
+
+            var transaction = _agent.CurrentTransaction;
+            InsertDistributedTraceHeaders(context.Headers, transaction);
+            var segment = transaction.StartMessageBrokerSegment(mc, queueData.DestinationType, MessageBrokerAction.Produce, MessageBrokerVendorName, queueData.QueueName);
+
+            await next.Send(context);
+            segment.End();
+        }
+
+        public async Task Send(SendContext context, IPipe<SendContext> next)
+        {
+            _ = _sendMethod ??= new Method(context.GetType(), SendMethodName,
+                context.GetType().FullName + "," + next.GetType().FullName);
+
+            var mc = new MethodCall(_sendMethod, context, default(string[]), true);
+
+            var queueData = MassTransitHelpers.GetQueueData(context.SourceAddress);
+
+            var transaction = _agent.CurrentTransaction;
+            InsertDistributedTraceHeaders(context.Headers, transaction);
+            var segment = transaction.StartMessageBrokerSegment(mc, queueData.DestinationType, MessageBrokerAction.Produce, MessageBrokerVendorName, queueData.QueueName);
+
+            await next.Send(context);
+            segment.End();
+        }
+
+        public static void InsertDistributedTraceHeaders(SendHeaders headers, ITransaction transaction)
+        {
+            var setHeaders = new Action<SendHeaders, string, string>((carrier, key, value) =>
+            {
+                carrier.Set(key, value);
+            });
+
+            transaction.InsertDistributedTraceHeaders(headers, setHeaders);
+        }
+
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/NewRelicPipeSpecification.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/NewRelicPipeSpecification.cs
new file mode 100644
index 0000000000..7c2a4394c3
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/NewRelicPipeSpecification.cs
@@ -0,0 +1,40 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Collections.Generic;
+using System.Linq;
+using GreenPipes;
+using MassTransit;
+
+namespace NewRelic.Providers.Wrapper.MassTransitLegacy
+{
+    public  class NewRelicPipeSpecification : IPipeSpecification<ConsumeContext>, IPipeSpecification<PublishContext>, IPipeSpecification<SendContext>
+    {
+        Agent.Api.IAgent _agent;
+
+        public NewRelicPipeSpecification(Agent.Api.IAgent agent)
+        {
+            _agent = agent;
+        }
+
+        public IEnumerable<ValidationResult> Validate()
+        {
+            return Enumerable.Empty<ValidationResult>();
+        }
+
+        public void Apply(IPipeBuilder<ConsumeContext> builder)
+        {
+            builder.AddFilter(new NewRelicFilter(_agent));
+        }
+
+        public void Apply(IPipeBuilder<PublishContext> builder)
+        {
+            builder.AddFilter(new NewRelicFilter(_agent));
+        }
+
+        public void Apply(IPipeBuilder<SendContext> builder)
+        {
+            builder.AddFilter(new NewRelicFilter(_agent));
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/README.md b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/README.md
new file mode 100644
index 0000000000..96a3b02c57
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/README.md
@@ -0,0 +1,5 @@
+This is the wrapper and instrumentation project for version 7.x of [MassTransit](https://masstransit.io/).
+
+The code in this project is nearly identical to that in the `MassTransit` project, which is for MassTransit v8. However, different MassTransit types are referenced
+in the two projects. The team decided at the time this instrumentation was introduced that eliminating the duplicate code would make things far less readable,
+and that code duplication was the lesser of two evils.
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/TransportConfigLegacyWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/TransportConfigLegacyWrapper.cs
new file mode 100644
index 0000000000..845d574fa3
--- /dev/null
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/TransportConfigLegacyWrapper.cs
@@ -0,0 +1,38 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using MassTransit;
+using NewRelic.Agent.Api;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.SystemExtensions;
+
+namespace NewRelic.Providers.Wrapper.MassTransitLegacy
+{
+    public class TransportConfigLegacyWrapper : IWrapper
+    {
+        private const string WrapperName = "TransportConfigLegacyWrapper";
+        public bool IsTransactionRequired => false;
+
+        public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
+        {
+            return new CanWrapResponse(WrapperName.Equals(methodInfo.RequestedWrapperName));
+        }
+
+        public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, Agent.Api.IAgent agent, ITransaction transaction)
+        {
+            // This will be run for each bus.  Each bus gets one transport.
+            // We can support more than one transport with this setup.
+            // Note that there are two instrumentation points that can get us here, and the first parameter is different for both,
+            // but they both implement IBusFactoryConfigurator, which is what we need
+            var configurator = instrumentedMethodCall.MethodCall.MethodArguments.ExtractNotNullAs<IBusFactoryConfigurator>(0);
+
+            var spec = new NewRelicPipeSpecification(agent);
+
+            configurator.ConfigurePublish(cfg => cfg.AddPipeSpecification(spec));
+            configurator.ConfigureSend(cfg => cfg.AddPipeSpecification(spec));
+            configurator.AddPipeSpecification(spec);
+
+            return Delegates.NoOp;
+        }
+    }
+}
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs
index 076950cfb7..54a24a1ab6 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs
@@ -6,6 +6,7 @@
 using System.Collections.Concurrent;
 using System.Net;
 using NewRelic.Agent.Extensions.Parsing;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
 using NewRelic.Parsing.ConnectionString;
 using NewRelic.Reflection;
 
@@ -104,7 +105,7 @@ private static object GetServerFromFromInterface(object owner)
         public static ConnectionInfo GetConnectionInfoFromCursor(object asyncCursor, object collectionNamespace, string utilizationHostName)
         {
             string host = null;
-            string port = null;
+            int port = -1;
 
             var channelSource = GetChannelSourceFieldFromGeneric(asyncCursor);
             var server = GetServerFromFromInterface(channelSource);
@@ -115,19 +116,19 @@ public static ConnectionInfo GetConnectionInfoFromCursor(object asyncCursor, obj
 
             if (dnsEndpoint != null)
             {
-                port = dnsEndpoint.Port.ToString();
+                port = dnsEndpoint.Port;
                 host = ConnectionStringParserHelper.NormalizeHostname(dnsEndpoint.Host, utilizationHostName);
             }
 
             if (ipEndpoint != null)
             {
-                port = ipEndpoint.Port.ToString();
+                port = ipEndpoint.Port;
                 host = ConnectionStringParserHelper.NormalizeHostname(ipEndpoint.Address.ToString(), utilizationHostName);
             }
 
             var databaseName = GetDatabaseNameFromCollectionNamespace(collectionNamespace);
 
-            return new ConnectionInfo(host, port, databaseName);
+            return new ConnectionInfo(DatastoreVendor.MongoDB.ToKnownName(), host, port, databaseName);
         }
 
         public static ConnectionInfo GetConnectionInfoFromDatabase(object database, string utilizationHostName)
@@ -135,17 +136,17 @@ public static ConnectionInfo GetConnectionInfoFromDatabase(object database, stri
             var databaseName = GetDatabaseNameFromDatabase(database);
             var servers = GetServersFromDatabase(database);
 
-            string port = null;
+            int port = -1;
             string host = null;
 
             if (servers.Count == 1)
             {
                 GetHostAndPortFromServer(servers[0], out var rawHost, out var rawPort);
-                port = rawPort.ToString();
+                port = rawPort;
                 host = ConnectionStringParserHelper.NormalizeHostname(rawHost, utilizationHostName);
             }
 
-            return new ConnectionInfo(host, port, databaseName);
+            return new ConnectionInfo(DatastoreVendor.MongoDB.ToKnownName(), host, port, databaseName);
         }
 
         private static IList GetServersFromDatabase(object database)
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj
index e25d1f29e9..071bac15e0 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj
@@ -5,6 +5,9 @@
     <AssemblyName>NewRelic.Providers.Wrapper.Owin</AssemblyName>
     <Description>Owin 2 Wrapper Provider for New Relic .NET Agent</Description>
   </PropertyGroup>
+<PropertyGroup>
+    <NoWarn>NU1903</NoWarn> <!-- Microsoft.Owin 2.0 has a high security vulnerability, but we have to reference that pacakage -->
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Owin" Version="2.0.0" />
   </ItemGroup>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/OwinStartupMiddleware.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/OwinStartupMiddleware.cs
index e4ff821dd9..0d56e3b05d 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/OwinStartupMiddleware.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/OwinStartupMiddleware.cs
@@ -120,7 +120,7 @@ private IEnumerable<string> GetHeaderValue(IOwinContext owinContext, string key)
         private ISegment SetupSegment(ITransaction transaction, IOwinContext owinContext)
         {
             var method = new Method(typeof(OwinStartupMiddleware), nameof(Invoke), nameof(owinContext));
-            var methodCall = new MethodCall(method, this, new object[] { owinContext });
+            var methodCall = new MethodCall(method, this, new object[] { owinContext }, true);
 
             var segment = transaction.StartTransactionSegment(methodCall, "Owin Middleware Pipeline");
             return segment;
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/Instrumentation.xml
index 02b1281948..9e018f1717 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/Instrumentation.xml
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/Instrumentation.xml
@@ -6,12 +6,14 @@ SPDX-License-Identifier: Apache-2.0
 <extension xmlns="urn:newrelic-extension">
 
 	<instrumentation>
+    <!-- Consume Pull -->
 		<tracerFactory name="BasicGetWrapper">
 			<match assemblyName="RabbitMQ.Client" className="RabbitMQ.Client.Framing.Impl.Model">
 				<exactMethodMatcher methodName="_Private_BasicGet" />
 			</match>
 		</tracerFactory>
 
+    <!-- Produce -->
 		<tracerFactory name="BasicPublishWrapper">
 			<match assemblyName="RabbitMQ.Client" className="RabbitMQ.Client.Framing.Impl.Model">
 				<exactMethodMatcher methodName="_Private_BasicPublish" parameters="System.String,System.String,System.Boolean,RabbitMQ.Client.IBasicProperties,System.Byte[]"/>
@@ -19,16 +21,18 @@ SPDX-License-Identifier: Apache-2.0
 			</match>
 		</tracerFactory>
 
+    <!-- Produce -->
 		<tracerFactory name="BasicPublishWrapperLegacy">
 			<match assemblyName="RabbitMQ.Client" className="RabbitMQ.Client.Framing.Impl.Model">
 				<exactMethodMatcher methodName="_Private_BasicPublish" parameters="System.String,System.String,System.Boolean,System.Boolean,RabbitMQ.Client.IBasicProperties,System.Byte[]"/>
 			</match>
 		</tracerFactory>
 
+    <!-- Consume  Push / Event / Subscribe -->
 		<tracerFactory name="HandleBasicDeliverWrapper">
-			<match assemblyName="RabbitMQ.Client" className="RabbitMQ.Client.Events.EventingBasicConsumer">
-				<exactMethodMatcher methodName="HandleBasicDeliver" />
-			</match>
+      <match assemblyName="RabbitMQ.Client" className="RabbitMQ.Client.Impl.ModelBase">
+        <exactMethodMatcher methodName="HandleBasicDeliver" />
+      </match>
 		</tracerFactory>
 		
 		<tracerFactory name="QueuePurgeWrapper">
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/SendCommandWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/SendCommandWrapper.cs
index fa3a90e219..f8d08eb9b2 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/SendCommandWrapper.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/SendCommandWrapper.cs
@@ -76,9 +76,13 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
 
             var host = TryGetPropertyName(PropertyHost, contextObject) ?? "unknown";
             host = ConnectionStringParserHelper.NormalizeHostname(host, agent.Configuration.UtilizationHostName);
-            var portPathOrId = TryGetPropertyName(PropertyPortPathOrId, contextObject);
+            var port = TryGetPropertyName(PropertyPortPathOrId, contextObject);
+            if (!int.TryParse(port, out int portNum))
+            {
+                portNum = -1;
+            }
             var databaseName = TryGetPropertyName(PropertyDatabaseName, contextObject);
-            var connectionInfo = new ConnectionInfo(host, portPathOrId, databaseName);
+            var connectionInfo = new ConnectionInfo(DatastoreVendor.Redis.ToKnownName(), host, portNum, databaseName);
 
             var segment = transaction.StartDatastoreSegment(instrumentedMethodCall.MethodCall, ParsedSqlStatement.FromOperation(DatastoreVendor.Redis, operation), connectionInfo);
 
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs
index a28d47baeb..10720f81e6 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs
@@ -102,18 +102,18 @@ public static ConnectionInfo GetConnectionInfoFromConnectionMultiplexer(MethodCa
             var dnsEndpoint = endpoint as DnsEndPoint;
             var ipEndpoint = endpoint as IPEndPoint;
 
-            string port = null;
+            int port = -1;
             string host = null;
 
             if (dnsEndpoint != null)
             {
-                port = dnsEndpoint.Port.ToString();
+                port = dnsEndpoint.Port;
                 host = ConnectionStringParserHelper.NormalizeHostname(dnsEndpoint.Host, utilizationHostName);
             }
 
             if (ipEndpoint != null)
             {
-                port = ipEndpoint.Port.ToString();
+                port = ipEndpoint.Port;
                 host = ConnectionStringParserHelper.NormalizeHostname(ipEndpoint.Address.ToString(), utilizationHostName);
             }
 
@@ -122,7 +122,7 @@ public static ConnectionInfo GetConnectionInfoFromConnectionMultiplexer(MethodCa
                 return null;
             }
 
-            return new ConnectionInfo(host, port, null);
+            return new ConnectionInfo(DatastoreVendor.Redis.ToKnownName(), host, port, null, null);
         }
 
         private static string GetCommandNameFromEnumValue(Enum commandValue)
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs
index 0d09792201..78edc24bce 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs
@@ -117,16 +117,16 @@ private ConnectionInfo GetConnectionInfo(EndPoint endpoint)
         {
             if (endpoint is DnsEndPoint dnsEndpoint)
             {
-                var port = dnsEndpoint.Port.ToString();
+                var port = dnsEndpoint.Port;
                 var host = ConnectionStringParserHelper.NormalizeHostname(dnsEndpoint.Host, _agent.Configuration.UtilizationHostName);
-                return new ConnectionInfo(host, port, null);
+                return new ConnectionInfo(DatastoreVendor.Redis.ToKnownName(), host, port, null, null);
             }
 
             if (endpoint is IPEndPoint ipEndpoint)
             {
-                var port = ipEndpoint.Port.ToString();
+                var port = ipEndpoint.Port;
                 var host = ConnectionStringParserHelper.NormalizeHostname(ipEndpoint.Address.ToString(), _agent.Configuration.UtilizationHostName);
-                return new ConnectionInfo(host, port, null);
+                return new ConnectionInfo(DatastoreVendor.Redis.ToKnownName(), host, port, null, null);
             }
 
             return null;
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj
index e22a38e318..5f12008b12 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj
@@ -5,6 +5,9 @@
     <AssemblyName>NewRelic.Providers.Wrapper.WebApi1</AssemblyName>
     <Description>Web API 1 Wrapper Provider for New Relic .NET Agent</Description>
   </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>NU1903</NoWarn> <!-- System.Net.Http 2.0 has a high security vulnerability, but we have to reference that pacakage -->
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Net.Http" Version="2.0.20710.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="4.0.20710.0" />
diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IConnectionStringParser.cs
index 9313fef5d3..781106a24a 100644
--- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IConnectionStringParser.cs
+++ b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IConnectionStringParser.cs
@@ -17,7 +17,7 @@ public static class ConnectionInfoParser
         private const int CacheCapacity = 1000;
         private static readonly SimpleCache<string, ConnectionInfo> _connectionInfoCache = new SimpleCache<string, ConnectionInfo>(CacheCapacity);
 
-        private static readonly ConnectionInfo Empty = new ConnectionInfo(null, null, null);
+        private static readonly ConnectionInfo Empty = new ConnectionInfo(null, null, null, null);
 
         public static ConnectionInfo FromConnectionString(DatastoreVendor vendor, string connectionString, string utilizationHostName)
         {
diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs
index 44562d9b76..ec1f302d13 100644
--- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs
+++ b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using NewRelic.Agent.Extensions.Parsing;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
@@ -27,7 +28,7 @@ public ConnectionInfo GetConnectionInfo(string utilizationHostName)
             var portPathOrId = ParsePortPathOrId();
             var databaseName = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _databaseNameKeys)?.Value;
 
-            return new ConnectionInfo(host, portPathOrId, databaseName);
+            return new ConnectionInfo(DatastoreVendor.IBMDB2.ToKnownName(), host, portPathOrId, databaseName);
         }
 
         private string ParseHost()
diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MsSqlConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MsSqlConnectionStringParser.cs
index cda78bd914..890f0dc417 100644
--- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MsSqlConnectionStringParser.cs
+++ b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MsSqlConnectionStringParser.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using NewRelic.Agent.Extensions.Parsing;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
@@ -27,7 +28,7 @@ public ConnectionInfo GetConnectionInfo(string utilizationHostName)
             var portPathOrId = ParsePortPathOrId();
             var databaseName = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _databaseNameKeys)?.Value;
             var instanceName = ParseInstanceName();
-            return new ConnectionInfo(host, portPathOrId, databaseName, instanceName);
+            return new ConnectionInfo(DatastoreVendor.MySQL.ToKnownName(), host, portPathOrId, databaseName, instanceName);
         }
 
         private string ParseHost()
diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MySqlConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MySqlConnectionStringParser.cs
index 3941ff12b4..f9c3c15341 100644
--- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MySqlConnectionStringParser.cs
+++ b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MySqlConnectionStringParser.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using NewRelic.Agent.Extensions.Parsing;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
 using System.Collections.Generic;
 using System.Data.Common;
 
@@ -30,12 +31,24 @@ public ConnectionInfo GetConnectionInfo(string utilizationHostName)
             else if (host != null)
                 host = ConnectionStringParserHelper.NormalizeHostname(host, utilizationHostName);
 
-            var portPathOrId = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _portKeys)?.Value;
-            if (portPathOrId == null && host != null) portPathOrId = "default";
-
             var databaseName = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _databaseNameKeys)?.Value;
 
-            return new ConnectionInfo(host, portPathOrId, databaseName);
+            var port = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _portKeys)?.Value;
+            if (port == null && host != null)
+            {
+                return new ConnectionInfo(DatastoreVendor.MySQL.ToKnownName(), host, "default", databaseName);
+            }
+            else
+            {
+                int portNum;
+                if (!int.TryParse(port, out portNum))
+                {
+                    portNum = -1;
+                }
+                return new ConnectionInfo(DatastoreVendor.MySQL.ToKnownName(), host, portNum, databaseName);
+            }
+
+
         }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/OracleConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/OracleConnectionStringParser.cs
index d3f8d6c2f2..139120e385 100644
--- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/OracleConnectionStringParser.cs
+++ b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/OracleConnectionStringParser.cs
@@ -6,6 +6,7 @@
 using System.Data.Common;
 using System.Linq;
 using NewRelic.Agent.Helpers;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
 
 namespace NewRelic.Parsing.ConnectionString
 {
@@ -26,8 +27,17 @@ public OracleConnectionStringParser(string connectionString)
         public ConnectionInfo GetConnectionInfo(string utilizationHostName)
         {
             var host = ParseHost();
-            var portPathOrId = ParsePortPathOrId();
-            return new ConnectionInfo(host, portPathOrId, null);
+            var portStr = ParsePortString();
+            if (string.IsNullOrEmpty(portStr))
+            {
+                return new ConnectionInfo(DatastoreVendor.Oracle.ToKnownName(), host, "default", null);
+            }
+            int port;
+            if (!int.TryParse(portStr, out port))
+            {
+                port = -1;
+            }
+            return new ConnectionInfo(DatastoreVendor.Oracle.ToKnownName(), host, port, null);
         }
 
         private string ParseHost()
@@ -81,7 +91,7 @@ private string ParseHost()
             return null;
         }
 
-        private string ParsePortPathOrId()
+        private string ParsePortString()
         {
             var host = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _hostKeys)?.Value;
             if (host == null) return null;
@@ -110,7 +120,7 @@ private string ParsePortPathOrId()
                 startOfValue = secondaryPortSection.IndexOf(StringSeparators.ColonChar);
                 if (startOfValue > -1) return secondaryPortSection.Substring(startOfValue + 1);
 
-                return "default";
+                return null;
             }
             else
             {
diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/PostgresConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/PostgresConnectionStringParser.cs
index a2d30a24c7..feae1654da 100644
--- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/PostgresConnectionStringParser.cs
+++ b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/PostgresConnectionStringParser.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using NewRelic.Agent.Extensions.Parsing;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
 using System.Collections.Generic;
 using System.Data.Common;
 
@@ -27,10 +28,15 @@ public ConnectionInfo GetConnectionInfo(string utilizationHostName)
             if (host != null)
                 host = ConnectionStringParserHelper.NormalizeHostname(host, utilizationHostName);
 
-            var portPathOrId = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _portKeys)?.Value;
             var databaseName = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _databaseNameKeys)?.Value;
 
-            return new ConnectionInfo(host, portPathOrId, databaseName);
+            var port = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _portKeys)?.Value;
+            if (port == null || !int.TryParse(port, out int portNum))
+            {
+                portNum = -1;
+            }
+
+            return new ConnectionInfo(DatastoreVendor.Postgres.ToKnownName(), host, portNum, databaseName);
         }
     }
 }
diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs
index c580303355..dd29b5488d 100644
--- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs
+++ b/src/Agent/NewRelic/Agent/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs
@@ -4,6 +4,7 @@
 using NewRelic.Agent.Extensions.Parsing;
 using System.Linq;
 using NewRelic.Agent.Helpers;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
 
 namespace NewRelic.Parsing.ConnectionString
 {
@@ -40,10 +41,14 @@ public ConnectionInfo GetConnectionInfo(string utilizationHostName)
                 // We can only capture the first server we detect.  It could be that there are many....
                 var hostPortPair = section.Split(StringSeparators.Colon);
                 var port = hostPortPair.Length == 2 ? hostPortPair[1] : null;
-                return new ConnectionInfo(ConnectionStringParserHelper.NormalizeHostname(hostPortPair[0], utilizationHostName), port, null);
+                if(!int.TryParse(port, out int portNum))
+                {
+                    portNum = -1;
+                }
+                return new ConnectionInfo(DatastoreVendor.Redis.ToKnownName(), ConnectionStringParserHelper.NormalizeHostname(hostPortPair[0], utilizationHostName), portNum, null);
             }
 
-            return new ConnectionInfo(null, null, null);
+            return new ConnectionInfo(null, null, null, null);
         }
     }
 }
diff --git a/src/Agent/NewRelic/Home/Home.csproj b/src/Agent/NewRelic/Home/Home.csproj
index cc871a1464..392fff2f8e 100644
--- a/src/Agent/NewRelic/Home/Home.csproj
+++ b/src/Agent/NewRelic/Home/Home.csproj
@@ -13,7 +13,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="NewRelic.Agent.Internal.Profiler" Version="10.17.0.8"/>
+    <PackageReference Include="NewRelic.Agent.Internal.Profiler" Version="10.18.0.15"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Agent/NewRelic/Profiler/Configuration/Configuration.h b/src/Agent/NewRelic/Profiler/Configuration/Configuration.h
index c79b60689b..ac84abd74d 100644
--- a/src/Agent/NewRelic/Profiler/Configuration/Configuration.h
+++ b/src/Agent/NewRelic/Profiler/Configuration/Configuration.h
@@ -32,6 +32,8 @@ namespace NewRelic { namespace Profiler { namespace Configuration {
             : _agentEnabled(true)
             , _agentEnabledInLocalConfig(false)
             , _logLevel(Logger::Level::LEVEL_INFO)
+            , _consoleLogging(false)
+            , _loggingEnabled(true)
             , _processes(new Processes())
             , _applicationPoolsWhiteList(new ApplicationPools())
             , _applicationPoolsBlackList(new ApplicationPools())
@@ -118,6 +120,8 @@ namespace NewRelic { namespace Profiler { namespace Configuration {
             : _agentEnabled(agentEnabled)
             , _agentEnabledInLocalConfig(false)
             , _logLevel(logLevel)
+            , _consoleLogging(false)
+            , _loggingEnabled(true)
             , _processes(processes)
             , _applicationPoolsWhiteList(whiteList)
             , _applicationPoolsBlackList(blackList)
@@ -188,10 +192,21 @@ namespace NewRelic { namespace Profiler { namespace Configuration {
             return _logLevel;
         }
 
+        bool GetConsoleLogging()
+        {
+            return _consoleLogging;
+        }
+        bool GetLoggingEnabled()
+        {
+            return _loggingEnabled;
+        }
+
     private:
         bool _agentEnabled;
         bool _agentEnabledInLocalConfig;
         Logger::Level _logLevel;
+        bool _consoleLogging;
+        bool _loggingEnabled;
         ProcessesPtr _processes;
         ApplicationPoolsPtr _applicationPoolsWhiteList;
         ApplicationPoolsPtr _applicationPoolsBlackList;
@@ -250,6 +265,18 @@ namespace NewRelic { namespace Profiler { namespace Configuration {
             if (logNode == nullptr)
                 return;
 
+            auto consoleAttribute = logNode->first_attribute(_X("console"), 0, false);
+            if (consoleAttribute != nullptr)
+            {
+                _consoleLogging = Strings::AreEqualCaseInsensitive(consoleAttribute->value(), _X("true"));
+            }
+
+            auto enabledAttribute = logNode->first_attribute(_X("enabled"), 0, false);
+            if (enabledAttribute != nullptr)
+            {
+                _loggingEnabled = Strings::AreEqualCaseInsensitive(enabledAttribute->value(), _X("true"));
+            }
+
             auto logLevelAttribute = logNode->first_attribute(_X("level"), 0, false);
             if (logLevelAttribute == nullptr)
                 return;
diff --git a/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigOverrideTest.cpp b/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigOverrideTest.cpp
new file mode 100644
index 0000000000..df03afbffc
--- /dev/null
+++ b/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigOverrideTest.cpp
@@ -0,0 +1,83 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#include <memory>
+#include <string>
+#include <set>
+#include "../Common/xplat.h"
+#include "../Common/Strings.h"
+#include "../Logging/DefaultFileLogLocation.h"
+#include "MockSystemCalls.h"
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace NewRelic { namespace Profiler { namespace Configuration { namespace Test
+{
+    TEST_CLASS(ConfigurationOverrideTest)
+    {
+    public:
+        TEST_METHOD(test_logging_enabled)
+        {
+            // Environment variable takes priority
+            _systemCalls.ResetEnvironmentVariables();
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_ENABLED"), _X("1"));
+            Assert::IsTrue(_systemCalls.GetLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_ENABLED"), _X("true"));
+            Assert::IsTrue(_systemCalls.GetLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_ENABLED"), _X("0"));
+            Assert::IsFalse(_systemCalls.GetLoggingEnabled(false));
+            Assert::IsFalse(_systemCalls.GetLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_ENABLED"), _X("false"));
+            Assert::IsFalse(_systemCalls.GetLoggingEnabled(false));
+            Assert::IsFalse(_systemCalls.GetLoggingEnabled(true));
+
+            // Use fallback (the config file value in actual usage)
+            _systemCalls.ResetEnvironmentVariables();
+
+            Assert::IsFalse(_systemCalls.GetLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_ENABLED"), _X("*invalid*"));
+            Assert::IsFalse(_systemCalls.GetLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetLoggingEnabled(true));
+        }
+        TEST_METHOD(test_console_logging_enabled)
+        {
+            // Environment variable takes priority
+            _systemCalls.ResetEnvironmentVariables();
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_CONSOLE"), _X("1"));
+            Assert::IsTrue(_systemCalls.GetConsoleLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetConsoleLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_CONSOLE"), _X("true"));
+            Assert::IsTrue(_systemCalls.GetConsoleLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetConsoleLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_CONSOLE"), _X("0"));
+            Assert::IsFalse(_systemCalls.GetConsoleLoggingEnabled(false));
+            Assert::IsFalse(_systemCalls.GetConsoleLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_CONSOLE"), _X("false"));
+            Assert::IsFalse(_systemCalls.GetConsoleLoggingEnabled(false));
+            Assert::IsFalse(_systemCalls.GetConsoleLoggingEnabled(true));
+
+            // Use fallback (the config file value in actual usage)
+            _systemCalls.ResetEnvironmentVariables();
+
+            Assert::IsFalse(_systemCalls.GetConsoleLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetConsoleLoggingEnabled(true));
+
+            _systemCalls.SetEnvironmentVariableW(_X("NEW_RELIC_LOG_CONSOLE"), _X("*invalid*"));
+            Assert::IsFalse(_systemCalls.GetConsoleLoggingEnabled(false));
+            Assert::IsTrue(_systemCalls.GetConsoleLoggingEnabled(true));
+        }
+
+    private:
+        MockSystemCalls _systemCalls;
+    };
+}}}}
diff --git a/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj b/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj
index c2cd62f2f4..734aec067c 100644
--- a/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj
@@ -176,12 +176,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="ConfigOverrideTest.cpp" />
     <ClCompile Include="ShouldInstrumentTest.cpp" />
     <ClCompile Include="ConfigurationTest.cpp" />
     <ClCompile Include="InstrumentationConfigurationTest.cpp" />
     <ClCompile Include="InstrumentationPointTest.cpp" />
     <ClCompile Include="StringsTest.cpp" />
     <ClCompile Include="TestModuleAttributes.cpp" />
+    <ClInclude Include="MockSystemCalls.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="ConfigurationTestTemplates.h" />
     <ClInclude Include="UnreferencedFunctions.h" />
diff --git a/src/Agent/NewRelic/Profiler/ConfigurationTest/MockSystemCalls.h b/src/Agent/NewRelic/Profiler/ConfigurationTest/MockSystemCalls.h
new file mode 100644
index 0000000000..f8d39e039e
--- /dev/null
+++ b/src/Agent/NewRelic/Profiler/ConfigurationTest/MockSystemCalls.h
@@ -0,0 +1,46 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+#include <functional>
+#include <string>
+#include <memory>
+#include <unordered_map>
+#ifdef PAL_STDCPP_COMPAT
+#include "../Profiler/UnixSystemCalls.h"
+#else
+#include "../Profiler/SystemCalls.h"
+#endif
+
+namespace NewRelic { namespace Profiler { namespace Configuration { namespace Test
+{
+    struct MockSystemCalls : NewRelic::Profiler::SystemCalls
+    {
+        std::unordered_map<xstring_t, xstring_t> environmentVariables;
+
+        MockSystemCalls()
+        {
+
+        }
+
+        virtual std::unique_ptr<xstring_t> TryGetEnvironmentVariable(const xstring_t& variableName) override
+        {
+            return std::make_unique<xstring_t>(environmentVariables[variableName]);
+        }
+
+        virtual bool FileExists(const xstring_t&) override
+        {
+            return true;
+        }
+
+        void SetEnvironmentVariable(xstring_t name, xstring_t value)
+        {
+            environmentVariables[name] = value;
+        }
+
+        void ResetEnvironmentVariables()
+        {
+            environmentVariables.clear();
+        }
+    };
+}}}}
diff --git a/src/Agent/NewRelic/Profiler/Logging/Logger.h b/src/Agent/NewRelic/Profiler/Logging/Logger.h
index 2bbf50a1b8..ef78c12b2d 100644
--- a/src/Agent/NewRelic/Profiler/Logging/Logger.h
+++ b/src/Agent/NewRelic/Profiler/Logging/Logger.h
@@ -6,6 +6,8 @@
 #include <memory>
 #include <mutex>
 #include <fstream> //wofstream
+#include <iostream>
+#include <ostream>
 #include <atomic>
 #include <cassert>
 #include "../Common/xplat.h"
@@ -44,7 +46,7 @@ namespace NewRelic {
                 using _Mystreamtype = std::basic_ostream<char_type>;
                 using _Mymut = std::mutex;
                 using _Mylockgrd = std::lock_guard<_Mymut>;
-                Logger(_Ostr&& myostr, Level level) : _level(level), _destination(std::move(myostr))
+                Logger(_Ostr&& myostr, Level level) : _level(level), _destination(std::move(myostr)), _console(false), _enabled(true), _initialized(false)
                 {
                     logging_available = true;
                 }
@@ -83,7 +85,39 @@ namespace NewRelic {
 
                 Level GetLevel() const noexcept
                 {
-                    return _level;
+                    if (!_console)
+                    {
+                        return _level;
+                    }
+                    // Console logging at debug or trace level incurs a very large
+                    // performance hit. Clamp the log level to INFO in that case.
+                    return (_level < Level::LEVEL_INFO) ? Level::LEVEL_INFO : _level;
+                }
+
+                void SetConsoleLogging(bool enabled)
+                {
+                    _console = enabled;
+                }
+
+                bool GetConsoleLogging()
+                {
+                    return _console;
+                }
+                void SetEnabled(bool enabled)
+                {
+                    _enabled = enabled;
+                }
+                bool GetEnabled()
+                {
+                    return _enabled;
+                }
+                void SetInitalized()
+                {
+                    _initialized = true;
+                }
+                bool GetInitialized()
+                {
+                    return _initialized;
                 }
 
                 _Mymut& mutex() const noexcept
@@ -94,6 +128,9 @@ namespace NewRelic {
                 _Ostr _destination;
                 Level _level;
                 mutable _Mymut _mutex;
+                bool _console;
+                bool _enabled;
+                bool _initialized;
             };
 
             using FileLogger = Logger<std::wofstream>;
@@ -127,7 +164,7 @@ namespace NewRelic {
                 }
 
                 using stream_char_t = typename _Log::char_type;
-                if (level >= log.GetLevel())
+                if (log.GetInitialized() && log.GetEnabled() && (level >= log.GetLevel()))
                 {
                     //each thread will have these on the stack...
                     std::tm  tstruct;
@@ -135,7 +172,7 @@ namespace NewRelic {
                     (void)time(&now);
                     (void)gmtime_s(&tstruct, &now);
                     auto levelstr = nrlog::GetLevelString(level);
-                    auto& strm = log.ostr();
+                    std::wostream& strm = log.GetConsoleLogging() ? std::wcout : log.ostr();
 
                     try
                     {
diff --git a/src/Agent/NewRelic/Profiler/LoggingTest/LoggerTest.cpp b/src/Agent/NewRelic/Profiler/LoggingTest/LoggerTest.cpp
index cf1966d990..d12aa51309 100644
--- a/src/Agent/NewRelic/Profiler/LoggingTest/LoggerTest.cpp
+++ b/src/Agent/NewRelic/Profiler/LoggingTest/LoggerTest.cpp
@@ -45,6 +45,9 @@ namespace NewRelic {
                     TEST_METHOD_INITIALIZE(MethodSetup)
                     {
                         StdLog.SetLevel(Level::LEVEL_INFO);
+                        StdLog.SetConsoleLogging(false);
+                        StdLog.SetEnabled(true);
+                        StdLog.SetInitalized();
                     }
 
                     TEST_METHOD(logger_verify_string_representation_of_levels)
@@ -182,7 +185,7 @@ namespace NewRelic {
                             LogError(L"Data too large to compress. ", std::hex, std::showbase, dataToCompress, std::resetiosflags(std::ios_base::basefield | std::ios_base::showbase));
                             AssertRegex(ERROR_PREFIX_REGEX L"Data too large to compress\\. 0xdeadbeef\n");
                         }
-                        { 
+                        {
                             //wchar_t NBTS
                             LogTrace(L"This is a small message.");
                             AssertRegex(TRACE_PREFIX_REGEX L"This is a small message\\.\n");
@@ -260,8 +263,8 @@ namespace NewRelic {
                         }
                         {
 
-                            wchar_t *source = L"<xml name:=foo>";
-                            const rapidxml::parse_error exception("what string", source+9);
+                            wchar_t* source = L"<xml name:=foo>";
+                            const rapidxml::parse_error exception("what string", source + 9);
                             LogError(L"Exception thrown while attempting to parse configuration file. ", exception.what(), L" at ", exception.where<wchar_t>());
                             AssertRegex(ERROR_PREFIX_REGEX L"Exception thrown while attempting to parse configuration file\\. what string at :=foo>\n");
                         }
@@ -317,7 +320,58 @@ namespace NewRelic {
                             auto str = StdLog.get_dest().str();
                             AssertRegex(ERROR_PREFIX_REGEX LR"X(Encountered unsupported instruction while attempting to generate byte code. Instruction: whipit.good)X" L"\n");
                         }
-                }
+                    }
+                    TEST_METHOD(logger_test_console)
+                    {
+                        StdLog.SetLevel(Level::LEVEL_TRACE);
+                        StdLog.SetConsoleLogging(true);
+                        ResetStdLog();
+
+                        LogInfo("blah blah blah");
+                        LogWarn("A warning");
+                        LogError("An error");
+
+                        AssertMessageCount(0);
+                    }
+
+                    TEST_METHOD(logger_test_console_restrictions)
+                    {
+                        ResetStdLog();
+                        StdLog.SetLevel(Level::LEVEL_TRACE);
+                        StdLog.SetConsoleLogging(true);
+                        Assert::AreEqual(StdLog.GetLevel(), Level::LEVEL_INFO);
+
+                        ResetStdLog();
+                        StdLog.SetConsoleLogging(false);
+                        StdLog.SetLevel(Level::LEVEL_TRACE);
+                        Assert::AreEqual(StdLog.GetLevel(), Level::LEVEL_TRACE);
+
+                        ResetStdLog();
+                        StdLog.SetLevel(Level::LEVEL_WARN);
+                        StdLog.SetConsoleLogging(true);
+                        Assert::AreEqual(StdLog.GetLevel(), Level::LEVEL_WARN);
+
+                        // Disabling console logging should revert to the original log level
+                        StdLog.SetConsoleLogging(true);
+                        StdLog.SetLevel(Level::LEVEL_DEBUG);
+                        Assert::AreEqual(StdLog.GetLevel(), Level::LEVEL_INFO);
+                        StdLog.SetConsoleLogging(false);
+                        Assert::AreEqual(StdLog.GetLevel(), Level::LEVEL_DEBUG);
+                    }
+
+                    TEST_METHOD(logger_test_disabled)
+                    {
+                        StdLog.SetLevel(Level::LEVEL_TRACE);
+                        StdLog.SetEnabled(false);
+                        ResetStdLog();
+
+                        LogInfo("blah blah blah");
+                        LogWarn("A warning");
+                        LogError("An error");
+
+                        AssertMessageCount(0);
+                    }
+
 
 
                     //------------------------------------------------------------
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriter/ISystemCalls.h b/src/Agent/NewRelic/Profiler/MethodRewriter/ISystemCalls.h
index df5e795ba2..bf29a7c4be 100644
--- a/src/Agent/NewRelic/Profiler/MethodRewriter/ISystemCalls.h
+++ b/src/Agent/NewRelic/Profiler/MethodRewriter/ISystemCalls.h
@@ -49,19 +49,7 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter {
 
         virtual bool GetIsAppDomainCachingDisabled()
         {
-            auto value = TryGetEnvironmentVariable(_X("NEW_RELIC_DISABLE_APPDOMAIN_CACHING"));
-
-            if (value == nullptr)
-            {
-                return false;
-            }
-
-            if(Strings::AreEqualCaseInsensitive(*value, _X("true")) || Strings::AreEqualCaseInsensitive(*value, _X("1")))
-            {
-                return true;
-            }
-
-            return false;
+            return GetEnvironmentBool(_X("NEW_RELIC_DISABLE_APPDOMAIN_CACHING"), false);
         }
 
         virtual std::unique_ptr<xstring_t> GetProfilerDelay()
@@ -89,8 +77,48 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter {
             return TryGetEnvironmentVariable(_X("APP_POOL_ID"));
         }
 
+        virtual bool GetLoggingEnabled(bool fallback)
+        {
+            return GetEnvironmentBool(_X("NEW_RELIC_LOG_ENABLED"), fallback);
+        }
+
+        virtual bool GetConsoleLoggingEnabled(bool fallback)
+        {
+            return GetEnvironmentBool(_X("NEW_RELIC_LOG_CONSOLE"), fallback);
+        }
+
+
+
     private:
         bool _isCoreClr = false;
+        /// <summary>
+        /// Gets an environment variable that should be a boolean
+        /// </summary>
+        /// <param name="variableName">Name of the environment variable to fetch</param>
+        /// <param name="fallback">If the environment variable doesn't
+        /// exist, or the value isn't 0/1/true/false, return the given fallback value</param>
+        /// <returns>The value of the environment variable, or the fallback</returns>
+        bool GetEnvironmentBool(const xstring_t& variableName, bool fallback)
+        {
+            auto value = TryGetEnvironmentVariable(variableName);
+
+            if (value == nullptr)
+            {
+                return fallback;
+            }
+
+            if (Strings::AreEqualCaseInsensitive(*value, _X("true")) || Strings::AreEqualCaseInsensitive(*value, _X("1")))
+            {
+                return true;
+            }
+
+            if (Strings::AreEqualCaseInsensitive(*value, _X("false")) || Strings::AreEqualCaseInsensitive(*value, _X("0")))
+            {
+                return false;
+            }
+
+            return fallback;
+        }
     };
     typedef std::shared_ptr<ISystemCalls> ISystemCallsPtr;
     typedef std::set<xstring_t> FilePaths;
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriterTest/FunctionManipulatorTest.cpp b/src/Agent/NewRelic/Profiler/MethodRewriterTest/FunctionManipulatorTest.cpp
index 5a594b411f..1830f6f96d 100644
--- a/src/Agent/NewRelic/Profiler/MethodRewriterTest/FunctionManipulatorTest.cpp
+++ b/src/Agent/NewRelic/Profiler/MethodRewriterTest/FunctionManipulatorTest.cpp
@@ -8,7 +8,6 @@
 
 #include "../Common/Macros.h"
 #include "MockFunction.h"
-#include "MockSystemCalls.h"
 #include "../MethodRewriter/FunctionManipulator.h"
 #include "../MethodRewriter/InstrumentFunctionManipulator.h"
 
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.cpp b/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.cpp
index 24d0852118..a71f158888 100644
--- a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.cpp
+++ b/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.cpp
@@ -11,7 +11,6 @@
 #include "../MethodRewriter/MethodRewriter.h"
 #include "CppUnitTest.h"
 #include "MockFunction.h"
-#include "MockSystemCalls.h"
 #include "UnreferencedFunctions.h"
 
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj b/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj
index 35749b8525..1c79257ea6 100644
--- a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj
@@ -182,7 +182,6 @@
   <ItemGroup>
     <ClInclude Include="MockFunction.h" />
     <ClInclude Include="MockFunctionHeaderInfo.h" />
-    <ClInclude Include="MockSystemCalls.h" />
     <ClInclude Include="MockTokenizer.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="TestTemplates.h" />
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MockSystemCalls.h b/src/Agent/NewRelic/Profiler/MethodRewriterTest/MockSystemCalls.h
deleted file mode 100644
index 7eb30b5825..0000000000
--- a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MockSystemCalls.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-#include <functional>
-#include <string>
-#include <memory>
-#include "../MethodRewriter/ISystemCalls.h"
-
-namespace NewRelic { namespace Profiler { namespace MethodRewriter { namespace Test {
-    struct MockSystemCalls : ISystemCalls
-    {
-        std::function<std::unique_ptr<std::wstring>(const std::wstring&)> EnvironmentVariableResult;
-
-        MockSystemCalls()
-        {
-            EnvironmentVariableResult = [](const std::wstring&)
-            {
-                return std::unique_ptr<std::wstring>(new std::wstring(L"C:\\foo\\bar"));
-            };
-        }
-
-        virtual std::unique_ptr<std::wstring> TryGetEnvironmentVariable(const std::wstring& variableName)
-        {
-            return EnvironmentVariableResult(variableName);
-        }
-
-        virtual bool FileExists(const xstring_t&) override
-        {
-            return true;
-        }
-    };
-}}}}
diff --git a/src/Agent/NewRelic/Profiler/Profiler/CorProfilerCallbackImpl.h b/src/Agent/NewRelic/Profiler/Profiler/CorProfilerCallbackImpl.h
index c6e679c3e1..6fc76d4c01 100644
--- a/src/Agent/NewRelic/Profiler/Profiler/CorProfilerCallbackImpl.h
+++ b/src/Agent/NewRelic/Profiler/Profiler/CorProfilerCallbackImpl.h
@@ -207,10 +207,29 @@ namespace NewRelic { namespace Profiler {
                     return CORPROF_E_PROFILER_CANCEL_ACTIVATION;
                 }
 
-                HRESULT loggingInitResult = InitializeLogging();
-                if (FAILED(loggingInitResult))
+                // A bit of a catch-22: we want to load the config file first in case there are logging
+                // settings, but we also want to log if there are issues with the config file.
+                // So first, we try to load the config file...
+                NewRelic::Profiler::Configuration::ConfigurationPtr configuration;
+                bool configFailed = false;
+                try
+                {
+                    configuration = InitializeConfigAndSetLogLevel();
+                }
+                catch (...)
+                {
+                    configFailed = true;
+                }
+
+                // ...then we initialize the log
+                InitializeLogging();
+
+                // If we failed to load the config file, try again. Not because we expect it
+                // to succeed, but because we want to log the error. We couldn't do that the
+                // first time because the logger hadn't been initialized yet
+                if (configFailed)
                 {
-                    return loggingInitResult;
+                    configuration = InitializeConfigAndSetLogLevel();
                 }
 
                 LogTrace(_productName);
@@ -222,7 +241,6 @@ namespace NewRelic { namespace Profiler {
                 //Init does not start threads or requires cleanup. RequestProfile will create the threads for the TP.
                 _threadProfiler.Init(_corProfilerInfo4);
 
-                auto configuration = InitializeConfigAndSetLogLevel();
 
                 HRESULT corePathInitResult = InitializeAndSetAgentCoreDllPath(_productName);
                 if (FAILED(corePathInitResult)) {
@@ -1064,21 +1082,24 @@ namespace NewRelic { namespace Profiler {
             return millisecondsInteger;
         }
 
-        HRESULT InitializeLogging()
+        void InitializeLogging()
         {
-            // if logging fails to initialize then just bail
-            try {
-                xstring_t logfilename(nrlog::DefaultFileLogLocation(_systemCalls).GetPathAndFileName());
-                std::string wlogfilename(std::begin(logfilename), std::end(logfilename));
-                nrlog::StdLog.get_dest().open(wlogfilename);
-                nrlog::StdLog.get_dest().exceptions(std::wostream::failbit | std::wostream::badbit);
-                LogInfo("Logger initialized.");
-            } catch (...) {
-                printf("Unable to initialize the New Relic .NET Agent log file.  Please make sure the logs directory is writeable.\n");
-                // we can't log errors if the logger failed to initialize
-                return CORPROF_E_PROFILER_CANCEL_ACTIVATION;
+            // Only need to initialize the file if we're doing file logging
+            if (nrlog::StdLog.GetEnabled() && !nrlog::StdLog.GetConsoleLogging())
+            {
+                try {
+                    xstring_t logfilename(nrlog::DefaultFileLogLocation(_systemCalls).GetPathAndFileName());
+                    std::string wlogfilename(std::begin(logfilename), std::end(logfilename));
+                    nrlog::StdLog.get_dest().open(wlogfilename);
+                    nrlog::StdLog.get_dest().exceptions(std::wostream::failbit | std::wostream::badbit);
+                    LogInfo("Logger initialized.");
+                }
+                catch (...) {
+                    // If we fail to create a log file, there's no sense in trying to log going forward.
+                    // We want the Profiler continue to run, though, so swallow the exception
+                    nrlog::StdLog.SetEnabled(false);
+                }
             }
-            return S_OK;
         }
 
         std::shared_ptr<Configuration::Configuration> InitializeConfigAndSetLogLevel()
@@ -1089,7 +1110,20 @@ namespace NewRelic { namespace Profiler {
 
             auto configuration = std::make_shared<Configuration::Configuration>(globalNewRelicConfigurationXml, localNewRelicConfigurationXml, applicationConfigurationXml, _systemCalls);
             nrlog::StdLog.SetLevel(configuration->GetLoggingLevel());
-            LogInfo(L"<-- New logging level set: ", nrlog::GetLevelString(nrlog::StdLog.GetLevel()));
+            nrlog::StdLog.SetConsoleLogging(_systemCalls->GetConsoleLoggingEnabled(configuration->GetConsoleLogging()));
+            nrlog::StdLog.SetEnabled(_systemCalls->GetLoggingEnabled(configuration->GetLoggingEnabled()));
+            nrlog::StdLog.SetInitalized();
+
+            if (nrlog::StdLog.GetEnabled())
+            {
+                LogInfo(L"<-- New logging level set: ", nrlog::GetLevelString(nrlog::StdLog.GetLevel()));
+                if (nrlog::StdLog.GetConsoleLogging())
+                {
+                    LogInfo(L"Console logging enabled");
+                }
+            }
+            // While we would like to indicate that logging is disabled somehow, there's of
+            // course no log to write to
 
             return configuration;
         }
diff --git a/src/NewRelic.Core/Logging/Log.cs b/src/NewRelic.Core/Logging/Log.cs
index 8d75d5f324..e044bfc873 100644
--- a/src/NewRelic.Core/Logging/Log.cs
+++ b/src/NewRelic.Core/Logging/Log.cs
@@ -23,6 +23,8 @@ public static void Initialize(ILogger logger)
             Logger = logger;
         }
 
+        public static bool FileLoggingHasFailed { get; set; }
+
         #region Error
 
         /// <summary>
diff --git a/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj b/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj
index 0e074d01e8..d57f465cd5 100644
--- a/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj
+++ b/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj b/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj
index 15b370d528..e9f7980f41 100644
--- a/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj
+++ b/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj
@@ -9,13 +9,13 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.3" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="JustMock" Version="2020.1.113.1" />
     <PackageReference Include="MoreLinq" Version="2.4.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
diff --git a/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj b/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj
index 46b7d303a4..0b17176a48 100644
--- a/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj
+++ b/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/samples/docker/alpine/.dockerignore b/tests/Agent/IntegrationTests/.dockerignore
similarity index 100%
rename from samples/docker/alpine/.dockerignore
rename to tests/Agent/IntegrationTests/.dockerignore
diff --git a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj
index 4dcdfdafb9..f9a11a1061 100644
--- a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj
+++ b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj
index 7ec38830dd..32672ae802 100644
--- a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj
+++ b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj b/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj
index 774f0bc0bf..233735e16d 100644
--- a/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj b/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj
index 874b7f1f5c..6ea08715c6 100644
--- a/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj
+++ b/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
    <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference> 
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj
index cc650680e7..d35eb41e34 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/Program.cs
index a440b00c64..f0fbc81ea5 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/Program.cs
@@ -38,7 +38,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
+                .UseUrls($@"http://127.0.0.1:{_port}/")
                 .Build();
 
         /// <summary>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj
index a24fa0aa3f..9ff16566e3 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/Program.cs
index e64dae6d96..e8d5222f07 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/Program.cs
@@ -32,7 +32,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls(string.Format(@"http://localhost:{0}/", _port))
+                .UseUrls(string.Format(@"http://127.0.0.1:{0}/", _port))
                 .Build();
     }
 }
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj
index 2df0082370..df4ed751eb 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/Program.cs
index 838a147b99..381dbacc26 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/Program.cs
@@ -35,7 +35,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                 {
                     webBuilder
                         .UseStartup<Startup>()
-                        .UseUrls($@"http://localhost:{_port}/");
+                        .UseUrls($@"http://127.0.0.1:{_port}/");
                 });
 
     }
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj
index ce8367ecd7..ac43d4563e 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/Program.cs
index 94305b012b..e895517599 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/Program.cs
@@ -35,7 +35,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
+                .UseUrls($@"http://127.0.0.1:{_port}/")
                 .Build();
 
     }
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj
index 4ab50862dc..5d7ff25058 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/Program.cs
index 53f6480ff0..882839aa1c 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/Program.cs
@@ -35,7 +35,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
+                .UseUrls($@"http://127.0.0.1:{_port}/")
                 .Build();
 
         /// <summary>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj
index 11ad958156..adc872e870 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="2.1.7" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/Program.cs
index 695083c64c..96a5080013 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/Program.cs
@@ -31,7 +31,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args, string port) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{port}/")
+                .UseUrls($@"http://127.0.0.1:{port}/")
                 .Build();
     }
 }
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj
index 4e574c7888..bc7a8596cf 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/Program.cs
index a5480ef7b9..1863045a6e 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/Program.cs
@@ -73,7 +73,7 @@ private static void CreatePidFile()
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
+                .UseUrls($@"http://127.0.0.1:{_port}/")
                 .Build();
     }
 }
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj
index c71bb5e81e..efa7de6e8d 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/Program.cs
index 508a8749d0..c10bbf3006 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/Program.cs
@@ -55,7 +55,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
+                .UseUrls($@"http://127.0.0.1:{_port}/")
                 .Build();
 
         private static void CreatePidFile()
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj
index b2ced69049..b1a8c4f8c3 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/Program.cs
index 1b872930f1..7c612af50a 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/Program.cs
@@ -32,7 +32,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
+                .UseUrls($@"http://127.0.0.1:{_port}/")
                 .Build();
 
     }
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj
index 7401da19a2..f8154d87ea 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/Program.cs
index 30091b4f9c..ef403e7071 100644
--- a/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/Program.cs
@@ -34,7 +34,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls(string.Format(@"http://localhost:{0}/", _port))
+                .UseUrls(string.Format(@"http://127.0.0.1:{0}/", _port))
                 .Build();
     }
 }
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj
new file mode 100644
index 0000000000..b3d0c270ae
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\ApplicationHelperLibraries\ApplicationLifecycle\ApplicationLifecycle.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Error.cshtml b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Error.cshtml
new file mode 100644
index 0000000000..6f92b95655
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Error.cshtml
@@ -0,0 +1,26 @@
+@page
+@model ErrorModel
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (Model.ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred.
+</p>
+<p>
+    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
+    It can result in displaying sensitive information from exceptions to end users.
+    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
+    and restarting the app.
+</p>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Error.cshtml.cs b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Error.cshtml.cs
new file mode 100644
index 0000000000..f3138e1dea
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Error.cshtml.cs
@@ -0,0 +1,30 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace BasicAspNetCoreRazorApplication.Pages
+{
+    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+    [IgnoreAntiforgeryToken]
+    public class ErrorModel : PageModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+        private readonly ILogger<ErrorModel> _logger;
+
+        public ErrorModel(ILogger<ErrorModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Index.cshtml b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Index.cshtml
new file mode 100644
index 0000000000..b5f0c15fce
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Index.cshtml
@@ -0,0 +1,10 @@
+@page
+@model IndexModel
+@{
+    ViewData["Title"] = "Home page";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Welcome</h1>
+    <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
+</div>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Index.cshtml.cs b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Index.cshtml.cs
new file mode 100644
index 0000000000..eb2b8c39d0
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Index.cshtml.cs
@@ -0,0 +1,23 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace BasicAspNetCoreRazorApplication.Pages
+{
+    public class IndexModel : PageModel
+    {
+        private readonly ILogger<IndexModel> _logger;
+
+        public IndexModel(ILogger<IndexModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_Layout.cshtml b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..0788579669
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_Layout.cshtml
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - BasicAspNetCoreRazorApplication</title>
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/BasicAspNetCoreRazorApplication.styles.css" asp-append-version="true" />
+</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-page="/Index">BasicAspNetCoreRazorApplication</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-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-page="/Index">Home</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
+    </div>
+
+    <footer class="border-top footer text-muted">
+        <div class="container">
+            &copy; 2023 - BasicAspNetCoreRazorApplication - <a asp-area="" asp-page="/Privacy">Privacy</a>
+        </div>
+    </footer>
+
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/js/site.js" asp-append-version="true"></script>
+
+    @await RenderSectionAsync("Scripts", required: false)
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_Layout.cshtml.css b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_Layout.cshtml.css
new file mode 100644
index 0000000000..a72cbeaf33
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_Layout.cshtml.css
@@ -0,0 +1,48 @@
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+  white-space: normal;
+  text-align: center;
+  word-break: break-all;
+}
+
+a {
+  color: #0077cc;
+}
+
+.btn-primary {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.border-top {
+  border-top: 1px solid #e5e5e5;
+}
+.border-bottom {
+  border-bottom: 1px solid #e5e5e5;
+}
+
+.box-shadow {
+  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+}
+
+button.accept-policy {
+  font-size: 1rem;
+  line-height: inherit;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  white-space: nowrap;
+  line-height: 60px;
+}
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_ValidationScriptsPartial.cshtml b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_ValidationScriptsPartial.cshtml
new file mode 100644
index 0000000000..5a16d80a9a
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/Shared/_ValidationScriptsPartial.cshtml
@@ -0,0 +1,2 @@
+<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/_ViewImports.cshtml b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..91cfb77269
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using BasicAspNetCoreRazorApplication
+@namespace BasicAspNetCoreRazorApplication.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/_ViewStart.cshtml b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Pages/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Program.cs
new file mode 100644
index 0000000000..13288c7d7f
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/Program.cs
@@ -0,0 +1,77 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using ApplicationLifecycle;
+
+namespace BasicAspNetCoreRazorApplication
+{
+    public class Program
+    {
+        private static string _port;
+
+        public static async Task Main(string[] args)
+        {
+
+            _port = AppLifecycleManager.GetPortFromArgs(args);
+
+            var ct = new CancellationTokenSource();
+
+            var builder = WebApplication.CreateBuilder(args);
+
+            // Add services to the container.
+            builder.Services.AddRazorPages();
+
+            var enableResponseCompression = Environment.GetEnvironmentVariable("ENABLE_RESPONSE_COMPRESSION");
+            if (enableResponseCompression == "1")
+                builder.Services.AddResponseCompression();
+
+            var app = builder.Build();
+
+            // Configure the HTTP request pipeline.
+            if (!app.Environment.IsDevelopment())
+            {
+                app.UseExceptionHandler("/Error");
+            }
+
+            if (enableResponseCompression == "1")
+                app.UseResponseCompression();
+
+            app.UseStaticFiles();
+
+            app.UseRouting();
+
+            app.UseAuthorization();
+
+            app.MapRazorPages();
+
+            app.MapGet("/foo", async context =>
+            {
+                var subscriptions = new
+                {
+                    Foo = 1, Bar = "Something"
+                };
+
+                await context.Response.WriteAsync(JsonSerializer.Serialize(subscriptions,
+                    new JsonSerializerOptions
+                    {
+                        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                    }));
+            });
+
+            app.Urls.Add($"http://127.0.0.1:{_port}");
+
+            var task = app.RunAsync(ct.Token);
+
+            AppLifecycleManager.CreatePidFile();
+
+            AppLifecycleManager.WaitForTestCompletion(_port);
+
+            ct.Cancel();
+
+            await task;
+        }
+    }
+}
diff --git a/samples/docker/ubuntu/appsettings.Development.json b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/appsettings.Development.json
similarity index 82%
rename from samples/docker/ubuntu/appsettings.Development.json
rename to tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/appsettings.Development.json
index 0c208ae918..770d3e9314 100644
--- a/samples/docker/ubuntu/appsettings.Development.json
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/appsettings.Development.json
@@ -1,4 +1,5 @@
 {
+  "DetailedErrors": true,
   "Logging": {
     "LogLevel": {
       "Default": "Information",
diff --git a/samples/docker/alpine/appsettings.json b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/appsettings.json
similarity index 100%
rename from samples/docker/alpine/appsettings.json
rename to tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/appsettings.json
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/css/site.css b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/css/site.css
new file mode 100644
index 0000000000..f8d98fcb77
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/css/site.css
@@ -0,0 +1,22 @@
+html {
+  font-size: 14px;
+}
+
+@media (min-width: 768px) {
+  html {
+    font-size: 16px;
+  }
+}
+
+.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
+  box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
+}
+
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: 60px;
+}
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/favicon.ico b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/favicon.ico
new file mode 100644
index 0000000000..63e859b476
Binary files /dev/null and b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/favicon.ico differ
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/static.html b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/static.html
new file mode 100644
index 0000000000..a6c8340093
--- /dev/null
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/wwwroot/static.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Static content</title>
+</head>
+<body>
+<p>Static is as static does.</p>
+</body>
+</html>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj b/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj
index df7480be02..0b5632d1be 100644
--- a/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj
+++ b/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj
@@ -86,7 +86,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj
index a97512bfcb..8314a08cf9 100644
--- a/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -113,7 +113,7 @@
       <Version>2.0.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -165,4 +165,4 @@
   <Target Name="Deploy" AfterTargets="Build">
     <MSBuild Projects="$(ProjectPath)" Targets="WebPublish" Properties="PublishProfile=LocalDeploy" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj
index 524a5fdf86..c08ff732e7 100644
--- a/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj
@@ -104,7 +104,7 @@
       <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj
index e0565f79ac..7125ce9984 100644
--- a/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj
@@ -90,7 +90,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj b/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj
index 03eb37a551..6158f55510 100644
--- a/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj
+++ b/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj
@@ -89,7 +89,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj
index 476817835b..c5499a43c4 100644
--- a/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -62,4 +62,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj
index 6d18579f20..c60da507f7 100644
--- a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj
+++ b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj
@@ -53,7 +53,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj
index f35e5488fc..efa47b1009 100644
--- a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj
+++ b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj
index ba4f9f88d4..a4c0a922b4 100644
--- a/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj
@@ -37,7 +37,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj b/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj
index 6a222588fd..9b238a0915 100644
--- a/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj
+++ b/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/Program.cs b/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/Program.cs
index 6254f8a1af..fe356913bc 100644
--- a/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/Program.cs
@@ -31,7 +31,7 @@ static void Main(string[] args)
 
         private void RealMain()
         {
-            var baseAddress = string.Format(@"http://*:{0}/", Port);
+            var baseAddress = string.Format(@"http://127.0.0.1:{0}/", Port);
             using (WebApp.Start<Startup>(baseAddress))
             {
                 using (var eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset,
diff --git a/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj b/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj
index 1a3ffc0400..b495050b01 100644
--- a/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
    <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference> 
diff --git a/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj b/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj
index f02009cfe8..a01d5ceef2 100644
--- a/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj
+++ b/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj
index 2583736ff7..adf032ff69 100644
--- a/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -76,7 +76,7 @@
       <Version>3.2.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -172,4 +172,4 @@
   <Target Name="Deploy" AfterTargets="Build">
     <MSBuild Projects="$(ProjectPath)" Targets="WebPublish" Properties="PublishProfile=LocalDeploy" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj
index 410eafa8e4..6cc8c36e0d 100644
--- a/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="2.6.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj b/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj
index c8f7df44f7..d966c8de0a 100644
--- a/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj
@@ -95,7 +95,7 @@
       <Version>2.0.30506</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj b/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj
index e479e589ba..bd9b198557 100644
--- a/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj
+++ b/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.Owin" Version="2.1.0" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="2.1.0" />
     <PackageReference Include="Microsoft.Owin.Hosting" Version="2.1.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Program.cs b/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Program.cs
index 951e1521b3..efe240b45d 100644
--- a/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Program.cs
@@ -31,7 +31,7 @@ static void Main(string[] args)
 
         private void RealMain()
         {
-            var baseAddress = string.Format(@"http://*:{0}/", Port);
+            var baseAddress = string.Format(@"http://127.0.0.1:{0}/", Port);
             using (WebApp.Start<Startup>(baseAddress))
             {
                 using (var eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset,
diff --git a/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj b/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj
index ad3565433c..9a61f12e7a 100644
--- a/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj
+++ b/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Owin" Version="3.1.0" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.1.0" />
     <PackageReference Include="Microsoft.Owin.Hosting" Version="3.1.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Program.cs b/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Program.cs
index 497ce6c252..b99be2cd01 100644
--- a/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Program.cs
@@ -31,7 +31,7 @@ static void Main(string[] args)
 
         private void RealMain()
         {
-            var baseAddress = string.Format(@"http://*:{0}/", Port);
+            var baseAddress = string.Format(@"http://127.0.0.1:{0}/", Port);
             using (WebApp.Start<Startup>(baseAddress))
             {
                 using (var eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset,
diff --git a/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj b/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj
index 4432faada4..54613dcd30 100644
--- a/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj
+++ b/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Program.cs b/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Program.cs
index 78e2ad8778..6b018502ec 100644
--- a/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Program.cs
@@ -31,7 +31,7 @@ static void Main(string[] args)
 
         private void RealMain()
         {
-            var baseAddress = string.Format(@"http://*:{0}/", Port);
+            var baseAddress = string.Format(@"http://127.0.0.1:{0}/", Port);
             using (WebApp.Start<Startup>(baseAddress))
             {
                 var eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset, "app_server_wait_for_all_request_done_" + Port.ToString());
diff --git a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Controllers/RemoteController.cs b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Controllers/RemoteController.cs
index 5962c544a5..495cb38b54 100644
--- a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Controllers/RemoteController.cs
+++ b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Controllers/RemoteController.cs
@@ -14,14 +14,14 @@ public class RemoteController : ApiController
         [Route("GetObjectTcp")]
         public string GetObjectTcp()
         {
-            var myMarshalByRefClassObj = (MyMarshalByRefClass)Activator.GetObject(typeof(MyMarshalByRefClass), "tcp://localhost:7878/GetObject");
+            var myMarshalByRefClassObj = (MyMarshalByRefClass)Activator.GetObject(typeof(MyMarshalByRefClass), "tcp://127.0.0.1:7878/GetObject");
             return GetObject(myMarshalByRefClassObj);
         }
 
         [Route("GetObjectHttp")]
         public string GetObjectHttp()
         {
-            var myMarshalByRefClassObj = (MyMarshalByRefClass)Activator.GetObject(typeof(MyMarshalByRefClass), "http://localhost:7879/GetObject");
+            var myMarshalByRefClassObj = (MyMarshalByRefClass)Activator.GetObject(typeof(MyMarshalByRefClass), "http://127.0.0.1:7879/GetObject");
             return GetObject(myMarshalByRefClassObj);
         }
 
diff --git a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj
index e8974e846f..237cbb03e7 100644
--- a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj
+++ b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -63,7 +63,7 @@
       <Version>2.0.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -106,4 +106,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Program.cs b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Program.cs
index d26480366c..98c9d07bbf 100644
--- a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/Program.cs
@@ -31,7 +31,7 @@ static void Main(string[] args)
 
         private void RealMain()
         {
-            var baseAddress = string.Format(@"http://*:{0}/", Port);
+            var baseAddress = string.Format(@"http://127.0.0.1:{0}/", Port);
             using (WebApp.Start<Startup>(baseAddress))
             {
                 using (var eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset,
diff --git a/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj b/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj
index fe78d364e8..63cf8d72a5 100644
--- a/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj
+++ b/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj
@@ -70,7 +70,7 @@
       <Version>2.0.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/Program.cs b/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/Program.cs
index a0be1d1bc7..8fe41d1b4f 100644
--- a/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/Program.cs
@@ -34,20 +34,16 @@ static void Main(string[] args)
 
         private void RealMain()
         {
-            var serverProviderTcp = new BinaryServerFormatterSinkProvider();
-            serverProviderTcp.TypeFilterLevel = System.Runtime.Serialization.Formatters.TypeFilterLevel.Full;
+            var serverProviderTcp = new BinaryServerFormatterSinkProvider { TypeFilterLevel = System.Runtime.Serialization.Formatters.TypeFilterLevel.Full };
             var clientProviderTcp = new BinaryClientFormatterSinkProvider();
-            var propertiesTcp = new System.Collections.Hashtable();
-            propertiesTcp["port"] = 7878;
+            var propertiesTcp = new System.Collections.Hashtable { ["port"] = 7878, ["bindTo"] = "127.0.0.1" };
 
             var tcpChannel = new TcpChannel(propertiesTcp, clientProviderTcp, serverProviderTcp);
             ChannelServices.RegisterChannel(tcpChannel, false);
 
-            var serverProviderHttp = new SoapServerFormatterSinkProvider();
-            serverProviderHttp.TypeFilterLevel = System.Runtime.Serialization.Formatters.TypeFilterLevel.Full;
+            var serverProviderHttp = new SoapServerFormatterSinkProvider { TypeFilterLevel = System.Runtime.Serialization.Formatters.TypeFilterLevel.Full };
             var clientProviderHttp = new SoapClientFormatterSinkProvider();
-            var propertiesHttp = new System.Collections.Hashtable();
-            propertiesHttp["port"] = 7879;
+            var propertiesHttp = new System.Collections.Hashtable { ["port"] = 7879, ["bindTo"] = "127.0.0.1" };
 
             var httpChannel = new HttpChannel(propertiesHttp, clientProviderHttp, serverProviderHttp);
             ChannelServices.RegisterChannel(httpChannel, false);
diff --git a/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj b/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj
index 236d8f5080..01e275607f 100644
--- a/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj
@@ -79,7 +79,7 @@
       <Version>2.0.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/Program.cs
index b8718246a6..ff7ca0d335 100644
--- a/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/Program.cs
+++ b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/Program.cs
@@ -38,7 +38,7 @@ public static void Main(string[] args)
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
+                .UseUrls($@"http://127.0.0.1:{_port}/")
                 .Build();
 
     }
diff --git a/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj
index a1f4c51e6e..c9958a0f4e 100644
--- a/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/AppHost.cs b/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/AppHost.cs
index 6f661bde2e..d66892dfbd 100644
--- a/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/AppHost.cs
+++ b/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/AppHost.cs
@@ -27,7 +27,7 @@ public override void Configure(Container container)
             // This plugin attempts to serialize everything in HttpContext using ServiceStack.Text
             // It tests that we do not reintroduce a StackOverflow issue that can crash apps.
             // We don't formally take responsibility over this but we do our best to do no harm.
-            Plugins.Add(new SeqRequestLogsFeature { SeqUrl = "http://localhost:5341" });
+            Plugins.Add(new SeqRequestLogsFeature { SeqUrl = "http://127.0.0.1:5341" });
         }
     }
 }
diff --git a/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj b/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj
index 943ff5986d..23f8c0db3d 100644
--- a/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj
@@ -58,7 +58,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj b/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj
index 4dead342ff..a6f3dbed90 100644
--- a/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj
+++ b/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj
@@ -53,7 +53,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj
index 86be265dd5..0abc2eec21 100644
--- a/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj
+++ b/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -92,7 +92,7 @@
       <Version>5.2.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -175,4 +175,4 @@
   <Target Name="Deploy" AfterTargets="Build">
     <MSBuild Projects="$(ProjectPath)" Targets="WebPublish" Properties="PublishProfile=LocalDeploy" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Consumer.cs b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Consumer.cs
new file mode 100644
index 0000000000..4023cf48f1
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Consumer.cs
@@ -0,0 +1,54 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Threading.Tasks;
+using Confluent.Kafka;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace KafkaTestApp
+{
+    public class Consumer
+    {
+        private readonly string _topic;
+        private readonly IConfiguration _configuration;
+        private readonly ILogger _logger;
+
+        public Consumer(IConfiguration configuration, string topic, ILogger logger)
+        {
+            _topic = topic;
+            _configuration = configuration;
+            _logger = logger;
+        }
+
+        public Task StartConsuming()
+        {
+            using (var consumer = new ConsumerBuilder<string, string>(_configuration.AsEnumerable()).Build())
+            {
+                consumer.Subscribe(_topic);
+                try
+                {
+                    while (true)
+                    {
+                        _ = consumer.Consume(120 * 1000);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    _logger.LogInformation("Consume operation canceled.");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Consumer error");
+                }
+                finally
+                {
+                    consumer.Close();
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Controllers/KafkaController.cs b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Controllers/KafkaController.cs
new file mode 100644
index 0000000000..5e6dc76de1
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Controllers/KafkaController.cs
@@ -0,0 +1,37 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+
+namespace KafkaTestApp.Controllers
+{
+    [ApiController]
+    [Route("kafka")]
+    public class KafkaController : ControllerBase
+    {
+        private readonly ILogger<KafkaController> _logger;
+
+        public KafkaController(ILogger<KafkaController> logger)
+        {
+            _logger = logger;
+        }
+
+        [HttpGet]
+        [Route("produce")]
+        public async Task<string> Produce()
+        {
+            await Program.Producer.Produce();
+            return "Complete";
+        }
+
+        [HttpGet]
+        [Route("produceasync")]
+        public async Task<string> ProduceAsync()
+        {
+            await Program.Producer.ProduceAsync();
+            return "Complete";
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Dockerfile b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Dockerfile
new file mode 100644
index 0000000000..a3ecc61e58
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Dockerfile
@@ -0,0 +1,57 @@
+ARG DISTRO_TAG
+FROM --platform=amd64 mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base
+WORKDIR /app
+EXPOSE 80
+RUN apt-get update \
+    && apt-get install -y wget \
+    && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+    && dpkg -i packages-microsoft-prod.deb \
+    && rm packages-microsoft-prod.deb \
+    && apt-get update \
+    && apt-get install -y aspnetcore-runtime-6.0
+
+
+# build image is always amd64 (to match the runner architecture), even though the target architecture may be arm64
+FROM --platform=amd64 mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build
+RUN apt-get update \
+    && apt-get install -y wget \
+    && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+    && dpkg -i packages-microsoft-prod.deb \
+    && rm packages-microsoft-prod.deb \
+    && apt-get update \
+    && apt-get install -y dotnet-sdk-6.0
+WORKDIR /src
+COPY ["KafkaTestApp/KafkaTestApp.csproj", "KafkaTestApp/"]
+ARG APP_DOTNET_VERSION
+RUN dotnet restore "KafkaTestApp/KafkaTestApp.csproj" -p:TargetFramework=net${APP_DOTNET_VERSION}
+
+COPY . .
+WORKDIR "/src/KafkaTestApp"
+RUN dotnet build "KafkaTestApp.csproj" -c Release -o /app/build --os linux --framework net${APP_DOTNET_VERSION}
+
+
+FROM build AS publish
+ARG APP_DOTNET_VERSION
+RUN dotnet publish "KafkaTestApp.csproj" -c Release -o /app/publish /p:UseAppHost=false --os linux --framework net${APP_DOTNET_VERSION}
+
+
+FROM base AS final
+
+# Enable the agent
+ARG NEW_RELIC_HOST
+ARG NEW_RELIC_LICENSE_KEY
+ARG NEW_RELIC_APP_NAME
+
+ENV CORECLR_ENABLE_PROFILING=1 \
+CORECLR_PROFILER={36032161-FFC0-4B61-B559-F6C5D41BAE5A} \
+CORECLR_NEWRELIC_HOME=/usr/local/newrelic-dotnet-agent \
+CORECLR_PROFILER_PATH=/usr/local/newrelic-dotnet-agent/libNewRelicProfiler.so \
+NEW_RELIC_HOST=${NEW_RELIC_HOST} \
+NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY} \
+NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME} \
+NEWRELIC_LOG_DIRECTORY=/app/logs
+
+WORKDIR /app
+COPY --from=publish /app/publish .
+
+ENTRYPOINT ["dotnet", "KafkaTestApp.dll"]
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj
new file mode 100644
index 0000000000..546ccc3a5d
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>.</DockerfileContext>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
+    
+    <PackageReference Include="Confluent.Kafka" Version="1.4.0" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <PackageReference Include="Confluent.Kafka" Version="2.2.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+  </ItemGroup>
+
+
+  
+</Project>
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Producer.cs b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Producer.cs
new file mode 100644
index 0000000000..d2db1a2669
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Producer.cs
@@ -0,0 +1,71 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Confluent.Kafka;
+using Confluent.Kafka.Admin;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace KafkaTestApp
+{
+    public class Producer
+    {
+        private readonly string _topic;
+        private readonly IProducer<string, string> _producer;
+        private readonly ILogger _logger;
+
+        public Producer(IConfiguration configuration, string topic, ILogger logger)
+        {
+            _topic = topic;
+            _producer = new ProducerBuilder<string, string>(configuration.AsEnumerable()).Build();
+            _logger = logger;
+        }
+
+        public void CreateTopic(IConfiguration configuration)
+        {
+            using (var adminClient = new AdminClientBuilder(configuration.AsEnumerable()).Build())
+            {
+                try
+                {
+                    adminClient.CreateTopicsAsync(new TopicSpecification[] {
+                        new TopicSpecification { Name = _topic, ReplicationFactor = 1, NumPartitions = 1 }
+                    }).Wait(10 * 1000);
+                }
+                catch (CreateTopicsException e)
+                {
+                    _logger.LogInformation($"An error occured creating topic {e.Results[0].Topic}: {e.Results[0].Error.Reason}");
+                }
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public async Task Produce()
+        {
+            var user = "syncTestUser";
+            var item = "syncTestItem";
+
+            _producer.Produce(_topic, new Message<string, string> { Key = user, Value = item },
+                (deliveryReport) =>
+                {
+                    if (deliveryReport.Error.Code != ErrorCode.NoError)
+                    {
+                        _logger.LogInformation($"Failed to deliver message: {deliveryReport.Error.Reason}");
+                    }
+                });
+
+            await Task.CompletedTask;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public async Task ProduceAsync()
+        {
+            var user = "asyncTestUser";
+            var item = "asyncTestItem";
+
+            _ = _producer.ProduceAsync(_topic, new Message<string, string> { Key = user, Value = item }).Result;
+            await Task.CompletedTask;
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Program.cs b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Program.cs
new file mode 100644
index 0000000000..506fda2870
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/Program.cs
@@ -0,0 +1,98 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace KafkaTestApp
+{
+    public class Program
+    {
+        private const int TopicNameLength = 15;
+        private static string _topic;
+        public static Producer Producer;
+        public static Consumer Consumer;
+
+        public static async Task Main(string[] args)
+        {
+            var builder = WebApplication.CreateBuilder(args);
+
+            // Add services to the container.
+            builder.Services.AddControllers();
+
+            // listen to any ip on port 80 for http
+            IPEndPoint ipEndPointHttp = new IPEndPoint(IPAddress.Any, 80);
+            builder.WebHost.UseUrls($"http://{ipEndPointHttp}");
+
+            var app = builder.Build();
+
+            SetupKafka(app.Logger);
+            var cTask = Task.Run(() => Consumer.StartConsuming());
+
+            // Configure the HTTP request pipeline.
+            app.UseAuthorization();
+            app.MapControllers();
+
+            await app.StartAsync();
+
+            CreatePidFile();
+
+            await app.WaitForShutdownAsync();
+        }
+
+        public static void SetupKafka(ILogger logger)
+        {
+            Thread.Sleep(15 * 1000); // Waiting for Kafka to get ready
+
+            var broker = Environment.GetEnvironmentVariable("NEW_RELIC_KAFKA_CONTAINER_NAME");
+            var kafkaConfig = new ConfigurationBuilder().AddInMemoryCollection().Build();
+            kafkaConfig["bootstrap.servers"] = $"{broker}:9092";
+            kafkaConfig["group.id"] = "kafka-dotnet-getting-started";
+            kafkaConfig["auto.offset.reset"] = "earliest";
+            kafkaConfig["dotnet.cancellation.delay.max.ms"] = "10000";
+
+            _topic = GenerateTopic();
+            Producer = new Producer(kafkaConfig, _topic, logger);
+            Producer.CreateTopic(kafkaConfig);
+            Consumer = new Consumer(kafkaConfig, _topic, logger);
+        }
+
+        public static void CreatePidFile()
+        {
+            var pidFileNameAndPath = Path.Combine(Environment.GetEnvironmentVariable("NEWRELIC_LOG_DIRECTORY"), "containerizedapp.pid");
+            var pid = Environment.ProcessId;
+            using var file = File.CreateText(pidFileNameAndPath);
+            file.WriteLine(pid);
+        }
+
+        private static string GenerateTopic()
+        {
+            var providedTopic = Environment.GetEnvironmentVariable("NEW_RELIC_KAFKA_TOPIC");
+            if (!string.IsNullOrEmpty(providedTopic))
+            {
+                return providedTopic;
+            }
+
+            var builder = new StringBuilder();
+            var rnd = new Random();
+
+            for (int i = 0; i < TopicNameLength; i++)
+            {
+                var shifter = Convert.ToInt32(Math.Floor(25 * rnd.NextDouble()));
+                builder.Append(Convert.ToChar(shifter + 65));
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/samples/docker/alpine/appsettings.Development.json b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/appsettings.Development.json
similarity index 100%
rename from samples/docker/alpine/appsettings.Development.json
rename to tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/appsettings.Development.json
diff --git a/samples/docker/centos/appsettings.json b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/appsettings.json
similarity index 100%
rename from samples/docker/centos/appsettings.json
rename to tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/appsettings.json
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml b/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml
index 5a7db2a18e..384212fa19 100644
--- a/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml
+++ b/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml
@@ -11,7 +11,8 @@ version: "3"
 # PLATFORM        The platform that the service runs on -- linux/amd64 or linux/arm64/v8
 # DOTNET_VERSION  The dotnet version number to use (7.0, 8.0, etc)
 # NETWORK_NAME    The network name to use for containers in this app. Should be unique among all running instances.
-#
+# TEST_DOCKERFILE The path and dockerfile to use for the service.
+# 
 # and the usual suspects:
 # NEW_RELIC_LICENSE_KEY
 # NEW_RELIC_HOST
@@ -28,7 +29,7 @@ services:
         platform: ${PLATFORM}
         build:
             context: .
-            dockerfile: SmokeTestApp/Dockerfile
+            dockerfile: ${TEST_DOCKERFILE}
             args:
                 DISTRO_TAG: ${DISTRO_TAG}
                 TARGET_ARCH: ${TARGET_ARCH}
@@ -36,6 +37,7 @@ services:
                 NEW_RELIC_APP_NAME: ${NEW_RELIC_APP_NAME}
                 NEW_RELIC_HOST: ${NEW_RELIC_HOST}
                 DOTNET_VERSION: ${DOTNET_VERSION}
+                APP_DOTNET_VERSION: ${APP_DOTNET_VERSION}
         ports:
           - "${PORT}:80"
         volumes:
@@ -76,8 +78,49 @@ services:
             service: smoketestapp
         build:
             dockerfile: SmokeTestApp/Dockerfile.centos
+
+    UbuntuX64Kafka1TestApp:
+        extends:
+            service: smoketestapp
+        depends_on:
+            - kafka-broker
+        environment:
+            - NEW_RELIC_KAFKA_TOPIC=${NEW_RELIC_KAFKA_TOPIC}
+            - NEW_RELIC_KAFKA_CONTAINER_NAME=${NEW_RELIC_KAFKA_CONTAINER_NAME}
+
+    UbuntuX64Kafka2TestApp:
+        extends:
+            service: smoketestapp
+        depends_on:
+            - kafka-broker
+        environment:
+            - NEW_RELIC_KAFKA_TOPIC=${NEW_RELIC_KAFKA_TOPIC}
+            - NEW_RELIC_KAFKA_CONTAINER_NAME=${NEW_RELIC_KAFKA_CONTAINER_NAME}
+
+    kafka-broker:
+        image: confluentinc/cp-kafka:7.5.0
+        container_name: ${NEW_RELIC_KAFKA_CONTAINER_NAME}
+        environment:
+          KAFKA_BROKER_ID: 1
+          KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+          KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${NEW_RELIC_KAFKA_CONTAINER_NAME}:29092,PLAINTEXT_HOST://${NEW_RELIC_KAFKA_CONTAINER_NAME}:9092
+          KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+          KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+          KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+          KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+          KAFKA_PROCESS_ROLES: broker,controller
+          KAFKA_NODE_ID: 1
+          KAFKA_CONTROLLER_QUORUM_VOTERS: 1@${NEW_RELIC_KAFKA_CONTAINER_NAME}:29093
+          KAFKA_LISTENERS: PLAINTEXT://${NEW_RELIC_KAFKA_CONTAINER_NAME}:29092,CONTROLLER://${NEW_RELIC_KAFKA_CONTAINER_NAME}:29093,PLAINTEXT_HOST://:9092
+          KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+          KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+          KAFKA_LOG_DIRS: /tmp/kraft-combined-logs
+          CLUSTER_ID: MkU3OEVBNTcwNTJENDM2Qk
+        
             
 networks:
     default:
         name: ${NETWORK_NAME}
         driver: bridge
+        driver_opts:
+          com.docker.network.bridge.enable_icc: "true"
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests.sln b/tests/Agent/IntegrationTests/ContainerIntegrationTests.sln
index 6c4d3d8176..bd86b65855 100644
--- a/tests/Agent/IntegrationTests/ContainerIntegrationTests.sln
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests.sln
@@ -20,6 +20,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_docker", "_docker", "{FB10
 		ContainerApplications\docker-compose.yml = ContainerApplications\docker-compose.yml
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KafkaTestApp", "ContainerApplications\KafkaTestApp\KafkaTestApp.csproj", "{1F7402D8-E345-480C-BBA6-6313A1DEEB23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewRelic.Testing.Assertions", "..\NewRelic.Testing.Assertions\NewRelic.Testing.Assertions.csproj", "{C0ADF41E-F8B8-4ECA-828F-F578E09B17A9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,6 +50,14 @@ Global
 		{F7EFC853-3F97-4D91-9A6F-37ADAAC739C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F7EFC853-3F97-4D91-9A6F-37ADAAC739C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7EFC853-3F97-4D91-9A6F-37ADAAC739C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F7402D8-E345-480C-BBA6-6313A1DEEB23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F7402D8-E345-480C-BBA6-6313A1DEEB23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F7402D8-E345-480C-BBA6-6313A1DEEB23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F7402D8-E345-480C-BBA6-6313A1DEEB23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0ADF41E-F8B8-4ECA-828F-F578E09B17A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0ADF41E-F8B8-4ECA-828F-F578E09B17A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0ADF41E-F8B8-4ECA-828F-F578E09B17A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0ADF41E-F8B8-4ECA-828F-F578E09B17A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -53,6 +65,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{FBA07795-8066-4641-88E5-05DD272D333A} = {84D70574-4AC7-4EA7-AE52-832C3531E082}
 		{FB10922F-3CC6-4497-AF53-DF6808380258} = {84D70574-4AC7-4EA7-AE52-832C3531E082}
+		{1F7402D8-E345-480C-BBA6-6313A1DEEB23} = {84D70574-4AC7-4EA7-AE52-832C3531E082}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB230433-D05D-4A1F-951B-CC14F47BBF42}
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs
index c107cab81f..6eaf9a8363 100644
--- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
@@ -15,7 +15,7 @@ namespace NewRelic.Agent.ContainerIntegrationTests.ContainerFixtures;
 
 public class ContainerApplication : RemoteApplication
 {
-
+    private readonly string _dockerfile;
     private readonly string _dotnetVersion;
     private readonly string _distroTag;
     private readonly string _targetArch;
@@ -23,6 +23,9 @@ public class ContainerApplication : RemoteApplication
     private readonly string _containerPlatform;
     private readonly string _dockerComposeServiceName;
 
+    // Used for handling dependent containers started automatically for services
+    public readonly List<string> DockerDependencies;
+
     protected override string ApplicationDirectoryName { get; }
 
     protected override string SourceApplicationDirectoryPath
@@ -33,12 +36,14 @@ protected override string SourceApplicationDirectoryPath
         }
     }
 
-    public ContainerApplication(string applicationDirectoryName, string distroTag, Architecture containerArchitecture, string dotnetVersion) : base(applicationType: ApplicationType.Container, isCoreApp: true)
+    public ContainerApplication(string applicationDirectoryName, string distroTag, Architecture containerArchitecture, string dotnetVersion, string dockerfile) : base(applicationType: ApplicationType.Container, isCoreApp: true)
     {
         ApplicationDirectoryName = applicationDirectoryName;
         _dockerComposeServiceName = applicationDirectoryName;
         _distroTag = distroTag;
         _dotnetVersion = dotnetVersion;
+        _dockerfile = dockerfile;
+        DockerDependencies = new List<string>();
 
         switch (containerArchitecture)
         {
@@ -55,9 +60,9 @@ public ContainerApplication(string applicationDirectoryName, string distroTag, A
         }
     }
 
-    public override string AppName => $"ContainerApplication: {_dotnetVersion}-{_distroTag}_{_targetArch}";
+    public override string AppName => $"{_dockerComposeServiceName}_{_dotnetVersion}-{_distroTag}_{_targetArch}";
 
-    private string ContainerName => $"smoketestapp_{_dotnetVersion}-{_distroTag}_{_targetArch}".ToLower(); // must be lowercase
+    private string ContainerName => $"{_dockerComposeServiceName}_{_dotnetVersion}-{_distroTag}_{_targetArch}".ToLower(); // must be lowercase
 
     public override void CopyToRemote()
     {
@@ -70,7 +75,7 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
     {
         CleanupContainer();
 
-        var arguments = $"compose up --force-recreate {_dockerComposeServiceName}";
+        var arguments = $"compose up --abort-on-container-exit --force-recreate {_dockerComposeServiceName}";
 
         var newRelicHomeDirectoryPath = DestinationNewRelicHomeDirectoryPath;
         var profilerLogDirectoryPath = DefaultLogFileDirectoryPath;
@@ -110,8 +115,10 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
         // Docker compose settings
         var testConfiguration = IntegrationTestConfiguration.GetIntegrationTestConfiguration("Default");
 
+        startInfo.EnvironmentVariables.Add("TEST_DOCKERFILE", _dockerfile);
         startInfo.EnvironmentVariables.Add("NEW_RELIC_APP_NAME", AppName);
         startInfo.EnvironmentVariables.Add("DOTNET_VERSION", _dotnetVersion);
+        startInfo.EnvironmentVariables.Add("APP_DOTNET_VERSION", _dotnetVersion);
         startInfo.EnvironmentVariables.Add("DISTRO_TAG", _distroTag);
         startInfo.EnvironmentVariables.Add("TARGET_ARCH", _targetArch);
         startInfo.EnvironmentVariables.Add("PLATFORM", _containerPlatform);
@@ -121,7 +128,9 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
         startInfo.EnvironmentVariables.Add("AGENT_PATH", newRelicHomeDirectoryPath);
         startInfo.EnvironmentVariables.Add("LOG_PATH", profilerLogDirectoryPath);
         startInfo.EnvironmentVariables.Add("CONTAINER_NAME", ContainerName);
-        startInfo.EnvironmentVariables.Add("NETWORK_NAME", Guid.NewGuid().ToString()); // generate a random network name to keep parallel test execution from failing
+        // generate a random network name to keep parallel test execution from failing
+        // network name length needs to be less than 15 characters to be compatible with linux containers
+        startInfo.EnvironmentVariables.Add("NETWORK_NAME", $"net-{System.Security.Cryptography.RandomNumberGenerator.GetInt32(1000000, 10000000)}");
 
         if (AdditionalEnvironmentVariables != null)
         {
@@ -180,9 +189,25 @@ public override void Shutdown()
     private void CleanupContainer()
     {
         Console.WriteLine($"[{AppName} {DateTime.Now}] Cleaning up container and images related to {ContainerName} container.");
+        TestLogger?.WriteLine($"[{AppName}] Cleaning up container and images related to {ContainerName} container.");
         // ensure there's no stray containers or images laying around
         Process.Start("docker", $"container rm --force {ContainerName}");
         Process.Start("docker", $"image rm --force {ContainerName}");
+
+        if (DockerDependencies.Count > 0)
+        {
+            foreach (var dep in DockerDependencies)
+            {
+                Console.WriteLine($"[{AppName} {DateTime.Now}] Removing dependent container: {dep}.");
+                TestLogger?.WriteLine($"[{AppName}] Removing dependent container: {dep}.");
+                Process.Start("docker", $"container rm --force {dep}");
+            }
+        }
+
+#if DEBUG
+        // Cleanup the networks with no attached containers. Mainly for testings on dev laptops - they can build up and block runs.
+        Process.Start("docker", "network prune -f");
+#endif
     }
 
     protected virtual void WaitForAppServerToStartListening(Process process, bool captureStandardOutput)
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerFixture.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerFixture.cs
index 4e11736870..9a6401a3df 100644
--- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerFixture.cs
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerFixture.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/LinuxKafkaTestFixtures.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/LinuxKafkaTestFixtures.cs
new file mode 100644
index 0000000000..54c02e5c56
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/LinuxKafkaTestFixtures.cs
@@ -0,0 +1,54 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Threading.Tasks;
+
+namespace NewRelic.Agent.ContainerIntegrationTests.ContainerFixtures;
+
+public abstract class LinuxKafkaTestFixtureBase : ContainerFixture
+{
+    protected LinuxKafkaTestFixtureBase(
+        string applicationDirectoryName,
+        string distroTag,
+        ContainerApplication.Architecture containerArchitecture,
+        string dockerfile,
+        string dotnetVersion) :
+        base(new ContainerApplication(applicationDirectoryName, distroTag, containerArchitecture, dotnetVersion, dockerfile))
+    {
+    }
+
+    public virtual void ExerciseApplication()
+    {
+        var address = $"http://localhost:{Port}/kafka/";
+        GetAndAssertStatusCode(address + "produce", System.Net.HttpStatusCode.OK);
+        GetAndAssertStatusCode(address + "produceasync", System.Net.HttpStatusCode.OK);
+    }
+
+    public void Delay(int seconds)
+    {
+        Task.Delay(TimeSpan.FromSeconds(seconds)).GetAwaiter().GetResult();
+    }
+}
+
+public class UbuntuX64Kafka1TestFixture : LinuxKafkaTestFixtureBase
+{
+    private static readonly string Dockerfile = "KafkaTestApp/Dockerfile";
+    private static readonly string ApplicationDirectoryName = "UbuntuX64Kafka1TestApp";
+    private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64;
+    private static readonly string DistroTag = "bullseye-slim";
+    private static readonly string DotnetVersion = "6.0";
+
+    public UbuntuX64Kafka1TestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile, DotnetVersion) { }
+}
+
+public class UbuntuX64Kafka2TestFixture : LinuxKafkaTestFixtureBase
+{
+    private static readonly string Dockerfile = "KafkaTestApp/Dockerfile";
+    private static readonly string ApplicationDirectoryName = "UbuntuX64Kafka2TestApp";
+    private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64;
+    private static readonly string DistroTag = "bullseye-slim";
+    private static readonly string DotnetVersion = "7.0";
+
+    public UbuntuX64Kafka2TestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile, DotnetVersion) { }
+}
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/LinuxSmokeTestFixtures.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/LinuxSmokeTestFixtures.cs
index d8e2aef9c3..6d8e471e20 100644
--- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/LinuxSmokeTestFixtures.cs
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/LinuxSmokeTestFixtures.cs
@@ -11,8 +11,8 @@ public abstract class LinuxSmokeTestFixtureBase : ContainerFixture
 {
     private static readonly string DotnetVersion = "7.0";
 
-    protected LinuxSmokeTestFixtureBase(string applicationDirectoryName, string distroTag, ContainerApplication.Architecture containerArchitecture) :
-        base(new ContainerApplication(applicationDirectoryName, distroTag, containerArchitecture, DotnetVersion))
+    protected LinuxSmokeTestFixtureBase(string applicationDirectoryName, string distroTag, ContainerApplication.Architecture containerArchitecture, string dockerfile) :
+        base(new ContainerApplication(applicationDirectoryName, distroTag, containerArchitecture, DotnetVersion, dockerfile))
     {
     }
 
@@ -30,78 +30,87 @@ public void Delay(int seconds)
 
 public class DebianX64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "DebianX64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64;
     private static readonly string DistroTag = "jammy";
 
-    public DebianX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public DebianX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 
 public class UbuntuX64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "UbuntuX64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64;
     private static readonly string DistroTag = "bullseye-slim";
 
-    public UbuntuX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public UbuntuX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 public class AlpineX64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "AlpineX64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64;
     private static readonly string DistroTag = "alpine";
 
-    public AlpineX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public AlpineX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 
 public class DebianArm64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "DebianArm64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.Arm64;
     private static readonly string DistroTag = "jammy";
 
-    public DebianArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public DebianArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 
 public class UbuntuArm64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "UbuntuArm64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.Arm64;
     private static readonly string DistroTag = "bullseye-slim";
 
-    public UbuntuArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public UbuntuArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 
 public class CentosX64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "CentosX64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64;
     private static readonly string DistroTag = "centos";
 
-    public CentosX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public CentosX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 public class CentosArm64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "CentosArm64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.Arm64;
     private static readonly string DistroTag = "centos";
 
-    public CentosArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public CentosArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 
 public class AmazonX64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "AmazonX64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.X64;
     private static readonly string DistroTag = "amazonlinux";
 
-    public AmazonX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public AmazonX64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
 public class AmazonArm64SmokeTestFixture : LinuxSmokeTestFixtureBase
 {
+    private static readonly string Dockerfile = "SmokeTestApp/Dockerfile";
     private static readonly string ApplicationDirectoryName = "AmazonArm64SmokeTestApp";
     private static readonly ContainerApplication.Architecture Architecture = ContainerApplication.Architecture.Arm64;
     private static readonly string DistroTag = "amazonlinux";
 
-    public AmazonArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture) { }
+    public AmazonArm64SmokeTestFixture() : base(ApplicationDirectoryName, DistroTag, Architecture, Dockerfile) { }
 }
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj
index 7302ff7371..a695daee69 100644
--- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj
@@ -10,19 +10,20 @@
   <Import Project="Test.targets" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.6.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.6.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\NewRelic.Testing.Assertions\NewRelic.Testing.Assertions.csproj" />
     <ProjectReference Include="..\IntegrationTestHelpers\IntegrationTestHelpers.csproj" />
   </ItemGroup>
 
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxKafkaTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxKafkaTests.cs
new file mode 100644
index 0000000000..dfb6d968d4
--- /dev/null
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxKafkaTests.cs
@@ -0,0 +1,130 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using NewRelic.Agent.ContainerIntegrationTests.ContainerFixtures;
+using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Testing.Assertions;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace ContainerIntegrationTests;
+
+public abstract class LinuxKafkaTest<T> : NewRelicIntegrationTest<T> where T : LinuxKafkaTestFixtureBase
+{
+    private const int TopicNameLength = 15;
+
+    internal string _topicName;
+    private readonly T _fixture;
+
+    protected LinuxKafkaTest(T fixture, ITestOutputHelper output) : base(fixture)
+    {
+        _fixture = fixture;
+        _fixture.TestLogger = output;
+
+        _topicName = GenerateTopic();
+        var brokerName = "broker" + _topicName;
+        ((ContainerApplication)_fixture.RemoteApplication).DockerDependencies.Add(brokerName);
+
+        _fixture.Actions(setupConfiguration: () =>
+            {
+                var configModifier = new NewRelicConfigModifier(_fixture.DestinationNewRelicConfigFilePath);
+                configModifier.SetLogLevel("debug");
+                configModifier.ConfigureFasterMetricsHarvestCycle(10);
+                configModifier.LogToConsole();
+
+                _fixture.RemoteApplication.SetAdditionalEnvironmentVariable("NEW_RELIC_KAFKA_TOPIC", _topicName);
+                _fixture.RemoteApplication.SetAdditionalEnvironmentVariable("NEW_RELIC_KAFKA_CONTAINER_NAME", brokerName);
+            },
+            exerciseApplication: () =>
+            {
+                _fixture.Delay(15); // wait long enough to ensure kafka and app are ready
+                _fixture.ExerciseApplication();
+
+                _fixture.Delay(11); // wait long enough to ensure a metric harvest occurs after we exercise the app
+                _fixture.AgentLog.WaitForLogLine(AgentLogBase.HarvestFinishedLogLineRegex, TimeSpan.FromSeconds(11));
+
+                // shut down the container and wait for the agent log to see it
+                _fixture.ShutdownRemoteApplication();
+                _fixture.AgentLog.WaitForLogLine(AgentLogBase.ShutdownLogLineRegex, TimeSpan.FromSeconds(10));
+            });
+
+        _fixture.Initialize();
+    }
+
+    [Fact]
+    public void Test()
+    {
+        var messageBrokerProduce = "MessageBroker/Kafka/Topic/Produce/Named/" + _topicName;
+        var messageBrokerProduceSerializationKey = messageBrokerProduce + "/Serialization/Key";
+        var messageBrokerProduceSerializationValue = messageBrokerProduce + "/Serialization/Value";
+
+        var messageBrokerConsume = "MessageBroker/Kafka/Topic/Consume/Named/" + _topicName;
+
+        var consumeTransactionName = @"OtherTransaction/Message/Kafka/Topic/Consume/Named/" + _topicName;
+        var produceWebTransactionName = @"WebTransaction/MVC/Kafka/Produce";
+
+        var metrics = _fixture.AgentLog.GetMetrics();
+        var spans = _fixture.AgentLog.GetSpanEvents();
+        var produceSpan = spans.FirstOrDefault(s => s.IntrinsicAttributes["name"].Equals(messageBrokerProduce));
+        var consumeTxnSpan = spans.FirstOrDefault(s => s.IntrinsicAttributes["name"].Equals(consumeTransactionName));
+
+        var expectedMetrics = new List<Assertions.ExpectedMetric>
+        {
+            new Assertions.ExpectedMetric { metricName = produceWebTransactionName, callCount = 2 }, // includes sync and async actions
+            new Assertions.ExpectedMetric { metricName = messageBrokerProduce, callCount = 2 },
+            new Assertions.ExpectedMetric { metricName = messageBrokerProduce, metricScope = produceWebTransactionName, callCount = 2 },
+            new Assertions.ExpectedMetric { metricName = messageBrokerProduceSerializationKey, callCount = 2 },
+            new Assertions.ExpectedMetric { metricName = messageBrokerProduceSerializationKey, metricScope = produceWebTransactionName, callCount = 2 },
+            new Assertions.ExpectedMetric { metricName = messageBrokerProduceSerializationValue, callCount = 2 },
+            new Assertions.ExpectedMetric { metricName = messageBrokerProduceSerializationValue, metricScope = produceWebTransactionName, callCount = 2 },
+
+            new Assertions.ExpectedMetric { metricName = consumeTransactionName, callCount = 2 },
+            new Assertions.ExpectedMetric { metricName = messageBrokerConsume, callCount = 2 },
+            new Assertions.ExpectedMetric { metricName = messageBrokerConsume, metricScope = consumeTransactionName, callCount = 2 },
+        };
+
+        NrAssert.Multiple(
+            () => Assertions.MetricsExist(expectedMetrics, metrics),
+            () => Assert.True(produceSpan.IntrinsicAttributes.ContainsKey("traceId")),
+            () => Assert.True(produceSpan.IntrinsicAttributes.ContainsKey("parentId")),
+            () => Assert.NotNull(consumeTxnSpan),
+            () => Assert.True(consumeTxnSpan.UserAttributes.ContainsKey("kafka.consume.byteCount")),
+            () => Assert.InRange((long)consumeTxnSpan.UserAttributes["kafka.consume.byteCount"], 20, 30), // usually is 24 - 26
+            () => Assert.True(consumeTxnSpan.IntrinsicAttributes.ContainsKey("traceId")),
+            () => Assert.False(consumeTxnSpan.IntrinsicAttributes.ContainsKey("parentId"))
+        );
+    }
+
+    internal static string GenerateTopic()
+    {
+        var builder = new StringBuilder();
+        for (int i = 0; i < TopicNameLength; i++)
+        {
+            var shifter= RandomNumberGenerator.GetInt32(0, 26);
+            builder.Append(Convert.ToChar(shifter + 65));
+        }
+
+        return builder.ToString();
+    }
+}
+
+[Collection("Sequential")]
+public class UbuntuX64Kafka1Test : LinuxKafkaTest<UbuntuX64Kafka1TestFixture>
+{
+    public UbuntuX64Kafka1Test(UbuntuX64Kafka1TestFixture fixture, ITestOutputHelper output) : base(fixture, output)
+    {
+    }
+}
+
+[Collection("Sequential")]
+public class UbuntuX64Kafka2Test : LinuxKafkaTest<UbuntuX64Kafka2TestFixture>
+{
+    public UbuntuX64Kafka2Test(UbuntuX64Kafka2TestFixture fixture, ITestOutputHelper output) : base(fixture, output)
+    {
+    }
+}
diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxSmokeTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxSmokeTests.cs
index 606be501f7..8618ca533f 100644
--- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxSmokeTests.cs
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxSmokeTests.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
diff --git a/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj b/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj
index 10cd25ded5..57bad0d359 100644
--- a/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj
+++ b/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj
@@ -110,7 +110,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj b/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj
index 746905d701..64bfe9c511 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj
@@ -46,12 +46,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="xunit">
-      <Version>2.4.0</Version>
+      <Version>2.6.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogBase.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogBase.cs
index 63865711fb..f03df34a49 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogBase.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogBase.cs
@@ -6,15 +6,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
-using System.Dynamic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using NewRelic.Agent.IntegrationTestHelpers.Models;
-using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
+using Xunit.Abstractions;
 
 namespace NewRelic.Agent.IntegrationTestHelpers
 {
@@ -73,12 +71,12 @@ public abstract class AgentLogBase
         // Transactions (either with an ID or "noop")
         public const string TransactionLinePrefix = FinestLogLinePrefixRegex + @"Trx ([a-fA-F0-9]*|Noop): ";
 
-        public AgentLogBase(RemoteApplication remoteApplication)
+        public AgentLogBase(ITestOutputHelper testLogger)
         {
-            _remoteApplication = remoteApplication;
+            _testLogger = testLogger;
         }
 
-        private RemoteApplication _remoteApplication;
+        private ITestOutputHelper _testLogger;
 
         public abstract IEnumerable<string> GetFileLines();
 
@@ -158,7 +156,7 @@ public IEnumerable<Match> WaitForLogLines(string regularExpression, TimeSpan? ti
 
             var timeout = timeoutOrZero ?? TimeSpan.Zero;
 
-            _remoteApplication.TestLogger?.WriteLine($"{Timestamp} WaitForLogLines  Waiting for expression: {regularExpression}. Duration: {timeout.TotalSeconds} seconds. Minimum count: {minimumCount}");
+            _testLogger?.WriteLine($"{Timestamp} WaitForLogLines  Waiting for expression: {regularExpression}. Duration: {timeout.TotalSeconds} seconds. Minimum count: {minimumCount}");
 
             var timeTaken = Stopwatch.StartNew();
             do
@@ -166,7 +164,7 @@ public IEnumerable<Match> WaitForLogLines(string regularExpression, TimeSpan? ti
                 var matches = TryGetLogLines(regularExpression).ToList();
                 if (matches.Count >= minimumCount)
                 {
-                    _remoteApplication.TestLogger?.WriteLine($"{Timestamp} WaitForLogLines  Matched expression: {regularExpression}.");
+                    _testLogger?.WriteLine($"{Timestamp} WaitForLogLines  Matched expression: {regularExpression}.");
                     return matches;
                 }
 
@@ -174,7 +172,7 @@ public IEnumerable<Match> WaitForLogLines(string regularExpression, TimeSpan? ti
             } while (timeTaken.Elapsed < timeout);
 
             var message = $"{Timestamp} Log line did not appear a minimum of {minimumCount} times within {timeout.TotalSeconds} seconds.  Expected line expression: {regularExpression}";
-            _remoteApplication.TestLogger?.WriteLine(message);
+            _testLogger?.WriteLine(message);
             throw new Exception(message);
         }
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogFile.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogFile.cs
index 087d155a49..1a6f5faa90 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogFile.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AgentLogFile.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading;
 using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
+using Xunit.Abstractions;
 
 namespace NewRelic.Agent.IntegrationTestHelpers
 {
@@ -20,8 +21,8 @@ public class AgentLogFile : AgentLogBase
 
         public bool Found => File.Exists(_filePath);
 
-        public AgentLogFile(string logDirectoryPath, RemoteApplication remoteApplication, string fileName = "", TimeSpan? timeoutOrZero = null, bool throwIfNotFound = true)
-            : base(remoteApplication)
+        public AgentLogFile(string logDirectoryPath, ITestOutputHelper testLogger, string fileName = "", TimeSpan? timeoutOrZero = null, bool throwIfNotFound = true)
+            : base(testLogger)
         {
             Contract.Assert(logDirectoryPath != null);
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs
index 39f84ae0f5..8867a9ac52 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs
@@ -16,7 +16,7 @@ static AssemblySetUp()
             Contract.ContractFailed += new EventHandler<ContractFailedEventArgs>((sender, eventArgs) =>
             {
                 eventArgs.SetHandled();
-                Assert.True(false, string.Format("{0}: {1} {2}", eventArgs.FailureKind, eventArgs.Message, eventArgs.Condition));
+                Assert.Fail(string.Format("{0}: {1} {2}", eventArgs.FailureKind, eventArgs.Message, eventArgs.Condition));
             });
         }
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/Assertions.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/Assertions.cs
index fb8adc6963..0b3496cc2b 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/Assertions.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/Assertions.cs
@@ -573,7 +573,9 @@ public static Metric TryFindMetric(ExpectedMetric expectedMetric, IEnumerable<Me
                     continue;
                 if (!expectedMetric.IsRegexName && expectedMetric.metricName != actualMetric.MetricSpec.Name)
                     continue;
-                if (expectedMetric.metricScope != actualMetric.MetricSpec.Scope)
+                if (expectedMetric.IsRegexScope && !Regex.IsMatch(actualMetric.MetricSpec.Scope ?? string.Empty, expectedMetric.metricScope))
+                    continue;
+                if (!expectedMetric.IsRegexScope && expectedMetric.metricScope != actualMetric.MetricSpec.Scope)
                     continue;
 
                 return actualMetric;
@@ -587,7 +589,8 @@ public static List<Metric> TryFindMetrics(ExpectedMetric expectedMetric, IEnumer
             var foundMetrics = actualMetrics
                 .Where(actualMetric => (expectedMetric.IsRegexName && Regex.IsMatch(actualMetric.MetricSpec.Name, expectedMetric.metricName)) ||
                                        (!expectedMetric.IsRegexName && expectedMetric.metricName == actualMetric.MetricSpec.Name))
-                .Where(actualMetric => expectedMetric.metricScope == actualMetric.MetricSpec.Scope)
+                .Where(actualMetric => (expectedMetric.IsRegexScope && Regex.IsMatch(actualMetric.MetricSpec.Scope, expectedMetric.metricScope)) ||
+                                       (!expectedMetric.IsRegexScope && expectedMetric.metricScope == actualMetric.MetricSpec.Scope))
                 .ToList();
 
             return foundMetrics;
@@ -1113,10 +1116,11 @@ public class ExpectedMetric
             public decimal? callCount = null;
             public decimal? CallCountAllHarvests = null;
             public bool IsRegexName = false;
+            public bool IsRegexScope = false;
 
             public override string ToString()
             {
-                return $"{{ metricName: {metricName} metricScope: {metricScope}, IsRegexName: {IsRegexName}, callCount: {callCount}, CallCountAllHarvests: {CallCountAllHarvests} }}";
+                return $"{{ metricName: {metricName} metricScope: {metricScope}, IsRegexName: {IsRegexName}, IsRegexScope: {IsRegexScope}, callCount: {callCount}, CallCountAllHarvests: {CallCountAllHarvests} }}";
             }
         }
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj b/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj
index 3dbc97cc4e..a474197090 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj
@@ -5,16 +5,16 @@
     <AssemblyName>NewRelic.Agent.IntegrationTestHelpers</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="xunit" version="2.4.0" />
-    <PackageReference Include="xunit.assert" Version="2.4.0" />
-    <PackageReference Include="xunit.core" Version="2.4.0" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
+    <PackageReference Include="xunit" version="2.6.1" />
+    <PackageReference Include="xunit.assert" Version="2.6.1" />
+    <PackageReference Include="xunit.core" Version="2.6.1" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.6.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Shared\Shared.csproj" />
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/JavaScriptAgent.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/JavaScriptAgent.cs
index c1858ce400..1be598cdca 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/JavaScriptAgent.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/JavaScriptAgent.cs
@@ -3,6 +3,7 @@
 
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Xunit;
@@ -24,6 +25,9 @@ public static string GetJavaScriptAgentScriptFromSource(string source)
         {
             const string regex = @"<script type=""text/javascript"">(.*?)</script>";
             var matches = Regex.Matches(source, regex, RegexOptions.Singleline);
+            if (matches.Count <= 0)
+                return null;
+
             var match = matches[1]; //specifically look for the 2nd match. The first match contains settings. The 2nd match contains the actual browser agent.
             Assert.True(match.Success, "Did not find a match for the JavaScript agent config in the provided page.");
             return match.Groups[1].Value;
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs
index ba4d425ba9..33cee41095 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs
@@ -405,5 +405,14 @@ public NewRelicConfigModifier ConfigureFasterUpdateLoadedModulesCycle(int second
             CommonUtils.SetConfigAppSetting(_configFilePath, "OverrideUpdateLoadedModulesCycle", seconds.ToString(), "urn:newrelic-config");
             return this;
         }
+
+        public NewRelicConfigModifier EnableAspNetCore6PlusBrowserInjection(bool enableBrowserInjection)
+        {
+            CommonUtils.ModifyOrCreateXmlNodeInNewRelicConfig(_configFilePath, new[] { "configuration" }, "appSettings", string.Empty);
+            CommonUtils.ModifyOrCreateXmlNodeInNewRelicConfig(_configFilePath, new[] { "configuration", "appSettings" }, "add", string.Empty);
+            CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(_configFilePath, new[] { "configuration", "appSettings", "add"}, "key", "EnableAspNetCore6PlusBrowserInjection");
+            CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(_configFilePath, new[] { "configuration", "appSettings", "add"}, "value", $"{enableBrowserInjection}");
+            return this;
+        }
     }
 }
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs
index a3473aced5..fdc8421099 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs
@@ -131,9 +131,6 @@ public string DefaultLogFileDirectoryPath
             }
         }
 
-
-        private string AgentLogFileName { get { return CommonUtils.GetAgentLogFileNameFromNewRelicConfig(DestinationNewRelicConfigFilePath); } }
-
         #endregion
 
         #region Abstract/Virtual
@@ -214,7 +211,7 @@ public string UniqueFolderName
 
         public int Port => _port ?? (_port = RandomPortGenerator.NextPort()).Value;
 
-        public readonly string DestinationServerName = Dns.GetHostName().ToLower();
+        public static readonly string DestinationServerName = "127.0.0.1";
 
         private NewRelicConfigModifier _newRelicConfigModifier;
         public NewRelicConfigModifier NewRelicConfig => _newRelicConfigModifier ?? (_newRelicConfigModifier = new NewRelicConfigModifier(DestinationNewRelicConfigFilePath));
@@ -227,10 +224,6 @@ public string UniqueFolderName
 
         public string DestinationNewRelicExtensionsDirectoryPath { get { return Path.Combine(DestinationNewRelicHomeDirectoryPath, "extensions"); } }
 
-        private AgentLogFile _agentLogFile;
-
-        public AgentLogFile AgentLog => _agentLogFile ?? (_agentLogFile = new AgentLogFile(DestinationNewRelicLogFileDirectoryPath, this, AgentLogFileName, Timing.TimeToWaitForLog));
-
         public ProfilerLogFile ProfilerLog { get { return new ProfilerLogFile(DefaultLogFileDirectoryPath, Timing.TimeToConnect); } }
 
         public bool CaptureStandardOutput { get; set; } = true;
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplicationFixture.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplicationFixture.cs
index 5ebef0ebae..c4679a7ab6 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplicationFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplicationFixture.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
@@ -47,8 +46,14 @@ public void SetTestClassType(Type testClassType)
         public readonly RemoteApplication RemoteApplication;
 
         public string UniqueFolderName { get { return RemoteApplication.UniqueFolderName; } }
+        private string AgentLogFileName { get { return CommonUtils.GetAgentLogFileNameFromNewRelicConfig(DestinationNewRelicConfigFilePath); } }
+
+
+        private AgentLogFile _agentLogFile;
+        public bool AgentLogExpected { get; set; } = true;
+
+        public AgentLogFile AgentLog => _agentLogFile ?? (_agentLogFile = new AgentLogFile(DestinationNewRelicLogFileDirectoryPath, TestLogger, AgentLogFileName, Timing.TimeToWaitForLog, AgentLogExpected));
 
-        public AgentLogFile AgentLog { get { return RemoteApplication.AgentLog; } }
 
         public ProfilerLogFile ProfilerLog { get { return RemoteApplication.ProfilerLog; } }
 
@@ -325,17 +330,19 @@ public virtual void Initialize()
 
                 finally
                 {
-                    TestLogger?.WriteLine("===== Begin Agent log file =====");
-                    try
+                    if (AgentLogExpected)
                     {
-                        TestLogger?.WriteLine(AgentLog.GetFullLogAsString());
-                    }
-                    catch (Exception)
-                    {
-                        TestLogger?.WriteLine("No log file found.");
+                        TestLogger?.WriteLine("===== Begin Agent log file =====");
+                        try
+                        {
+                            TestLogger?.WriteLine(AgentLog.GetFullLogAsString());
+                        }
+                        catch (Exception)
+                        {
+                            TestLogger?.WriteLine("No log file found.");
+                        }
+                        TestLogger?.WriteLine("----- End of Agent log file -----");
                     }
-                    TestLogger?.WriteLine("----- End of Agent log file -----");
-
                 }
             }
         }
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteConsoleApplication.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteConsoleApplication.cs
index 8c5efd30d1..421e42c090 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteConsoleApplication.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteConsoleApplication.cs
@@ -3,7 +3,6 @@
 
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs
index 516168fa98..58d4f33c70 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs
@@ -333,7 +333,7 @@ protected virtual void WaitForAppServerToStartListening(Process process, bool ca
                 CapturedOutput.WriteProcessOutputToLog("[RemoteService]: WaitForAppServerToStartListening");
             }
 
-            Assert.True(false, "Remote process never generated a .pid file!");
+            Assert.Fail("Remote process never generated a .pid file!");
         }
 
         // set the application name in app.config (agent will trump names set in newrelic.config with the process name, which is undesirable)
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs
index 7eec2a37fa..b6561bf4bc 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs
@@ -184,7 +184,7 @@ private void SetSitePortInApplicationHostConfig()
             };
             var attributes = new[]
             {
-                new KeyValuePair<string, string>("bindingInformation", string.Format(@"*:{0}:", Port)),
+                new KeyValuePair<string, string>("bindingInformation", string.Format(@"127.0.0.1:{0}:", Port)),
             };
             XmlUtils.ModifyOrCreateXmlAttributes(DestinationApplicationHostConfigFilePath, string.Empty, nodes, attributes);
         }
@@ -253,7 +253,7 @@ private void WaitForHostedWebCoreToStartListening(Process process, bool captureS
                 CapturedOutput.WriteProcessOutputToLog("[RemoteWebApplication]: WaitForHostedWebCoreToStartListening");
             }
 
-            Assert.True(false, "Remote process never generated a .pid file!");
+            Assert.Fail("Remote process never generated a .pid file!");
         }
     }
 }
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs
index 10aac0423a..13451bd834 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs
@@ -36,7 +36,7 @@ enum ValidatorState
 
         private static void Fail(string msg)
         {
-            Assert.True(false, "Hosted Web Core log failed validation: " + msg);
+            Assert.Fail("Hosted Web Core log failed validation: " + msg);
         }
 
         public static void ValidateHostedWebCoreConsoleOutput(string log, ITestOutputHelper testLogger)
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/Timing.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/Timing.cs
index 7422d0bd7f..837d10a4d4 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/Timing.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/Timing.cs
@@ -11,11 +11,7 @@ public static class Timing
         public static readonly TimeSpan TimeToColdStart = TimeSpan.FromMinutes(5);
         public static readonly TimeSpan TimeToConnect = TimeSpan.FromSeconds(30);
         public static readonly TimeSpan TimeToWaitForLog = TimeSpan.FromMinutes(3);
-        public static readonly TimeSpan TimeToApm = TimeSpan.FromMinutes(7);
         public static readonly TimeSpan TimeBetweenHarvests = TimeSpan.FromMinutes(1);
-        public static readonly TimeSpan ApmCheckInterval = TimeSpan.FromSeconds(5);
-        // how long to keep pinging APM for data until we get expected results (this is after the metrics show up but are incorrect)
-        public static readonly TimeSpan ApmRetyTimeout = TimeSpan.FromMinutes(1);
         public static readonly TimeSpan TimeBetweenFileExistChecks = TimeSpan.FromSeconds(1);
         public static readonly TimeSpan RequestTimeout = TimeSpan.FromMinutes(1);
         public static readonly TimeSpan TimeToDockerComposeUp = TimeSpan.FromMinutes(5);
diff --git a/tests/Agent/IntegrationTests/IntegrationTests.sln b/tests/Agent/IntegrationTests/IntegrationTests.sln
index 6f2aa045d3..69c9021ead 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests.sln
+++ b/tests/Agent/IntegrationTests/IntegrationTests.sln
@@ -132,7 +132,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreFeatures", "Appli
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreBasicWebApiApplication", "Applications\AspNetCoreBasicWebApiApplication\AspNetCoreBasicWebApiApplication.csproj", "{69F04BE2-6859-45BB-97E7-E5ACDEE53503}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedApplicationHelpers", "SharedApplications\Common\SharedApplicationHelpers\SharedApplicationHelpers.csproj", "{85A4B5C1-1248-4DE2-AE97-B96B6FA3AE09}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedApplicationHelpers", "SharedApplications\Common\SharedApplicationHelpers\SharedApplicationHelpers.csproj", "{85A4B5C1-1248-4DE2-AE97-B96B6FA3AE09}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicAspNetCoreRazorApplication", "Applications\BasicAspNetCoreRazorApplication\BasicAspNetCoreRazorApplication.csproj", "{8F7EBBC3-B22F-43AC-978E-2CD8AD7C02CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -352,6 +354,10 @@ Global
 		{85A4B5C1-1248-4DE2-AE97-B96B6FA3AE09}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85A4B5C1-1248-4DE2-AE97-B96B6FA3AE09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85A4B5C1-1248-4DE2-AE97-B96B6FA3AE09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F7EBBC3-B22F-43AC-978E-2CD8AD7C02CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F7EBBC3-B22F-43AC-978E-2CD8AD7C02CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F7EBBC3-B22F-43AC-978E-2CD8AD7C02CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F7EBBC3-B22F-43AC-978E-2CD8AD7C02CF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -404,6 +410,7 @@ Global
 		{01291327-B0E8-4EAB-929B-D6B796BF1D7C} = {F0F6F2CE-8AE8-49E1-8EE9-A44B451EFC29}
 		{69F04BE2-6859-45BB-97E7-E5ACDEE53503} = {F0F6F2CE-8AE8-49E1-8EE9-A44B451EFC29}
 		{85A4B5C1-1248-4DE2-AE97-B96B6FA3AE09} = {30CF078E-E531-441E-83AB-24AB9B1C179F}
+		{8F7EBBC3-B22F-43AC-978E-2CD8AD7C02CF} = {F0F6F2CE-8AE8-49E1-8EE9-A44B451EFC29}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3830ABDF-4AEA-4D91-83A2-13F091D1DF5F}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/AgentFeatures/BrowserAgentAutoInjection6Plus.cs b/tests/Agent/IntegrationTests/IntegrationTests/AgentFeatures/BrowserAgentAutoInjection6Plus.cs
new file mode 100644
index 0000000000..8232166297
--- /dev/null
+++ b/tests/Agent/IntegrationTests/IntegrationTests/AgentFeatures/BrowserAgentAutoInjection6Plus.cs
@@ -0,0 +1,144 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTests.RemoteServiceFixtures;
+using NewRelic.Testing.Assertions;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NewRelic.Agent.IntegrationTests.AgentFeatures
+{
+    public abstract class BrowserAgentAutoInjection6PlusBase : NewRelicIntegrationTest<BasicAspNetCoreRazorApplicationFixture>
+    {
+        private readonly BasicAspNetCoreRazorApplicationFixture _fixture;
+        private string _htmlContent;
+        private string _staticContent;
+        private string _fooContent;
+        private bool _browserInjectionEnabled;
+
+        protected BrowserAgentAutoInjection6PlusBase(BasicAspNetCoreRazorApplicationFixture fixture,
+            ITestOutputHelper output, bool enableBrowserInjection, bool enableResponseCompression, string loaderType = "rum")
+            : base(fixture)
+        {
+            _browserInjectionEnabled = enableBrowserInjection;
+
+            _fixture = fixture;
+            _fixture.TestLogger = output;
+            _fixture.Actions
+            (
+                setupConfiguration: () =>
+                {
+                    var configPath = fixture.DestinationNewRelicConfigFilePath;
+
+                    var configModifier = new NewRelicConfigModifier(configPath);
+                    configModifier.AutoInstrumentBrowserMonitoring(true);
+                    configModifier.BrowserMonitoringEnableAttributes(true);
+                    configModifier.EnableAspNetCore6PlusBrowserInjection(enableBrowserInjection);
+
+                    configModifier.BrowserMonitoringLoader(loaderType);
+                },
+                exerciseApplication: () =>
+                {
+                    _htmlContent = _fixture.Get("Index"); // get a razor page
+                    _staticContent = _fixture.Get("static.html"); // get static content
+                    _fooContent = _fixture.Get("foo"); // get a manually-written response body with no content type
+                }
+            );
+
+            _fixture.SetResponseCompression(enableResponseCompression);
+
+            _fixture.Initialize();
+
+        }
+
+        [Fact]
+        public void Test()
+        {
+            NrAssert.Multiple(
+                () => Assert.NotNull(_htmlContent),
+                () => Assert.NotNull(_staticContent),
+                () => Assert.NotNull(_fooContent)
+            );
+
+            var connectResponseData = _fixture.AgentLog.GetConnectResponseData();
+
+            var jsAgentFromConnectResponse = connectResponseData.JsAgentLoader;
+
+            var jsAgentFromHtmlContent = JavaScriptAgent.GetJavaScriptAgentScriptFromSource(_htmlContent);
+            var jsAgentFromStaticContent = JavaScriptAgent.GetJavaScriptAgentScriptFromSource(_staticContent);
+            var jsAgentFromFooContent = JavaScriptAgent.GetJavaScriptAgentScriptFromSource(_fooContent);
+
+            if (_browserInjectionEnabled)
+            {
+                Assert.Equal(jsAgentFromConnectResponse, jsAgentFromHtmlContent);
+                Assert.Equal(jsAgentFromConnectResponse, jsAgentFromStaticContent);
+                Assert.Null(jsAgentFromFooContent);
+            }
+            else
+            {
+                Assert.Null(jsAgentFromHtmlContent);
+                Assert.Null(jsAgentFromStaticContent);
+                Assert.Null(jsAgentFromFooContent);
+            }
+
+            // verify that the browser injecting stream wrapper didn't catch an exception and disable itself
+            var agentDisabledLogLine = _fixture.AgentLog.TryGetLogLine(AgentLogBase.ErrorLogLinePrefixRegex + "Unexpected exception. Browser injection will be disabled. *?");
+            Assert.Null(agentDisabledLogLine);
+        }
+    }
+
+    [NetCoreTest]
+    public class BrowserAgentAutoInjection6PlusRumUnCompressed : BrowserAgentAutoInjection6PlusBase
+    {
+        public BrowserAgentAutoInjection6PlusRumUnCompressed(BasicAspNetCoreRazorApplicationFixture fixture, ITestOutputHelper output)
+            : base(fixture, output, true, false)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class BrowserAgentAutoInjection6PlusRumCompressed : BrowserAgentAutoInjection6PlusBase
+    {
+        public BrowserAgentAutoInjection6PlusRumCompressed(BasicAspNetCoreRazorApplicationFixture fixture, ITestOutputHelper output)
+            : base(fixture, output, true, true)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class BrowserAgentAutoInjection6PlusInjectionDisabledRumUnCompressed : BrowserAgentAutoInjection6PlusBase
+    {
+        public BrowserAgentAutoInjection6PlusInjectionDisabledRumUnCompressed(BasicAspNetCoreRazorApplicationFixture fixture, ITestOutputHelper output)
+            : base(fixture, output, true, false)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class BrowserAgentAutoInjection6PlusInjectionDisabledRumCompressed : BrowserAgentAutoInjection6PlusBase
+    {
+        public BrowserAgentAutoInjection6PlusInjectionDisabledRumCompressed(BasicAspNetCoreRazorApplicationFixture fixture, ITestOutputHelper output)
+            : base(fixture, output, false, true)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class BrowserAgentAutoInjection6PlusSpa : BrowserAgentAutoInjection6PlusBase
+    {
+        public BrowserAgentAutoInjection6PlusSpa(BasicAspNetCoreRazorApplicationFixture fixture, ITestOutputHelper output)
+            : base(fixture, output, true, true, "spa")
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class BrowserAgentAutoInjection6PlusFull : BrowserAgentAutoInjection6PlusBase
+    {
+        public BrowserAgentAutoInjection6PlusFull(BasicAspNetCoreRazorApplicationFixture fixture, ITestOutputHelper output)
+            : base(fixture, output, true, true, "full")
+        {
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/ConsoleLoggingTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/ConsoleLoggingTests.cs
new file mode 100644
index 0000000000..e57f6023a3
--- /dev/null
+++ b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/ConsoleLoggingTests.cs
@@ -0,0 +1,90 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NewRelic.Agent.IntegrationTests.AgentLogs
+{
+    public abstract class ConsoleLoggingTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
+        where TFixture : ConsoleDynamicMethodFixture
+    {
+        private readonly TFixture _fixture;
+
+        public ConsoleLoggingTestsBase(TFixture fixture, ITestOutputHelper output) : base(fixture)
+        {
+            _fixture = fixture;
+            _fixture.SetTimeout(TimeSpan.FromMinutes(1));
+            _fixture.TestLogger = output;
+
+            _fixture.AddCommand($"RootCommands InstrumentedMethodToStartAgent");
+            _fixture.AddCommand($"RootCommands DelaySeconds 10");
+
+            _fixture.AddActions
+            (
+                setupConfiguration: () =>
+                {
+                    var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
+                    configModifier
+                    .SetLogLevel("debug");
+
+                    _fixture.RemoteApplication.SetAdditionalEnvironmentVariable("NEW_RELIC_LOG_CONSOLE", "true");
+
+                },
+                exerciseApplication: () =>
+                {
+                }
+            );
+
+            _fixture.Initialize();
+        }
+
+        [Fact]
+        public void ConsoleLogsExist()
+        {
+            var stdOut = _fixture.RemoteApplication.CapturedOutput.StandardOutput;
+
+            Assert.Contains("Console logging enabled", stdOut); // A profiler log message
+            Assert.Contains("Log level set to DEBUG", stdOut);  // An agent log message
+        }
+    }
+
+    [NetFrameworkTest]
+    public class ConsoleLoggingFWLatestTests : ConsoleLoggingTestsBase<ConsoleDynamicMethodFixtureFWLatest>
+    {
+        public ConsoleLoggingFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+
+    [NetFrameworkTest]
+    public class ConsoleLoggingFW462Tests : ConsoleLoggingTestsBase<ConsoleDynamicMethodFixtureFW462>
+    {
+        public ConsoleLoggingFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class ConsoleLoggingCoreLatestTests : ConsoleLoggingTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
+    {
+        public ConsoleLoggingCoreLatestTests(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class ConsoleLoggingCoreOldestTests : ConsoleLoggingTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
+    {
+        public ConsoleLoggingCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LogFileFormatTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LogFileFormatTests.cs
new file mode 100644
index 0000000000..d001275456
--- /dev/null
+++ b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LogFileFormatTests.cs
@@ -0,0 +1,52 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using NewRelic.Agent.IntegrationTestHelpers;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NewRelic.Agent.IntegrationTests.AgentLogs
+{
+    [NetFrameworkTest]
+    public class LogFileFormatTests : NewRelicIntegrationTest<RemoteServiceFixtures.BasicMvcApplicationTestFixture>
+    {
+        private readonly RemoteServiceFixtures.BasicMvcApplicationTestFixture _fixture;
+
+        public LogFileFormatTests(RemoteServiceFixtures.BasicMvcApplicationTestFixture fixture, ITestOutputHelper output) : base(fixture)
+        {
+            _fixture = fixture;
+            _fixture.TestLogger = output;
+            _fixture.Actions
+            (
+                setupConfiguration: () =>
+                {
+                    var configPath = fixture.DestinationNewRelicConfigFilePath;
+                    var configModifier = new NewRelicConfigModifier(configPath);
+                    configModifier.ForceTransactionTraces();
+                },
+                exerciseApplication: () =>
+                {
+                    _fixture.Get();
+                }
+            );
+            _fixture.Initialize();
+        }
+
+        [Fact]
+        public void Test()
+        {
+            // get the first log line and validate it's in the expected format
+            var firstLogLine = _fixture.AgentLog.GetFileLines().First();
+
+            var match = Regex.Match(firstLogLine,
+                @"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d{3} NewRelic .{6}: \[pid: \d{1,}, tid: \d{1,}\] .*");
+
+            Assert.True(match.Success);
+            Assert.Single(match.Groups);
+            Assert.Equal(firstLogLine, match.Groups[0].Value);
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LogLevelAndDirectoryEnvironmentTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LogLevelAndDirectoryEnvironmentTests.cs
index e7f30c5b34..9385d0d272 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LogLevelAndDirectoryEnvironmentTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LogLevelAndDirectoryEnvironmentTests.cs
@@ -46,9 +46,9 @@ public LogLevelAndDirectoryEnvironmentTests(T fixture, ITestOutputHelper output)
         [Fact]
         public void AgentLog()
         {
-            var configLocation = new AgentLogFile(_configLogDirectory, _fixture.RemoteApplication, throwIfNotFound: false);
-            var generalEnvLocation = new AgentLogFile(_generalEnvLogDirectory, _fixture.RemoteApplication, throwIfNotFound: false);
-            var profilerEnvLocation = new AgentLogFile(_profilerEnvLogDirectory, _fixture.RemoteApplication, throwIfNotFound: false);
+            var configLocation = new AgentLogFile(_configLogDirectory, _fixture.TestLogger, throwIfNotFound: false);
+            var generalEnvLocation = new AgentLogFile(_generalEnvLogDirectory, _fixture.TestLogger, throwIfNotFound: false);
+            var profilerEnvLocation = new AgentLogFile(_profilerEnvLogDirectory, _fixture.TestLogger, throwIfNotFound: false);
 
             Assert.False(configLocation.Found);
             Assert.True(generalEnvLocation.Found);
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LoggingDisabledTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LoggingDisabledTests.cs
new file mode 100644
index 0000000000..e0982d75cc
--- /dev/null
+++ b/tests/Agent/IntegrationTests/IntegrationTests/AgentLogs/LoggingDisabledTests.cs
@@ -0,0 +1,89 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.IO;
+using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NewRelic.Agent.IntegrationTests.AgentLogs
+{
+    public abstract class LoggingDisabledTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
+        where TFixture : ConsoleDynamicMethodFixture
+    {
+        private readonly TFixture _fixture;
+
+        public LoggingDisabledTestsBase(TFixture fixture, ITestOutputHelper output) : base(fixture)
+        {
+            _fixture = fixture;
+            _fixture.SetTimeout(TimeSpan.FromMinutes(1));
+            _fixture.TestLogger = output;
+            _fixture.AgentLogExpected = false;
+
+            _fixture.AddCommand($"RootCommands InstrumentedMethodToStartAgent");
+            _fixture.AddCommand($"RootCommands DelaySeconds 10");
+
+            _fixture.AddActions
+            (
+                setupConfiguration: () =>
+                {
+                    var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
+                    configModifier
+                    .SetLogLevel("debug");
+
+                    _fixture.RemoteApplication.SetAdditionalEnvironmentVariable("NEW_RELIC_LOG_ENABLED", "false");
+
+                },
+                exerciseApplication: () =>
+                {
+                }
+            );
+
+            _fixture.Initialize();
+        }
+
+        [Fact]
+        public void LogsDirShouldNotExist()
+        {
+            Assert.False(Directory.Exists(_fixture.RemoteApplication.DefaultLogFileDirectoryPath), "Logs are disabled so logs dir should not exist.");
+        }
+    }
+
+    [NetFrameworkTest]
+    public class LoggingDisabledFWLatestTests : LoggingDisabledTestsBase<ConsoleDynamicMethodFixtureFWLatest>
+    {
+        public LoggingDisabledFWLatestTests(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+
+    [NetFrameworkTest]
+    public class LoggingDisabledFW462Tests : LoggingDisabledTestsBase<ConsoleDynamicMethodFixtureFW462>
+    {
+        public LoggingDisabledFW462Tests(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class LoggingDisabledCoreLatestTests : LoggingDisabledTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
+    {
+        public LoggingDisabledCoreLatestTests(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+
+    [NetCoreTest]
+    public class LoggingDisabledCoreOldestTests : LoggingDisabledTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
+    {
+        public LoggingDisabledCoreOldestTests(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
+            : base(fixture, output)
+        {
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/BasicInstrumentation/BasicAspNetCoreRazorTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/BasicInstrumentation/BasicAspNetCoreRazorTests.cs
new file mode 100644
index 0000000000..724a12c27f
--- /dev/null
+++ b/tests/Agent/IntegrationTests/IntegrationTests/BasicInstrumentation/BasicAspNetCoreRazorTests.cs
@@ -0,0 +1,140 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+
+using System.Collections.Generic;
+using System.Linq;
+using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.Models;
+using NewRelic.Testing.Assertions;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NewRelic.Agent.IntegrationTests.BasicInstrumentation
+{
+    [NetCoreTest]
+    public class BasicAspNetCoreRazorTests : NewRelicIntegrationTest<RemoteServiceFixtures.BasicAspNetCoreRazorApplicationFixture>
+    {
+        private readonly RemoteServiceFixtures.BasicAspNetCoreRazorApplicationFixture _fixture;
+        private string _responseBody;
+
+        public BasicAspNetCoreRazorTests(RemoteServiceFixtures.BasicAspNetCoreRazorApplicationFixture fixture, ITestOutputHelper output)
+            : base(fixture)
+        {
+            _fixture = fixture;
+            _fixture.TestLogger = output;
+            _fixture.Actions
+            (
+                setupConfiguration: () =>
+                {
+                    var configPath = fixture.DestinationNewRelicConfigFilePath;
+                    var configModifier = new NewRelicConfigModifier(configPath);
+                    configModifier.ForceTransactionTraces();
+                    configModifier.SetCodeLevelMetricsEnabled();
+                    configModifier.EnableAspNetCore6PlusBrowserInjection(true);
+                },
+                exerciseApplication: () =>
+                {
+                    _responseBody = _fixture.Get("Index");
+                }
+            );
+            _fixture.Initialize();
+        }
+
+        [Fact]
+        public void Test()
+        {
+            var expectedMetrics = new List<Assertions.ExpectedMetric>
+            {
+                new Assertions.ExpectedMetric { metricName = @"Supportability/AnalyticsEvents/TotalEventsSeen", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"Supportability/AnalyticsEvents/TotalEventsCollected", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"WebTransaction/Razor/Pages/Index", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"HttpDispatcher", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"WebTransaction", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"WebTransactionTotalTime", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"WebTransactionTotalTime/Razor/Pages/Index", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"DotNet/Pages_Index/OnGet", metricScope = @"WebTransaction/Razor/Pages/Index", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"DotNet/Middleware Pipeline", metricScope = @"WebTransaction/Razor/Pages/Index", callCount = 1 },
+            };
+            var unexpectedMetrics = new List<Assertions.ExpectedMetric>
+            {
+                new Assertions.ExpectedMetric { metricName = @"OtherTransaction/Normalized/*" },
+                new Assertions.ExpectedMetric { metricName = @"OtherTransaction/all" },
+
+                // The .NET agent does not have the information needed to generate this metric
+                new Assertions.ExpectedMetric { metricName = @"CPU/WebTransaction", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"CPU/WebTransaction/Razor/Pages/Index", callCount = 1 },
+            };
+
+            var expectedTransactionTraceSegments = new List<string>
+            {
+                @"DotNet/Pages_Index/OnGet",
+            };
+            var expectedTransactionTraceAgentAttributes = new Dictionary<string, object>
+            {
+                { "response.status", "200" },
+                { "http.statusCode", 200 },
+                { "request.uri", "/Index" }
+            };
+            var expectedTransactionEventIntrinsicAttributes1 = new Dictionary<string, string>
+            {
+                {"type", "Transaction"}
+            };
+            var expectedTransactionEventIntrinsicAttributes2 = new List<string>
+            {
+                "timestamp",
+                "duration",
+                "webDuration",
+                "totalTime"
+            };
+            var expectedTransactionEventAgentAttributes = new Dictionary<string, object>
+            {
+                { "response.status", "200" },
+                { "http.statusCode", 200 },
+                { "request.uri", "/Index" }
+            };
+
+            var expectedGetIndexAttributes = new Dictionary<string, string>()
+            {
+                { "code.namespace", "BasicAspNetCoreRazorApplication.Pages.Pages_Index" },
+                { "code.function", "OnGet" }
+            };
+
+            var connect = _fixture.AgentLog.GetConnectData().Environment.GetPluginList();
+            Assert.DoesNotContain(connect, x => x.Contains("NewRelic.Providers.Wrapper.AspNetCore6Plus"));
+
+            var metrics = _fixture.AgentLog.GetMetrics().ToList();
+
+            var transactionSamples = _fixture.AgentLog.GetTransactionSamples().ToList();
+
+            var transactionSample = transactionSamples
+                .FirstOrDefault(sample => sample.Path == @"WebTransaction/Razor/Pages/Index");
+            var transactionEvent = _fixture.AgentLog.GetTransactionEvents()
+                .FirstOrDefault();
+
+            var spanEvents = _fixture.AgentLog.GetSpanEvents().ToList();
+            var getIndexSpan = spanEvents.FirstOrDefault(se => se.IntrinsicAttributes["name"].ToString() == "DotNet/Pages_Index/OnGet");
+
+            NrAssert.Multiple(
+                () => Assert.NotNull(transactionSample),
+                () => Assert.NotNull(transactionEvent),
+                () => Assert.NotNull(_responseBody)
+                );
+
+            NrAssert.Multiple
+            (
+                () => Assertions.MetricsExist(expectedMetrics, metrics),
+                () => Assertions.MetricsDoNotExist(unexpectedMetrics, metrics),
+                () => Assertions.TransactionTraceSegmentsExist(expectedTransactionTraceSegments, transactionSample),
+                () => Assertions.TransactionTraceHasAttributes(expectedTransactionTraceAgentAttributes, TransactionTraceAttributeType.Agent, transactionSample),
+                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes1, TransactionEventAttributeType.Intrinsic, transactionEvent),
+                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes2, TransactionEventAttributeType.Intrinsic, transactionEvent),
+                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventAgentAttributes, TransactionEventAttributeType.Agent, transactionEvent),
+                () => Assertions.SpanEventHasAttributes(expectedGetIndexAttributes, SpanEventAttributeType.Agent, getIndexSpan),
+                () => JavaScriptAgent.GetJavaScriptAgentConfigFromSource(_responseBody),
+                () => Assert.Empty(_fixture.AgentLog.GetErrorTraces()),
+                () => Assert.Empty(_fixture.AgentLog.GetErrorEvents())
+            );
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatDisabledChainedRequestsWebRequest.cs b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatDisabledChainedRequestsWebRequest.cs
index 7fd8fefb95..439586b7bb 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatDisabledChainedRequestsWebRequest.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatDisabledChainedRequestsWebRequest.cs
@@ -8,6 +8,7 @@
 using System.Net.Http.Headers;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.Models;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Agent.IntegrationTests.CatInbound;
 using NewRelic.Testing.Assertions;
 using Xunit;
@@ -62,15 +63,15 @@ public void Test()
             {
                 new Assertions.ExpectedMetric { metricName = @"External/all", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = @"External/allWeb", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest", callCount = 1 }
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/all", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest", callCount = 1 }
             };
             var unexpectedMetrics = new List<Assertions.ExpectedMetric>
             {
-                new Assertions.ExpectedMetric { metricName = $@"ExternalApp/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index" },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest" },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalApp/{RemoteApplication.DestinationServerName}/{crossProcessId}/all", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index" },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest" },
                 new Assertions.ExpectedMetric { metricName = @"ClientApplication/[^/]+/all", IsRegexName = true }
             };
             var expectedCallerTraceSegmentRegexes = new List<string>
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedAsyncAwaitRestSharp.cs b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedAsyncAwaitRestSharp.cs
index 59e3517f5c..d899c976f1 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedAsyncAwaitRestSharp.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedAsyncAwaitRestSharp.cs
@@ -8,6 +8,7 @@
 using System.Net.Http.Headers;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.Models;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -75,7 +76,7 @@ public void Test()
             var unexpectedMetrics = new List<Assertions.ExpectedMetric>
             {
 				// This scoped metric should be superceded by the ExternalTransaction metric above
-				new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/RestSharpController/AsyncAwaitClient" }
+				new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/RestSharpController/AsyncAwaitClient" }
             };
 
             // Note: we are checking the attributes attached to the *Callee's* transaction, not the caller's transaction. The attributes attached to the caller's transaction are already fully vetted in the CatInbound tests.
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsHttpClient.cs b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsHttpClient.cs
index 6ab583a7de..743c4171ce 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsHttpClient.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsHttpClient.cs
@@ -8,6 +8,7 @@
 using System.Net.Http.Headers;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.Models;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -67,17 +68,17 @@ public void Test()
             {
                 new Assertions.ExpectedMetric { metricName = @"External/all", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = @"External/allWeb", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalApp/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", metricScope = @"WebTransaction/MVC/DefaultController/ChainedHttpClient", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/all", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalApp/{RemoteApplication.DestinationServerName}/{crossProcessId}/all", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", metricScope = @"WebTransaction/MVC/DefaultController/ChainedHttpClient", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = @"ClientApplication/[^/]+/all", IsRegexName = true }
             };
             var unexpectedMetrics = new List<Assertions.ExpectedMetric>
             {
 				// This scoped metric should be superceded by the ExternalTransaction metric above
-				new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/DefaultController/ChainedHttpClient" }
+				new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/DefaultController/ChainedHttpClient" }
             };
             // Note: we are checking the attributes attached to the *Callee's* transaction, not the caller's transaction. The attributes attached to the caller's transaction are already fully vetted in the CatInbound tests.
             var expectedTransactionEventIntrinsicAttributes1 = new List<string>
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsWebRequest.cs b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsWebRequest.cs
index 1eca9046ea..ad8542c77e 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsWebRequest.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedRequestsWebRequest.cs
@@ -8,6 +8,7 @@
 using System.Net.Http.Headers;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.Models;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -69,17 +70,17 @@ public void Test()
             {
                 new Assertions.ExpectedMetric { metricName = @"External/all", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = @"External/allWeb", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalApp/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{_fixture.RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/all", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalApp/{RemoteApplication.DestinationServerName}/{crossProcessId}/all", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"ExternalTransaction/{RemoteApplication.DestinationServerName}/{crossProcessId}/WebTransaction/MVC/DefaultController/Index", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = @"ClientApplication/[^/]+/all", IsRegexName = true }
             };
             var unexpectedMetrics = new List<Assertions.ExpectedMetric>
             {
 				// This scoped metric should be superceded by the ExternalTransaction metric above
-				new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest" }
+				new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/DefaultController/ChainedWebRequest" }
             };
             // Note: we are checking the attributes attached to the *Callee's* transaction, not the caller's transaction. The attributes attached to the caller's transaction are already fully vetted in the CatInbound tests.
             var expectedTransactionEventIntrinsicAttributes1 = new List<string>
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedTaskResultRestSharp.cs b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedTaskResultRestSharp.cs
index fa72476fa2..70008b43fe 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedTaskResultRestSharp.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/CatOutbound/CatEnabledChainedTaskResultRestSharp.cs
@@ -8,6 +8,7 @@
 using System.Net.Http.Headers;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.Models;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -78,7 +79,7 @@ public void Test()
             var unexpectedMetrics = new List<Assertions.ExpectedMetric>
             {
 				// This scoped metric should be superceded by the ExternalTransaction metric above
-				new Assertions.ExpectedMetric { metricName = $@"External/{_fixture.RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/RestSharpController/TaskResultClient" }
+				new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/RestSharpController/TaskResultClient" }
             };
 
             // Note: we are checking the attributes attached to the *Callee's* transaction, not the caller's transaction. The attributes attached to the caller's transaction are already fully vetted in the CatInbound tests.
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Configuration/GuidConfigurationTest.cs b/tests/Agent/IntegrationTests/IntegrationTests/Configuration/GuidConfigurationTest.cs
index bf0dce51fd..116056884a 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/Configuration/GuidConfigurationTest.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/Configuration/GuidConfigurationTest.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Linq;
@@ -49,7 +49,7 @@ public void Test()
             var match = IsCore ? CORE_LOG : FRAMEWORK_LOG;
 
             // Profiler should flag correctly regardless
-            Assert.True(_fixture.ProfilerLog.GetFileLines().Any(l => l.EndsWith(match)),
+            Assert.True(_fixture.ProfilerLog.GetFileLines().Any(l => l.Contains(match)),
                 $"Expected '{match}' in Profiler, but was not found.");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/AspNetCoreDistTraceRequestChainTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/AspNetCoreDistTraceRequestChainTests.cs
index f8c70e5027..fa4b3c9e54 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/AspNetCoreDistTraceRequestChainTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/AspNetCoreDistTraceRequestChainTests.cs
@@ -39,8 +39,8 @@ public AspNetCoreDistTraceRequestChainTests(AspNetCoreDistTraceRequestChainFixtu
                     _fixture.ExecuteTraceRequestChain("CallNext", "CallNext", "CallEnd", null);
                     _fixture.ExecuteTraceRequestChain("CallNext", "CallNext", "CallError", null);
 
-                    _fixture.FirstCallApplication.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
-                    _fixture.SecondCallApplication.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
+                    _fixture.FirstCallAppAgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
+                    _fixture.SecondCallAppAgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
                     _fixture.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
                 }
             );
@@ -51,7 +51,7 @@ public AspNetCoreDistTraceRequestChainTests(AspNetCoreDistTraceRequestChainFixtu
         [Fact]
         public void VerifyFirstApplication()
         {
-            var metrics = _fixture.FirstCallApplication.AgentLog.GetMetrics().ToList();
+            var metrics = _fixture.FirstCallAppAgentLog.GetMetrics().ToList();
 
             Assert.NotNull(metrics);
 
@@ -64,7 +64,7 @@ public void VerifyFirstApplication()
 
             Assertions.MetricsExist(FirstAppExpectedData.CallNextMetrics, metrics);
 
-            var transactionEvents = _fixture.FirstCallApplication.AgentLog.GetTransactionEvents().ToList();
+            var transactionEvents = _fixture.FirstCallAppAgentLog.GetTransactionEvents().ToList();
 
             Assert.Equal(ExpectedTransactionCount, transactionEvents.Count);
 
@@ -81,7 +81,7 @@ void AssertFirstAppTransactionEvent(int eventIndex)
                 );
             }
 
-            var allSpanEvents = _fixture.FirstCallApplication.AgentLog.GetSpanEvents()
+            var allSpanEvents = _fixture.FirstCallAppAgentLog.GetSpanEvents()
                 .OrderBy(s => s.IntrinsicAttributes["timestamp"]).ToList();
 
             ValidateSpanEventAttributesForTransactionEvent(0);
@@ -101,7 +101,7 @@ void ValidateSpanEventAttributesForTransactionEvent(int eventIndex)
         [Fact]
         public void VerifySecondApplication()
         {
-            var metrics = _fixture.SecondCallApplication.AgentLog.GetMetrics().ToList();
+            var metrics = _fixture.SecondCallAppAgentLog.GetMetrics().ToList();
             var accountId = _fixture.AgentLog.GetAccountId();
             var secondAppExpectedData = new SecondAppExpectedData(accountId);
 
@@ -116,7 +116,7 @@ public void VerifySecondApplication()
 
             Assertions.MetricsExist(SecondAppExpectedData.CallNextMetrics, metrics);
 
-            var transactionEvents = _fixture.SecondCallApplication.AgentLog.GetTransactionEvents()
+            var transactionEvents = _fixture.SecondCallAppAgentLog.GetTransactionEvents()
                 .OrderBy(evt => evt.IntrinsicAttributes["timestamp"])
                 .ToList();
 
@@ -125,14 +125,14 @@ public void VerifySecondApplication()
             AssertSecondAppTransactionEvent(0);
             AssertSecondAppTransactionEvent(1);
 
-            var parentTransactionEvent = _fixture.FirstCallApplication.AgentLog.GetTransactionEvents()
+            var parentTransactionEvent = _fixture.FirstCallAppAgentLog.GetTransactionEvents()
                 .OrderBy(evt => evt.IntrinsicAttributes["timestamp"]).ToList().First();
 
             Assert.True(TraceIdsAreEqual(parentTransactionEvent, transactionEvents.First()));
 
             void AssertSecondAppTransactionEvent(int eventIndex)
             {
-                var expectedPersistedParentEventAttributes = GetExpectedTransactionAttributesFromPreviousApp(_fixture.FirstCallApplication, eventIndex);
+                var expectedPersistedParentEventAttributes = GetExpectedTransactionAttributesFromPreviousApp(_fixture.FirstCallAppAgentLog, eventIndex);
                 var transactionEvent = transactionEvents[eventIndex];
 
                 NrAssert.Multiple(
@@ -144,7 +144,7 @@ void AssertSecondAppTransactionEvent(int eventIndex)
                 );
             }
 
-            var allSpanEvents = _fixture.SecondCallApplication.AgentLog.GetSpanEvents()
+            var allSpanEvents = _fixture.SecondCallAppAgentLog.GetSpanEvents()
                 .OrderBy(s => s.IntrinsicAttributes["timestamp"]).ToList();
 
             ValidateSpanEventAttributesForTransactionEvent(0);
@@ -154,7 +154,7 @@ void ValidateSpanEventAttributesForTransactionEvent(int eventIndex)
             {
                 var transactionId = transactionEvents[eventIndex].IntrinsicAttributes["guid"].ToString();
                 var expectedTraceId =
-                    _fixture.FirstCallApplication.AgentLog.GetTransactionEvents()
+                    _fixture.FirstCallAppAgentLog.GetTransactionEvents()
                         .OrderBy(e => e.IntrinsicAttributes["timestamp"]).ToList()[eventIndex]
                         .IntrinsicAttributes["traceId"].ToString();
 
@@ -195,7 +195,7 @@ public void VerifyFinalApplication()
             AssertFinalAppTransactionEvent(0);
             AssertFinalAppTransactionEvent(1);
 
-            var parentTransactionEvent = _fixture.SecondCallApplication.AgentLog.GetTransactionEvents()
+            var parentTransactionEvent = _fixture.SecondCallAppAgentLog.GetTransactionEvents()
                 .OrderBy(evt => evt.IntrinsicAttributes["timestamp"])
                 .ToList()
                 .First();
@@ -204,8 +204,8 @@ public void VerifyFinalApplication()
 
             void AssertFinalAppTransactionEvent(int eventIndex)
             {
-                var expectedPersistedParentEventAttributes = GetExpectedTransactionAttributesFromPreviousApp(_fixture.SecondCallApplication, eventIndex);
-                var expectedAttributeValuesPayloadReceived = GetExpectedAttributeValuesPayloadReceived(_fixture.SecondCallApplication.AgentLog.GetAccountId());
+                var expectedPersistedParentEventAttributes = GetExpectedTransactionAttributesFromPreviousApp(_fixture.SecondCallAppAgentLog, eventIndex);
+                var expectedAttributeValuesPayloadReceived = GetExpectedAttributeValuesPayloadReceived(_fixture.SecondCallAppAgentLog.GetAccountId());
                 var transactionEvent = transactionEvents[eventIndex];
 
                 try
@@ -234,7 +234,7 @@ void ValidateSpanEventAttributesForTransactionEvent(int eventIndex)
             {
                 var transactionId = transactionEvents[eventIndex].IntrinsicAttributes["guid"].ToString();
                 var expectedTraceId =
-                    _fixture.FirstCallApplication.AgentLog.GetTransactionEvents()
+                    _fixture.FirstCallAppAgentLog.GetTransactionEvents()
                         .OrderBy(e => e.IntrinsicAttributes["timestamp"]).ToList()[eventIndex]
                         .IntrinsicAttributes["traceId"].ToString();
 
@@ -247,10 +247,10 @@ void ValidateSpanEventAttributesForTransactionEvent(int eventIndex)
 
         #region Transaction Event Validation
 
-        private static Dictionary<string, object> GetExpectedTransactionAttributesFromPreviousApp(RemoteApplication application, int index)
+        private static Dictionary<string, object> GetExpectedTransactionAttributesFromPreviousApp(AgentLogFile agentLog, int index)
         {
-            var parentAccountId = application.AgentLog.GetAccountId();
-            var transactionEvents = application.AgentLog.GetTransactionEvents()
+            var parentAccountId = agentLog.GetAccountId();
+            var transactionEvents = agentLog.GetTransactionEvents()
                 .OrderBy(evt => evt.IntrinsicAttributes["timestamp"])
                 .ToList();
 
@@ -363,10 +363,10 @@ public class FirstAppExpectedData
                 new Assertions.ExpectedMetric { metricName = @"WebTransactionTotalTime/MVC/FirstCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
 
                 new Assertions.ExpectedMetric { metricName = @"DotNet/FirstCallController/CallNext", CallCountAllHarvests = ExpectedTransactionCount },
-                new Assertions.ExpectedMetric { metricName = @"External/localhost/Stream/GET", CallCountAllHarvests = ExpectedTransactionCount },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", CallCountAllHarvests = ExpectedTransactionCount },
 
                 new Assertions.ExpectedMetric { metricName = @"DotNet/FirstCallController/CallNext", metricScope = @"WebTransaction/MVC/FirstCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
-                new Assertions.ExpectedMetric { metricName = @"External/localhost/Stream/GET", metricScope = @"WebTransaction/MVC/FirstCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/FirstCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
                 new Assertions.ExpectedMetric { metricName = @"DotNet/Middleware Pipeline", metricScope = @"WebTransaction/MVC/FirstCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
             };
 
@@ -408,10 +408,10 @@ public SecondAppExpectedData(string accountId)
                 new Assertions.ExpectedMetric { metricName = @"WebTransactionTotalTime/MVC/SecondCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
 
                 new Assertions.ExpectedMetric { metricName = @"DotNet/SecondCallController/CallNext", CallCountAllHarvests = ExpectedTransactionCount },
-                new Assertions.ExpectedMetric { metricName = @"External/localhost/Stream/GET", CallCountAllHarvests = ExpectedTransactionCount },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", CallCountAllHarvests = ExpectedTransactionCount },
 
                 new Assertions.ExpectedMetric { metricName = @"DotNet/SecondCallController/CallNext", metricScope = @"WebTransaction/MVC/SecondCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
-                new Assertions.ExpectedMetric { metricName = @"External/localhost/Stream/GET", metricScope = @"WebTransaction/MVC/SecondCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
+                new Assertions.ExpectedMetric { metricName = $@"External/{RemoteApplication.DestinationServerName}/Stream/GET", metricScope = @"WebTransaction/MVC/SecondCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
                 new Assertions.ExpectedMetric { metricName = @"DotNet/Middleware Pipeline", metricScope = @"WebTransaction/MVC/SecondCall/CallNext/{nextUrl}", CallCountAllHarvests = ExpectedTransactionCount },
             };
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTests.cs
index e476804966..7967980199 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTests.cs
@@ -8,6 +8,7 @@
 using Xunit;
 using Xunit.Abstractions;
 using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 
 namespace NewRelic.Agent.IntegrationTests.DistributedTracing.W3CInstrumentationTests
 {
@@ -26,9 +27,9 @@ public HttpClientW3CTests(OwinTracingChainFixture fixture, ITestOutputHelper out
                 {
                     fixture.ExecuteTraceRequestChainHttpClient(Headers);
 
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.MetricDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.MetricDataLogLineRegex, TimeSpan.FromMinutes(2));
                 }
             );
 
@@ -39,7 +40,7 @@ public HttpClientW3CTests(OwinTracingChainFixture fixture, ITestOutputHelper out
         public override void RootSpanAttributes()
         {
             var senderRootSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/WebAPI/DistributedTracingSender/CallNext").FirstOrDefault();
-            var externalSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "External/localhost/Stream/GET").FirstOrDefault();
+            var externalSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{RemoteApplication.DestinationServerName}/Stream/GET").FirstOrDefault();
 
             var receiverRootSpanEvent = ReceiverAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/WebAPI/DistributedTracingReceiver/CallEnd").FirstOrDefault();
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTestsNetCore.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTestsNetCore.cs
index 769815ea83..e04174781b 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTestsNetCore.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpClientW3CTestsNetCore.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Agent.IntegrationTests.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 using Xunit;
@@ -46,8 +47,8 @@ public HttpClientW3CTestsNetCore(AspNetCoreDistTraceRequestChainFixture fixture,
 
                     _fixture.ExecuteTraceRequestChain("CallNext", "CallNext", "CallEnd", headers);
 
-                    _fixture.FirstCallApplication.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
-                    _fixture.SecondCallApplication.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
+                    _fixture.FirstCallAppAgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
+                    _fixture.SecondCallAppAgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
                     _fixture.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
                 }
             );
@@ -58,18 +59,18 @@ public HttpClientW3CTestsNetCore(AspNetCoreDistTraceRequestChainFixture fixture,
         [Fact]
         public void Test()
         {
-            var senderAppTxEvent = _fixture.FirstCallApplication.AgentLog.GetTransactionEvents().FirstOrDefault();
+            var senderAppTxEvent = _fixture.FirstCallAppAgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(senderAppTxEvent);
 
-            var receiverAppTxEvents = _fixture.SecondCallApplication.AgentLog.GetTransactionEvents().FirstOrDefault();
+            var receiverAppTxEvents = _fixture.SecondCallAppAgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(receiverAppTxEvents);
 
-            var lastCallAppTxEvents = _fixture.RemoteApplication.AgentLog.GetTransactionEvents().FirstOrDefault();
+            var lastCallAppTxEvents = _fixture.AgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(lastCallAppTxEvents);
 
-            var senderAppSpanEvents = _fixture.FirstCallApplication.AgentLog.GetSpanEvents();
-            var receiverAppSpanEvents = _fixture.SecondCallApplication.AgentLog.GetSpanEvents();
-            var lastCallAppSpanEvents = _fixture.RemoteApplication.AgentLog.GetSpanEvents();
+            var senderAppSpanEvents = _fixture.FirstCallAppAgentLog.GetSpanEvents();
+            var receiverAppSpanEvents = _fixture.SecondCallAppAgentLog.GetSpanEvents();
+            var lastCallAppSpanEvents = _fixture.AgentLog.GetSpanEvents();
 
             Assert.Equal(senderAppTxEvent.IntrinsicAttributes["guid"], receiverAppTxEvents.IntrinsicAttributes["parentId"]);
             Assert.Equal(receiverAppTxEvents.IntrinsicAttributes["guid"], lastCallAppTxEvents.IntrinsicAttributes["parentId"]);
@@ -90,10 +91,10 @@ public void Test()
             }
 
             var senderRootSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/FirstCall/CallNext/{nextUrl}").FirstOrDefault();
-            var externalSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "External/localhost/Stream/GET").FirstOrDefault();
+            var externalSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{RemoteApplication.DestinationServerName}/Stream/GET").FirstOrDefault();
 
             var receiverRootSpanEvent = receiverAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/SecondCall/CallNext/{nextUrl}").FirstOrDefault();
-            var receiverExternalSpanEvent = receiverAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "External/localhost/Stream/GET").FirstOrDefault();
+            var receiverExternalSpanEvent = receiverAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{RemoteApplication.DestinationServerName}/Stream/GET").FirstOrDefault();
 
             var lastRootSpanEvent = lastCallAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/LastCall/CallEnd").FirstOrDefault();
 
@@ -126,8 +127,8 @@ public void Test()
                 new Assertions.ExpectedMetric { metricName = @"Supportability/TraceContext/TraceState/NoNrEntry", callCount = 1 }
             };
 
-            var accountId = _fixture.SecondCallApplication.AgentLog.GetAccountId();
-            var appId = _fixture.SecondCallApplication.AgentLog.GetApplicationId();
+            var accountId = _fixture.SecondCallAppAgentLog.GetAccountId();
+            var appId = _fixture.SecondCallAppAgentLog.GetApplicationId();
 
             var receiverExpectedMetrics = new List<Assertions.ExpectedMetric>
             {
@@ -146,8 +147,8 @@ public void Test()
             };
 
 
-            var senderActualMetrics = _fixture.FirstCallApplication.AgentLog.GetMetrics();
-            var receiverActualMetrics = _fixture.SecondCallApplication.AgentLog.GetMetrics();
+            var senderActualMetrics = _fixture.FirstCallAppAgentLog.GetMetrics();
+            var receiverActualMetrics = _fixture.SecondCallAppAgentLog.GetMetrics();
 
             NrAssert.Multiple(
                 () => Assertions.MetricsExist(senderExpectedMetrics, senderActualMetrics),
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTests.cs
index 396d5b82cb..99811d8aa2 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTests.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -25,9 +26,9 @@ public HttpWebRequestW3CTests(RemoteServiceFixtures.FrameworkTracingChainFixture
                 {
                     fixture.ExecuteTraceRequestChainHttpWebRequest(Headers);
 
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.MetricDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.MetricDataLogLineRegex, TimeSpan.FromMinutes(2));
                 }
             );
 
@@ -38,7 +39,7 @@ public HttpWebRequestW3CTests(RemoteServiceFixtures.FrameworkTracingChainFixture
         public override void RootSpanAttributes()
         {
             var senderRootSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/DefaultController/ChainedWebRequest").FirstOrDefault();
-            var externalSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{_fixture.SenderApplication.DestinationServerName}/Stream/GET").FirstOrDefault();
+            var externalSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{RemoteApplication.DestinationServerName}/Stream/GET").FirstOrDefault();
 
             var receiverRootSpanEvent = ReceiverAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/DefaultController/Index").FirstOrDefault();
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTestsNetCore.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTestsNetCore.cs
index 23327b6e90..fdb65b4138 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTestsNetCore.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/HttpWebRequestW3CTestsNetCore.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Agent.IntegrationTests.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 using Xunit;
@@ -45,8 +46,8 @@ public HttpWebRequestW3CTestsNetCore(AspNetCoreDistTraceRequestChainFixture fixt
 
                     _fixture.ExecuteTraceRequestChain("WebRequestCallNext", "WebRequestCallNext", "CallEnd", headers);
 
-                    _fixture.FirstCallApplication.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
-                    _fixture.SecondCallApplication.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
+                    _fixture.FirstCallAppAgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
+                    _fixture.SecondCallAppAgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
                     _fixture.AgentLog.WaitForLogLines(AgentLogBase.TransactionTransformCompletedLogLineRegex, TimeSpan.FromSeconds(15), ExpectedTransactionCount);
                 }
             );
@@ -56,14 +57,14 @@ public HttpWebRequestW3CTestsNetCore(AspNetCoreDistTraceRequestChainFixture fixt
         [Fact]
         public void Test()
         {
-            var senderAppTxEvent = _fixture.FirstCallApplication.AgentLog.GetTransactionEvents().FirstOrDefault();
+            var senderAppTxEvent = _fixture.FirstCallAppAgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(senderAppTxEvent);
 
-            var receiverAppTxEvents = _fixture.SecondCallApplication.AgentLog.GetTransactionEvents().FirstOrDefault();
+            var receiverAppTxEvents = _fixture.SecondCallAppAgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(receiverAppTxEvents);
 
-            var senderAppSpanEvents = _fixture.FirstCallApplication.AgentLog.GetSpanEvents();
-            var receiverAppSpanEvents = _fixture.SecondCallApplication.AgentLog.GetSpanEvents();
+            var senderAppSpanEvents = _fixture.FirstCallAppAgentLog.GetSpanEvents();
+            var receiverAppSpanEvents = _fixture.SecondCallAppAgentLog.GetSpanEvents();
 
             Assert.Equal(senderAppTxEvent.IntrinsicAttributes["guid"], receiverAppTxEvents.IntrinsicAttributes["parentId"]);
 
@@ -78,7 +79,7 @@ public void Test()
             }
 
             var senderRootSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/FirstCall/WebRequestCallNext/{nextUrl}").FirstOrDefault();
-            var externalSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "External/localhost/Stream/GET").FirstOrDefault();
+            var externalSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{RemoteApplication.DestinationServerName}/Stream/GET").FirstOrDefault();
 
             var receiverRootSpanEvent = receiverAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/SecondCall/WebRequestCallNext/{nextUrl}").FirstOrDefault();
 
@@ -102,8 +103,8 @@ public void Test()
                 new Assertions.ExpectedMetric { metricName = @"Supportability/TraceContext/TraceState/NoNrEntry", callCount = 1 }
             };
 
-            var accountId = _fixture.SecondCallApplication.AgentLog.GetAccountId();
-            var appId = _fixture.SecondCallApplication.AgentLog.GetApplicationId();
+            var accountId = _fixture.SecondCallAppAgentLog.GetAccountId();
+            var appId = _fixture.SecondCallAppAgentLog.GetApplicationId();
 
             var receiverExpectedMetrics = new List<Assertions.ExpectedMetric>
             {
@@ -120,8 +121,8 @@ public void Test()
                 new Assertions.ExpectedMetric { metricName = @"Supportability/TraceContext/TraceState/NoNrEntry", callCount = 1 }
             };
 
-            var senderActualMetrics = _fixture.FirstCallApplication.AgentLog.GetMetrics();
-            var receiverActualMetrics = _fixture.SecondCallApplication.AgentLog.GetMetrics();
+            var senderActualMetrics = _fixture.FirstCallAppAgentLog.GetMetrics();
+            var receiverActualMetrics = _fixture.SecondCallAppAgentLog.GetMetrics();
 
             NrAssert.Multiple(
                 () => Assertions.MetricsExist(senderExpectedMetrics, senderActualMetrics),
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/RestSharpW3CTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/RestSharpW3CTests.cs
index 69a1bd7c4c..3e1d6f0960 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/RestSharpW3CTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/RestSharpW3CTests.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using NewRelic.Agent.IntegrationTestHelpers;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -25,9 +26,9 @@ public RestSharpW3CTests(RemoteServiceFixtures.FrameworkTracingChainFixture fixt
                 {
                     fixture.ExecuteTraceRequestChainRestSharp(Headers);
 
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
-                    fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.MetricDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.MetricDataLogLineRegex, TimeSpan.FromMinutes(2));
                 }
             );
             fixture.Initialize();
@@ -37,7 +38,7 @@ public RestSharpW3CTests(RemoteServiceFixtures.FrameworkTracingChainFixture fixt
         public override void RootSpanAttributes()
         {
             var senderRootSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/MVC/DistributedTracingController/MakeExternalCallUsingRestClient").FirstOrDefault();
-            var externalSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/localhost/Stream/GET").FirstOrDefault();
+            var externalSpanEvent = SenderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{RemoteApplication.DestinationServerName}/Stream/GET").FirstOrDefault();
 
             var receiverRootSpanEvent = ReceiverAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "WebTransaction/WebAPI/RestAPI/Get").FirstOrDefault();
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/TraceIdTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/TraceIdTests.cs
index 7be52c0d86..fa2787ebf4 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/TraceIdTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/TraceIdTests.cs
@@ -33,8 +33,8 @@ public TraceIdTests(AspNetCoreBasicWebApiApplicationFixture fixture, ITestOutput
                 exerciseApplication: () =>
                 {
                     _traceId = _fixture.GetTraceId();
-                    _fixture.RemoteApplication.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
-                    _fixture.RemoteApplication.AgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    _fixture.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    _fixture.AgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(2));
                 }
             );
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CTestBase.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CTestBase.cs
index bcd6cd14e1..a266f2d55d 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CTestBase.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CTestBase.cs
@@ -50,19 +50,19 @@ public W3CTestBase(T fixture, ITestOutputHelper output) : base(fixture)
         protected TransactionEvent SenderAppTxEvent => _senderAppTxEvent ?? (_senderAppTxEvent = _fixture.AgentLog.GetTransactionEvents().FirstOrDefault());
 
         private TransactionEvent _receiverAppTxEvent;
-        protected TransactionEvent ReceiverAppTxEvent => _receiverAppTxEvent ?? (_receiverAppTxEvent = _fixture.ReceiverApplication.AgentLog.GetTransactionEvents().FirstOrDefault());
+        protected TransactionEvent ReceiverAppTxEvent => _receiverAppTxEvent ?? (_receiverAppTxEvent = _fixture.ReceiverAppAgentLog.GetTransactionEvents().FirstOrDefault());
 
         private List<SpanEvent> _senderAppSpanEvents;
         protected List<SpanEvent> SenderAppSpanEvents => _senderAppSpanEvents ?? (_senderAppSpanEvents = _fixture.AgentLog.GetSpanEvents().ToList());
 
         private SpanEvent[] _receiverAppSpanEvents;
-        protected SpanEvent[] ReceiverAppSpanEvents => _receiverAppSpanEvents ?? (_receiverAppSpanEvents = _fixture.ReceiverApplication.AgentLog.GetSpanEvents().ToArray());
+        protected SpanEvent[] ReceiverAppSpanEvents => _receiverAppSpanEvents ?? (_receiverAppSpanEvents = _fixture.ReceiverAppAgentLog.GetSpanEvents().ToArray());
 
         private Metric[] _senderActualMetrics;
         protected Metric[] SenderActualMetrics => _senderActualMetrics ?? (_senderActualMetrics = _fixture.AgentLog.GetMetrics().ToArray());
 
         private Metric[] _receiverActualMetrics;
-        protected Metric[] ReceiverActualMetrics => _receiverActualMetrics ?? (_receiverActualMetrics = _fixture.ReceiverApplication.AgentLog.GetMetrics().ToArray());
+        protected Metric[] ReceiverActualMetrics => _receiverActualMetrics ?? (_receiverActualMetrics = _fixture.ReceiverAppAgentLog.GetMetrics().ToArray());
 
         [Fact]
         public void TransactionsAttributes()
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CValidation.cs b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CValidation.cs
index 4855d12b9a..ed7df44db9 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CValidation.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/DistributedTracing/W3CInstrumentationTests/W3CValidation.cs
@@ -64,14 +64,14 @@ public W3CValidation(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHel
                     _fixture.RemoteApplication.NewRelicConfig.SetRequestTimeout(TimeSpan.FromSeconds(10));
                     _fixture.RemoteApplication.NewRelicConfig.ForceTransactionTraces();
 
-                    _fixture.AddCommand($"W3CTestService StartService {_fixture.RemoteApplication.Port}");
+                    _fixture.AddCommand($"W3CTestService StartService {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port}");
                     _fixture.AddCommand($@"GitCommand Clone https://github.com/w3c/trace-context.git {Path.Combine(_fixture.RemoteApplication.DestinationApplicationDirectoryPath, "trace-context")}");
                     _fixture.AddCommand($@"GitCommand Checkout { Path.Combine(_fixture.RemoteApplication.DestinationApplicationDirectoryPath, "trace-context")} 98f210efd89c63593dce90e2bae0a1bdcb986f51");
                     _fixture.AddCommand("ProcessRunner ProcessName python.exe");
                     _fixture.AddCommand("ProcessRunner AddArgument -m unittest");
                     _fixture.AddCommand("ProcessRunner AddSwitch -v");
                     _fixture.AddCommand($@"ProcessRunner WorkingDirectory {Path.Combine(_fixture.RemoteApplication.DestinationApplicationDirectoryPath, "trace-context", "test")}"); // python W3C tests are in test dir
-                    _fixture.AddCommand($"ProcessRunner AddEnvironmentVariable SERVICE_ENDPOINT http://localhost:{_fixture.RemoteApplication.Port}/test");
+                    _fixture.AddCommand($"ProcessRunner AddEnvironmentVariable SERVICE_ENDPOINT http://{_fixture.DestinationServerName}:{_fixture.RemoteApplication.Port}/test");
                     _fixture.AddCommand($"ProcessRunner AddEnvironmentVariable STRICT_LEVEL 1");
                     _fixture.AddCommand("ProcessRunner Start");
                     _fixture.AddCommand("ProcessRunner WaitforExit 30000");
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj b/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj
index 743b9eb3fc..84e6441180 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj
+++ b/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj
@@ -34,7 +34,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Grpc.Core" Version="2.40.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -42,12 +43,18 @@
     <PackageReference Include="Selenium.Support" Version="4.4.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.4.0" />
     <PackageReference Include="Selenium.WebDriver.IEDriver" Version="4.3.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.abstractions" Version="2.0.2" />
-    <PackageReference Include="xunit.assert" Version="2.4.0" />
-    <PackageReference Include="xunit.core" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" version="2.4.0" />
+    <PackageReference Include="xunit" Version="2.6.1" />
+    <PackageReference Include="xunit.abstractions" Version="2.0.3" />
+    <PackageReference Include="xunit.assert" Version="2.6.1" />
+    <PackageReference Include="xunit.core" Version="2.6.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.6.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" version="2.5.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System" />
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
new file mode 100644
index 0000000000..ab2393343e
--- /dev/null
+++ b/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
@@ -0,0 +1,161 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Collections.Generic;
+using System.Linq;
+using NewRelic.Agent.IntegrationTestHelpers;
+using Xunit;
+using Xunit.Abstractions;
+using System;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
+
+namespace NewRelic.Agent.IntegrationTests.MassTransit
+{
+    public abstract class MassTransitTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
+        where TFixture : ConsoleDynamicMethodFixture
+    {
+        private readonly TFixture _fixture;
+
+        public MassTransitTestsBase(TFixture fixture, ITestOutputHelper output, bool useStartBus) : base(fixture)
+        {
+            _fixture = fixture;
+            _fixture.SetTimeout(TimeSpan.FromMinutes(2));
+            _fixture.TestLogger = output;
+
+            if (useStartBus)
+            {
+                _fixture.AddCommand($"MassTransitExerciser StartBus");
+            }
+            else
+            {
+                _fixture.AddCommand("MassTransitExerciser StartHost");
+            }
+            _fixture.AddCommand("MassTransitExerciser Publish publishedMessageOne");
+            _fixture.AddCommand("MassTransitExerciser Publish publishedMessageTwo");
+            _fixture.AddCommand("MassTransitExerciser Send sentMessageOne");
+            _fixture.AddCommand("MassTransitExerciser Send sentMessageTwo");
+
+            if (useStartBus)
+            {
+                _fixture.AddCommand($"MassTransitExerciser StopBus");
+            }
+            else
+            {
+                _fixture.AddCommand("MassTransitExerciser StopHost");
+            }
+
+            _fixture.AddActions
+            (
+                setupConfiguration: () =>
+                {
+                    var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
+                    configModifier.ForceTransactionTraces();
+                    configModifier.SetLogLevel("finest");
+                },
+                exerciseApplication: () =>
+                {
+                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.MetricDataLogLineRegex, TimeSpan.FromMinutes(2));
+                }
+            );
+
+            _fixture.Initialize();
+        }
+
+        [Fact]
+        public void Test()
+        {
+
+            var massTransitMetricNameRegexBase = @"MessageBroker\/MassTransit\/Queue\/";
+            var queueNameRegex = @"Named\/(.{26})"; // The auto-generated in-memory queue names have 26 chars
+            var massTransitProduceMetricNameRegex = massTransitMetricNameRegexBase + @"Produce\/" + queueNameRegex;
+            var massTransitConsumeMetricNameRegex = massTransitMetricNameRegexBase + @"Consume\/" + queueNameRegex;
+
+            var metrics = _fixture.AgentLog.GetMetrics().ToList();
+
+            var expectedMetrics = new List<Assertions.ExpectedMetric>
+            {
+                new Assertions.ExpectedMetric { metricName = massTransitConsumeMetricNameRegex, callCount = 4, IsRegexName = true},
+                new Assertions.ExpectedMetric { metricName = massTransitProduceMetricNameRegex, callCount = 4, IsRegexName = true},
+
+                new Assertions.ExpectedMetric { metricName = massTransitConsumeMetricNameRegex, callCount = 4, IsRegexName = true, metricScope = @"OtherTransaction\/Message\/MassTransit\/Queue\/" + queueNameRegex, IsRegexScope = true},
+                new Assertions.ExpectedMetric { metricName = massTransitProduceMetricNameRegex, callCount = 2, IsRegexName = true, metricScope = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MassTransitExerciser/Publish"},
+                new Assertions.ExpectedMetric { metricName = massTransitProduceMetricNameRegex, callCount = 2, IsRegexName = true, metricScope = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MassTransitExerciser/Send"},
+            };
+
+            Assertions.MetricsExist(expectedMetrics, metrics);
+
+            var transactionEvent = _fixture.AgentLog.TryGetTransactionEvent($"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MassTransitExerciser/Publish");
+
+            Assert.NotNull( transactionEvent );
+        }
+    }
+
+    // Tests using StartHost (hosted service configuration method)
+    [NetFrameworkTest]
+    public class MassTransitTests_StartHost_FW462 : MassTransitTestsBase<ConsoleDynamicMethodFixtureFW462>
+    {
+        public MassTransitTests_StartHost_FW462(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
+            : base(fixture, output, false)
+        {
+        }
+    }
+    [NetFrameworkTest]
+    public class MassTransitTests_StartHost_FWLatest : MassTransitTestsBase<ConsoleDynamicMethodFixtureFWLatest>
+    {
+        public MassTransitTests_StartHost_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
+            : base(fixture, output, false)
+        {
+        }
+    }
+    [NetCoreTest]
+    public class MassTransitTests_StartHost_Core60 : MassTransitTestsBase<ConsoleDynamicMethodFixtureCore60>
+    {
+        public MassTransitTests_StartHost_Core60(ConsoleDynamicMethodFixtureCore60 fixture, ITestOutputHelper output)
+            : base(fixture, output, false)
+        {
+        }
+    }
+    [NetCoreTest]
+    public class MassTransitTests_StartHost_CoreLatest : MassTransitTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
+    {
+        public MassTransitTests_StartHost_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
+            : base(fixture, output, false)
+        {
+        }
+    }
+
+    // Tests using StartBus (bus factory configuration method)
+    [NetFrameworkTest]
+    public class MassTransitTests_StartBus_FW462 : MassTransitTestsBase<ConsoleDynamicMethodFixtureFW462>
+    {
+        public MassTransitTests_StartBus_FW462(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
+            : base(fixture, output, true)
+        {
+        }
+    }
+    [NetFrameworkTest]
+    public class MassTransitTests_StartBus_FWLatest : MassTransitTestsBase<ConsoleDynamicMethodFixtureFWLatest>
+    {
+        public MassTransitTests_StartBus_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
+            : base(fixture, output, true)
+        {
+        }
+    }
+    [NetCoreTest]
+    public class MassTransitTests_StartBus_Core60 : MassTransitTestsBase<ConsoleDynamicMethodFixtureCore60>
+    {
+        public MassTransitTests_StartBus_Core60(ConsoleDynamicMethodFixtureCore60 fixture, ITestOutputHelper output)
+            : base(fixture, output, true)
+        {
+        }
+    }
+    [NetCoreTest]
+    public class MassTransitTests_StartBus_CoreLatest : MassTransitTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
+    {
+        public MassTransitTests_StartBus_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
+            : base(fixture, output, true)
+        {
+        }
+    }
+
+}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinCATChainTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinCATChainTests.cs
index c663d40501..4994377184 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinCATChainTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinCATChainTests.cs
@@ -40,7 +40,7 @@ public OwinCATChainTests(OwinTracingChainFixture fixture, ITestOutputHelper outp
                 {
                     _fixture.ExecuteTraceRequestChainHttpClient();
 
-                    _fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
+                    _fixture.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(2));
                 }
             );
 
@@ -53,7 +53,7 @@ public void Test()
             var senderAppTxEvent = _fixture.AgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(senderAppTxEvent);
 
-            var receiverAppTxEvent = _fixture.ReceiverApplication.AgentLog.GetTransactionEvents().FirstOrDefault();
+            var receiverAppTxEvent = _fixture.ReceiverAppAgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(receiverAppTxEvent);
 
             var expectedSenderAttributes = new List<string>
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinDTChainTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinDTChainTests.cs
index 02d6355c9e..e27b89f35a 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinDTChainTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/Owin/OwinDTChainTests.cs
@@ -8,6 +8,7 @@
 using Xunit.Abstractions;
 using NewRelic.Agent.IntegrationTestHelpers;
 using System.Collections.Generic;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 
 namespace NewRelic.Agent.IntegrationTests.Owin
@@ -41,8 +42,8 @@ public OwinDTChainTests(OwinTracingChainFixture fixture, ITestOutputHelper outpu
                 {
                     _fixture.ExecuteTraceRequestChainHttpClient();
 
-                    _fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(1));
-                    _fixture.ReceiverApplication.AgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(1));
+                    _fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.AnalyticsEventDataLogLineRegex, TimeSpan.FromMinutes(1));
+                    _fixture.ReceiverAppAgentLog.WaitForLogLine(AgentLogFile.SpanEventDataLogLineRegex, TimeSpan.FromMinutes(1));
                 }
             );
 
@@ -55,13 +56,13 @@ public void Test()
             var senderAppTxEvent = _fixture.AgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(senderAppTxEvent);
 
-            var receiverAppTxEvent = _fixture.ReceiverApplication.AgentLog.GetTransactionEvents().FirstOrDefault();
+            var receiverAppTxEvent = _fixture.ReceiverAppAgentLog.GetTransactionEvents().FirstOrDefault();
             Assert.NotNull(receiverAppTxEvent);
 
             var senderAppSpanEvents = _fixture.AgentLog.GetSpanEvents();
-            var receiverAppSpanEvents = _fixture.ReceiverApplication.AgentLog.GetSpanEvents();
+            var receiverAppSpanEvents = _fixture.ReceiverAppAgentLog.GetSpanEvents();
 
-            var externalSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == "External/localhost/Stream/GET")
+            var externalSpanEvent = senderAppSpanEvents.Where(@event => @event?.IntrinsicAttributes?["name"]?.ToString() == $"External/{RemoteApplication.DestinationServerName}/Stream/GET")
                 .FirstOrDefault();
             Assert.Equal(externalSpanEvent.IntrinsicAttributes["guid"], receiverAppTxEvent.IntrinsicAttributes["parentSpanId"]);
 
@@ -113,14 +114,14 @@ public void Test()
             };
 
             var senderActualMetrics = _fixture.AgentLog.GetMetrics();
-            var receiverActualMetrics = _fixture.ReceiverApplication.AgentLog.GetMetrics();
+            var receiverActualMetrics = _fixture.ReceiverAppAgentLog.GetMetrics();
 
             NrAssert.Multiple(
                 () => Assertions.MetricsExist(senderExpectedMetrics, senderActualMetrics),
                 () => Assertions.MetricsExist(receiverExpectedMetrics, receiverActualMetrics)
             );
 
-            var transportDurationMetric = _fixture.ReceiverApplication.AgentLog.GetMetricByName($"TransportDuration/App/{acctId}/{appId}/HTTP/all");
+            var transportDurationMetric = _fixture.ReceiverAppAgentLog.GetMetricByName($"TransportDuration/App/{acctId}/{appId}/HTTP/all");
             Assert.True(transportDurationMetric.Values.Total > 0);
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreBasicWebApiApplicationFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreBasicWebApiApplicationFixture.cs
index c13ce2c0c7..f3e986535f 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreBasicWebApiApplicationFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreBasicWebApiApplicationFixture.cs
@@ -16,13 +16,13 @@ public AspNetCoreBasicWebApiApplicationFixture() : base(new RemoteService("AspNe
 
         public void MakeExternalCallUsingHttpClient(string baseAddress, string path)
         {
-            var address = $"http://localhost:{Port}/api/default/MakeExternalCallUsingHttpClient?baseAddress={baseAddress}&path={path}";
+            var address = $"http://{DestinationServerName}:{Port}/api/default/MakeExternalCallUsingHttpClient?baseAddress={baseAddress}&path={path}";
             GetStringAndAssertContains(address, "Worked");
         }
 
         public string GetTraceId()
         {
-            var address = $"http://localhost:{Port}/api/default/GetTraceId";
+            var address = $"http://{DestinationServerName}:{Port}/api/default/GetTraceId";
             return GetStringAndAssertIsNotNull(address);
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreDistTraceRequestChainFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreDistTraceRequestChainFixture.cs
index 29dd1385ab..fa87db7ab1 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreDistTraceRequestChainFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreDistTraceRequestChainFixture.cs
@@ -18,6 +18,12 @@ public class AspNetCoreDistTraceRequestChainFixture : RemoteApplicationFixture
         public RemoteService FirstCallApplication { get; set; }
         public RemoteService SecondCallApplication { get; set; }
 
+        private AgentLogFile _firstCallAppAgentLog;
+        private AgentLogFile _secondCallAppAgentLog;
+
+        public AgentLogFile FirstCallAppAgentLog => _firstCallAppAgentLog ?? (_firstCallAppAgentLog = new AgentLogFile(FirstCallApplication.DefaultLogFileDirectoryPath, TestLogger, string.Empty, Timing.TimeToWaitForLog));
+        public AgentLogFile SecondCallAppAgentLog => _secondCallAppAgentLog ?? (_secondCallAppAgentLog = new AgentLogFile(SecondCallApplication.DefaultLogFileDirectoryPath, TestLogger, string.Empty, Timing.TimeToWaitForLog));
+
         public AspNetCoreDistTraceRequestChainFixture()
             : base(new RemoteService(ApplicationDirectoryName, ExecutableName, "net7.0", ApplicationType.Bounded, true, true, true))
         {
@@ -41,9 +47,9 @@ public AspNetCoreDistTraceRequestChainFixture()
 
         public void ExecuteTraceRequestChain(string firstAppAction, string secondAppAction, string thirdAppAction, IEnumerable<KeyValuePair<string, string>> headers = null)
         {
-            var firstCallBaseUrl = $"http://localhost:{FirstCallApplication.Port}/FirstCall";
-            var secondCallBaseUrl = $"http://localhost:{SecondCallApplication.Port}/SecondCall";
-            var lastCallBaseUrl = $"http://localhost:{RemoteApplication.Port}/LastCall";
+            var firstCallBaseUrl = $"http://{DestinationServerName}:{FirstCallApplication.Port}/FirstCall";
+            var secondCallBaseUrl = $"http://{DestinationServerName}:{SecondCallApplication.Port}/SecondCall";
+            var lastCallBaseUrl = $"http://{DestinationServerName}:{RemoteApplication.Port}/LastCall";
 
             var lastCallUrl = $"{lastCallBaseUrl}/{thirdAppAction}";
             var secondCallUrl = $"{secondCallBaseUrl}/{secondAppAction}?nextUrl={lastCallUrl}";
@@ -82,18 +88,18 @@ public override void Initialize()
         {
             base.Initialize();
 
-            WriteApplicationAgentLogToTestLogger(nameof(FirstCallApplication), FirstCallApplication);
-            WriteApplicationAgentLogToTestLogger(nameof(SecondCallApplication), SecondCallApplication);
+            WriteApplicationAgentLogToTestLogger(nameof(FirstCallApplication), FirstCallAppAgentLog);
+            WriteApplicationAgentLogToTestLogger(nameof(SecondCallApplication), SecondCallAppAgentLog);
         }
 
-        private void WriteApplicationAgentLogToTestLogger(string applicationName, RemoteService application)
+        private void WriteApplicationAgentLogToTestLogger(string applicationName, AgentLogFile agentLog)
         {
             TestLogger?.WriteLine("");
             TestLogger?.WriteLine($"===== Begin {applicationName} log file =====");
 
             try
             {
-                TestLogger?.WriteLine(application.AgentLog.GetFullLogAsString());
+                TestLogger?.WriteLine(agentLog.GetFullLogAsString());
             }
             catch (Exception)
             {
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreFeaturesFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreFeaturesFixture.cs
index b2396a8c12..751e587646 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreFeaturesFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreFeaturesFixture.cs
@@ -17,37 +17,37 @@ public AspNetCoreFeaturesFixture() : base(new RemoteService(ApplicationDirectory
 
         public void Get()
         {
-            var address = $"http://localhost:{Port}/";
+            var address = $"http://{DestinationServerName}:{Port}/";
             GetStringAndAssertContains(address, "<html>");
         }
 
         public void ThrowException()
         {
-            var address = $"http://localhost:{Port}/Home/ThrowException";
+            var address = $"http://{DestinationServerName}:{Port}/Home/ThrowException";
             GetAndAssertStatusCode(address, HttpStatusCode.InternalServerError);
         }
 
         public void AccessCollectible()
         {
-            var address = $"http://localhost:{Port}/Collectible/AccessCollectible";
+            var address = $"http://{DestinationServerName}:{Port}/Collectible/AccessCollectible";
             _httpClient.GetStringAsync(address).Wait();
         }
 
         public void AsyncStream()
         {
-            var address = $"http://localhost:{Port}/api/AsyncStream";
+            var address = $"http://{DestinationServerName}:{Port}/api/AsyncStream";
             GetStringAndAssertContains(address, "45");
         }
 
         public void InterfaceDefaultsGetWithAttributes()
         {
-            var address = $"http://localhost:{Port}/InterfaceDefaults/GetWithAttributes";
+            var address = $"http://{DestinationServerName}:{Port}/InterfaceDefaults/GetWithAttributes";
             GetStringAndAssertContains(address, "Done");
         }
 
         public void InterfaceDefaultsGetWithoutAttributes()
         {
-            var address = $"http://localhost:{Port}/InterfaceDefaults/GetWithoutAttributes";
+            var address = $"http://{DestinationServerName}:{Port}/InterfaceDefaults/GetWithoutAttributes";
             GetStringAndAssertContains(address, "Done");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcAsyncTestsFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcAsyncTestsFixture.cs
index 6cf952ee35..6ef662e6ce 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcAsyncTestsFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcAsyncTestsFixture.cs
@@ -17,43 +17,43 @@ public AspNetCoreMvcAsyncTestsFixture() : base(new RemoteService(ApplicationDire
 
         public void GetIoBoundNoSpecialAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/IoBoundNoSpecialAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/IoBoundNoSpecialAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetCustomMiddlewareIoBoundNoSpecialAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/CustomMiddlewareIoBoundNoSpecialAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/CustomMiddlewareIoBoundNoSpecialAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetIoBoundConfigureAwaitFalseAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/IoBoundConfigureAwaitFalseAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/IoBoundConfigureAwaitFalseAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetCpuBoundTasksAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/CpuBoundTasksAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/CpuBoundTasksAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetManualTaskRunBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskRunBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskRunBlocked";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetManualTaskFactoryStartNewBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetManualNewThreadStartBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/NewThreadStartBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/NewThreadStartBlocked";
             GetStringAndAssertEqual(address, "Worked");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcBasicRequestsFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcBasicRequestsFixture.cs
index b4bc087a66..4a749516a7 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcBasicRequestsFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcBasicRequestsFixture.cs
@@ -23,12 +23,12 @@ public AspNetCoreMvcBasicRequestsFixture() : base(new RemoteService(ApplicationD
 
         public void Get()
         {
-            var address = $"http://localhost:{Port}/";
+            var address = $"http://{DestinationServerName}:{Port}/";
             GetStringAndAssertContains(address, "<html>");
         }
         public void GetCORSPreflight()
         {
-            var address = $"http://localhost:{Port}/Home/About";
+            var address = $"http://{DestinationServerName}:{Port}/Home/About";
 
             using (var request = new HttpRequestMessage(HttpMethod.Options, address))
             {
@@ -45,7 +45,7 @@ public void GetCORSPreflight()
 
         public void MakePostRequestWithCustomRequestHeader(Dictionary<string, string> customHeadersToAdd)
         {
-            var address = $"http://localhost:{Port}/";
+            var address = $"http://{DestinationServerName}:{Port}/";
 
             using (var request = new HttpRequestMessage(HttpMethod.Options, address))
             {
@@ -79,61 +79,61 @@ public void MakePostRequestWithCustomRequestHeader(Dictionary<string, string> cu
 
         public void ThrowException()
         {
-            var address = $"http://localhost:{Port}/Home/ThrowException";
+            var address = $"http://{DestinationServerName}:{Port}/Home/ThrowException";
             GetAndAssertStatusCode(address, HttpStatusCode.InternalServerError);
         }
 
         public void ThrowExceptionWithMessage(string exceptionMessage)
         {
-            var address = $"http://localhost:{Port}/ExpectedErrorTest/ThrowExceptionWithMessage?exceptionMessage={exceptionMessage}";
+            var address = $"http://{DestinationServerName}:{Port}/ExpectedErrorTest/ThrowExceptionWithMessage?exceptionMessage={exceptionMessage}";
             GetAndAssertStatusCode(address, HttpStatusCode.InternalServerError);
         }
 
         public void ReturnADesiredStatusCode(int statusCode)
         {
-            var address = $"http://localhost:{Port}/ExpectedErrorTest/ReturnADesiredStatusCode?statusCode={statusCode}";
+            var address = $"http://{DestinationServerName}:{Port}/ExpectedErrorTest/ReturnADesiredStatusCode?statusCode={statusCode}";
             GetAndAssertStatusCode(address, (HttpStatusCode)statusCode);
         }
 
         public void ThrowCustomException()
         {
-            var address = $"http://localhost:{Port}/ExpectedErrorTest/ThrowCustomException";
+            var address = $"http://{DestinationServerName}:{Port}/ExpectedErrorTest/ThrowCustomException";
             GetAndAssertStatusCode(address, HttpStatusCode.InternalServerError);
         }
 
         public void GetWithData(string requestParameter)
         {
-            var address = $"http://localhost:{Port}/Home/Query?data={requestParameter}";
+            var address = $"http://{DestinationServerName}:{Port}/Home/Query?data={requestParameter}";
             GetStringAndAssertContains(address, "<html>");
         }
 
         public void GetHttpClient()
         {
-            var address = $"http://localhost:{Port}/Home/HttpClient";
+            var address = $"http://{DestinationServerName}:{Port}/Home/HttpClient";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetHttpClientTaskCancelled()
         {
-            var address = $"http://localhost:{Port}/Home/HttpClientTaskCancelled";
+            var address = $"http://{DestinationServerName}:{Port}/Home/HttpClientTaskCancelled";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetHttpClientFactory()
         {
-            var address = $"http://localhost:{Port}/Home/HttpClientFactory";
+            var address = $"http://{DestinationServerName}:{Port}/Home/HttpClientFactory";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetTypedHttpClient()
         {
-            var address = $"http://localhost:{Port}/Home/TypedHttpClient";
+            var address = $"http://{DestinationServerName}:{Port}/Home/TypedHttpClient";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetCallAsyncExternal()
         {
-            var address = $"http://localhost:{Port}/DetachWrapper/CallAsyncExternal";
+            var address = $"http://{DestinationServerName}:{Port}/DetachWrapper/CallAsyncExternal";
             GetStringAndAssertEqual(address, "Worked");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcCoreFrameworkFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcCoreFrameworkFixture.cs
index efa8655eed..6243b7d248 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcCoreFrameworkFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcCoreFrameworkFixture.cs
@@ -18,7 +18,7 @@ public AspNetCoreMvcCoreFrameworkFixture() : base(new RemoteService(ApplicationD
 
         public void Get()
         {
-            var address = $"http://localhost:{Port}/api/values";
+            var address = $"http://{DestinationServerName}:{Port}/api/values";
             GetStringAndAssertContains(address, "value1");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkAsyncTestsFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkAsyncTestsFixture.cs
index c6815673fc..55504b958a 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkAsyncTestsFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkAsyncTestsFixture.cs
@@ -19,43 +19,43 @@ public AspNetCoreMvcFrameworkAsyncTestsFixture() : base(new RemoteService(Applic
 
         public void GetIoBoundNoSpecialAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/IoBoundNoSpecialAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/IoBoundNoSpecialAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetCustomMiddlewareIoBoundNoSpecialAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/CustomMiddlewareIoBoundNoSpecialAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/CustomMiddlewareIoBoundNoSpecialAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetIoBoundConfigureAwaitFalseAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/IoBoundConfigureAwaitFalseAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/IoBoundConfigureAwaitFalseAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetCpuBoundTasksAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwaitTest/CpuBoundTasksAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwaitTest/CpuBoundTasksAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetManualTaskRunBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskRunBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskRunBlocked";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetManualTaskFactoryStartNewBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
             GetStringAndAssertEqual(address, "Worked");
         }
 
         public void GetManualNewThreadStartBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/NewThreadStartBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/NewThreadStartBlocked";
             GetStringAndAssertEqual(address, "Worked");
         }
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkFixture.cs
index 3dcdaebe6b..379e4108ea 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreMvcFrameworkFixture.cs
@@ -21,13 +21,13 @@ public AspNetCoreMvcFrameworkFixture() : base(new RemoteService(ApplicationDirec
 
         public void Get()
         {
-            var address = $"http://localhost:{Port}/";
+            var address = $"http://{DestinationServerName}:{Port}/";
             GetStringAndAssertContains(address, "<html>");
         }
 
         public void GetCORSPreflight()
         {
-            var address = $"http://localhost:{Port}/Home/About";
+            var address = $"http://{DestinationServerName}:{Port}/Home/About";
 
             using (var request = new HttpRequestMessage(HttpMethod.Options, address))
             {
@@ -44,19 +44,19 @@ public void GetCORSPreflight()
 
         public void ThrowException()
         {
-            var address = $"http://localhost:{Port}/Home/ThrowException";
+            var address = $"http://{DestinationServerName}:{Port}/Home/ThrowException";
             GetAndAssertStatusCode(address, HttpStatusCode.InternalServerError);
         }
 
         public void GetWithData(string requestParameter)
         {
-            var address = $"http://localhost:{Port}/Home/Query?data={requestParameter}";
+            var address = $"http://{DestinationServerName}:{Port}/Home/Query?data={requestParameter}";
             GetStringAndAssertContains(address, "<html>");
         }
 
         public void GetCallAsyncExternal()
         {
-            var address = $"http://localhost:{Port}/DetachWrapper/CallAsyncExternal";
+            var address = $"http://{DestinationServerName}:{Port}/DetachWrapper/CallAsyncExternal";
             GetStringAndAssertEqual(address, "Worked");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiCustomAttributesFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiCustomAttributesFixture.cs
index 4a1a8bc575..7621486d6c 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiCustomAttributesFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiCustomAttributesFixture.cs
@@ -17,7 +17,7 @@ public AspNetCoreWebApiCustomAttributesFixture() : base(new RemoteService(Applic
 
         public void Get()
         {
-            var address = string.Format("http://localhost:{0}/api/CustomAttributes", Port);
+            var address = $"http://{DestinationServerName}:{Port}/api/CustomAttributes";
             GetStringAndAssertEqual(address, "success");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiWithCollectorFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiWithCollectorFixture.cs
index 410b733129..ff6c0926c7 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiWithCollectorFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/AspNetCoreWebApiWithCollectorFixture.cs
@@ -15,7 +15,7 @@ public AspNetCoreWebApiWithCollectorFixture() : base(new RemoteService("AspNetCo
 
         public void Get()
         {
-            var address = $"http://localhost:{Port}/api/default/AwesomeName";
+            var address = $"http://{DestinationServerName}:{Port}/api/default/AwesomeName";
             GetStringAndAssertContains(address, "Chuck Norris");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicAspNetCoreRazorApplicationFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicAspNetCoreRazorApplicationFixture.cs
new file mode 100644
index 0000000000..029ee38846
--- /dev/null
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicAspNetCoreRazorApplicationFixture.cs
@@ -0,0 +1,66 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.IO;
+using System.IO.Compression;
+using System.Net.Http;
+using System.Text;
+using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
+using Xunit;
+
+namespace NewRelic.Agent.IntegrationTests.RemoteServiceFixtures
+{
+    public class BasicAspNetCoreRazorApplicationFixture : RemoteApplicationFixture
+    {
+        private bool _responseCompressionEnabled;
+        private const string ApplicationDirectoryName = @"BasicAspNetCoreRazorApplication";
+        private const string ExecutableName = @"BasicAspNetCoreRazorApplication.exe";
+        public BasicAspNetCoreRazorApplicationFixture()
+            : base(new RemoteService(ApplicationDirectoryName, ExecutableName, targetFramework: "net7.0", ApplicationType.Bounded, true, true, true))
+        {
+        }
+
+        public void SetResponseCompression(bool enabled)
+        {
+            _responseCompressionEnabled = enabled;
+            SetAdditionalEnvironmentVariable("ENABLE_RESPONSE_COMPRESSION", enabled ? "1" : "0");
+        }
+
+        public string Get(string endpoint)
+        {
+            var address = $"http://{DestinationServerName}:{Port}/{endpoint}";
+
+            if (_responseCompressionEnabled)
+            {
+                using (var requestMessage = new HttpRequestMessage(HttpMethod.Get, address))
+                {
+                    requestMessage.Headers.Add("Accept-Encoding", "gzip");
+
+                    using (var response = _httpClient.SendAsync(requestMessage).Result)
+                    {
+                        var resultBytes = response.Content.ReadAsByteArrayAsync().Result;
+                        Assert.NotNull(resultBytes);
+
+                        if (response.Content.Headers.ContentEncoding != null &&
+                            response.Content.Headers.ContentEncoding.ToString() == "gzip")
+                        {
+                            using (var ms = new MemoryStream(resultBytes))
+                            using (var gzip = new GZipStream(ms, CompressionMode.Decompress))
+                            {
+                                var reader = new StreamReader(gzip, Encoding.UTF8);
+
+                                var result = reader.ReadToEndAsync().Result;
+                                Assert.NotNull(result);
+                                return result;
+                            }
+                        }
+                        else // not compressed
+                            return response.Content.ReadAsStringAsync().Result;
+                    }
+                }
+            }
+
+            return GetString(address);
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicAspWebService.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicAspWebService.cs
index 720d06d177..594f5bb4bb 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicAspWebService.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicAspWebService.cs
@@ -37,6 +37,8 @@ public void InvokeAsyncCall()
             _driver.Navigate().GoToUrl(address);
         }
 
+        public override string DestinationServerName { get; } = "localhost";
+
         public override void Dispose()
         {
             if (_driver != null)
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs
index ee7c99a440..ea8fccd9f9 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs
@@ -124,7 +124,7 @@ public void WaitForStartup()
                 }
             }
 
-            Assert.True(false, @"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds.");
+            Assert.Fail(@"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds.");
         }
 
         public void GetWithStatusCode(int statusCode)
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs
index 0c545f6e97..de8f5ef2ea 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs
@@ -60,7 +60,7 @@ public void WaitForStartup()
                 }
             }
 
-            Assert.True(false, @"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds.");
+            Assert.Fail(@"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds.");
         }
 
         public void Get()
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/DTBasicMVCApplicationFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/DTBasicMVCApplicationFixture.cs
index bf396f342a..a7d93b9e09 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/DTBasicMVCApplicationFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/DTBasicMVCApplicationFixture.cs
@@ -20,14 +20,14 @@ public DTBasicMVCApplicationFixture() : base(new RemoteWebApplication("BasicMvcA
 
         public void Initiate()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/Initiate";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/Initiate";
 
             GetStringAndIgnoreResult(address);
         }
 
         public void ReceiveDTPayload()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/ReceivePayload";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/ReceivePayload";
 
             //string payload = "eyJ2IjpbMCwxXSwiZCI6eyJ0eSI6IkFwcCIsImFjIjoiMSIsImFwIjoiNTE0MjQiLCJwYSI6IjVmYTNjMDE0OThlMjQ0YTYiLCJpZCI6IjI3ODU2ZjcwZDNkMzE0YjciLCJ0ciI6IjMyMjFiZjA5YWEwYmNmMGQiLCJwciI6MC4xMjM0LCJzYSI6ZmFsc2UsInRpIjoxNDgyOTU5NTI1NTc3fX0=";
             string payload =
@@ -43,7 +43,7 @@ public void ReceiveDTPayload()
 
         public void GenerateMajorVersionMetric()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/SupportabilityReceivePayload";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/SupportabilityReceivePayload";
 
             // Version: [9999,1]
             string payload = "eyJ2IjpbOTk5OSwxXSwiZCI6eyJ0eSI6IkFwcCIsImFjIjoiOTEyMyIsImFwIjoiNTE0MjQiLCJpZCI6IjI3ODU2ZjcwZDNkMzE0YjciLCJ0ciI6IjE0ODI5NTk1MjU1NzciLCJwciI6MC4xMjM0LCJzYSI6ZmFsc2UsInRpIjoxNTI5NDI0MTMwNjAzLCJwYSI6IjVmYTNjMDE0OThlMjQ0YTYifX0=";
@@ -54,7 +54,7 @@ public void GenerateMajorVersionMetric()
 
         public void GenerateIgnoredNullMetric()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/SupportabilityReceivePayload";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/SupportabilityReceivePayload";
             string payload = null;
 
             var headers = new List<KeyValuePair<string, string>>() { new KeyValuePair<string, string>(DTHeaderName, payload) };
@@ -63,7 +63,7 @@ public void GenerateIgnoredNullMetric()
 
         public void GenerateParsePayloadMetric()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/SupportabilityReceivePayload";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/SupportabilityReceivePayload";
             string payload = "eyJ2IjpbMCwxXSwiZCI6eyJ0eSI6IkFwcCIsImZvbyI6ImJhciIsYWMiOiI5MTIzIiwiYXAiOiI1MTQyNCIsImlkIjoiMjc4NTZmNzBkM2QzMTRiNyIsInRyIjoiMTQ4Mjk1OTUyNTU3NyIsInByIjowLjEyMzQsInNhIjpmYWxzZSwidGkiOjE1Mjk0MjQxMzA2MDMsInBhIjoiNWZhM2MwMTQ5OGUyNDRhNiJ9fQ==";
 
             var headers = new List<KeyValuePair<string, string>>() { new KeyValuePair<string, string>(DTHeaderName, payload) };
@@ -72,7 +72,7 @@ public void GenerateParsePayloadMetric()
 
         public void GenerateAcceptSuccessMetric()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/SupportabilityReceivePayload";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/SupportabilityReceivePayload";
             string payload = "eyJ2IjpbMCwxXSwiZCI6eyJ0eSI6IkFwcCIsImFjIjoiMSIsImFwIjoiNTE0MjQiLCJwYSI6IjVmYTNjMDE0OThlMjQ0YTYiLCJpZCI6IjI3ODU2ZjcwZDNkMzE0YjciLCJ0ciI6IjMyMjFiZjA5YWEwYmNmMGQiLCJwciI6MC4xMjM0LCJzYSI6ZmFsc2UsInRpIjoxNDgyOTU5NTI1NTc3fX0=";
 
             var headers = new List<KeyValuePair<string, string>>() { new KeyValuePair<string, string>(DTHeaderName, payload) };
@@ -81,7 +81,7 @@ public void GenerateAcceptSuccessMetric()
 
         public void GenerateUntrustedAccountMetric()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/SupportabilityReceivePayload";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/SupportabilityReceivePayload";
 
             //{"v":[0,1],"d":{"ty":"App","ac":"8675309","ap":"51424","pa":"5fa3c01498e244a6","id":"27856f70d3d314b7","tr":"3221bf09aa0bcf0d","pr":0.1234,"sa":false,"ti":1482959525577}}
             string payload = "eyJ2IjpbMCwxXSwiZCI6eyJ0eSI6IkFwcCIsImFjIjoiODY3NTMwOSIsImFwIjoiNTE0MjQiLCJwYSI6IjVmYTNjMDE0OThlMjQ0YTYiLCJpZCI6IjI3ODU2ZjcwZDNkMzE0YjciLCJ0ciI6IjMyMjFiZjA5YWEwYmNmMGQiLCJwciI6MC4xMjM0LCJzYSI6ZmFsc2UsInRpIjoxNDgyOTU5NTI1NTc3fX0=";
@@ -92,7 +92,7 @@ public void GenerateUntrustedAccountMetric()
 
         public void GenerateCreateSuccessMetric()
         {
-            var address = $"http://localhost:{Port}/DistributedTracing/SupportabilityCreatePayload";
+            var address = $"http://{DestinationServerName}:{Port}/DistributedTracing/SupportabilityCreatePayload";
             string payload = "eyJ2IjpbMCwxXSwiZCI6eyJ0eSI6IkFwcCIsImFjIjoiMSIsImFwIjoiNTE0MjQiLCJwYSI6IjVmYTNjMDE0OThlMjQ0YTYiLCJpZCI6IjI3ODU2ZjcwZDNkMzE0YjciLCJ0ciI6IjMyMjFiZjA5YWEwYmNmMGQiLCJwciI6MC4xMjM0LCJzYSI6ZmFsc2UsInRpIjoxNDgyOTU5NTI1NTc3fX0=";
 
             var headers = new List<KeyValuePair<string, string>>() { new KeyValuePair<string, string>(DTHeaderName, payload) };
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MockNewRelicFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MockNewRelicFixture.cs
index 10f69fb2fb..64a3463e16 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MockNewRelicFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MockNewRelicFixture.cs
@@ -135,7 +135,7 @@ public override void Initialize()
             {
                 base.Initialize();
 
-                RemoteApplication.AgentLog.WaitForLogLine(AgentLogFile.ShutdownLogLineRegex, TimeSpan.FromMinutes(2));
+                AgentLog.WaitForLogLine(AgentLogFile.ShutdownLogLineRegex, TimeSpan.FromMinutes(2));
                 MockNewRelicApplication.Shutdown();
                 MockNewRelicApplication.CapturedOutput?.WriteProcessOutputToLog("MockNewRelic application:");
             }
@@ -150,7 +150,7 @@ public override void Initialize()
         public override void ShutdownRemoteApplication()
         {
             base.ShutdownRemoteApplication();
-            RemoteApplication.AgentLog.WaitForLogLine(AgentLogFile.ShutdownLogLineRegex, TimeSpan.FromMinutes(2));
+            AgentLog.WaitForLogLine(AgentLogFile.ShutdownLogLineRegex, TimeSpan.FromMinutes(2));
             MockNewRelicApplication.Shutdown();
         }
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MvcAsyncFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MvcAsyncFixture.cs
index 918b67a00e..ad9070b56a 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MvcAsyncFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MvcAsyncFixture.cs
@@ -26,7 +26,7 @@ public void GetIoBoundConfigureAwaitFalseAsync()
 
         public void GetCpuBoundTasksAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwait/CpuBoundTasksAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwait/CpuBoundTasksAsync";
             GetStringAndAssertEqual(address, "Worked");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/OwinWebApiFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/OwinWebApiFixture.cs
index 2680a7356e..29e7e16903 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/OwinWebApiFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/OwinWebApiFixture.cs
@@ -136,43 +136,43 @@ public void GetIoBoundConfigureAwaitFalseAsync()
         }
         public void GetCpuBoundTasksAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwait/CpuBoundTasksAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwait/CpuBoundTasksAsync";
             GetJsonAndAssertEqual(address, "Worked");
         }
         public void GetCustomMiddlewareIoBoundNoSpecialAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwait/CustomMiddlewareIoBoundNoSpecialAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwait/CustomMiddlewareIoBoundNoSpecialAsync";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void ErrorResponse()
         {
-            var address = $"http://localhost:{Port}/AsyncAwait/ErrorResponse";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwait/ErrorResponse";
 
             GetAndAssertSuccessStatus(address, false, GetHeaders());
         }
 
         public void GetManualTaskRunBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskRunBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskRunBlocked";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetManualTaskFactoryStartNewBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetManualNewThreadStartBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/NewThreadStartBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/NewThreadStartBlocked";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetBogusPath(string bogusPath)
         {
-            var address = string.Format(@"http://{0}:{1}/{2}", DestinationServerName, Port, bogusPath);
+            var address = $@"http://{DestinationServerName}:{Port}/{bogusPath}";
             GetAndAssertStatusCode(address, HttpStatusCode.NotFound, GetHeaders());
         }
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/SerilogSumologicFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/SerilogSumologicFixture.cs
index ce777d3396..c7a8889b63 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/SerilogSumologicFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/SerilogSumologicFixture.cs
@@ -16,13 +16,13 @@ public SerilogSumologicFixture() : base(new RemoteService(ApplicationDirectoryNa
 
         public void SyncControllerMethod()
         {
-            var address = $"http://localhost:{Port}/Home/SyncControllerMethod";
+            var address = $"http://{DestinationServerName}:{Port}/Home/SyncControllerMethod";
             GetStringAndAssertContains(address, "<html>");
         }
 
         public void AsyncControllerMethod()
         {
-            var address = $"http://localhost:{Port}/Home/AsyncControllerMethod";
+            var address = $"http://{DestinationServerName}:{Port}/Home/AsyncControllerMethod";
             GetStringAndAssertContains(address, "<html>");
         }
     }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/TracingChainFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/TracingChainFixture.cs
index 2f96915e71..47f90ede41 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/TracingChainFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/TracingChainFixture.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 
@@ -17,8 +16,10 @@ public class TracingChainFixture : RemoteApplicationFixture
         private string _applicationDirectoryName;
         private string _executableName;
         private string _targetFramework;
+        private AgentLogFile _recieverAppAgentLog;
 
         public RemoteApplication ReceiverApplication { get; set; }
+        public AgentLogFile ReceiverAppAgentLog => _recieverAppAgentLog ?? (_recieverAppAgentLog = new AgentLogFile(ReceiverApplication.DefaultLogFileDirectoryPath, TestLogger, string.Empty, Timing.TimeToWaitForLog));
         public RemoteWebApplication SenderApplication => (RemoteWebApplication)RemoteApplication;
 
         public TracingChainFixture(string ApplicationDirectoryName, string ExecutableName, string TargetFramework) : base(new RemoteService(ApplicationDirectoryName, ExecutableName, TargetFramework, ApplicationType.Bounded))
@@ -37,7 +38,7 @@ public override void Initialize()
         {
             base.Initialize();
 
-            WriteApplicationAgentLogToTestLogger(nameof(ReceiverApplication), ReceiverApplication);
+            WriteApplicationAgentLogToTestLogger(nameof(ReceiverApplication), ReceiverAppAgentLog);
         }
 
         public override void ShutdownRemoteApplication()
@@ -54,14 +55,14 @@ public override void Dispose()
             base.Dispose();
         }
 
-        private void WriteApplicationAgentLogToTestLogger(string applicationName, RemoteApplication application)
+        private void WriteApplicationAgentLogToTestLogger(string applicationName, AgentLogFile agentLog)
         {
             TestLogger?.WriteLine("");
             TestLogger?.WriteLine($"===== Begin {applicationName} log file =====");
 
             try
             {
-                TestLogger?.WriteLine(application.AgentLog.GetFullLogAsString());
+                TestLogger?.WriteLine(agentLog.GetFullLogAsString());
             }
             catch (Exception)
             {
@@ -109,7 +110,7 @@ public RemoteApplication SetupReceiverApplication(bool isDistributedTracing, boo
         public HttpResponseHeaders ExecuteTraceRequestChainHttpWebRequest(IEnumerable<KeyValuePair<string, string>> headers)
         {
             const string action = "Index";
-            var queryString = $"?chainedServerName={ReceiverApplication.DestinationServerName}&chainedPortNumber={ReceiverApplication.Port}&chainedAction={action}";
+            var queryString = $"?chainedServerName={DestinationServerName}&chainedPortNumber={ReceiverApplication.Port}&chainedAction={action}";
 
             var address = $"http://{DestinationServerName}:{Port}/Default/ChainedWebRequest{queryString}";
 
@@ -130,8 +131,8 @@ public HttpResponseHeaders ExecuteTraceRequestChainHttpWebRequest(IEnumerable<Ke
         public void ExecuteTraceRequestChainHttpClient(IEnumerable<KeyValuePair<string, string>> headers = null)
         {
             // the test calls the senderUrl, passing in the receiverUrl as a parameter
-            var senderBaseUrl = $"http://localhost:{RemoteApplication.Port}";
-            var receiverBaseUrl = $"http://localhost:{ReceiverApplication.Port}";
+            var senderBaseUrl = $"http://{DestinationServerName}:{RemoteApplication.Port}";
+            var receiverBaseUrl = $"http://{DestinationServerName}:{ReceiverApplication.Port}";
 
             var receiverUrl = $"{receiverBaseUrl}/api/CallEnd";
             var senderUrl = $"{senderBaseUrl}/api/CallNext?nextUrl={receiverUrl}";
@@ -143,8 +144,8 @@ public void ExecuteTraceRequestChainHttpClient(IEnumerable<KeyValuePair<string,
 
         public void ExecuteTraceRequestChainRestSharp(IEnumerable<KeyValuePair<string, string>> headers)
         {
-            var secondCallUrl = $"http://localhost:{ReceiverApplication.Port}/api/RestAPI";
-            var firstCallUrl = $"http://localhost:{SenderApplication.Port}/DistributedTracing/MakeExternalCallUsingRestClient?externalCallUrl={secondCallUrl}";
+            var secondCallUrl = $"http://{DestinationServerName}:{ReceiverApplication.Port}/api/RestAPI";
+            var firstCallUrl = $"http://{DestinationServerName}:{SenderApplication.Port}/DistributedTracing/MakeExternalCallUsingRestClient?externalCallUrl={secondCallUrl}";
 
             GetStringAndAssertEqual(firstCallUrl, "Worked", headers);
         }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/WebApiAsyncFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/WebApiAsyncFixture.cs
index 50b603d1a3..32afa84a37 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/WebApiAsyncFixture.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/WebApiAsyncFixture.cs
@@ -30,73 +30,73 @@ public void GetIoBoundConfigureAwaitFalseAsync()
 
         public void GetCpuBoundTasksAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncAwait/CpuBoundTasksAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncAwait/CpuBoundTasksAsync";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetManualTaskRunBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskRunBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskRunBlocked";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetManualTaskFactoryStartNewBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/TaskFactoryStartNewBlocked";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetManualNewThreadStartBlocked()
         {
-            var address = $"http://localhost:{Port}/ManualAsync/NewThreadStartBlocked";
+            var address = $"http://{DestinationServerName}:{Port}/ManualAsync/NewThreadStartBlocked";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetAsync_AwaitedAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncFireAndForget/Async_AwaitedAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncFireAndForget/Async_AwaitedAsync";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetAsync_FireAndForget()
         {
-            var address = $"http://localhost:{Port}/AsyncFireAndForget/Async_FireAndForget";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncFireAndForget/Async_FireAndForget";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetAsync_Sync()
         {
-            var address = $"http://localhost:{Port}/AsyncFireAndForget/Async_Sync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncFireAndForget/Async_Sync";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetSync_AwaitedAsync()
         {
-            var address = $"http://localhost:{Port}/AsyncFireAndForget/Sync_AwaitedAsync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncFireAndForget/Sync_AwaitedAsync";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetSync_FireAndForget()
         {
-            var address = $"http://localhost:{Port}/AsyncFireAndForget/Sync_FireAndForget";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncFireAndForget/Sync_FireAndForget";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void GetSync_Sync()
         {
-            var address = $"http://localhost:{Port}/AsyncFireAndForget/Sync_Sync";
+            var address = $"http://{DestinationServerName}:{Port}/AsyncFireAndForget/Sync_Sync";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public void ExecuteResponseTimeTestOperation(int delayDurationSeconds)
         {
-            var address = $"http://localhost:{Port}/ResponseTime/CallsOtherMethod/{delayDurationSeconds}";
+            var address = $"http://{DestinationServerName}:{Port}/ResponseTime/CallsOtherMethod/{delayDurationSeconds}";
             GetJsonAndAssertEqual(address, "Worked");
         }
 
         public string Request(HttpMethod method)
         {
-            using (var requestMessage = new HttpRequestMessage(method, $"http://localhost:{Port}/AsyncFireAndForget/Sync_Sync"))
+            using (var requestMessage = new HttpRequestMessage(method, $"http://{DestinationServerName}:{Port}/AsyncFireAndForget/Sync_Sync"))
             {
                 var result = _httpClient.SendAsync(requestMessage).Result;
                 return result.Content.ReadAsStringAsync().Result;
@@ -105,7 +105,7 @@ public string Request(HttpMethod method)
 
         public void Get404(string Path = "DoesNotExist")
         {
-            GetAndAssertStatusCode($"http://localhost:{Port}/{Path}", HttpStatusCode.NotFound);
+            GetAndAssertStatusCode($"http://{DestinationServerName}:{Port}/{Path}", HttpStatusCode.NotFound);
         }
     }
 }
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersDisabledTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersDisabledTests.cs
index 512b3fc586..ed102240be 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersDisabledTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersDisabledTests.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 #if NETFRAMEWORK
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersEnabledTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersEnabledTests.cs
index 6361528b66..1b2777ccd1 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersEnabledTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RequestHeadersCapture/WCF/AllowAllHeadersEnabledTests.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 #if NETFRAMEWORK
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationAsyncAwaitCAT.cs b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationAsyncAwaitCAT.cs
index fbd5f98da6..f40cdc7791 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationAsyncAwaitCAT.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationAsyncAwaitCAT.cs
@@ -24,11 +24,11 @@ public RestSharpInstrumentationAsyncAwaitCATBase(TFixture fixture, ITestOutputHe
             _fixture.SetTimeout(TimeSpan.FromMinutes(2));
             _fixture.TestLogger = output;
 
-            _fixture.AddCommand($"RestSharpService StartService {_fixture.RemoteApplication.Port}");
-            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.RemoteApplication.Port} GET true true");
-            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.RemoteApplication.Port} PUT false false");
-            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.RemoteApplication.Port} POST false false");
-            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.RemoteApplication.Port} DELETE true true");
+            _fixture.AddCommand($"RestSharpService StartService {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port}");
+            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} GET true true");
+            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} PUT false false");
+            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} POST false false");
+            _fixture.AddCommand($"RestSharpExerciser AsyncAwaitClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} DELETE true true");
             _fixture.AddCommand("RestSharpService StopService");
 
             _fixture.AddActions
@@ -49,20 +49,22 @@ public RestSharpInstrumentationAsyncAwaitCATBase(TFixture fixture, ITestOutputHe
         [Fact]
         public void Test()
         {
+            var serverName = _fixture.DestinationServerName;
+
             var crossProcessId = _fixture.AgentLog.GetCrossProcessId();
             var callerTransactionName = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.RestSharp.RestSharpExerciser/AsyncAwaitClient";
 
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
                 new Assertions.ExpectedMetric { metricName = "External/all", callCount = 4 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/GET", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/PUT", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/POST", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/DELETE", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Get", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Put", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Post", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Delete", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/GET", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/PUT", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/POST", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/DELETE", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Get", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Put", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Post", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Delete", metricScope = callerTransactionName, callCount = 1 },
             };
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationCAT.cs b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationCAT.cs
index 09e21d7dba..51397df926 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationCAT.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationCAT.cs
@@ -24,12 +24,12 @@ public RestSharpInstrumentationCATBase(TFixture fixture, ITestOutputHelper outpu
             _fixture.SetTimeout(TimeSpan.FromMinutes(2));
             _fixture.TestLogger = output;
 
-            _fixture.AddCommand($"RestSharpService StartService {_fixture.RemoteApplication.Port}");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} GET false");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} PUT false");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} POST false");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} DELETE false");
-            _fixture.AddCommand($"RestSharpExerciser RestSharpClientTaskCancelled {_fixture.RemoteApplication.Port}");
+            _fixture.AddCommand($"RestSharpService StartService {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port}");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} GET false");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} PUT false");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} POST false");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} DELETE false");
+            _fixture.AddCommand($"RestSharpExerciser RestSharpClientTaskCancelled {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port}");
             _fixture.AddCommand("RestSharpService StopService");
 
             _fixture.AddActions
@@ -55,18 +55,19 @@ public void Test()
             var callerTransactionName = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.RestSharp.RestSharpExerciser/SyncClient";
             var cancelledTrasnsactionName = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.RestSharp.RestSharpExerciser/RestSharpClientTaskCancelled";
 
+            var serverName = _fixture.DestinationServerName;
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
                 new Assertions.ExpectedMetric { metricName = "External/all", callCount = 5 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/GET", callCount = 2 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/PUT", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/POST", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/DELETE", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/GET", metricScope = cancelledTrasnsactionName, callCount = 1},
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Get", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Put", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Post", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Delete", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/GET", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/PUT", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/POST", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/DELETE", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/GET", metricScope = cancelledTrasnsactionName, callCount = 1},
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Get", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Put", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Post", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Delete", metricScope = callerTransactionName, callCount = 1 },
             };
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationDistributedTracing.cs b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationDistributedTracing.cs
index a247f55005..538f309782 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationDistributedTracing.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationDistributedTracing.cs
@@ -26,12 +26,12 @@ public RestSharpInstrumentationDistributedTracingBase(TFixture fixture, ITestOut
             _fixture.SetTimeout(TimeSpan.FromMinutes(2));
             _fixture.TestLogger = output;
 
-            _fixture.AddCommand($"RestSharpService StartService {_fixture.RemoteApplication.Port}");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} GET false");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} PUT false");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} POST false");
-            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.RemoteApplication.Port} DELETE false");
-            _fixture.AddCommand($"RestSharpExerciser RestSharpClientTaskCancelled {_fixture.RemoteApplication.Port}");
+            _fixture.AddCommand($"RestSharpService StartService {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port}");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} GET false");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} PUT false");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} POST false");
+            _fixture.AddCommand($"RestSharpExerciser SyncClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} DELETE false");
+            _fixture.AddCommand($"RestSharpExerciser RestSharpClientTaskCancelled {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port}");
             _fixture.AddCommand("RestSharpService StopService");
 
             _fixture.AddActions
@@ -55,18 +55,20 @@ public void Test()
             var callerTransactionName = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.RestSharp.RestSharpExerciser/SyncClient";
             var cancelledTrasnsactionName = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.RestSharp.RestSharpExerciser/RestSharpClientTaskCancelled";
 
+            var serverName = _fixture.DestinationServerName;
+
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
                 new Assertions.ExpectedMetric { metricName = "External/all", callCount = 5 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/GET", callCount = 2 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/PUT", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/POST", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/DELETE", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/GET", metricScope = cancelledTrasnsactionName, callCount = 1},
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/GET", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/PUT", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/POST", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/DELETE", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/GET", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/PUT", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/POST", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/DELETE", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/GET", metricScope = cancelledTrasnsactionName, callCount = 1},
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/GET", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/PUT", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/POST", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/DELETE", metricScope = callerTransactionName, callCount = 1 },
             };
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationTaskResultCAT.cs b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationTaskResultCAT.cs
index 3c3068a832..bb72ee83be 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationTaskResultCAT.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/RestSharp/RestSharpClientInstrumentationTaskResultCAT.cs
@@ -24,11 +24,11 @@ public RestSharpInstrumentationTaskResultCATBase(TFixture fixture, ITestOutputHe
             _fixture.SetTimeout(TimeSpan.FromMinutes(2));
             _fixture.TestLogger = output;
 
-            _fixture.AddCommand($"RestSharpService StartService {_fixture.RemoteApplication.Port}");
-            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.RemoteApplication.Port} GET true true");
-            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.RemoteApplication.Port} PUT false false");
-            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.RemoteApplication.Port} POST false false");
-            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.RemoteApplication.Port} DELETE true true");
+            _fixture.AddCommand($"RestSharpService StartService {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port}");
+            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} GET true true");
+            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} PUT false false");
+            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} POST false false");
+            _fixture.AddCommand($"RestSharpExerciser TaskResultClient {_fixture.DestinationServerName} {_fixture.RemoteApplication.Port} DELETE true true");
             _fixture.AddCommand("RestSharpService StopService");
 
             _fixture.AddActions
@@ -52,17 +52,19 @@ public void Test()
             var crossProcessId = _fixture.AgentLog.GetCrossProcessId();
             var callerTransactionName = "OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.RestSharp.RestSharpExerciser/TaskResultClient";
 
+            var serverName = _fixture.DestinationServerName;
+            ;
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
                 new Assertions.ExpectedMetric { metricName = "External/all", callCount = 4 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/GET", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/PUT", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/POST", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"External/localhost/Stream/DELETE", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Get", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Put", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Post", metricScope = callerTransactionName, callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/localhost/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Delete", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/GET", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/PUT", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/POST", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"External/{serverName}/Stream/DELETE", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Get", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Put", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Post", metricScope = callerTransactionName, callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"ExternalTransaction/{serverName}/{crossProcessId}/WebTransaction/WebAPI/RestAPI/Delete", metricScope = callerTransactionName, callCount = 1 },
             };
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFClientTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFClientTests.cs
index dabde19c51..a674612d8a 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFClientTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFClientTests.cs
@@ -38,14 +38,16 @@ public override void TransactionEvents()
         [Fact]
         public override void Metrics()
         {
+            var serverName = _bindingToTest == WCFBindingType.NetTcp ? "127.0.0.1" :  "localhost";
+
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
-                new Assertions.ExpectedMetric(){ metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncThrowException", callCount = 2 },
-                new Assertions.ExpectedMetric(){ metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncGetData", callCount = 2 /*Begin/End + Event Based Async*/  },
-                new Assertions.ExpectedMetric(){ metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncThrowException", callCount = 4 /*Begin/End + Event Based Async*/ },
-                new Assertions.ExpectedMetric(){ metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncGetData" , callCount = 1 },
-                new Assertions.ExpectedMetric(){ metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncThrowException", callCount = 2  },
-                new Assertions.ExpectedMetric(){ metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncGetData", callCount = 1  },
+                new Assertions.ExpectedMetric(){ metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncThrowException", callCount = 2 },
+                new Assertions.ExpectedMetric(){ metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncGetData", callCount = 2 /*Begin/End + Event Based Async*/  },
+                new Assertions.ExpectedMetric(){ metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncThrowException", callCount = 4 /*Begin/End + Event Based Async*/ },
+                new Assertions.ExpectedMetric(){ metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncGetData" , callCount = 1 },
+                new Assertions.ExpectedMetric(){ metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncThrowException", callCount = 2  },
+                new Assertions.ExpectedMetric(){ metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncGetData", callCount = 1  },
 
                 new Assertions.ExpectedMetric(){ metricName = "DotNet/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/ThrowException",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/ThrowException", callCount = _countClientInvocationMethodsToTest * 2 },
@@ -59,17 +61,17 @@ public override void Metrics()
 
             var catExcludedMetrics = new[]
             {
-                new Assertions.ExpectedMetric() { metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncGetData",
+                new Assertions.ExpectedMetric() { metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncGetData",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/GetData" },
-                new Assertions.ExpectedMetric() { metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncGetData",
+                new Assertions.ExpectedMetric() { metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncGetData",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/GetData" },
-                new Assertions.ExpectedMetric() { metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncGetData",
+                new Assertions.ExpectedMetric() { metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncGetData",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/GetData" },
-                new Assertions.ExpectedMetric() { metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncThrowException",
+                new Assertions.ExpectedMetric() { metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Sync_SyncThrowException",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/ThrowException" },
-                new Assertions.ExpectedMetric() { metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncThrowException",
+                new Assertions.ExpectedMetric() { metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.Begin_SyncThrowException",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/ThrowException" },
-                new Assertions.ExpectedMetric() { metricName = $"External/localhost/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncThrowException",
+                new Assertions.ExpectedMetric() { metricName = $"External/{serverName}/Stream/{SharedWcfLibraryNamespace}.IWcfClient.TAP_SyncThrowException",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/ThrowException" },
             };
 
@@ -138,14 +140,16 @@ public override void CAT_Metrics()
             var countExpectedCreate = _countClientInvocationMethodsToTest * COUNT_SVC_METHODS      //1 for each WCF Client call
                                     + _countClientInvocationMethodsToTest;                         //1 for GetData's HTTP call on the service
 
+            var serverName = _bindingToTest == WCFBindingType.NetTcp ? "127.0.0.1" :  "localhost";
+
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
-                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest * COUNT_SVC_METHODS, metricName = $"ExternalApp/localhost/{CATCrossProcessID_Service}/all" },
-                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest, metricName = $"ExternalTransaction/localhost/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncGetData"},
-                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest, metricName = $"ExternalTransaction/localhost/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncGetData",
+                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest * COUNT_SVC_METHODS, metricName = $"ExternalApp/{serverName}/{CATCrossProcessID_Service}/all" },
+                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest, metricName = $"ExternalTransaction/{serverName}/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncGetData"},
+                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest, metricName = $"ExternalTransaction/{serverName}/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncGetData",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/GetData"},
-                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest * 2, metricName = $"ExternalTransaction/localhost/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncThrowException"},
-                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest * 2, metricName = $"ExternalTransaction/localhost/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncThrowException",
+                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest * 2, metricName = $"ExternalTransaction/{serverName}/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncThrowException"},
+                new Assertions.ExpectedMetric(){ callCount = _countClientInvocationMethodsToTest * 2, metricName = $"ExternalTransaction/{serverName}/{CATCrossProcessID_Service}/WebTransaction/WCF/{SharedWcfLibraryNamespace}.IWcfService.SyncThrowException",
                     metricScope = "OtherTransaction/Custom/ConsoleMultiFunctionApplicationFW.NetFrameworkLibraries.WCF.WCFClient/ThrowException"},
 
                 new Assertions.ExpectedMetric(){ metricName = "Supportability/CrossApplicationTracing/Request/Create/Success" , callCount = countExpectedCreate },//16
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFLogHelpers.cs b/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFLogHelpers.cs
index 32abde054d..219e2a3c1f 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFLogHelpers.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/WCF/WCFLogHelpers.cs
@@ -65,7 +65,7 @@ public AgentLogFile AgentLog_Client
                     .Where(f => !f.Name.StartsWith("NewRelic.Profiler.", StringComparison.OrdinalIgnoreCase))
                     .FirstOrDefault(f => f.Name.EndsWith("ConsoleMultiFunctionApplicationFW.log", StringComparison.OrdinalIgnoreCase));
 
-                    _agentLog_Client = new AgentLogFile(_fixture.DestinationNewRelicLogFileDirectoryPath, _fixture.RemoteApplication, logFile.Name);
+                    _agentLog_Client = new AgentLogFile(_fixture.DestinationNewRelicLogFileDirectoryPath, _fixture.TestLogger, logFile.Name);
                 }
 
                 return _agentLog_Client;
@@ -85,7 +85,7 @@ public AgentLogFile AgentLog_Service
                     .Where(f => !f.Name.StartsWith("NewRelic.Profiler.", StringComparison.OrdinalIgnoreCase))
                     .FirstOrDefault(f => !f.Name.EndsWith("ConsoleMultiFunctionApplicationFW.log", StringComparison.OrdinalIgnoreCase));
 
-                    _agentLog_Service = new AgentLogFile(_fixture.DestinationNewRelicLogFileDirectoryPath, _fixture.RemoteApplication, logFile.Name);
+                    _agentLog_Service = new AgentLogFile(_fixture.DestinationNewRelicLogFileDirectoryPath, _fixture.TestLogger, logFile.Name);
                 }
 
                 return _agentLog_Service;
diff --git a/tests/Agent/IntegrationTests/Models/Models.csproj b/tests/Agent/IntegrationTests/Models/Models.csproj
index ee1c70c4b3..6252c57da7 100644
--- a/tests/Agent/IntegrationTests/Models/Models.csproj
+++ b/tests/Agent/IntegrationTests/Models/Models.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/Shared/Shared.csproj b/tests/Agent/IntegrationTests/Shared/Shared.csproj
index 7a0e67bee0..6b5c58e136 100644
--- a/tests/Agent/IntegrationTests/Shared/Shared.csproj
+++ b/tests/Agent/IntegrationTests/Shared/Shared.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/ConsoleMFLogger.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/ConsoleMFLogger.cs
index 548fd590b3..9ec1c4ff3b 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/ConsoleMFLogger.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/ConsoleMFLogger.cs
@@ -9,6 +9,10 @@ namespace MultiFunctionApplicationHelpers
     public static class ConsoleMFLogger
     {
 
+        private static string LogTs => DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss,fff");
+
+        private static int Tid => System.Threading.Thread.CurrentThread.ManagedThreadId;
+
         public static void Info()
         {
             Info("");
@@ -18,7 +22,7 @@ public static void Info(params string[] message)
         {
             foreach (var msg in message)
             {
-                Console.WriteLine($"{DateTime.Now.ToLongTimeString()} :{msg}");
+                Console.WriteLine($"{LogTs} tid:{Tid} {msg}");
             }
         }
 
@@ -31,7 +35,7 @@ public static void Error(params string[] message)
         {
             foreach (var msg in message)
             {
-                Console.Error.WriteLine($"{DateTime.Now.ToLongTimeString()} :{msg}");
+                Console.Error.WriteLine($"{LogTs} tid:{Tid} {msg}");
             }
         }
 
@@ -39,5 +43,6 @@ public static void Error(Exception ex)
         {
             Error(ex.ToString());
         }
+
     }
 }
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
index 1ab76ad2a9..ede8128a3b 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="log4net.Ext.Json" Version="2.0.9.1" Condition="'$(TargetFramework)' == 'net6.0'" />
     <PackageReference Include="log4net" Version="2.0.14" Condition="'$(TargetFramework)' == 'net7.0'" />
     <PackageReference Include="log4net.Ext.Json" Version="2.0.10.1" Condition="'$(TargetFramework)' == 'net7.0'" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -61,44 +61,44 @@
     <PackageReference Include="MySql.Data" Version="8.0.15" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="MySql.Data" Version="8.0.30" Condition="'$(TargetFramework)' == 'net48'" />
     <!-- MySql.Data v8.0.33 is a breaking change for the agent and requires agent version 10.11.1 or greater -->
-    <PackageReference Include="MySql.Data" Version="8.1.0" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="MySql.Data" Version="8.2.0" Condition="'$(TargetFramework)' == 'net481'" />
 
     <!-- MySql.Data .NET/Core references -->
     <PackageReference Include="MySql.Data" Version="6.10.7" Condition="'$(TargetFramework)' == 'net6.0'" />
     <!-- MySql.Data v8.0.33 is a breaking change for the agent and requires agent version 10.11.1 or greater -->
-    <PackageReference Include="MySql.Data" Version="8.1.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="MySql.Data" Version="8.2.0" Condition="'$(TargetFramework)' == 'net7.0'" />
 
     <!-- MongoDB.Driver .NET Framework references -->
     <!-- 2.3.0 is the oldest version we support, 2.17.1 is the newest version as of October 2022 -->
     <PackageReference Include="MongoDB.Driver" Version="2.3.0" Condition="'$(TargetFramework)' == 'net462'" />
     <PackageReference Include="MongoDB.Driver" Version="2.14.1" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="MongoDB.Driver" Version="2.17.1" Condition="'$(TargetFramework)' == 'net48'" />
-    <PackageReference Include="MongoDB.Driver" Version="2.21.0" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="MongoDB.Driver" Version="2.22.0" Condition="'$(TargetFramework)' == 'net481'" />
 
     <!-- MongoDB.Driver .NET/Core references -->
     <!-- Minimum version we can use with .NET core 3.0 or greater is 2.8.1, due to this bug: https://github.com/mongodb/mongo-csharp-driver/pull/372 -->
     <PackageReference Include="MongoDB.Driver" Version="2.8.1" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageReference Include="MongoDB.Driver" Version="2.21.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="MongoDB.Driver" Version="2.22.0" Condition="'$(TargetFramework)' == 'net7.0'" />
 
     <!-- MySqlConnector framework references -->
     <PackageReference Include="MySqlConnector" Version="1.0.1" Condition="'$(TargetFramework)' == 'net462'" />
     <PackageReference Include="MySqlConnector" Version="1.3.13" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="MySqlConnector" Version="2.1.2" Condition="'$(TargetFramework)' == 'net48'" />
-    <PackageReference Include="MySqlConnector" Version="2.2.4" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="MySqlConnector" Version="2.3.1" Condition="'$(TargetFramework)' == 'net481'" />
 
     <!-- MySqlConnector .NET/Core references -->
     <PackageReference Include="MySqlConnector" Version="1.0.1" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageReference Include="MySqlConnector" Version="2.2.4" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="MySqlConnector" Version="2.3.1" Condition="'$(TargetFramework)' == 'net7.0'" />
 
     <!-- StackExchange.Redis framework references -->
     <PackageReference Include="StackExchange.Redis.StrongName" Version="1.1.608" Condition="'$(TargetFramework)' == 'net462'" />
     <PackageReference Include="StackExchange.Redis" Version="2.0.601" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="StackExchange.Redis" Version="2.2.88" Condition="'$(TargetFramework)' == 'net48'" />
-    <PackageReference Include="StackExchange.Redis" Version="2.6.116" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.4" Condition="'$(TargetFramework)' == 'net481'" />
     
     <!-- StackExchange.Redis .NET/Core references -->
     <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageReference Include="StackExchange.Redis" Version="2.6.116" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.4" Condition="'$(TargetFramework)' == 'net7.0'" />
 
     <!-- Elasticsearch NEST framework references -->
     <PackageReference Include="NEST" Version="7.0.0" Condition="'$(TargetFramework)' == 'net462'" />
@@ -141,7 +141,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" Condition="'$(TargetFramework)' == 'net48'" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" Condition="'$(TargetFramework)' == 'net48'" />
 
-    <PackageReference Include="Serilog" Version="3.0.1" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="Serilog" Version="3.1.1" Condition="'$(TargetFramework)' == 'net481'" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" Condition="'$(TargetFramework)' == 'net481'" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" Condition="'$(TargetFramework)' == 'net481'" />
 
@@ -157,7 +157,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" Condition="'$(TargetFramework)' == 'net6.0'" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" Condition="'$(TargetFramework)' == 'net6.0'" />
 
-    <PackageReference Include="Serilog" Version="3.0.1" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="Serilog" Version="3.1.1" Condition="'$(TargetFramework)' == 'net7.0'" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" Condition="'$(TargetFramework)' == 'net7.0'" />
 
@@ -195,9 +195,9 @@
     <PackageReference Include="RabbitMQ.Client" Version="3.6.9" Condition="'$(TargetFramework)' == 'net462'" />
     <PackageReference Include="RabbitMQ.Client" Version="4.1.3" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="RabbitMQ.Client" Version="6.0.0" Condition="'$(TargetFramework)' == 'net48'" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.5.0" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.6.0" Condition="'$(TargetFramework)' == 'net481'" />
     <PackageReference Include="RabbitMQ.Client" Version="5.2.0" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.5.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.6.0" Condition="'$(TargetFramework)' == 'net7.0'" />
 
     <PackageReference Include="NServiceBus" Version="5.0.0" Condition="'$(TargetFramework)' == 'net462'" />
     <PackageReference Include="NServiceBus" Version="6.5.10" Condition="'$(TargetFramework)' == 'net471'" />
@@ -241,12 +241,12 @@
 
   <ItemGroup> <!-- Versions below 4.5 did not support netstandard 2.0 -->
     <PackageReference Include="NLog" Version="4.5.9" Condition="'$(TargetFramework)' == 'net6.0'" />
-	  <PackageReference Include="NLog" Version="5.2.4" Condition="'$(TargetFramework)' == 'net7.0'" />
+	  <PackageReference Include="NLog" Version="5.2.5" Condition="'$(TargetFramework)' == 'net7.0'" />
 
     <PackageReference Include="NLog" Version="4.3.11" Condition="'$(TargetFramework)' == 'net462'" />
     <PackageReference Include="NLog" Version="4.1.2" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="NLog" Version="4.5.11" Condition="'$(TargetFramework)' == 'net48'" />
-    <PackageReference Include="NLog" Version="5.2.4" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="NLog" Version="5.2.5" Condition="'$(TargetFramework)' == 'net481'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -262,6 +262,36 @@
     <Reference Include="System.Messaging" Condition="'$(TargetFramework)' == 'net481'" />
   </ItemGroup>
 
+  <!--MassTransit-->
+  <ItemGroup>
+
+    <PackageReference Include="MassTransit" Version="7.1.0" Condition="'$(TargetFramework)' == 'net462'" />
+    <PackageReference Include="MassTransit" Version="7.1.0" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="MassTransit" Version="7.3.1" Condition="'$(TargetFramework)' == 'net48'" />
+    <PackageReference Include="MassTransit" Version="8.1.1" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="MassTransit" Version="7.3.1" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <PackageReference Include="MassTransit" Version="8.1.1" Condition="'$(TargetFramework)' == 'net7.0'" />
+
+    <PackageReference Include="MassTransit.AspNetCore" Version="7.1.0" Condition="'$(TargetFramework)' == 'net462'" />
+    <PackageReference Include="MassTransit.AspNetCore" Version="7.1.0" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="MassTransit.AspNetCore" Version="7.3.1" Condition="'$(TargetFramework)' == 'net48'" />
+    <PackageReference Include="MassTransit.AspNetCore" Version="7.3.1" Condition="'$(TargetFramework)' == 'net6.0'" />
+
+    <PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="7.1.0" Condition="'$(TargetFramework)' == 'net462'" />
+    <PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="7.1.0" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="7.3.1" Condition="'$(TargetFramework)' == 'net48'" />
+    <PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="7.3.1" Condition="'$(TargetFramework)' == 'net6.0'" />
+
+    <!--These references are needed for the MassTransit exerciser.  They need to use a version this old because they have
+    a dependency on Microsoft.Extensions.Logging for the same version or greater, and we have references to old versions
+    of MEL for testing MEL instrumentation.-->
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" Condition="'$(TargetFramework)' == 'net481'" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" Condition="'$(TargetFramework)' == 'net48'" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" Condition="'$(TargetFramework)' == 'net462'" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
+  </ItemGroup>
+
   <!-- RestSharp -->
   <ItemGroup>
     <!-- This version is used to test against our minimum supported version called out in docs, and
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/LogInstrumentation/SerilogLoggingWebAdapter.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/LogInstrumentation/SerilogLoggingWebAdapter.cs
index 2091e4cd3e..ba746400cd 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/LogInstrumentation/SerilogLoggingWebAdapter.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/LogInstrumentation/SerilogLoggingWebAdapter.cs
@@ -107,7 +107,7 @@ private void RunApplication(LoggerConfiguration loggerConfig)
         { 
             var logger = loggerConfig.CreateLogger();
 
-            _uriBase = "http://localhost:" + _loggingPort + "/";
+            _uriBase = "http://127.0.0.1:" + _loggingPort + "/";
             var hostTask = CreateHostBuilder(_uriBase).Build().RunAsync();
 
             Console.WriteLine("URI: " + _uriBase);
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/MassTransitExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/MassTransitExerciser.cs
new file mode 100644
index 0000000000..36b5d3c1a7
--- /dev/null
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/MassTransitExerciser.cs
@@ -0,0 +1,123 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+#if !NET481_OR_GREATER && !NET7_0_OR_GREATER
+#define MASSTRANSIT7
+#endif
+
+using MassTransit;
+using MultiFunctionApplicationHelpers.NetStandardLibraries.MassTransit;
+using NewRelic.Agent.IntegrationTests.Shared.ReflectionHelpers;
+using NewRelic.Api.Agent;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using IHost = Microsoft.Extensions.Hosting.IHost;
+
+namespace MultiFunctionApplicationHelpers.NetStandardLibraries
+{
+    [Library]
+    class MassTransitExerciser
+    {
+        CancellationTokenSource _cts;
+        Task _hostedServiceTask;
+        IHost _host;
+        IBus _bus;
+        IBusControl _busControl;
+
+// Note that StartHost/StopHost and StartBus/StopBus are two different
+// setup methods
+
+        [LibraryMethod]
+        public void StartHost()
+        {
+            _host = CreateMassTransitHost();
+            _bus = _host.Services.GetService<IBus>();
+            _cts = new CancellationTokenSource();
+            _hostedServiceTask = _host.RunAsync(_cts.Token);
+        }
+
+        private static IHost CreateMassTransitHost()
+        {
+            var builder = Host.CreateDefaultBuilder().ConfigureServices((hostContext, services) =>
+            {
+                services.AddMassTransit(x =>
+                {
+                    x.AddConsumer<MessageConsumer>();
+
+                    x.UsingInMemory((context, cfg) =>
+                    {
+                        cfg.ConfigureEndpoints(context);
+                    });
+
+                });
+#if MASSTRANSIT7
+                services.AddMassTransitHostedService();
+#endif
+            });
+            return builder.Build();
+        }
+
+        [LibraryMethod]
+        public void StopHost()
+        {
+            _cts.Cancel();
+            _hostedServiceTask.Wait();
+            _hostedServiceTask.Dispose();
+        }
+
+        [LibraryMethod]
+        public async Task StartBus()
+        {
+            _cts = new CancellationTokenSource();
+            _busControl = Bus.Factory.CreateUsingInMemory(configure =>
+            {
+                configure.ReceiveEndpoint(System.Guid.NewGuid().ToString(), cfg =>
+                {
+                    cfg.Consumer<MessageConsumer>();
+                });
+            });
+
+            // IBusControl is an IBus and this lets the Publish and Send methods not care which
+            // setup method was used
+            _bus = _busControl;
+
+            await _busControl.StartAsync(_cts.Token);
+        }
+
+        [LibraryMethod]
+        public async Task StopBus()
+        {
+            await _busControl.StopAsync();
+        }
+
+        [LibraryMethod]
+        [Transaction]
+        [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
+        public async Task Publish(string text)
+        {
+            var message = new Message() { Text = text };
+            await _bus.Publish(message);
+            ConsoleMFLogger.Info($"Published message {text}");
+
+            // This sleep ensures that this transaction method is the one sampled for transaction trace data
+            Thread.Sleep(1000);
+        }
+
+        [LibraryMethod]
+        [Transaction]
+        [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
+        public async Task Send(string text)
+        {
+            var message = new Message() { Text = text };
+            var sendEndpoint = await _bus.GetPublishSendEndpoint<Message>();
+            await sendEndpoint.Send(message);
+            ConsoleMFLogger.Info($"Sent message {text}");
+
+            // This sleep ensures that this transaction method is the one sampled for transaction trace data
+            Thread.Sleep(1000);
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/Message.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/Message.cs
new file mode 100644
index 0000000000..68bdebd453
--- /dev/null
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/Message.cs
@@ -0,0 +1,10 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+namespace MultiFunctionApplicationHelpers.NetStandardLibraries.MassTransit
+{
+    public class Message
+    {
+        public string Text { get; set; }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/MessageConsumer.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/MessageConsumer.cs
new file mode 100644
index 0000000000..d33b8587f2
--- /dev/null
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MassTransit/MessageConsumer.cs
@@ -0,0 +1,17 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Threading.Tasks;
+using MassTransit;
+
+namespace MultiFunctionApplicationHelpers.NetStandardLibraries.MassTransit
+{
+    public class MessageConsumer : IConsumer<Message>
+    {
+        public Task Consume(ConsumeContext<Message> context)
+        {
+            ConsoleMFLogger.Info($"Received message {context.Message.Text}");
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs
index e1ca7f1f29..d367d072f2 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Collections.Generic;
@@ -16,17 +16,9 @@
 namespace MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql
 {
     [Library]
-    public class MicrosoftDataSqlClientExerciser
+    public class MicrosoftDataSqlClientExerciser : MsSqlExerciserBase
     {
 
-        private const string InsertPersonMsSql = "INSERT INTO {0} (FirstName, LastName, Email) VALUES('Testy', 'McTesterson', 'testy@mctesterson.com')";
-        private const string DeletePersonMsSql = "DELETE FROM {0} WHERE Email = 'testy@mctesterson.com'";
-        private const string CountPersonMsSql = "SELECT COUNT(*) FROM {0} WITH(nolock)";
-        private static readonly string CreateProcedureStatement = @"CREATE OR ALTER PROCEDURE [dbo].[{0}] {1} AS RETURN 0";
-        private const string CreatePersonTableMsSql = "CREATE TABLE {0} (FirstName varchar(20) NOT NULL, LastName varchar(20) NOT NULL, Email varchar(50) NOT NULL)";
-        private const string DropPersonTableMsSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP TABLE {0}";
-        private const string DropProcedureSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP PROCEDURE {0}";
-
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
@@ -38,7 +30,7 @@ public string MsSql(string tableName)
             {
                 connection.Open();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
+                using (var command = new SqlCommand(SelectPersonByFirstNameMsSql, connection))
                 {
 
                     using (var reader = command.ExecuteReader())
@@ -88,7 +80,7 @@ public async Task<string> MsSqlAsync(string tableName)
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
+                using (var command = new SqlCommand(SelectPersonByLastNameMsSql, connection))
                 {
                     using (var reader = await command.ExecuteReaderAsync())
                     {
@@ -137,7 +129,7 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
             {
                 connection.Open();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand(SelectPersonByParameterizedFirstNameMsSql, connection))
                 {
                     command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
                     using (var reader = command.ExecuteReader())
@@ -160,7 +152,7 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)
+        public async Task<string> MsSqlAsync_WithParameterizedQuery(bool paramsWithAtSign)
         {
             var teamMembers = new List<string>();
 
@@ -168,9 +160,9 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand(SelectPersonByParameterizedLastNameMsSql, connection))
                 {
-                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
+                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@LN" : "LN", "Lee"));
                     using (var reader = await command.ExecuteReaderAsync())
                     {
                         while (await reader.ReadAsync())
@@ -183,25 +175,6 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
                         }
                     }
                 }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = await command.ExecuteNonQueryAsync();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = await command.ExecuteScalarAsync();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = await command.ExecuteNonQueryAsync();
-                }
             }
 
             return string.Join(",", teamMembers);
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MsSqlExerciserBase.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MsSqlExerciserBase.cs
new file mode 100644
index 0000000000..96f91b9131
--- /dev/null
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MsSqlExerciserBase.cs
@@ -0,0 +1,21 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+namespace MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql
+{
+    public class MsSqlExerciserBase
+    {
+
+        protected const string SelectPersonByFirstNameMsSql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'";
+        protected const string SelectPersonByLastNameMsSql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = 'Doe'";
+        protected const string SelectPersonByParameterizedFirstNameMsSql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN";
+        protected const string SelectPersonByParameterizedLastNameMsSql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = @LN";
+        protected const string InsertPersonMsSql = "INSERT INTO {0} (FirstName, LastName, Email) VALUES('Testy', 'McTesterson', 'testy@mctesterson.com')";
+        protected const string DeletePersonMsSql = "DELETE FROM {0} WHERE Email = 'testy@mctesterson.com'";
+        protected const string CountPersonMsSql = "SELECT COUNT(*) FROM {0} WITH(nolock)";
+        protected static readonly string CreateProcedureStatement = @"CREATE OR ALTER PROCEDURE [dbo].[{0}] {1} AS RETURN 0";
+        protected const string CreatePersonTableMsSql = "CREATE TABLE {0} (FirstName varchar(20) NOT NULL, LastName varchar(20) NOT NULL, Email varchar(50) NOT NULL)";
+        protected const string DropPersonTableMsSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP TABLE {0}";
+        protected const string DropProcedureSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP PROCEDURE {0}";
+    }
+}
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataExerciser.cs
index 33b821dc95..13aaf624e0 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataExerciser.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataExerciser.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 #if NETFRAMEWORK
@@ -19,16 +19,8 @@
 namespace MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql
 {
     [Library]
-    public class SystemDataExerciser
+    public class SystemDataExerciser : MsSqlExerciserBase
     {
-        private const string InsertPersonMsSql = "INSERT INTO {0} (FirstName, LastName, Email) VALUES('Testy', 'McTesterson', 'testy@mctesterson.com')";
-        private const string DeletePersonMsSql = "DELETE FROM {0} WHERE Email = 'testy@mctesterson.com'";
-        private const string CountPersonMsSql = "SELECT COUNT(*) FROM {0} WITH(nolock)";
-        private static readonly string CreateProcedureStatement = @"CREATE OR ALTER PROCEDURE [dbo].[{0}] {1} AS RETURN 0";
-        private const string CreatePersonTableMsSql = "CREATE TABLE {0} (FirstName varchar(20) NOT NULL, LastName varchar(20) NOT NULL, Email varchar(50) NOT NULL)";
-        private const string DropPersonTableMsSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP TABLE {0}";
-        private const string DropProcedureSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP PROCEDURE {0}";
-
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
@@ -40,7 +32,7 @@ public string MsSql(string tableName)
             {
                 connection.Open();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
+                using (var command = new SqlCommand(SelectPersonByFirstNameMsSql, connection))
                 {
 
                     using (var reader = command.ExecuteReader())
@@ -90,7 +82,7 @@ public async Task<string> MsSqlAsync(string tableName)
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
+                using (var command = new SqlCommand(SelectPersonByLastNameMsSql, connection))
                 {
                     using (var reader = await command.ExecuteReaderAsync())
                     {
@@ -139,7 +131,7 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
             {
                 connection.Open();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand(SelectPersonByParameterizedFirstNameMsSql, connection))
                 {
                     command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
                     using (var reader = command.ExecuteReader())
@@ -163,7 +155,7 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)
+        public async Task<string> MsSqlAsync_WithParameterizedQuery(bool paramsWithAtSign)
         {
             var teamMembers = new List<string>();
 
@@ -171,9 +163,9 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand(SelectPersonByParameterizedLastNameMsSql, connection))
                 {
-                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
+                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@LN" : "LN", "Lee"));
                     using (var reader = await command.ExecuteReaderAsync())
                     {
                         while (await reader.ReadAsync())
@@ -186,25 +178,6 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
                         }
                     }
                 }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = await command.ExecuteNonQueryAsync();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = await command.ExecuteScalarAsync();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = await command.ExecuteNonQueryAsync();
-                }
             }
 
             return string.Join(",", teamMembers);
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs
index f36b527dca..bd8659bd0e 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 #if NETCOREAPP3_1_OR_GREATER
@@ -13,22 +13,12 @@
 using NewRelic.Agent.IntegrationTests.Shared.ReflectionHelpers;
 using NewRelic.Api.Agent;
 using System.Threading;
-using System.Data.OleDb;
-using System.Data.Odbc;
 
 namespace MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql
 {
     [Library]
-    public class SystemDataSqlClientExerciser
+    public class SystemDataSqlClientExerciser : MsSqlExerciserBase
     {
-        private const string InsertPersonMsSql = "INSERT INTO {0} (FirstName, LastName, Email) VALUES('Testy', 'McTesterson', 'testy@mctesterson.com')";
-        private const string DeletePersonMsSql = "DELETE FROM {0} WHERE Email = 'testy@mctesterson.com'";
-        private const string CountPersonMsSql = "SELECT COUNT(*) FROM {0} WITH(nolock)";
-        private static readonly string CreateProcedureStatement = @"CREATE OR ALTER PROCEDURE [dbo].[{0}] {1} AS RETURN 0";
-        private const string CreatePersonTableMsSql = "CREATE TABLE {0} (FirstName varchar(20) NOT NULL, LastName varchar(20) NOT NULL, Email varchar(50) NOT NULL)";
-        private const string DropPersonTableMsSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP TABLE {0}";
-        private const string DropProcedureSql = "IF (OBJECT_ID('{0}') IS NOT NULL) DROP PROCEDURE {0}";
-
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
@@ -40,7 +30,7 @@ public string MsSql(string tableName)
             {
                 connection.Open();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
+                using (var command = new SqlCommand(SelectPersonByFirstNameMsSql, connection))
                 {
 
                     using (var reader = command.ExecuteReader())
@@ -90,7 +80,7 @@ public async Task<string> MsSqlAsync(string tableName)
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
+                using (var command = new SqlCommand(SelectPersonByLastNameMsSql, connection))
                 {
                     using (var reader = await command.ExecuteReaderAsync())
                     {
@@ -139,7 +129,7 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
             {
                 connection.Open();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand(SelectPersonByParameterizedFirstNameMsSql, connection))
                 {
                     command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
                     using (var reader = command.ExecuteReader())
@@ -163,7 +153,7 @@ public string MsSqlWithParameterizedQuery(bool paramsWithAtSign)
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)
+        public async Task<string> MsSqlAsync_WithParameterizedQuery(bool paramsWithAtSign)
         {
             var teamMembers = new List<string>();
 
@@ -171,9 +161,9 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
             {
                 await connection.OpenAsync();
 
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
+                using (var command = new SqlCommand(SelectPersonByParameterizedLastNameMsSql, connection))
                 {
-                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
+                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@LN" : "LN", "Lee"));
                     using (var reader = await command.ExecuteReaderAsync())
                     {
                         while (await reader.ReadAsync())
@@ -186,25 +176,6 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
                         }
                     }
                 }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = await command.ExecuteNonQueryAsync();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = await command.ExecuteScalarAsync();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = await command.ExecuteNonQueryAsync();
-                }
             }
 
             return string.Join(",", teamMembers);
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Owin/OwinService.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Owin/OwinService.cs
index 61bb7b2940..a8bc354c1a 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Owin/OwinService.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/Owin/OwinService.cs
@@ -25,9 +25,9 @@ internal OwinService(IStartup startup) : this()
             _startup = startup;
         }
 
-        public void StartService(int port)
+        public void StartService(string server, int port)
         {
-            _service = WebApp.Start(url: $"http://localhost:{port}/", _startup.Configuration);
+            _service = WebApp.Start(url: $"http://{server}:{port}/", _startup.Configuration);
             Task.Delay(7000).Wait();
         }
 
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharp107andBeyondExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharp107andBeyondExerciser.cs
index 325966668f..092e1217f4 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharp107andBeyondExerciser.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharp107andBeyondExerciser.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 
@@ -28,9 +28,9 @@ private class Bird
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public string SyncClient(int port, string method, bool generic)
+        public string SyncClient(string host, int port, string method, bool generic)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
             var client = new RestClient($"http://{myHost}:{myPort}");
 
@@ -68,9 +68,9 @@ public string SyncClient(int port, string method, bool generic)
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> AsyncAwaitClient(int port, string method, bool generic, bool cancelable)
+        public async Task<string> AsyncAwaitClient(string host, int port, string method, bool generic, bool cancelable)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
             var client = new RestClient($"http://{myHost}:{myPort}");
 
@@ -116,9 +116,9 @@ public async Task<string> AsyncAwaitClient(int port, string method, bool generic
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public string TaskResultClient(int port, string method, bool generic, bool cancelable)
+        public string TaskResultClient(string host, int port, string method, bool generic, bool cancelable)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
             var client = new RestClient($"http://{myHost}:{myPort}");
 
@@ -167,9 +167,9 @@ public string TaskResultClient(int port, string method, bool generic, bool cance
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> RestSharpClientTaskCancelled(int port)
+        public async Task<string> RestSharpClientTaskCancelled(string host, int port)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
 
             var endpoint = "api/RestAPI/";
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpExerciser.cs
index 478d8f9281..f90b2de172 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpExerciser.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpExerciser.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 
@@ -28,9 +28,9 @@ private class Bird
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public string SyncClient(int port, string method, bool generic)
+        public string SyncClient(string host, int port, string method, bool generic)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
             var client = new RestClient($"http://{myHost}:{myPort}");
 
@@ -67,9 +67,9 @@ public string SyncClient(int port, string method, bool generic)
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> AsyncAwaitClient(int port, string method, bool generic, bool cancelable)
+        public async Task<string> AsyncAwaitClient(string host, int port, string method, bool generic, bool cancelable)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
             var client = new RestClient($"http://{myHost}:{myPort}");
 
@@ -115,9 +115,9 @@ public async Task<string> AsyncAwaitClient(int port, string method, bool generic
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public string TaskResultClient(int port, string method, bool generic, bool cancelable)
+        public string TaskResultClient(string host, int port, string method, bool generic, bool cancelable)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
             var client = new RestClient($"http://{myHost}:{myPort}");
 
@@ -166,9 +166,9 @@ public string TaskResultClient(int port, string method, bool generic, bool cance
         [LibraryMethod]
         [Transaction]
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
-        public async Task<string> RestSharpClientTaskCancelled(int port)
+        public async Task<string> RestSharpClientTaskCancelled(string host, int port)
         {
-            var myHost = "localhost"; // Request.RequestUri.Host;
+            var myHost = host;
             var myPort = port;
 
             var endpoint = "api/RestAPI/";
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpService.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpService.cs
index 8ab85fc849..fb858feb62 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpService.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RestSharp/RestSharpService.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 
@@ -17,10 +17,11 @@ public class RestSharpService
         /// <summary>
         /// Starts the RestSharp Test Service with a specific port and path
         /// </summary>
+        /// <param name="server"></param>
         /// <param name="port"></param>
         /// <param name="relativePath"></param>
         [LibraryMethod]
-        public void StartService(int port)
+        public void StartService(string server, int port)
         {
             try
             {
@@ -33,7 +34,7 @@ public void StartService(int port)
                     .Build();
 
                 // Start OWIN host 
-                _owinService.StartService(port);
+                _owinService.StartService(server, port);
             }
             catch (Exception ex)
             {
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/W3C/W3CTestService.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/W3C/W3CTestService.cs
index 3c0e6f82eb..90095a6353 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/W3C/W3CTestService.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/W3C/W3CTestService.cs
@@ -16,10 +16,8 @@ public class W3CTestService
         /// <summary>
         /// Starts the W3C Test Service with a specific port and path
         /// </summary>
-        /// <param name="port"></param>
-        /// <param name="relativePath"></param>
         [LibraryMethod]
-        public void StartService(int port)
+        public void StartService(string server, int port)
         {
             try
             {
@@ -31,7 +29,7 @@ public void StartService(int port)
                     .Build();
 
                 // Start OWIN host 
-                _owinService.StartService(port);
+                _owinService.StartService(server, port);
             }
             catch (Exception ex)
             {
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj
index fa546358e8..f6821b60c8 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj
index 20e0d11339..b8cb5a14ef 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj
+++ b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj
index 0738952432..0d9df2ec90 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj
+++ b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFLibraryHelpers.cs b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFLibraryHelpers.cs
index 04cc5e2778..a210cbbb98 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFLibraryHelpers.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFLibraryHelpers.cs
@@ -25,7 +25,7 @@ public static Uri GetEndpointAddress(WCFBindingType bindingTypeEnum, int port, s
                 case WCFBindingType.CustomClass:
                     return new Uri($@"http://localhost:{port}/{relativeUrl}");
                 case WCFBindingType.NetTcp:
-                    return new Uri($@"net.tcp://localhost:{port}/{relativeUrl}");
+                    return new Uri($@"net.tcp://127.0.0.1:{port}/{relativeUrl}");
                 default:
                     throw new NotSupportedException($"Binding Type {bindingTypeEnum}");
             }
diff --git a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFServiceSelfHosted.cs b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFServiceSelfHosted.cs
index 153cd44309..c8c8031787 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFServiceSelfHosted.cs
+++ b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/NetFrameworkLibraries/WCF/WCFServiceSelfHosted.cs
@@ -6,6 +6,7 @@
 using NewRelic.Agent.IntegrationTests.Shared.Wcf;
 using NewRelic.Agent.IntegrationTests.Shared.ReflectionHelpers;
 using System;
+using System.Diagnostics;
 using System.ServiceModel;
 using System.ServiceModel.Description;
 
@@ -24,6 +25,8 @@ public class WCFServiceSelfHosted
         [LibraryMethod]
         public void StartService(string bindingType, int port, string relativePath)
         {
+            //Debugger.Launch();
+
             relativePath = relativePath.TrimStart('/');
 
             if (_wcfService_SelfHosted != null)
diff --git a/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj b/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj
index b7d3245a78..420a120e39 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj
+++ b/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj
index 883ffea867..2fb2572434 100644
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj
+++ b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -83,7 +83,7 @@
       <Version>3.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -180,4 +180,4 @@
       </ReferencePath>
     </ItemGroup>
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/BasicMvcCoreApplication.csproj b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/BasicMvcCoreApplication.csproj
deleted file mode 100644
index c4b50700de..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/BasicMvcCoreApplication.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19239.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Npgsql" Version="4.0.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Shared\Shared.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Controllers/MicrosoftDataSqlClientController.cs b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Controllers/MicrosoftDataSqlClientController.cs
deleted file mode 100644
index 6accd6a5d1..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Controllers/MicrosoftDataSqlClientController.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-
-using NewRelic.Agent.IntegrationTests.Shared;
-using System.Collections.Generic;
-using System.Data;
-using Microsoft.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BasicMvcApplication.Controllers
-{
-    public class MicrosoftDataSqlClientController : Controller
-    {
-        private const string InsertPersonMsSql = "INSERT INTO {0} (FirstName, LastName, Email) VALUES('Testy', 'McTesterson', 'testy@mctesterson.com')";
-        private const string DeletePersonMsSql = "DELETE FROM {0} WHERE Email = 'testy@mctesterson.com'";
-        private const string CountPersonMsSql = "SELECT COUNT(*) FROM {0} WITH(nolock)";
-
-        [HttpGet]
-        [Route("MicrosoftDataSqlClient/MsSql")]
-        public string MsSql(string tableName)
-        {
-            var teamMembers = new List<string>();
-
-            using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
-            {
-                connection.Open();
-
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
-                {
-
-                    using (var reader = command.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            if (reader.NextResult())
-                            {
-                                teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            }
-                        }
-                    }
-                }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = command.ExecuteNonQuery();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = command.ExecuteScalar();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = command.ExecuteNonQuery();
-                }
-            }
-
-            return string.Join(",", teamMembers);
-        }
-
-        [HttpGet]
-        [Route("MicrosoftDataSqlClient/MsSqlAsync")]
-        public async Task<string> MsSqlAsync(string tableName)
-        {
-            var teamMembers = new List<string>();
-
-            using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
-            {
-                await connection.OpenAsync();
-
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
-                {
-                    using (var reader = await command.ExecuteReaderAsync())
-                    {
-                        while (await reader.ReadAsync())
-                        {
-                            teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            if (await reader.NextResultAsync())
-                            {
-                                teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            }
-                        }
-                    }
-                }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = await command.ExecuteNonQueryAsync();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = await command.ExecuteScalarAsync();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = await command.ExecuteNonQueryAsync();
-                }
-            }
-
-            return string.Join(",", teamMembers);
-        }
-
-        [HttpGet]
-        [Route("MicrosoftDataSqlClient/MsSqlWithParameterizedQuery")]
-        public string MsSqlWithParameterizedQuery(string tableName, bool paramsWithAtSign)
-        {
-            var teamMembers = new List<string>();
-
-            using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
-            {
-                connection.Open();
-
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
-                {
-                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
-                    using (var reader = command.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            if (reader.NextResult())
-                            {
-                                teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            }
-                        }
-                    }
-                }
-            }
-
-            return string.Join(",", teamMembers);
-        }
-
-        [HttpGet]
-        [Route("MicrosoftDataSqlClient/MsSqlAsync_WithParameterizedQuery")]
-        public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bool paramsWithAtSign)
-        {
-            var teamMembers = new List<string>();
-
-            using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
-            {
-                await connection.OpenAsync();
-
-                using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
-                {
-                    command.Parameters.Add(new SqlParameter(paramsWithAtSign ? "@FN" : "FN", "O'Keefe"));
-                    using (var reader = await command.ExecuteReaderAsync())
-                    {
-                        while (await reader.ReadAsync())
-                        {
-                            teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            if (await reader.NextResultAsync())
-                            {
-                                teamMembers.Add(reader.GetString(reader.GetOrdinal("FirstName")));
-                            }
-                        }
-                    }
-                }
-
-                var insertSql = string.Format(InsertPersonMsSql, tableName);
-                var countSql = string.Format(CountPersonMsSql, tableName);
-                var deleteSql = string.Format(DeletePersonMsSql, tableName);
-
-                using (var command = new SqlCommand(insertSql, connection))
-                {
-                    var insertCount = await command.ExecuteNonQueryAsync();
-                }
-
-                using (var command = new SqlCommand(countSql, connection))
-                {
-                    var teamMemberCount = await command.ExecuteScalarAsync();
-                }
-
-                using (var command = new SqlCommand(deleteSql, connection))
-                {
-                    var deleteCount = await command.ExecuteNonQueryAsync();
-                }
-            }
-
-            return string.Join(",", teamMembers);
-        }
-
-        [HttpGet]
-        [Route("MicrosoftDataSqlClient/MsSqlParameterizedStoredProcedure")]
-        public int MsSqlParameterizedStoredProcedure(string procedureName, bool paramsWithAtSign)
-        {
-            EnsureProcedure(procedureName, DbParameterData.MsSqlParameters);
-
-            using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
-            using (var command = new SqlCommand(procedureName, connection))
-            {
-                connection.Open();
-                command.CommandType = CommandType.StoredProcedure;
-                foreach (var parameter in DbParameterData.MsSqlParameters)
-                {
-                    var paramName = paramsWithAtSign
-                        ? parameter.ParameterName
-                        : parameter.ParameterName.TrimStart('@');
-
-                    command.Parameters.Add(new SqlParameter(paramName, parameter.Value));
-                }
-
-                return command.ExecuteNonQuery();
-            }
-        }
-
-        private static readonly string CreateProcedureStatement = @"CREATE OR ALTER PROCEDURE [dbo].[{0}] {1} AS RETURN 0";
-
-        private void EnsureProcedure(string procedureName, DbParameter[] dbParameters)
-        {
-            var parameters = string.Join(", ", dbParameters.Select(x => $"{x.ParameterName} {x.DbTypeName}"));
-            var statement = string.Format(CreateProcedureStatement, procedureName, parameters);
-            using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
-            using (var command = new SqlCommand(statement, connection))
-            {
-                connection.Open();
-                command.ExecuteNonQuery();
-            }
-        }
-
-    }
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Models/ErrorViewModel.cs b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Models/ErrorViewModel.cs
deleted file mode 100644
index 5deeea54f6..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Models/ErrorViewModel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-
-using System;
-
-namespace BasicMvcCoreApplication.Models
-{
-    public class ErrorViewModel
-    {
-        public string RequestId { get; set; }
-
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-    }
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Program.cs b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Program.cs
deleted file mode 100644
index 8410078f2d..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Program.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Diagnostics;
-using System.Reflection;
-using System.Threading;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.CodeAnalysis;
-
-
-namespace BasicMvcCoreApplication
-{
-    public class Program
-    {
-        private const string DefaultPort = "5001";
-
-        private static string _port;
-
-        private static string _applicationName;
-
-        public static void Main(string[] args)
-        {
-            var commandLine = string.Join(" ", args);
-
-            _applicationName = Path.GetFileNameWithoutExtension(new Uri(Assembly.GetExecutingAssembly().Location).LocalPath) + ".exe";
-
-            Console.WriteLine($"[{_applicationName}] Joined args: {commandLine}");
-
-            var result = CommandLineParser.SplitCommandLineIntoArguments(commandLine, true);
-
-            var argPort = result.FirstOrDefault()?.Split('=')[1];
-            _port = argPort ?? DefaultPort;
-
-            Console.WriteLine($"[{_applicationName}] Received port: {argPort} | Using port: {_port}");
-
-            var ct = new CancellationTokenSource();
-            var task = BuildWebHost(args).RunAsync(ct.Token);
-
-            using (var eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset,
-                       "app_server_wait_for_all_request_done_" + _port))
-            {
-                CreatePidFile();
-                eventWaitHandle.WaitOne(TimeSpan.FromMinutes(5));
-            }
-
-            ct.Cancel();
-
-            task.GetAwaiter().GetResult();
-        }
-
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .UseUrls($@"http://localhost:{_port}/")
-                .Build();
-
-        private static void CreatePidFile()
-        {
-            var pid = Process.GetCurrentProcess().Id;
-            var applicationDirectory =
-                Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().Location).LocalPath),
-                    _applicationName);
-            var pidFilePath = applicationDirectory + ".pid";
-
-            using (var file = File.CreateText(pidFilePath))
-            {
-                file.WriteLine(pid);
-            }
-        }
-    }
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Properties/launchSettings.json b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Properties/launchSettings.json
deleted file mode 100644
index a08c687261..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false, 
-    "anonymousAuthentication": true, 
-    "iisExpress": {
-      "applicationUrl": "http://localhost:60383",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "BasicMvcCoreApplication": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Startup.cs b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Startup.cs
deleted file mode 100644
index b2989ffd95..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Startup.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace BasicMvcCoreApplication
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public 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.AddMvc(options =>
-            {
-                options.SuppressAsyncSuffixInActionNames = false;
-            });
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            app.UseStaticFiles();
-            app.UseRouting();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/appsettings.Development.json b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/appsettings.Development.json
deleted file mode 100644
index e203e9407e..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/appsettings.Development.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
-    }
-  }
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/appsettings.json b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/appsettings.json
deleted file mode 100644
index def9159a7d..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/appsettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj b/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj
index f4b7784330..d0789670d1 100644
--- a/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj
+++ b/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj
@@ -76,7 +76,7 @@
       <Version>2.2.29</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>17.6.40</Version>
+      <Version>17.7.30</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests.sln b/tests/Agent/IntegrationTests/UnboundedIntegrationTests.sln
index 56769744a5..04d81af6f1 100644
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests.sln
+++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests.sln
@@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDBApplication", "Unbou
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewRelic.Testing.Assertions", "..\NewRelic.Testing.Assertions\NewRelic.Testing.Assertions.csproj", "{2A932B62-8787-4963-8D53-F83BF6ACBB5C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicMvcCoreApplication", "UnboundedApplications\BasicMvcCoreApplication\BasicMvcCoreApplication.csproj", "{26AEFF66-DFF2-4C85-AB0C-0B2672E8A434}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedApplications", "SharedApplications", "{859E490D-4C1A-4D9D-8271-5FE2E0726ADE}"
 	ProjectSection(SolutionItems) = preProject
 		SharedApplications\WcfAppIisHosted\WcfAppIisHosted.csproj = SharedApplications\WcfAppIisHosted\WcfAppIisHosted.csproj
@@ -80,10 +78,6 @@ Global
 		{2A932B62-8787-4963-8D53-F83BF6ACBB5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A932B62-8787-4963-8D53-F83BF6ACBB5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A932B62-8787-4963-8D53-F83BF6ACBB5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26AEFF66-DFF2-4C85-AB0C-0B2672E8A434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26AEFF66-DFF2-4C85-AB0C-0B2672E8A434}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26AEFF66-DFF2-4C85-AB0C-0B2672E8A434}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26AEFF66-DFF2-4C85-AB0C-0B2672E8A434}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D07A4F7-70FD-40D4-AA95-BA9A98F14CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D07A4F7-70FD-40D4-AA95-BA9A98F14CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D07A4F7-70FD-40D4-AA95-BA9A98F14CD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,7 +113,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{EA98CDD2-655D-4239-9B9F-44EB806DEE53} = {03BAC949-FAD7-4EE6-A2BD-45E3DE2407F9}
 		{A8308E64-6659-4EFB-A9C4-0C48D4C99A61} = {03BAC949-FAD7-4EE6-A2BD-45E3DE2407F9}
-		{26AEFF66-DFF2-4C85-AB0C-0B2672E8A434} = {03BAC949-FAD7-4EE6-A2BD-45E3DE2407F9}
 		{8D07A4F7-70FD-40D4-AA95-BA9A98F14CD0} = {859E490D-4C1A-4D9D-8271-5FE2E0726ADE}
 		{5350D3F3-CE09-4992-9756-ACCC92A9129C} = {859E490D-4C1A-4D9D-8271-5FE2E0726ADE}
 		{129FF113-1F3A-4DAA-8D6F-287DF67A68FA} = {859E490D-4C1A-4D9D-8271-5FE2E0726ADE}
@@ -128,7 +121,7 @@ Global
 		{F35861EC-9861-4776-AF51-9C2B7F1DBA5C} = {129FF113-1F3A-4DAA-8D6F-287DF67A68FA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Data.6.0.1304.0\lib\NET45
 		SolutionGuid = {656848E2-BFD2-4092-9328-C6CDF39B1274}
+		EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Data.6.0.1304.0\lib\NET45
 	EndGlobalSection
 EndGlobal
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/CosmosDB/CosmosDBTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/CosmosDB/CosmosDBTests.cs
index d008deb364..e68c635ca7 100644
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/CosmosDB/CosmosDBTests.cs
+++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/CosmosDB/CosmosDBTests.cs
@@ -2,12 +2,20 @@
 // SPDX-License-Identifier: Apache-2.0
 
 
+using Azure;
+using Couchbase.Core;
 using NewRelic.Agent.IntegrationTestHelpers;
 using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
 using NewRelic.Testing.Assertions;
 using System;
+using System.CodeDom.Compiler;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
+using System.Net.NetworkInformation;
+using System.Net.PeerToPeer.Collaboration;
+using System.Reflection;
+using System.Windows.Forms;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -76,6 +84,16 @@ public void CreateReadAndDeleteDatabaseTests()
                 new Assertions.ExpectedMetric { metricName = $"Datastore/operation/CosmosDB/ReadDatabase", metricScope = expectedTransactionName, callCount = 2 },
                 new Assertions.ExpectedMetric { metricName = $"Datastore/operation/CosmosDB/DeleteDatabase", metricScope = expectedTransactionName, callCount = 1 },
             };
+            var expectedAgentAttributes = new List<string>
+            {
+                "db.system",
+                "db.operation",
+                "db.instance",
+                "peer.address",
+                "peer.hostname",
+                "server.address",
+                "server.port"
+            };
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
             var spanEvents = _fixture.AgentLog.GetSpanEvents();
@@ -85,7 +103,9 @@ public void CreateReadAndDeleteDatabaseTests()
             NrAssert.Multiple
             (
                 () => Assertions.MetricsExist(expectedMetrics, metrics),
-                () => Assert.Equal(6, operationDatastoreSpans.Count())
+                () => Assert.Equal(6, operationDatastoreSpans.Count()),
+                () => Assertions.SpanEventHasAttributes(expectedAgentAttributes, IntegrationTestHelpers.Models.SpanEventAttributeType.Agent, operationDatastoreSpans.FirstOrDefault())
+
             );
         }
 
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs
index ec2403b42d..d8aa55c256 100644
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs
+++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs
@@ -156,6 +156,16 @@ private void ValidateOperation(string operationName)
             {
                 new Assertions.ExpectedMetric { metricName = $"Datastore/statement/Elasticsearch/{expectedIndexName}/{expectedOperationName}", metricScope = expectedTransactionName, callCount = 1 },
             };
+            var expectedAgentAttributes = new List<string>
+            {
+                "db.system",
+                "db.operation",
+                "db.instance",
+                "peer.address",
+                "peer.hostname",
+                "server.address",
+                "server.port"
+            };
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
 
@@ -173,7 +183,8 @@ private void ValidateOperation(string operationName)
             (
                 () => Assertions.MetricsExist(expectedMetrics, metrics),
                 () => Assert.Single(operationDatastoreSpans),
-                () => Assert.Equal(_host, uri)
+                () => Assert.Equal(_host, uri),
+                () => Assertions.SpanEventHasAttributes(expectedAgentAttributes, IntegrationTestHelpers.Models.SpanEventAttributeType.Agent, operationDatastoreSpans.FirstOrDefault())
             );
         }
 
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlAsyncTests.cs
deleted file mode 100644
index 88c59571b3..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlAsyncTests.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NewRelic.Agent.IntegrationTestHelpers;
-using NewRelic.Agent.IntegrationTestHelpers.Models;
-using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
-using NewRelic.Agent.IntegrationTests.Shared;
-using NewRelic.Testing.Assertions;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace NewRelic.Agent.UnboundedIntegrationTests.MsSql
-{
-    public abstract class MsSqlAsyncTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
-        where TFixture : ConsoleDynamicMethodFixture
-    {
-        private readonly ConsoleDynamicMethodFixture _fixture;
-        private readonly string _expectedTransactionName;
-
-        private readonly string _tableName;
-        private readonly string _libraryName;
-
-        public MsSqlAsyncTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, string libraryName) : base(fixture)
-        {
-            MsSqlWarmupHelper.WarmupMsSql();
-
-            _fixture = fixture;
-            _fixture.TestLogger = output;
-            _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlAsync";
-            _tableName = Utilities.GenerateTableName();
-            _libraryName = libraryName;
-
-            _fixture.AddCommand($"{excerciserName} CreateTable {_tableName}");
-            _fixture.AddCommand($"{excerciserName} MsSqlAsync {_tableName}");
-            _fixture.AddCommand($"{excerciserName} Wait 5000");
-            _fixture.AddCommand($"{excerciserName} DropTable {_tableName}");
-
-            _fixture.AddActions
-            (
-                setupConfiguration: () =>
-                {
-                    var configPath = fixture.DestinationNewRelicConfigFilePath;
-                    var configModifier = new NewRelicConfigModifier(configPath);
-                    configModifier.ConfigureFasterMetricsHarvestCycle(15);
-                    configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);
-                    configModifier.ConfigureFasterSqlTracesHarvestCycle(15);
-
-                    configModifier.ForceTransactionTraces();
-
-                    CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(configPath, new[] { "configuration", "transactionTracer" }, "explainEnabled", "true");
-                    CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(configPath, new[] { "configuration", "transactionTracer" }, "explainThreshold", "1");
-
-                    var instrumentationFilePath = $@"{fixture.DestinationNewRelicExtensionsDirectoryPath}\NewRelic.Providers.Wrapper.Sql.Instrumentation.xml";
-                    CommonUtils.SetAttributeOnTracerFactoryInNewRelicInstrumentation(
-                       instrumentationFilePath,
-                        "", "enabled", "true");
-                },
-                exerciseApplication: () =>
-                {
-                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.AgentConnectedLogLineRegex, TimeSpan.FromMinutes(1));
-                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.SqlTraceDataLogLineRegex, TimeSpan.FromMinutes(1));
-                }
-            );
-
-            _fixture.Initialize();
-        }
-
-        [Fact]
-        public void Test()
-        {
-            var expectedDatastoreCallCount = 4;
-
-            //This value is dictated by the query and subsequent ExecuteScalarAsync that is being run as part of this test. In this case, we're running a query that returns a single row.
-            //This results in a call to ReadAsync followed by a NextResultAsync and finally another ReadAsync. Therefore
-            //the call count for the Iterate metric should be 3.
-            var expectedIterateCallCount = 3;
-
-            var expectedMetrics = new List<Assertions.ExpectedMetric>
-            {
-                new Assertions.ExpectedMetric { metricName = @"Datastore/all", callCount = expectedDatastoreCallCount },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/all", callCount = expectedDatastoreCallCount },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/allOther", callCount = expectedDatastoreCallCount },
-
-                new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/OpenAsync", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/allOther", callCount = expectedDatastoreCallCount },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/instance/MSSQL/{CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)}/default", callCount = expectedDatastoreCallCount},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 2 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/statement/MSSQL/teammembers/select", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/statement/MSSQL/teammembers/select", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/select", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/select", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/insert", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/insert", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/delete", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/delete", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount },
-                new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount, metricScope = _expectedTransactionName}
-            };
-
-            var unexpectedMetrics = new List<Assertions.ExpectedMetric>
-            {
-                // The operation metric should not be scoped because the statement metric is scoped instead
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 3, metricScope = _expectedTransactionName },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 1, metricScope = _expectedTransactionName },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1, metricScope = _expectedTransactionName },
-
-                // Don't double count the open
-                new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/Open" },
-            };
-            var expectedTransactionTraceSegments = new List<string>
-            {
-                "Datastore/statement/MSSQL/teammembers/select"
-            };
-            var expectedTransactionTraceSegmentParameters = new List<Assertions.ExpectedSegmentParameter>
-            {
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "explain_plan"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "sql", parameterValue = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = ?"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "host", parameterValue = CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "port_path_or_id", parameterValue = "default"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "database_name", parameterValue = "NewRelic"}
-
-            };
-
-            var expectedTransactionEventIntrinsicAttributes = new List<string>
-            {
-                "databaseDuration"
-            };
-            var expectedSqlTraces = new List<Assertions.ExpectedSqlTrace>
-            {
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName = _expectedTransactionName,
-                    Sql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = ?",
-                    DatastoreMetricName = "Datastore/statement/MSSQL/teammembers/select",
-                    HasExplainPlan = true
-                },
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName = _expectedTransactionName,
-                    Sql = $"SELECT COUNT(*) FROM {_tableName} WITH(nolock)",
-                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/select",
-
-                    HasExplainPlan = true
-                },
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName = _expectedTransactionName,
-                    Sql = $"INSERT INTO {_tableName} (FirstName, LastName, Email) VALUES(?, ?, ?)",
-                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/insert",
-
-                    HasExplainPlan = true
-                },
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName = _expectedTransactionName,
-                    Sql = $"DELETE FROM {_tableName} WHERE Email = ?",
-                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/delete",
-
-                    HasExplainPlan = true
-                }
-            };
-
-            var metrics = _fixture.AgentLog.GetMetrics().ToList();
-            var transactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedTransactionName);
-            var transactionEvent = _fixture.AgentLog.TryGetTransactionEvent(_expectedTransactionName);
-            var sqlTraces = _fixture.AgentLog.GetSqlTraces().ToList();
-
-            NrAssert.Multiple(
-                () => Assert.NotNull(transactionSample),
-                () => Assert.NotNull(transactionEvent)
-                );
-
-            NrAssert.Multiple
-            (
-                () => Assertions.MetricsExist(expectedMetrics, metrics),
-                () => Assertions.MetricsDoNotExist(unexpectedMetrics, metrics),
-                () => Assertions.TransactionTraceSegmentsExist(expectedTransactionTraceSegments, transactionSample),
-                () => Assertions.TransactionTraceSegmentParametersExist(expectedTransactionTraceSegmentParameters, transactionSample),
-                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes, TransactionEventAttributeType.Intrinsic, transactionEvent),
-                () => Assertions.SqlTraceExists(expectedSqlTraces, sqlTraces)
-            );
-        }
-    }
-
-    [NetFrameworkTest]
-    public class MsSqlAsyncTests_SystemData_FWLatest : MsSqlAsyncTestsBase<ConsoleDynamicMethodFixtureFWLatest>
-    {
-        public MsSqlAsyncTests_SystemData_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataExerciser",
-                  libraryName: "System.Data.SqlClient")
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlAsyncTests_SystemDataSqlClient_CoreLatest : MsSqlAsyncTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
-    {
-        public MsSqlAsyncTests_SystemDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataSqlClientExerciser",
-                  libraryName: "System.Data.SqlClient")
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlAsyncTests_SystemDataSqlClient_CoreOldest : MsSqlAsyncTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
-    {
-        public MsSqlAsyncTests_SystemDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataSqlClientExerciser",
-                  libraryName: "System.Data.SqlClient")
-        {
-        }
-    }
-
-    [NetFrameworkTest]
-    public class MsSqlAsyncTests_MicrosoftDataSqlClient_FWLatest : MsSqlAsyncTestsBase<ConsoleDynamicMethodFixtureFWLatest>
-    {
-        public MsSqlAsyncTests_MicrosoftDataSqlClient_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  libraryName: "Microsoft.Data.SqlClient")
-        {
-        }
-    }
-
-    [NetFrameworkTest]
-    public class MsSqlAsyncTests_MicrosoftDataSqlClient_FW462 : MsSqlAsyncTestsBase<ConsoleDynamicMethodFixtureFW462>
-    {
-        public MsSqlAsyncTests_MicrosoftDataSqlClient_FW462(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  libraryName: "Microsoft.Data.SqlClient")
-        {
-        }
-    }
-
-
-    [NetCoreTest]
-    public class MsSqlAsyncTests_MicrosoftDataSqlClient_CoreLatest : MsSqlAsyncTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
-    {
-        public MsSqlAsyncTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  libraryName: "Microsoft.Data.SqlClient")
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlAsyncTests_MicrosoftDataSqlClient_CoreOldest : MsSqlAsyncTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
-    {
-        public MsSqlAsyncTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  libraryName: "Microsoft.Data.SqlClient")
-        {
-        }
-    }
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamAsyncTests.cs
deleted file mode 100644
index b179ec0bea..0000000000
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamAsyncTests.cs
+++ /dev/null
@@ -1,389 +0,0 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NewRelic.Agent.IntegrationTestHelpers;
-using NewRelic.Agent.IntegrationTestHelpers.Models;
-using NewRelic.Agent.IntegrationTestHelpers.RemoteServiceFixtures;
-using NewRelic.Agent.IntegrationTests.Shared;
-using NewRelic.Testing.Assertions;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace NewRelic.Agent.UnboundedIntegrationTests.MsSql
-{
-    public abstract class MsSqlQueryParamAsyncTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
-        where TFixture : ConsoleDynamicMethodFixture
-    {
-        private readonly ConsoleDynamicMethodFixture _fixture;
-        private readonly string _expectedTransactionName;
-        private readonly string _tableName;
-        private readonly bool _paramsWithAtSign;
-
-        public MsSqlQueryParamAsyncTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, bool paramsWithAtSign) : base(fixture)
-        {
-            MsSqlWarmupHelper.WarmupMsSql();
-
-            _fixture = fixture;
-            _fixture.TestLogger = output;
-            _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlAsync_WithParameterizedQuery";
-            _tableName = Utilities.GenerateTableName();
-
-            _fixture.AddCommand($"{excerciserName} CreateTable {_tableName}");
-            _fixture.AddCommand($"{excerciserName} MsSqlAsync_WithParameterizedQuery {_tableName} {paramsWithAtSign}");
-            _fixture.AddCommand($"{excerciserName} Wait 5000");
-            _fixture.AddCommand($"{excerciserName} DropTable {_tableName}");
-
-            _paramsWithAtSign = paramsWithAtSign;
-
-            _fixture.AddActions
-            (
-                setupConfiguration: () =>
-                {
-                    var configPath = fixture.DestinationNewRelicConfigFilePath;
-                    var configModifier = new NewRelicConfigModifier(configPath);
-                    configModifier.ConfigureFasterMetricsHarvestCycle(15);
-                    configModifier.ConfigureFasterTransactionTracesHarvestCycle(15);
-                    configModifier.ConfigureFasterSqlTracesHarvestCycle(15);
-
-                    configModifier.ForceTransactionTraces();
-                    configModifier.SetLogLevel("finest");       //This has to stay at finest to ensure parameter check security
-
-                    CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(configPath, new[] { "configuration", "transactionTracer" }, "explainEnabled", "true");
-                    CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(configPath, new[] { "configuration", "transactionTracer" }, "explainThreshold", "1");
-
-                    var instrumentationFilePath = $@"{fixture.DestinationNewRelicExtensionsDirectoryPath}\NewRelic.Providers.Wrapper.Sql.Instrumentation.xml";
-                    CommonUtils.SetAttributeOnTracerFactoryInNewRelicInstrumentation(
-                       instrumentationFilePath,
-                        "", "enabled", "true");
-                },
-                exerciseApplication: () =>
-                {
-                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.AgentConnectedLogLineRegex, TimeSpan.FromMinutes(1));
-                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.SqlTraceDataLogLineRegex, TimeSpan.FromMinutes(1));
-                }
-            );
-
-            _fixture.Initialize();
-        }
-
-        [Fact]
-        public void Test()
-        {
-            var expectedDatastoreCallCount = 4;
-            //This value is dictated by the query and subsequent ExecuteScalarAsync that is being run as part of this test. In this case, we're running a query that returns
-            //a single row.
-            //This results in a call to ReadAsync followed by a NextResultAsync and finally a another ReadAsync. Therefore the call count for the Iterate metric should be 4.
-            var expectedIterateCallCount = 3;
-
-            var expectedMetrics = new List<Assertions.ExpectedMetric>
-            {
-                new Assertions.ExpectedMetric { metricName = @"Datastore/all", callCount = expectedDatastoreCallCount },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/all", callCount = expectedDatastoreCallCount },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/allOther", callCount = expectedDatastoreCallCount },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/allOther", callCount = expectedDatastoreCallCount },
-
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/instance/MSSQL/{CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)}/default", callCount = expectedDatastoreCallCount},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 2 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/statement/MSSQL/teammembers/select", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/statement/MSSQL/teammembers/select", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/select", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/select", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/insert", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/insert", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/delete", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/delete", callCount = 1, metricScope = _expectedTransactionName},
-
-                new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount },
-                new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount, metricScope = _expectedTransactionName}
-            };
-
-            var unexpectedMetrics = new List<Assertions.ExpectedMetric>
-            {
-                // The operation metric should not be scoped because the statement metric is scoped instead
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 3, metricScope = _expectedTransactionName },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 1, metricScope = _expectedTransactionName },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1, metricScope = _expectedTransactionName }
-            };
-            var expectedTransactionTraceSegments = new List<string>
-            {
-                "Datastore/statement/MSSQL/teammembers/select"
-            };
-            var expectedTransactionTraceSegmentParameters = new List<Assertions.ExpectedSegmentParameter>
-            {
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "explain_plan"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "sql", parameterValue = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "host", parameterValue = CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "port_path_or_id", parameterValue = "default"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "database_name", parameterValue = "NewRelic"}
-            };
-
-            var expectedTransactionEventIntrinsicAttributes = new List<string>
-            {
-                "databaseDuration"
-            };
-
-            var expectedSqlTraces = new List<Assertions.ExpectedSqlTrace>
-            {
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName = _expectedTransactionName,
-                    Sql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN",
-                    DatastoreMetricName = "Datastore/statement/MSSQL/teammembers/select",
-                    HasExplainPlan = true
-                },
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName = _expectedTransactionName,
-                    Sql = $"SELECT COUNT(*) FROM {_tableName} WITH(nolock)",
-                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/select",
-
-                    HasExplainPlan = true
-                },
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName =_expectedTransactionName,
-                    Sql = $"INSERT INTO {_tableName} (FirstName, LastName, Email) VALUES(?, ?, ?)",
-                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/insert",
-
-                    HasExplainPlan = true
-                },
-                new Assertions.ExpectedSqlTrace
-                {
-                    TransactionName = _expectedTransactionName,
-                    Sql = $"DELETE FROM {_tableName} WHERE Email = ?",
-                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/delete",
-
-                    HasExplainPlan = true
-                }
-            };
-
-            var expectedQueryParameters = _paramsWithAtSign
-                ? DbParameterData.MsSqlParameters.ToDictionary(p => p.ParameterName, p => p.ExpectedValue)
-                : DbParameterData.MsSqlParameters.ToDictionary(p => p.ParameterName.TrimStart('@'), p => p.ExpectedValue);
-
-            var metrics = _fixture.AgentLog.GetMetrics().ToList();
-            var transactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedTransactionName);
-            var transactionEvent = _fixture.AgentLog.TryGetTransactionEvent(_expectedTransactionName);
-            var sqlTraces = _fixture.AgentLog.GetSqlTraces().ToList();
-            var logEntries = _fixture.AgentLog.GetFileLines().ToList();
-
-            NrAssert.Multiple(
-                () => Assert.NotNull(transactionSample),
-                () => Assert.NotNull(transactionEvent)
-                );
-
-            NrAssert.Multiple
-            (
-                () => Assertions.MetricsExist(expectedMetrics, metrics),
-                () => Assertions.MetricsDoNotExist(unexpectedMetrics, metrics),
-                () => Assertions.TransactionTraceSegmentsExist(expectedTransactionTraceSegments, transactionSample),
-                () => Assertions.TransactionTraceSegmentParametersExist(expectedTransactionTraceSegmentParameters, transactionSample),
-                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes, TransactionEventAttributeType.Intrinsic, transactionEvent),
-                () => Assertions.SqlTraceExists(expectedSqlTraces, sqlTraces),
-                () => Assertions.LogLinesNotExist(new[] { AgentLogFile.ErrorLogLinePrefixRegex }, logEntries)
-            );
-        }
-    }
-
-
-    #region System.Data (.NET Framework only)
-    [NetFrameworkTest]
-    public class MsSqlQueryParamAsyncTests_SystemData_FWLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureFWLatest>
-    {
-        public MsSqlQueryParamAsyncTests_SystemData_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataExerciser",
-                  paramsWithAtSign: true)
-        {
-        }
-    }
-
-    [NetFrameworkTest]
-    public class MsSqlQueryParamAsyncTests_SystemData_NoAtSigns_FWLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureFWLatest>
-    {
-        public MsSqlQueryParamAsyncTests_SystemData_NoAtSigns_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataExerciser",
-                  paramsWithAtSign: false)
-        {
-        }
-    }
-    #endregion
-
-
-    #region System.Data.SqlClient (.NET Core/5+ only)
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_SystemDataSqlClient_CoreLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
-    {
-        public MsSqlQueryParamAsyncTests_SystemDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataSqlClientExerciser",
-                  paramsWithAtSign: true)
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_SystemDataSqlClient_NoAtSigns_CoreLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
-    {
-        public MsSqlQueryParamAsyncTests_SystemDataSqlClient_NoAtSigns_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataSqlClientExerciser",
-                  paramsWithAtSign: false)
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_SystemDataSqlClient_CoreOldest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
-    {
-        public MsSqlQueryParamAsyncTests_SystemDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataSqlClientExerciser",
-                  paramsWithAtSign: true)
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_SystemDataSqlClient_NoAtSigns_CoreOldest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
-    {
-        public MsSqlQueryParamAsyncTests_SystemDataSqlClient_NoAtSigns_CoreOldest(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "SystemDataSqlClientExerciser",
-                  paramsWithAtSign: false)
-        {
-        }
-    }
-    #endregion
-
-
-    #region Microsoft.Data.SqlClient (FW and Core/5+)
-
-    [NetFrameworkTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_FWLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureFWLatest>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
-
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: true)
-        {
-        }
-    }
-
-    [NetFrameworkTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_FWLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureFWLatest>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: false)
-        {
-        }
-    }
-
-    [NetFrameworkTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_FW462 : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureFW462>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_FW462(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
-
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: true)
-        {
-        }
-    }
-
-    [NetFrameworkTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_FW462 : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureFW462>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_FW462(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: false)
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_CoreLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: true)
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_CoreLatest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: false)
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_CoreOldest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: true)
-        {
-        }
-    }
-
-    [NetCoreTest]
-    public class MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_CoreOldest : MsSqlQueryParamAsyncTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
-    {
-        public MsSqlQueryParamAsyncTests_MicrosoftDataSqlClient_NoAtSigns_CoreOldest(ConsoleDynamicMethodFixtureCoreOldest fixture, ITestOutputHelper output)
-            : base(
-                  fixture: fixture,
-                  output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser",
-                  paramsWithAtSign: false)
-        {
-        }
-    }
-
-    #endregion
-}
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs
index f76c43ee46..0b9fade440 100644
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs
+++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs
@@ -20,7 +20,7 @@ public abstract class MsSqlQueryParamTestsBase<TFixture> : NewRelicIntegrationTe
     {
         private readonly ConsoleDynamicMethodFixture _fixture;
         private readonly string _expectedTransactionName;
-        private readonly string _tableName;
+        private readonly string _expectedAsyncTransactionName;
         private readonly bool _paramsWithAtSigns;
 
         public MsSqlQueryParamTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, bool paramsWithAtSign) : base(fixture)
@@ -30,11 +30,10 @@ public MsSqlQueryParamTestsBase(TFixture fixture, ITestOutputHelper output, stri
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlWithParameterizedQuery";
-            _tableName = Utilities.GenerateTableName();
+            _expectedAsyncTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlAsync_WithParameterizedQuery";
 
-            _fixture.AddCommand($"{excerciserName} CreateTable {_tableName}");
             _fixture.AddCommand($"{excerciserName} MsSqlWithParameterizedQuery {paramsWithAtSign}");
-            _fixture.AddCommand($"{excerciserName} DropTable {_tableName}");
+            _fixture.AddCommand($"{excerciserName} MsSqlAsync_WithParameterizedQuery {paramsWithAtSign}");
 
             _paramsWithAtSigns = paramsWithAtSign;
 
@@ -75,20 +74,23 @@ public void Test()
         {
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
-                new Assertions.ExpectedMetric { metricName = @"Datastore/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/allOther", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/all", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/allOther", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/instance/MSSQL/{CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)}/default", callCount = 1},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/teammembers/select", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/all", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/allOther", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/all", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/allOther", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/instance/MSSQL/{CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)}/default", callCount = 2},
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/teammembers/select", callCount = 2 },
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/teammembers/select", callCount = 1, metricScope = _expectedTransactionName},
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/teammembers/select", callCount = 1, metricScope = _expectedAsyncTransactionName},
             };
             var unexpectedMetrics = new List<Assertions.ExpectedMetric>
             {
-				// The operation metric should not be scoped because the statement metric is scoped instead
-				new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", metricScope = _expectedTransactionName },
+                // The operation metric should not be scoped because the statement metric is scoped instead
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", metricScope = _expectedTransactionName },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", metricScope = _expectedAsyncTransactionName },
             };
+
             var expectedTransactionTraceSegments = new List<string>
             {
                 $"Datastore/statement/MSSQL/teammembers/select"
@@ -98,18 +100,12 @@ public void Test()
             var expectedQueryParameters = _paramsWithAtSigns
                 ? new Dictionary<string, object> { { "@FN", "O'Keefe" } }
                 : new Dictionary<string, object> { { "FN", "O'Keefe" } };
-
-
-            var expectedTransactionTraceSegmentParameters = new List<Assertions.ExpectedSegmentParameter>
-            {
-                new Assertions.ExpectedSegmentParameter { segmentName = $"Datastore/statement/MSSQL/teammembers/select", parameterName = "explain_plan" },
-                new Assertions.ExpectedSegmentParameter { segmentName = $"Datastore/statement/MSSQL/teammembers/select", parameterName = "sql", parameterValue = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "host", parameterValue = CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "port_path_or_id", parameterValue = "default"},
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "database_name", parameterValue = "NewRelic"},
-            };
+            var expectedAsyncQueryParameters = _paramsWithAtSigns
+                ? new Dictionary<string, object> { { "@LN", "Lee" } }
+                : new Dictionary<string, object> { { "LN", "Lee" } };
 
             var expectedTransactionTraceQueryParameters = new Assertions.ExpectedSegmentQueryParameters { segmentName = $"Datastore/statement/MSSQL/teammembers/select", QueryParameters = expectedQueryParameters };
+            var expectedAsyncTransactionTraceQueryParameters = new Assertions.ExpectedSegmentQueryParameters { segmentName = $"Datastore/statement/MSSQL/teammembers/select", QueryParameters = expectedAsyncQueryParameters };
 
             var expectedTransactionEventIntrinsicAttributes = new List<string>
             {
@@ -126,17 +122,41 @@ public void Test()
                     QueryParameters = expectedQueryParameters,
                     HasExplainPlan = true
                 },
+                new Assertions.ExpectedSqlTrace
+                {
+                    TransactionName = _expectedAsyncTransactionName,
+                    Sql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = @LN",
+                    DatastoreMetricName = "Datastore/statement/MSSQL/teammembers/select",
+                    QueryParameters = expectedAsyncQueryParameters,
+                    HasExplainPlan = true
+                },
             };
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
-            var transactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedTransactionName);
+            var syncTransactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedTransactionName);
+            var asyncTransactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedAsyncTransactionName);
             var transactionEvent = _fixture.AgentLog.TryGetTransactionEvent(_expectedTransactionName);
+            var asyncTransactionEvent = _fixture.AgentLog.TryGetTransactionEvent(_expectedAsyncTransactionName);
             var sqlTraces = _fixture.AgentLog.GetSqlTraces().ToList();
             var logEntries = _fixture.AgentLog.GetFileLines();
 
+            // some variable expectations based on which transaction was sampled
+            var asyncSampled = asyncTransactionSample != null;
+            var transactionSample = asyncSampled ? asyncTransactionSample : syncTransactionSample;
+            var whereClause = asyncSampled ? "LastName = @LN" : "FirstName = @FN";
+            var expectedTransactionTraceSegmentParameters = new List<Assertions.ExpectedSegmentParameter>
+            {
+                new Assertions.ExpectedSegmentParameter { segmentName = $"Datastore/statement/MSSQL/teammembers/select", parameterName = "explain_plan" },
+                new Assertions.ExpectedSegmentParameter { segmentName = $"Datastore/statement/MSSQL/teammembers/select", parameterName = "sql", parameterValue = $"SELECT * FROM NewRelic.dbo.TeamMembers WHERE {whereClause}"},
+                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "host", parameterValue = CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)},
+                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "port_path_or_id", parameterValue = "default"},
+                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "database_name", parameterValue = "NewRelic"},
+            };
+
             NrAssert.Multiple(
                 () => Assert.NotNull(transactionSample),
-                () => Assert.NotNull(transactionEvent)
+                () => Assert.NotNull(transactionEvent),
+                () => Assert.NotNull(asyncTransactionEvent)
                 );
 
             NrAssert.Multiple
@@ -146,7 +166,7 @@ public void Test()
                 () => Assertions.TransactionTraceSegmentsExist(expectedTransactionTraceSegments, transactionSample),
 
                 () => Assertions.TransactionTraceSegmentParametersExist(expectedTransactionTraceSegmentParameters, transactionSample),
-                () => Assertions.TransactionTraceSegmentQueryParametersExist(expectedTransactionTraceQueryParameters, transactionSample),
+                () => Assertions.TransactionTraceSegmentQueryParametersExist(asyncSampled ? expectedAsyncTransactionTraceQueryParameters: expectedTransactionTraceQueryParameters, transactionSample),
 
                 () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes, TransactionEventAttributeType.Intrinsic, transactionEvent),
                 () => Assertions.SqlTraceExists(expectedSqlTraces, sqlTraces),
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs
index 5cc5de23b1..6fa4aa0b60 100644
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs
+++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs
@@ -20,20 +20,33 @@ public abstract class MsSqlTestsBase<TFixture> : NewRelicIntegrationTest<TFixtur
     {
         private readonly ConsoleDynamicMethodFixture _fixture;
         private readonly string _expectedTransactionName;
+        private readonly string _expectedAsyncTransactionName;
         private readonly string _tableName;
+        private readonly string _asyncTableName;
+        private readonly string _libraryName;
 
-        public MsSqlTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName) : base(fixture)
+        public MsSqlTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, string libraryName) : base(fixture)
         {
             MsSqlWarmupHelper.WarmupMsSql();
 
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSql";
+            _expectedAsyncTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlAsync";
+
+            //Using different table names for the sync and async calls prevents sql traces from being merged
             _tableName = Utilities.GenerateTableName();
+            _asyncTableName = Utilities.GenerateTableName();
+            _libraryName = libraryName;
 
             _fixture.AddCommand($"{excerciserName} CreateTable {_tableName}");
+            _fixture.AddCommand($"{excerciserName} CreateTable {_asyncTableName}");
             _fixture.AddCommand($"{excerciserName} MsSql {_tableName}");
+            _fixture.AddCommand($"{excerciserName} MsSqlAsync {_asyncTableName}");
+            _fixture.AddCommand($"{excerciserName} Wait 5000"); // TBD if this is really necessary
+
             _fixture.AddCommand($"{excerciserName} DropTable {_tableName}");
+            _fixture.AddCommand($"{excerciserName} DropTable {_asyncTableName}");
 
             _fixture.AddActions
             (
@@ -55,6 +68,7 @@ public MsSqlTestsBase(TFixture fixture, ITestOutputHelper output, string excerci
                 },
                 exerciseApplication: () =>
                 {
+                    _fixture.AgentLog.WaitForLogLine(AgentLogBase.AgentConnectedLogLineRegex, TimeSpan.FromMinutes(1));
                     _fixture.AgentLog.WaitForLogLine(AgentLogBase.SqlTraceDataLogLineRegex, TimeSpan.FromMinutes(1));
                 }
             );
@@ -64,10 +78,10 @@ public MsSqlTestsBase(TFixture fixture, ITestOutputHelper output, string excerci
         [Fact]
         public void Test()
         {
-            var expectedDatastoreCallCount = 4;
-            //This value is dictated by the query that is being run as part of this test. In this case, we're running a query that returns a single row.
-            //This results in a call to Read, NextResult and then a final Read. Therefore the call count for the Iterate metric should be 3.
-            var expectedIterateCallCount = 3;
+            var expectedDatastoreCallCount = 8;
+            //This value is dictated by the queries that are being run as part of this test. In this case, we're running two queries that each return a single row.
+            //This results in a call to Read, NextResult and then a final Read. Therefore the overall call count for the Iterate metric should be 6.
+            var expectedIterateCallCount = 6;
 
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
@@ -75,53 +89,81 @@ public void Test()
                 new Assertions.ExpectedMetric { metricName = @"Datastore/allOther", callCount = expectedDatastoreCallCount },
                 new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/all", callCount = expectedDatastoreCallCount },
                 new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/allOther", callCount = expectedDatastoreCallCount },
+
+                new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/Open", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/OpenAsync", callCount = 1 },
+
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/instance/MSSQL/{CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)}/default", callCount = expectedDatastoreCallCount},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 2 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/teammembers/select", callCount = 1 },
-                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/teammembers/select", callCount = 1, metricScope = _expectedTransactionName},
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 4 },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/statement/MSSQL/teammembers/select", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/statement/MSSQL/teammembers/select", callCount = 1, metricScope = _expectedTransactionName},
+                new Assertions.ExpectedMetric { metricName = @"Datastore/statement/MSSQL/teammembers/select", callCount = 1, metricScope = _expectedAsyncTransactionName},
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/select", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/select", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_asyncTableName}/select", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_asyncTableName}/select", callCount = 1, metricScope = _expectedAsyncTransactionName},
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 2 },
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/insert", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/insert", callCount = 1, metricScope = _expectedTransactionName},
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_asyncTableName}/insert", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_asyncTableName}/insert", callCount = 1, metricScope = _expectedAsyncTransactionName},
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 2 },
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/delete", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_tableName}/delete", callCount = 1, metricScope = _expectedTransactionName},
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_asyncTableName}/delete", callCount = 1 },
+                new Assertions.ExpectedMetric { metricName = $@"Datastore/statement/MSSQL/{_asyncTableName}/delete", callCount = 1, metricScope = _expectedAsyncTransactionName},
                 new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount },
-                new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount, metricScope = _expectedTransactionName}
+                new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount / 2, metricScope = _expectedTransactionName},
+                new Assertions.ExpectedMetric { metricName = @"DotNet/DatabaseResult/Iterate", callCount = expectedIterateCallCount / 2, metricScope = _expectedAsyncTransactionName}
             };
             var unexpectedMetrics = new List<Assertions.ExpectedMetric>
             {
                 // The operation metric should not be scoped because the statement metric is scoped instead
                 new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", metricScope = _expectedTransactionName },
                 new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", metricScope = _expectedTransactionName },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", metricScope = _expectedTransactionName }
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", metricScope = _expectedTransactionName },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", metricScope = _expectedAsyncTransactionName },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", metricScope = _expectedAsyncTransactionName },
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", metricScope = _expectedAsyncTransactionName }
             };
             var expectedTransactionTraceSegments = new List<string>
             {
-                $"Datastore/statement/MSSQL/teammembers/select"
+                "Datastore/statement/MSSQL/teammembers/select"
             };
 
+            var expectedTransactionEventIntrinsicAttributes = new List<string>
+            {
+                "databaseDuration"
+            };
+
+            var metrics = _fixture.AgentLog.GetMetrics().ToList();
+            var syncTransactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedTransactionName);
+            var syncTransactionEvent = _fixture.AgentLog.TryGetTransactionEvent(_expectedTransactionName);
+            var asyncTransactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedAsyncTransactionName);
+            var asyncTransactionEvent = _fixture.AgentLog.TryGetTransactionEvent(_expectedAsyncTransactionName);
+            var sqlTraces = _fixture.AgentLog.GetSqlTraces().ToList();
+
+            // Some variable expectations based on which transaction was sampled
+            var sampledTransactionSample = syncTransactionSample != null ? syncTransactionSample : asyncTransactionSample;
+            var firstOrLastNameQueried = syncTransactionSample != null ? "FirstName" : "LastName";
+
             var expectedTransactionTraceSegmentParameters = new List<Assertions.ExpectedSegmentParameter>
             {
                 new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "explain_plan" },
-                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "sql", parameterValue = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = ?"},
+                new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "sql", parameterValue = $"SELECT * FROM NewRelic.dbo.TeamMembers WHERE {firstOrLastNameQueried} = ?"},
                 new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "host", parameterValue = CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)},
                 new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "port_path_or_id", parameterValue = "default"},
                 new Assertions.ExpectedSegmentParameter { segmentName = "Datastore/statement/MSSQL/teammembers/select", parameterName = "database_name", parameterValue = "NewRelic"}
 
             };
 
-            var expectedTransactionEventIntrinsicAttributes = new List<string>
-            {
-                "databaseDuration"
-            };
 
+            // There should be a total of 8 traces: 4 for the sync methods and 4 for the async methods.
             var expectedSqlTraces = new List<Assertions.ExpectedSqlTrace>
             {
                 new Assertions.ExpectedSqlTrace
                 {
-                    TransactionName = _expectedTransactionName,
+                    TransactionName = _expectedTransactionName, //sync select
                     Sql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = ?",
                     DatastoreMetricName = "Datastore/statement/MSSQL/teammembers/select",
 
@@ -129,7 +171,15 @@ public void Test()
                 },
                 new Assertions.ExpectedSqlTrace
                 {
-                    TransactionName = _expectedTransactionName,
+                    TransactionName = _expectedAsyncTransactionName, //async select - note querying LastName
+                    Sql = "SELECT * FROM NewRelic.dbo.TeamMembers WHERE LastName = ?",
+                    DatastoreMetricName = "Datastore/statement/MSSQL/teammembers/select",
+
+                    HasExplainPlan = true
+                },
+                new Assertions.ExpectedSqlTrace
+                {
+                    TransactionName = _expectedTransactionName, //sync count
                     Sql = $"SELECT COUNT(*) FROM {_tableName} WITH(nolock)",
                     DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/select",
 
@@ -137,7 +187,15 @@ public void Test()
                 },
                 new Assertions.ExpectedSqlTrace
                 {
-                    TransactionName = _expectedTransactionName,
+                    TransactionName = _expectedAsyncTransactionName, //async count
+                    Sql = $"SELECT COUNT(*) FROM {_asyncTableName} WITH(nolock)",
+                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_asyncTableName}/select",
+
+                    HasExplainPlan = true
+                },
+                new Assertions.ExpectedSqlTrace
+                {
+                    TransactionName = _expectedTransactionName, //sync insert
                     Sql = $"INSERT INTO {_tableName} (FirstName, LastName, Email) VALUES(?, ?, ?)",
                     DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/insert",
 
@@ -145,33 +203,46 @@ public void Test()
                 },
                 new Assertions.ExpectedSqlTrace
                 {
-                    TransactionName = _expectedTransactionName,
+                    TransactionName = _expectedAsyncTransactionName, //async insert
+                    Sql = $"INSERT INTO {_asyncTableName} (FirstName, LastName, Email) VALUES(?, ?, ?)",
+                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_asyncTableName}/insert",
+
+                    HasExplainPlan = true
+                },
+                new Assertions.ExpectedSqlTrace
+                {
+                    TransactionName = _expectedTransactionName, //sync delete
                     Sql = $"DELETE FROM {_tableName} WHERE Email = ?",
                     DatastoreMetricName = $"Datastore/statement/MSSQL/{_tableName}/delete",
 
+                    HasExplainPlan = true
+                },
+                new Assertions.ExpectedSqlTrace
+                {
+                    TransactionName = _expectedAsyncTransactionName, //async delete
+                    Sql = $"DELETE FROM {_asyncTableName} WHERE Email = ?",
+                    DatastoreMetricName = $"Datastore/statement/MSSQL/{_asyncTableName}/delete",
+
                     HasExplainPlan = true
                 }
             };
 
-            var metrics = _fixture.AgentLog.GetMetrics().ToList();
-            var transactionSample = _fixture.AgentLog.TryGetTransactionSample(_expectedTransactionName);
-            var transactionEvent = _fixture.AgentLog.TryGetTransactionEvent(_expectedTransactionName);
-            var sqlTraces = _fixture.AgentLog.GetSqlTraces().ToList();
-
             NrAssert.Multiple(
-                () => Assert.NotNull(transactionSample),
-                () => Assert.NotNull(transactionEvent)
+                () => Assert.NotNull(sampledTransactionSample),
+                () => Assert.NotNull(syncTransactionEvent),
+                () => Assert.NotNull(asyncTransactionEvent)
                 );
 
             NrAssert.Multiple
             (
                 () => Assertions.MetricsExist(expectedMetrics, metrics),
                 () => Assertions.MetricsDoNotExist(unexpectedMetrics, metrics),
-                () => Assertions.TransactionTraceSegmentsExist(expectedTransactionTraceSegments, transactionSample),
+                () => Assertions.TransactionTraceSegmentsExist(expectedTransactionTraceSegments, sampledTransactionSample),
 
-                () => Assertions.TransactionTraceSegmentParametersExist(expectedTransactionTraceSegmentParameters, transactionSample),
+                () => Assertions.TransactionTraceSegmentParametersExist(expectedTransactionTraceSegmentParameters, sampledTransactionSample),
 
-                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes, TransactionEventAttributeType.Intrinsic, transactionEvent),
+                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes, TransactionEventAttributeType.Intrinsic, syncTransactionEvent),
+                () => Assertions.TransactionEventHasAttributes(expectedTransactionEventIntrinsicAttributes, TransactionEventAttributeType.Intrinsic, asyncTransactionEvent),
                 () => Assertions.SqlTraceExists(expectedSqlTraces, sqlTraces)
             );
         }
@@ -184,7 +255,8 @@ public MsSqlTests_SystemData_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixtur
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "SystemDataExerciser")
+                  excerciserName: "SystemDataExerciser",
+                  libraryName: "System.Data.SqlClient")
         {
         }
     }
@@ -196,7 +268,8 @@ public MsSqlTests_SystemDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCore
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "SystemDataSqlClientExerciser")
+                  excerciserName: "SystemDataSqlClientExerciser",
+                  libraryName: "System.Data.SqlClient")
         {
         }
     }
@@ -208,7 +281,8 @@ public MsSqlTests_SystemDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureCore
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "SystemDataSqlClientExerciser")
+                  excerciserName: "SystemDataSqlClientExerciser",
+                  libraryName: "System.Data.SqlClient")
         {
         }
     }
@@ -220,7 +294,8 @@ public MsSqlTests_MicrosoftDataSqlClient_FWLatest(ConsoleDynamicMethodFixtureFWL
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
@@ -232,7 +307,8 @@ public MsSqlTests_MicrosoftDataSqlClient_FW462(ConsoleDynamicMethodFixtureFW462
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
@@ -244,7 +320,8 @@ public MsSqlTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureC
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
@@ -256,7 +333,8 @@ public MsSqlTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureC
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj
index b263ec2eb2..9f847cb938 100644
--- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj
+++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj
@@ -45,7 +45,8 @@
     <PackageReference Include="Common.Logging" Version="3.3.1" />
     <PackageReference Include="Common.Logging.Core" Version="3.3.1" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -53,12 +54,18 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="CouchbaseNetClient" Version="2.3.8" />
     <PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.2400" />
-    <PackageReference Include="xunit" version="2.4.0" />
-    <PackageReference Include="xunit.assert" Version="2.4.0" />
-    <PackageReference Include="xunit.core" Version="2.4.0" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="xunit" version="2.6.1" />
+    <PackageReference Include="xunit.assert" Version="2.6.1" />
+    <PackageReference Include="xunit.core" Version="2.6.1" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.6.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.6.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   
   <ItemGroup>
diff --git a/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj b/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj
index a45737fc9b..ad19091156 100644
--- a/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj
+++ b/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj
@@ -3,13 +3,14 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="NUnit" Version="3.13.1" />
   </ItemGroup>
 </Project>
diff --git a/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs b/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs
index e8e111ee93..ef71f3db41 100644
--- a/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs
+++ b/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using NUnit.Framework;
 
 namespace NewRelic.Testing.Assertions
 {
@@ -30,30 +31,19 @@ public static T Throws<T>(Action action) where T : Exception
             throw new TestFailureException($"Expected exception of type '{typeof(T)}' was not thrown.");
         }
 
+        /// <summary>
+        /// OBSOLETE
+        /// Please use NUnit.Framework.Assert.Multiple() instead.
+        /// This method just passes through to Assert.Multiple().
+        /// </summary>
+        /// <param name="actions"></param>
         public static void Multiple(params Action[] actions)
         {
-            var exceptions = new List<Tuple<int,Exception>>();
-            for(var i = 0; i < actions.Length; i++)
+            Assert.Multiple(() =>
             {
-                try
-                {
-                    actions[i]();
-                }
-                catch (TestFailureException testEx)
-                {
-                    exceptions.Add(new Tuple<int, Exception>(i, testEx));
-                }
-                catch (Exception ex)
-                {
-                    exceptions.Add(new Tuple<int, Exception>(i, ex));
-                }
-            }
-
-            if (!exceptions.Any())
-                return;
-
-            var details = FormatExceptions(exceptions);
-            throw new TestFailureException(details);
+                foreach (var action in actions)
+                    action();
+            });
         }
 
         private static string FormatException(Exception exception)
diff --git a/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj b/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj
index 25e54eeaa2..a7f32bb6f1 100644
--- a/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj
+++ b/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj
@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="JustMock" Version="2020.1.113.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Agent/UnitTests/CompositeTests/AgentWrapperApiExtensions.cs b/tests/Agent/UnitTests/CompositeTests/AgentWrapperApiExtensions.cs
index 090b2854c9..4ee6431af3 100644
--- a/tests/Agent/UnitTests/CompositeTests/AgentWrapperApiExtensions.cs
+++ b/tests/Agent/UnitTests/CompositeTests/AgentWrapperApiExtensions.cs
@@ -56,7 +56,7 @@ public static ISegment StartExternalRequestSegmentOrThrow(this IAgent agent, Uri
         public static ISegment StartDatastoreRequestSegmentOrThrow(this IAgent agent, string operation, DatastoreVendor vendor, string model, string commandText = null, MethodCall methodCall = null, string host = null, string portPathOrId = null, string databaseName = null, IDictionary<string, IConvertible> queryParameters = null)
         {
             methodCall = methodCall ?? GetDefaultMethodCall(agent);
-            var segment = agent.CurrentTransaction.StartDatastoreSegment(methodCall, new ParsedSqlStatement(vendor, model, operation), new ConnectionInfo(host, portPathOrId, databaseName), commandText, queryParameters);
+            var segment = agent.CurrentTransaction.StartDatastoreSegment(methodCall, new ParsedSqlStatement(vendor, model, operation), new ConnectionInfo(vendor.ToKnownName(), host, portPathOrId, databaseName), commandText, queryParameters);
             if (segment == null)
                 throw new NullReferenceException("segment");
 
@@ -67,7 +67,7 @@ public static ISegment StartStackExchangeRedisDatastoreRequestSegmentOrThrow(thi
         {
             methodCall = methodCall ?? GetDefaultMethodCall(agent);
             var xTransaction = (ITransactionExperimental)agent.CurrentTransaction;
-            var segment = xTransaction.StartStackExchangeRedisSegment(RuntimeHelpers.GetHashCode(methodCall), ParsedSqlStatement.FromOperation(vendor, operation), new ConnectionInfo(host, portPathOrId, databaseName), relativeStartTime, relativeEndTime);
+            var segment = xTransaction.StartStackExchangeRedisSegment(RuntimeHelpers.GetHashCode(methodCall), ParsedSqlStatement.FromOperation(vendor, operation), new ConnectionInfo(vendor.ToKnownName(), host, portPathOrId, databaseName), relativeStartTime, relativeEndTime);
             if (segment == null)
                 throw new NullReferenceException("segment");
 
@@ -89,7 +89,8 @@ private static MethodCall GetDefaultMethodCall(IAgent agent)
             return new MethodCall(
                 new Method(agent.GetType(), "methodName", "parameterTypeNames"),
                 agent,
-                new object[0]
+                new object[0],
+                false
                 );
         }
 
@@ -98,7 +99,8 @@ private static MethodCall GetCustomSegmentMethodCall(IAgent agent)
             return new MethodCall(
                 new Method(agent.GetType(), "methodName", "parameterTypeNames"),
                 agent,
-                new object[] { "customName" }
+                new object[] { "customName" },
+                false
                 );
         }
     }
diff --git a/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj b/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj
index 7472411812..3486ad8fd6 100644
--- a/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj
+++ b/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj
@@ -7,13 +7,13 @@
     <RunSettingsFilePath>$(SolutionDir)test.runsettings</RunSettingsFilePath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="JustMock" Version="2020.1.113.1" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="MoreLinq" Version="2.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs b/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs
index 5603c6cd8c..5915ab5348 100644
--- a/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs
+++ b/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs
@@ -255,10 +255,13 @@ public void ExternalHttpSpanEvent_HasExpectedAttributes()
             TestPayloadInfoMatchesSpanInfo(Payload, rootSpan, actualSpan, "http");
 
             var agentAttributes = actualSpan.AgentAttributes();
+            var intrinsicAttributes = actualSpan.IntrinsicAttributes();
 
             //The specific test
             Assert.AreEqual(url, agentAttributes["http.url"]);
-            Assert.AreEqual(method, agentAttributes["http.method"]);
+            Assert.AreEqual(method, agentAttributes["http.request.method"]);
+            Assert.AreEqual("127.0.0.2", intrinsicAttributes["server.address"]);
+            Assert.AreEqual(123, intrinsicAttributes["server.port"]);
         }
 
         private static Dictionary<string, string> NewRelicHeaders
diff --git a/tests/Agent/UnitTests/CompositeTests/TransactionNameTests.cs b/tests/Agent/UnitTests/CompositeTests/TransactionNameTests.cs
index 265cd8b670..becb569a77 100644
--- a/tests/Agent/UnitTests/CompositeTests/TransactionNameTests.cs
+++ b/tests/Agent/UnitTests/CompositeTests/TransactionNameTests.cs
@@ -177,6 +177,33 @@ public void SetMessageBrokerTransactionName_UpdatesTransactionNameCorrectly()
             NrAssert.Multiple(
                 () => MetricAssertions.MetricsExist(expectedMetrics, actualMetrics),
                 () => Assert.AreEqual("OtherTransaction/Message/vendor/Queue/Named/dest", transactionTrace.TransactionMetricName)
+            );
+        }
+
+        [Test]
+        public void SetKafkaMessageBrokerTransactionName_UpdatesTransactionNameCorrectly()
+        {
+            var transaction = _agent.CreateTransaction(
+                isWeb: true,
+                category: EnumNameCache<WebTransactionType>.GetName(WebTransactionType.Action),
+                transactionDisplayName: "name",
+                doNotTrackAsUnitOfWork: true);
+            transaction.SetKafkaMessageBrokerTransactionName(MessageBrokerDestinationType.Topic, "vendor", "dest", TransactionNamePriority.Route);
+            var segment = _agent.StartTransactionSegmentOrThrow("simpleName");
+            segment.End();
+            transaction.End();
+
+            _compositeTestAgent.Harvest();
+
+            var expectedMetrics = new[]
+            {
+                new ExpectedMetric {Name = "OtherTransaction/Message/vendor/Topic/Consume/Named/dest"}
+            };
+            var actualMetrics = _compositeTestAgent.Metrics.ToList();
+            var transactionTrace = _compositeTestAgent.TransactionTraces.First();
+            NrAssert.Multiple(
+                () => MetricAssertions.MetricsExist(expectedMetrics, actualMetrics),
+                () => Assert.AreEqual("OtherTransaction/Message/vendor/Topic/Consume/Named/dest", transactionTrace.TransactionMetricName)
                 );
         }
 
diff --git a/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs b/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs
index 9b4a44449d..37e5e7077f 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs
@@ -9,6 +9,7 @@
 using NewRelic.Agent.Core.Utilities;
 using NewRelic.Agent.Core.WireModels;
 using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.Core.Logging;
 using NewRelic.SystemInterfaces;
 using NewRelic.Testing.Assertions;
 using NUnit.Framework;
@@ -26,10 +27,12 @@ public class AgentHealthReporterTests
         private AgentHealthReporter _agentHealthReporter;
         private List<MetricWireModel> _publishedMetrics;
         private ConfigurationAutoResponder _configurationAutoResponder;
+        private bool _enableLogging;
 
         [SetUp]
         public void SetUp()
         {
+            _enableLogging = true;
             var configuration = GetDefaultConfiguration();
             _configurationAutoResponder = new ConfigurationAutoResponder(configuration);
 
@@ -45,13 +48,14 @@ public void TearDown()
             _configurationAutoResponder.Dispose();
         }
 
-        private static IConfiguration GetDefaultConfiguration()
+        private IConfiguration GetDefaultConfiguration()
         {
             var configuration = Mock.Create<IConfiguration>();
             Mock.Arrange(() => configuration.LogEventCollectorEnabled).Returns(true);
             Mock.Arrange(() => configuration.LogDecoratorEnabled).Returns(true);
             Mock.Arrange(() => configuration.LogMetricsCollectorEnabled).Returns(true);
             Mock.Arrange(() => configuration.InfiniteTracingCompression).Returns(true);
+            Mock.Arrange(() => configuration.LoggingEnabled).Returns(() => _enableLogging);
             return configuration;
         }
 
@@ -136,6 +140,45 @@ public void ReportSupportabilityCountMetric_SuppliedCount()
             );
         }
 
+        [Test]
+        public void ReportCountMetric()
+        {
+            const string MetricName = "Some/Metric/Name";
+            _agentHealthReporter.ReportCountMetric(MetricName, 2);
+            Assert.AreEqual(1, _publishedMetrics.Count);
+            NrAssert.Multiple(
+                () => Assert.AreEqual(MetricName, _publishedMetrics[0].MetricName.Name),
+                () => Assert.AreEqual(2, _publishedMetrics[0].Data.Value0)
+            );
+        }
+
+        [Test]
+        public void ReportByteMetric()
+        {
+            const string MetricName = "Some/Metric/Name";
+            const long totalBytes = 1024 * 1024 * 1024;
+            _agentHealthReporter.ReportByteMetric(MetricName, totalBytes);
+            Assert.AreEqual(1, _publishedMetrics.Count);
+            NrAssert.Multiple(
+                () => Assert.AreEqual(MetricName, _publishedMetrics[0].MetricName.Name),
+                () => Assert.AreEqual(MetricDataWireModel.BuildByteData(totalBytes), _publishedMetrics[0].Data)
+            );
+        }
+
+        [Test]
+        public void ReportByteMetric_WithExclusiveBytes()
+        {
+            const string MetricName = "Some/Metric/Name";
+            const long totalBytes = 1024 * 1024 * 1024;
+            const long exclusiveBytes = 1024 * 1024 * 64;
+            _agentHealthReporter.ReportByteMetric(MetricName, totalBytes, exclusiveBytes);
+            Assert.AreEqual(1, _publishedMetrics.Count);
+            NrAssert.Multiple(
+                () => Assert.AreEqual(MetricName, _publishedMetrics[0].MetricName.Name),
+                () => Assert.AreEqual(MetricDataWireModel.BuildByteData(totalBytes, exclusiveBytes), _publishedMetrics[0].Data)
+            );
+        }
+
         [Test]
         public void CollectMetrics_ReportsAgentVersion()
         {
@@ -312,6 +355,7 @@ public void ReportLoggingSupportabilityMetrics()
             _agentHealthReporter.ReportLoggingEventCollected();
             _agentHealthReporter.ReportLoggingEventsSent(2);
             _agentHealthReporter.ReportLoggingEventsDropped(3);
+            _agentHealthReporter.ReportLoggingEventsEmpty();
             _agentHealthReporter.ReportLogForwardingFramework("log4net");
 
             _agentHealthReporter.ReportLogForwardingEnabledWithFramework("Framework1");
@@ -325,6 +369,7 @@ public void ReportLoggingSupportabilityMetrics()
                 { "Supportability/Logging/Forwarding/Seen", 1 },
                 { "Supportability/Logging/Forwarding/Sent", 2 },
                 { "Supportability/Logging/Forwarding/Dropped", 3 },
+                { "Supportability/Logging/Forwarding/Empty", 1 },
                 { "Supportability/Logging/Metrics/DotNET/enabled", 1 },
                 { "Supportability/Logging/Forwarding/DotNET/enabled", 1 },
                 { "Supportability/Logging/LocalDecorating/DotNET/enabled", 1 },
@@ -384,5 +429,39 @@ public void LoggingConfigurationSupportabilityMetricsOnlyReportedOnce()
             actualMetricNamesAndValues = _publishedMetrics.Select(x => new KeyValuePair<string, long>(x.MetricName.Name, x.Data.Value0));
             CollectionAssert.IsNotSubsetOf(expectedMetricNamesAndValues, actualMetricNamesAndValues);
         }
+
+        [Test]
+        public void LoggingDisabledSupportabilityMetricsPresent()
+        {
+            _enableLogging = false;
+            Log.FileLoggingHasFailed = true;
+            _agentHealthReporter.CollectMetrics();
+
+            var expectedMetricNamesAndValues = new Dictionary<string, long>
+            {
+                { "Supportability/DotNET/AgentLogging/Disabled", 1 },
+                { "Supportability/DotNET/AgentLogging/DisabledDueToError", 1 },
+            };
+            var actualMetricNamesAndValues = _publishedMetrics.Select(x => new KeyValuePair<string, long>(x.MetricName.Name, x.Data.Value0));
+
+            CollectionAssert.IsSubsetOf(expectedMetricNamesAndValues, actualMetricNamesAndValues);
+
+            Log.FileLoggingHasFailed = false;
+        }
+
+        [Test]
+        public void LoggingDisabledSupportabilityMetricsMissing()
+        {
+            Log.FileLoggingHasFailed = false;
+            _agentHealthReporter.CollectMetrics();
+
+            var expectedMetricNamesAndValues = new Dictionary<string, long>
+            {
+                { "Supportability/DotNET/AgentLogging/Disabled", 1 },
+                { "Supportability/DotNET/AgentLogging/DisabledDueToError", 1 },
+            };
+            Assert.False(_publishedMetrics.Any(x => x.MetricName.Name == "Supportability/DotNET/AgentLogging/Disabled"));
+            Assert.False(_publishedMetrics.Any(x => x.MetricName.Name == "Supportability/DotNET/AgentLogging/DisabledDueToError"));
+        }
     }
 }
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs
index ea04b19979..0b3d2f4759 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs
@@ -3241,6 +3241,18 @@ public bool AsyncHttpClientSegmentsDoNotCountTowardsParentExclusiveTimeTests(str
             return defaultConfig.ForceSynchronousTimingCalculationHttpClient;
         }
 
+        [TestCase(null, ExpectedResult = false)]
+        [TestCase("not a bool", ExpectedResult = false)]
+        [TestCase("false", ExpectedResult = false)]
+        [TestCase("true", ExpectedResult = true)]
+        public bool AspNetCore6PlusBrowserInjectionTests(string localConfigValue)
+        {
+            _localConfig.appSettings.Add(new configurationAdd { key = "EnableAspNetCore6PlusBrowserInjection", value = localConfigValue });
+            var defaultConfig = new TestableDefaultConfiguration(_environment, _localConfig, _serverConfig, _runTimeConfig, _securityPoliciesConfiguration, _processStatic, _httpRuntimeStatic, _configurationManagerStatic, _dnsStatic);
+
+            return defaultConfig.EnableAspNetCore6PlusBrowserInjection;
+        }
+
         [TestCase("true", true, ExpectedResult = true)]
         [TestCase("true", false, ExpectedResult = true)]
         [TestCase("true", null, ExpectedResult = true)]
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj
index 49a8d10cfb..161007237b 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj
+++ b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj
@@ -10,12 +10,12 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="JustMock" Version="2020.1.113.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="MoreLinq" Version="2.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumLoaderInsertionLocationTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumLoaderInsertionLocationTests.cs
index ea5414eeeb..e28d66a8f7 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumLoaderInsertionLocationTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumLoaderInsertionLocationTests.cs
@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using NewRelic.Agent.Core.BrowserMonitoring;
 using NUnit.Framework;
 
@@ -21,13 +23,32 @@ public void TestFilesCanEnumerate()
         }
 
         [Test, TestCaseSource(nameof(GetRumTestData))]
-        public void cross_agent_browser_monitor_injection_from_files(string fileName, string data, string expected)
+        public void cross_agent_browser_monitor_injection_using_BrowserMonitoringWriter(string fileName, string data, string expected)
         {
             var writer = new BrowserMonitoringWriter(() => "EXPECTED_RUM_LOADER_LOCATION");
             var result = writer.WriteScriptHeaders(data);
             Assert.AreEqual(expected, result);
         }
 
+        [Test, TestCaseSource(nameof(GetRumTestData))]
+        public async Task cross_agent_browser_monitor_injection_using_BrowserScriptInjectionHelper(string fileName, string data, string expected)
+        {
+            using (var ms = new MemoryStream())
+            {
+                var dataBytes = Encoding.UTF8.GetBytes(data);
+                await BrowserScriptInjectionHelper.InjectBrowserScriptAsync(dataBytes, ms, Encoding.UTF8.GetBytes("EXPECTED_RUM_LOADER_LOCATION"), null);
+
+                await ms.FlushAsync();
+                ms.Position = 0;
+
+                var resultBytes = ms.ToArray();
+                var result = Encoding.UTF8.GetString(resultBytes);
+
+                Assert.AreEqual(expected, result);
+
+            }
+        }
+
         private static IEnumerable<TestCaseData> GetRumTestData()
         {
             var rumContentDirectory = Path.Combine(TestContext.CurrentContext.TestDirectory, @"BrowserMonitoring\rum_loader_insertion_location\");
diff --git a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/AgentSettingsTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/AgentSettingsTests.cs
index ec4707f0a8..9b3463822c 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/AgentSettingsTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/AgentSettingsTests.cs
@@ -24,7 +24,7 @@ public void serializes_correctly()
 
             var json = JsonConvert.SerializeObject(agentSettings);
 
-            const string expectedJson = @"{""agent.name"":"".NET Agent"",""agent.run_id"":""AgentRunId"",""agent.enabled"":true,""agent.license_key.configured"":true,""agent.application_names"":[""name1"",""name2"",""name3""],""agent.application_names_source"":""ApplicationNameSource"",""agent.auto_start"":true,""browser_monitoring.application_id"":""BrowserMonitoringApplicationId"",""browser_monitoring.auto_instrument"":true,""browser_monitoring.beacon_address"":""BrowserMonitoringBeaconAddress"",""browser_monitoring.error_beacon_address"":""BrowserMonitoringErrorBeaconAddress"",""browser_monitoring.javascript_agent.populated"":true,""browser_monitoring.javascript_agent_file"":""BrowserMonitoringJavaScriptAgentFile"",""browser_monitoring.loader"":""BrowserMonitoringJavaScriptAgentLoaderType"",""browser_monitoring.loader_debug"":false,""browser_monitoring.monitoring_key.populated"":true,""browser_monitoring.use_ssl"":true,""security.policies_token"":""SecurityPoliciesToken"",""security.policies_token_exists"":true,""agent.allow_all_request_headers"":true,""agent.attributes_enabled"":true,""agent.can_use_attributes_includes"":true,""agent.can_use_attributes_includes_source"":""CanUseAttributesIncludesSource"",""agent.attributes_include"":[""include1"",""include2"",""include3""],""agent.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""agent.attributes_default_excludes"":[""defaultExclude1"",""defaultExclude2"",""defaultExclude3""],""transaction_events.attributes_enabled"":false,""transaction_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""transaction_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""transaction_trace.attributes_enabled"":true,""transaction_trace.attributes_include"":[""include1"",""include2"",""include3""],""transaction_trace.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""error_collector.attributes_enabled"":false,""error_collector.attributes_include"":[""include1"",""include2"",""include3""],""error_collector.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""browser_monitoring.attributes_enabled"":false,""browser_monitoring.attributes_include"":[""include1"",""include2"",""include3""],""browser_monitoring.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""custom_parameters.enabled"":false,""custom_parameters.source"":""CaptureCustomParametersSource"",""collector.host"":""CollectorHost"",""collector.port"":1234,""collector.send_data_on_exit"":true,""collector.send_data_on_exit_threshold"":4321.0,""collector.send_environment_info"":true,""collector.sync_startup"":true,""collector.timeout"":1234,""collector.max_payload_size_in_bytes"":4321,""agent.complete_transactions_on_thread"":true,""agent.compressed_content_encoding"":""CompressedContentEncoding"",""agent.configuration_version"":1234,""cross_application_tracer.cross_process_id"":""CrossApplicationTracingCrossProcessId"",""cross_application_tracer.enabled"":true,""distributed_tracing.enabled"":true,""span_events.enabled"":true,""span_events.harvest_cycle"":""00:20:34"",""span_events.attributes_enabled"":true,""span_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""span_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""infinite_tracing.trace_count_consumers"":1234,""infinite_tracing.trace_observer_host"":""InfiniteTracingTraceObserverHost"",""infinite_tracing.trace_observer_port"":""InfiniteTracingTraceObserverPort"",""infinite_tracing.trace_observer_ssl"":""InfiniteTracingTraceObserverSsl"",""infinite_tracing.dev.test_flaky"":1234.0,""infinite_tracing.dev.test_flaky_code"":4321,""infinite_tracing.dev.test_delay_ms"":1234,""infinite_tracing.spans_queue_size"":4321,""infinite_tracing.spans_partition_count"":1234,""infinite_tracing.spans_batch_size"":4321,""infinite_tracing.connect_timeout_ms"":1234,""infinite_tracing.send_data_timeout_ms"":4321,""infinite_tracing.exit_timeout_ms"":1234,""infinite_tracing.compression"":true,""agent.primary_application_id"":""PrimaryApplicationId"",""agent.trusted_account_key"":""TrustedAccountKey"",""agent.account_id"":""AccountId"",""datastore_tracer.name_reporting_enabled"":true,""datastore_tracer.query_parameters_enabled"":true,""error_collector.enabled"":true,""error_collector.capture_events_enabled"":true,""error_collector.max_samples_stored"":1234,""error_collector.harvest_cycle"":""00:20:34"",""error_collector.max_per_period"":4321,""error_collector.expected_classes"":[""expected1"",""expected2"",""expected3""],""error_collector.expected_messages"":{""first"":[""first1"",""first2""],""second"":[""second1"",""second2""]},""error_collector.expected_status_codes"":[""expectedError1"",""expectedError2"",""expectedError3""],""error_collector.expected_errors_config"":{""third"":[""third1"",""third2""],""fourth"":[""fourth1"",""fourth2""]},""error_collector.ignore_errors_config"":{""fifth"":[""fifth1"",""fifth2""],""sixth"":[""sixth1"",""sixth2""]},""error_collector.ignore_classes"":[""ignoreError1"",""ignoreError2"",""ignoreError3""],""error_collector.ignore_messages"":{""seven"":[""seven1"",""seven2""],""eight"":[""eight1"",""eight2""]},""agent.request_headers_map"":{""one"":""1"",""two"":""2""},""cross_application_tracer.encoding_key"":""EncodingKey"",""agent.entity_guid"":""EntityGuid"",""agent.high_security_mode_enabled"":true,""agent.custom_instrumentation_editor_enabled"":true,""agent.custom_instrumentation_editor_enabled_source"":""CustomInstrumentationEditorEnabledSource"",""agent.strip_exception_messages"":true,""agent.strip_exception_messages_source"":""StripExceptionMessagesSource"",""agent.instance_reporting_enabled"":true,""agent.instrumentation_logging_enabled"":true,""agent.labels"":""Labels"",""agent.metric_name_regex_rules"":[{""MatchExpression"":""match1"",""Replacement"":""replacement1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""match1"",""Options"":3}},{""MatchExpression"":""match2"",""Replacement"":""replacement2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""match2"",""Options"":3}}],""agent.new_relic_config_file_path"":""NewRelicConfigFilePath"",""agent.app_settings_config_file_path"":""AppSettingsConfigFilePath"",""proxy.host.configured"":true,""proxy.uri_path.configured"":true,""proxy.port.configured"":true,""proxy.username.configured"":true,""proxy.password.configured"":true,""proxy.domain.configured"":true,""agent.put_for_data_sent"":true,""slow_sql.enabled"":true,""transaction_tracer.explain_threshold"":""00:20:34"",""transaction_tracer.explain_enabled"":true,""transaction_tracer.max_explain_plans"":1234,""transaction_tracer.max_sql_statements"":4321,""transaction_tracer.sql_traces_per_period"":1234,""transaction_tracer.max_stack_trace_lines"":4321,""error_collector.ignore_status_codes"":[""ignore1"",""ignore2"",""ignore3""],""agent.thread_profiling_methods_to_ignore"":[""ignoreMethod1"",""ignoreMethod2"",""ignoreMethod3""],""custom_events.enabled"":true,""custom_events.enabled_source"":""CustomEventsEnabledSource"",""custom_events.attributes_enabled"":true,""custom_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""custom_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""custom_events.max_samples_stored"":1234,""custom_events.harvest_cycle"":""00:20:34"",""agent.disable_samplers"":true,""thread_profiler.enabled"":true,""transaction_events.enabled"":true,""transaction_events.max_samples_stored"":4321,""transaction_events.harvest_cycle"":""01:12:01"",""transaction_events.transactions_enabled"":true,""transaction_name.regex_rules"":[{""MatchExpression"":""matchTrans1"",""Replacement"":""replacementTrans1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchTrans1"",""Options"":3}},{""MatchExpression"":""matchTrans2"",""Replacement"":""replacementTrans2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchTrans2"",""Options"":3}}],""transaction_name.whitelist_rules"":{""nine"":[""nine1"",""nine2""],""ten"":[""ten1"",""ten2""]},""transaction_tracer.apdex_f"":""00:20:34"",""transaction_tracer.apdex_t"":""01:12:01"",""transaction_tracer.transaction_threshold"":""00:20:34"",""transaction_tracer.enabled"":true,""transaction_tracer.max_segments"":1234,""transaction_tracer.record_sql"":""TransactionTracerRecordSql"",""transaction_tracer.record_sql_source"":""TransactionTracerRecordSqlSource"",""transaction_tracer.max_stack_traces"":4321,""agent.trusted_account_ids"":[1,2,3],""agent.server_side_config_enabled"":true,""agent.ignore_server_side_config"":true,""agent.url_regex_rules"":[{""MatchExpression"":""matchUrl1"",""Replacement"":""replacementUrl1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchUrl1"",""Options"":3}},{""MatchExpression"":""matchUrl2"",""Replacement"":""replacementUrl2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchUrl2"",""Options"":3}}],""agent.request_path_exclusion_list"":[{""Pattern"":""asdf"",""Options"":0},{""Pattern"":""qwerty"",""Options"":1},{""Pattern"":""yolo"",""Options"":4}],""agent.web_transactions_apdex"":{""first"":1.0,""second"":2.0},""agent.wrapper_exception_limit"":1234,""utilization.detect_aws_enabled"":true,""utilization.detect_azure_enabled"":true,""utilization.detect_gcp_enabled"":true,""utilization.detect_pcf_enabled"":true,""utilization.detect_docker_enabled"":true,""utilization.detect_kubernetes_enabled"":true,""utilization.logical_processors"":22,""utilization.total_ram_mib"":33,""utilization.billing_host"":""UtilizationBillingHost"",""utilization.hostname"":""UtilizationHostName"",""utilization.full_hostname"":""UtilizationFullHostName"",""diagnostics.capture_agent_timing_enabled"":true,""diagnostics.capture_agent_timing_frequency"":1234,""agent.use_resource_based_naming_for_wcf_enabled"":true,""agent.event_listener_samplers_enabled"":true,""agent.sampling_target"":1234,""span_events.max_samples_stored"":4321,""agent.sampling_target_period_in_seconds"":1234,""agent.payload_success_metrics_enabled"":true,""agent.process_host_display_name"":""ProcessHostDisplayName"",""transaction_tracer.database_statement_cache_capacity"":1234,""agent.force_synchronous_timing_calculation_for_http_client"":true,""agent.exclude_new_relic_header"":true,""application_logging.enabled"":true,""application_logging.metrics.enabled"":true,""application_logging.forwarding.enabled"":true,""application_logging.forwarding.max_samples_stored"":1234,""application_logging.forwarding.log_level_denylist"":[""testlevel1, testlevel2""],""application_logging.harvest_cycle"":""00:20:34"",""application_logging.local_decorating.enabled"":true,""agent.app_domain_caching_disabled"":true,""agent.force_new_transaction_on_new_thread_enabled"":true,""agent.code_level_metrics_enabled"":true,""agent.app_settings"":{""hello"":""friend"",""we"":""made"",""it"":""to"",""the"":""end""},""application_logging.forwarding.context_data.enabled"":true,""application_logging.forwarding.context_data.include"":[""attr1"",""attr2""],""application_logging.forwarding.context_data.exclude"":[""attr1"",""attr2""],""metrics.harvest_cycle"":""00:01:00"",""transaction_traces.harvest_cycle"":""00:01:00"",""error_traces.harvest_cycle"":""00:01:00"",""get_agent_commands.cycle"":""00:01:00"",""default.harvest_cycle"":""00:01:00"",""sql_traces.harvest_cycle"":""00:01:00"",""update_loaded_modules.cycle"":""00:01:00"",""stackexchangeredis_cleanup.cycle"":""00:01:00""}";
+            const string expectedJson = @"{""agent.name"":"".NET Agent"",""agent.run_id"":""AgentRunId"",""agent.enabled"":true,""agent.license_key.configured"":true,""agent.application_names"":[""name1"",""name2"",""name3""],""agent.application_names_source"":""ApplicationNameSource"",""agent.auto_start"":true,""browser_monitoring.application_id"":""BrowserMonitoringApplicationId"",""browser_monitoring.auto_instrument"":true,""browser_monitoring.beacon_address"":""BrowserMonitoringBeaconAddress"",""browser_monitoring.error_beacon_address"":""BrowserMonitoringErrorBeaconAddress"",""browser_monitoring.javascript_agent.populated"":true,""browser_monitoring.javascript_agent_file"":""BrowserMonitoringJavaScriptAgentFile"",""browser_monitoring.loader"":""BrowserMonitoringJavaScriptAgentLoaderType"",""browser_monitoring.loader_debug"":false,""browser_monitoring.monitoring_key.populated"":true,""browser_monitoring.use_ssl"":true,""security.policies_token"":""SecurityPoliciesToken"",""security.policies_token_exists"":true,""agent.allow_all_request_headers"":true,""agent.attributes_enabled"":true,""agent.can_use_attributes_includes"":true,""agent.can_use_attributes_includes_source"":""CanUseAttributesIncludesSource"",""agent.attributes_include"":[""include1"",""include2"",""include3""],""agent.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""agent.attributes_default_excludes"":[""defaultExclude1"",""defaultExclude2"",""defaultExclude3""],""transaction_events.attributes_enabled"":false,""transaction_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""transaction_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""transaction_trace.attributes_enabled"":true,""transaction_trace.attributes_include"":[""include1"",""include2"",""include3""],""transaction_trace.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""error_collector.attributes_enabled"":false,""error_collector.attributes_include"":[""include1"",""include2"",""include3""],""error_collector.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""browser_monitoring.attributes_enabled"":false,""browser_monitoring.attributes_include"":[""include1"",""include2"",""include3""],""browser_monitoring.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""custom_parameters.enabled"":false,""custom_parameters.source"":""CaptureCustomParametersSource"",""collector.host"":""CollectorHost"",""collector.port"":1234,""collector.send_data_on_exit"":true,""collector.send_data_on_exit_threshold"":4321.0,""collector.send_environment_info"":true,""collector.sync_startup"":true,""collector.timeout"":1234,""collector.max_payload_size_in_bytes"":4321,""agent.complete_transactions_on_thread"":true,""agent.compressed_content_encoding"":""CompressedContentEncoding"",""agent.configuration_version"":1234,""cross_application_tracer.cross_process_id"":""CrossApplicationTracingCrossProcessId"",""cross_application_tracer.enabled"":true,""distributed_tracing.enabled"":true,""span_events.enabled"":true,""span_events.harvest_cycle"":""00:20:34"",""span_events.attributes_enabled"":true,""span_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""span_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""infinite_tracing.trace_count_consumers"":1234,""infinite_tracing.trace_observer_host"":""InfiniteTracingTraceObserverHost"",""infinite_tracing.trace_observer_port"":""InfiniteTracingTraceObserverPort"",""infinite_tracing.trace_observer_ssl"":""InfiniteTracingTraceObserverSsl"",""infinite_tracing.dev.test_flaky"":1234.0,""infinite_tracing.dev.test_flaky_code"":4321,""infinite_tracing.dev.test_delay_ms"":1234,""infinite_tracing.spans_queue_size"":4321,""infinite_tracing.spans_partition_count"":1234,""infinite_tracing.spans_batch_size"":4321,""infinite_tracing.connect_timeout_ms"":1234,""infinite_tracing.send_data_timeout_ms"":4321,""infinite_tracing.exit_timeout_ms"":1234,""infinite_tracing.compression"":true,""agent.primary_application_id"":""PrimaryApplicationId"",""agent.trusted_account_key"":""TrustedAccountKey"",""agent.account_id"":""AccountId"",""datastore_tracer.name_reporting_enabled"":true,""datastore_tracer.query_parameters_enabled"":true,""error_collector.enabled"":true,""error_collector.capture_events_enabled"":true,""error_collector.max_samples_stored"":1234,""error_collector.harvest_cycle"":""00:20:34"",""error_collector.max_per_period"":4321,""error_collector.expected_classes"":[""expected1"",""expected2"",""expected3""],""error_collector.expected_messages"":{""first"":[""first1"",""first2""],""second"":[""second1"",""second2""]},""error_collector.expected_status_codes"":[""expectedError1"",""expectedError2"",""expectedError3""],""error_collector.expected_errors_config"":{""third"":[""third1"",""third2""],""fourth"":[""fourth1"",""fourth2""]},""error_collector.ignore_errors_config"":{""fifth"":[""fifth1"",""fifth2""],""sixth"":[""sixth1"",""sixth2""]},""error_collector.ignore_classes"":[""ignoreError1"",""ignoreError2"",""ignoreError3""],""error_collector.ignore_messages"":{""seven"":[""seven1"",""seven2""],""eight"":[""eight1"",""eight2""]},""agent.request_headers_map"":{""one"":""1"",""two"":""2""},""cross_application_tracer.encoding_key"":""EncodingKey"",""agent.entity_guid"":""EntityGuid"",""agent.high_security_mode_enabled"":true,""agent.custom_instrumentation_editor_enabled"":true,""agent.custom_instrumentation_editor_enabled_source"":""CustomInstrumentationEditorEnabledSource"",""agent.strip_exception_messages"":true,""agent.strip_exception_messages_source"":""StripExceptionMessagesSource"",""agent.instance_reporting_enabled"":true,""agent.instrumentation_logging_enabled"":true,""agent.labels"":""Labels"",""agent.metric_name_regex_rules"":[{""MatchExpression"":""match1"",""Replacement"":""replacement1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""match1"",""Options"":3}},{""MatchExpression"":""match2"",""Replacement"":""replacement2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""match2"",""Options"":3}}],""agent.new_relic_config_file_path"":""NewRelicConfigFilePath"",""agent.app_settings_config_file_path"":""AppSettingsConfigFilePath"",""proxy.host.configured"":true,""proxy.uri_path.configured"":true,""proxy.port.configured"":true,""proxy.username.configured"":true,""proxy.password.configured"":true,""proxy.domain.configured"":true,""agent.put_for_data_sent"":true,""slow_sql.enabled"":true,""transaction_tracer.explain_threshold"":""00:20:34"",""transaction_tracer.explain_enabled"":true,""transaction_tracer.max_explain_plans"":1234,""transaction_tracer.max_sql_statements"":4321,""transaction_tracer.sql_traces_per_period"":1234,""transaction_tracer.max_stack_trace_lines"":4321,""error_collector.ignore_status_codes"":[""ignore1"",""ignore2"",""ignore3""],""agent.thread_profiling_methods_to_ignore"":[""ignoreMethod1"",""ignoreMethod2"",""ignoreMethod3""],""custom_events.enabled"":true,""custom_events.enabled_source"":""CustomEventsEnabledSource"",""custom_events.attributes_enabled"":true,""custom_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""custom_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""custom_events.max_samples_stored"":1234,""custom_events.harvest_cycle"":""00:20:34"",""agent.disable_samplers"":true,""thread_profiler.enabled"":true,""transaction_events.enabled"":true,""transaction_events.max_samples_stored"":4321,""transaction_events.harvest_cycle"":""01:12:01"",""transaction_events.transactions_enabled"":true,""transaction_name.regex_rules"":[{""MatchExpression"":""matchTrans1"",""Replacement"":""replacementTrans1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchTrans1"",""Options"":3}},{""MatchExpression"":""matchTrans2"",""Replacement"":""replacementTrans2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchTrans2"",""Options"":3}}],""transaction_name.whitelist_rules"":{""nine"":[""nine1"",""nine2""],""ten"":[""ten1"",""ten2""]},""transaction_tracer.apdex_f"":""00:20:34"",""transaction_tracer.apdex_t"":""01:12:01"",""transaction_tracer.transaction_threshold"":""00:20:34"",""transaction_tracer.enabled"":true,""transaction_tracer.max_segments"":1234,""transaction_tracer.record_sql"":""TransactionTracerRecordSql"",""transaction_tracer.record_sql_source"":""TransactionTracerRecordSqlSource"",""transaction_tracer.max_stack_traces"":4321,""agent.trusted_account_ids"":[1,2,3],""agent.server_side_config_enabled"":true,""agent.ignore_server_side_config"":true,""agent.url_regex_rules"":[{""MatchExpression"":""matchUrl1"",""Replacement"":""replacementUrl1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchUrl1"",""Options"":3}},{""MatchExpression"":""matchUrl2"",""Replacement"":""replacementUrl2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchUrl2"",""Options"":3}}],""agent.request_path_exclusion_list"":[{""Pattern"":""asdf"",""Options"":0},{""Pattern"":""qwerty"",""Options"":1},{""Pattern"":""yolo"",""Options"":4}],""agent.web_transactions_apdex"":{""first"":1.0,""second"":2.0},""agent.wrapper_exception_limit"":1234,""utilization.detect_aws_enabled"":true,""utilization.detect_azure_enabled"":true,""utilization.detect_gcp_enabled"":true,""utilization.detect_pcf_enabled"":true,""utilization.detect_docker_enabled"":true,""utilization.detect_kubernetes_enabled"":true,""utilization.logical_processors"":22,""utilization.total_ram_mib"":33,""utilization.billing_host"":""UtilizationBillingHost"",""utilization.hostname"":""UtilizationHostName"",""utilization.full_hostname"":""UtilizationFullHostName"",""diagnostics.capture_agent_timing_enabled"":true,""diagnostics.capture_agent_timing_frequency"":1234,""agent.use_resource_based_naming_for_wcf_enabled"":true,""agent.event_listener_samplers_enabled"":true,""agent.sampling_target"":1234,""span_events.max_samples_stored"":4321,""agent.sampling_target_period_in_seconds"":1234,""agent.payload_success_metrics_enabled"":true,""agent.process_host_display_name"":""ProcessHostDisplayName"",""transaction_tracer.database_statement_cache_capacity"":1234,""agent.force_synchronous_timing_calculation_for_http_client"":true,""agent.enable_asp_net_core_6plus_browser_injection"":true,""agent.exclude_new_relic_header"":true,""application_logging.enabled"":true,""application_logging.metrics.enabled"":true,""application_logging.forwarding.enabled"":true,""application_logging.forwarding.max_samples_stored"":1234,""application_logging.forwarding.log_level_denylist"":[""testlevel1, testlevel2""],""application_logging.harvest_cycle"":""00:20:34"",""application_logging.local_decorating.enabled"":true,""agent.app_domain_caching_disabled"":true,""agent.force_new_transaction_on_new_thread_enabled"":true,""agent.code_level_metrics_enabled"":true,""agent.app_settings"":{""hello"":""friend"",""we"":""made"",""it"":""to"",""the"":""end""},""application_logging.forwarding.context_data.enabled"":true,""application_logging.forwarding.context_data.include"":[""attr1"",""attr2""],""application_logging.forwarding.context_data.exclude"":[""attr1"",""attr2""],""metrics.harvest_cycle"":""00:01:00"",""transaction_traces.harvest_cycle"":""00:01:00"",""error_traces.harvest_cycle"":""00:01:00"",""get_agent_commands.cycle"":""00:01:00"",""default.harvest_cycle"":""00:01:00"",""sql_traces.harvest_cycle"":""00:01:00"",""update_loaded_modules.cycle"":""00:01:00"",""stackexchangeredis_cleanup.cycle"":""00:01:00"",""agent.logging_enabled"":true}";
 
             // Confirm that JsonIgnored properties are present, but not serialized
             Assert.NotNull(agentSettings.AgentLicenseKey);
diff --git a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ConnectModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ConnectModelTests.cs
index 9e543aa78a..d122e57400 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ConnectModelTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ConnectModelTests.cs
@@ -60,7 +60,7 @@ public void serializes_correctly()
 
                 var json = JsonConvert.SerializeObject(connectModel);
 
-                const string expectedJson = @"{""pid"":1,""language"":""dotnet"",""display_host"":""customHostName"",""host"":""myHost"",""app_name"":[""name1"",""name2""],""agent_version"":""1.0"",""agent_version_timestamp"":0,""security_settings"":{""transaction_tracer"":{""record_sql"":""raw""}},""high_security"":true,""event_harvest_config"":{""harvest_limits"":{""analytic_event_data"":4321,""custom_event_data"":1234,""error_event_data"":1234,""span_event_data"":4321,""log_event_data"":1234}},""identifier"":""myIdentifier"",""labels"":[{""label_type"":""type1"",""label_value"":""value1""}],""settings"":{""agent.name"":"".NET Agent"",""agent.run_id"":""AgentRunId"",""agent.enabled"":true,""agent.license_key.configured"":true,""agent.application_names"":[""name1"",""name2"",""name3""],""agent.application_names_source"":""ApplicationNameSource"",""agent.auto_start"":true,""browser_monitoring.application_id"":""BrowserMonitoringApplicationId"",""browser_monitoring.auto_instrument"":true,""browser_monitoring.beacon_address"":""BrowserMonitoringBeaconAddress"",""browser_monitoring.error_beacon_address"":""BrowserMonitoringErrorBeaconAddress"",""browser_monitoring.javascript_agent.populated"":true,""browser_monitoring.javascript_agent_file"":""BrowserMonitoringJavaScriptAgentFile"",""browser_monitoring.loader"":""BrowserMonitoringJavaScriptAgentLoaderType"",""browser_monitoring.loader_debug"":false,""browser_monitoring.monitoring_key.populated"":true,""browser_monitoring.use_ssl"":true,""security.policies_token"":""SecurityPoliciesToken"",""security.policies_token_exists"":true,""agent.allow_all_request_headers"":true,""agent.attributes_enabled"":true,""agent.can_use_attributes_includes"":true,""agent.can_use_attributes_includes_source"":""CanUseAttributesIncludesSource"",""agent.attributes_include"":[""include1"",""include2"",""include3""],""agent.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""agent.attributes_default_excludes"":[""defaultExclude1"",""defaultExclude2"",""defaultExclude3""],""transaction_events.attributes_enabled"":false,""transaction_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""transaction_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""transaction_trace.attributes_enabled"":true,""transaction_trace.attributes_include"":[""include1"",""include2"",""include3""],""transaction_trace.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""error_collector.attributes_enabled"":false,""error_collector.attributes_include"":[""include1"",""include2"",""include3""],""error_collector.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""browser_monitoring.attributes_enabled"":false,""browser_monitoring.attributes_include"":[""include1"",""include2"",""include3""],""browser_monitoring.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""custom_parameters.enabled"":false,""custom_parameters.source"":""CaptureCustomParametersSource"",""collector.host"":""CollectorHost"",""collector.port"":1234,""collector.send_data_on_exit"":true,""collector.send_data_on_exit_threshold"":4321.0,""collector.send_environment_info"":true,""collector.sync_startup"":true,""collector.timeout"":1234,""collector.max_payload_size_in_bytes"":4321,""agent.complete_transactions_on_thread"":true,""agent.compressed_content_encoding"":""CompressedContentEncoding"",""agent.configuration_version"":1234,""cross_application_tracer.cross_process_id"":""CrossApplicationTracingCrossProcessId"",""cross_application_tracer.enabled"":true,""distributed_tracing.enabled"":true,""span_events.enabled"":true,""span_events.harvest_cycle"":""00:20:34"",""span_events.attributes_enabled"":true,""span_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""span_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""infinite_tracing.trace_count_consumers"":1234,""infinite_tracing.trace_observer_host"":""InfiniteTracingTraceObserverHost"",""infinite_tracing.trace_observer_port"":""InfiniteTracingTraceObserverPort"",""infinite_tracing.trace_observer_ssl"":""InfiniteTracingTraceObserverSsl"",""infinite_tracing.dev.test_flaky"":1234.0,""infinite_tracing.dev.test_flaky_code"":4321,""infinite_tracing.dev.test_delay_ms"":1234,""infinite_tracing.spans_queue_size"":4321,""infinite_tracing.spans_partition_count"":1234,""infinite_tracing.spans_batch_size"":4321,""infinite_tracing.connect_timeout_ms"":1234,""infinite_tracing.send_data_timeout_ms"":4321,""infinite_tracing.exit_timeout_ms"":1234,""infinite_tracing.compression"":true,""agent.primary_application_id"":""PrimaryApplicationId"",""agent.trusted_account_key"":""TrustedAccountKey"",""agent.account_id"":""AccountId"",""datastore_tracer.name_reporting_enabled"":true,""datastore_tracer.query_parameters_enabled"":true,""error_collector.enabled"":true,""error_collector.capture_events_enabled"":true,""error_collector.max_samples_stored"":1234,""error_collector.harvest_cycle"":""00:20:34"",""error_collector.max_per_period"":4321,""error_collector.expected_classes"":[""expected1"",""expected2"",""expected3""],""error_collector.expected_messages"":{""first"":[""first1"",""first2""],""second"":[""second1"",""second2""]},""error_collector.expected_status_codes"":[""expectedError1"",""expectedError2"",""expectedError3""],""error_collector.expected_errors_config"":{""third"":[""third1"",""third2""],""fourth"":[""fourth1"",""fourth2""]},""error_collector.ignore_errors_config"":{""fifth"":[""fifth1"",""fifth2""],""sixth"":[""sixth1"",""sixth2""]},""error_collector.ignore_classes"":[""ignoreError1"",""ignoreError2"",""ignoreError3""],""error_collector.ignore_messages"":{""seven"":[""seven1"",""seven2""],""eight"":[""eight1"",""eight2""]},""agent.request_headers_map"":{""one"":""1"",""two"":""2""},""cross_application_tracer.encoding_key"":""EncodingKey"",""agent.entity_guid"":""EntityGuid"",""agent.high_security_mode_enabled"":true,""agent.custom_instrumentation_editor_enabled"":true,""agent.custom_instrumentation_editor_enabled_source"":""CustomInstrumentationEditorEnabledSource"",""agent.strip_exception_messages"":true,""agent.strip_exception_messages_source"":""StripExceptionMessagesSource"",""agent.instance_reporting_enabled"":true,""agent.instrumentation_logging_enabled"":true,""agent.labels"":""Labels"",""agent.metric_name_regex_rules"":[{""MatchExpression"":""match1"",""Replacement"":""replacement1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""match1"",""Options"":3}},{""MatchExpression"":""match2"",""Replacement"":""replacement2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""match2"",""Options"":3}}],""agent.new_relic_config_file_path"":""NewRelicConfigFilePath"",""agent.app_settings_config_file_path"":""AppSettingsConfigFilePath"",""proxy.host.configured"":true,""proxy.uri_path.configured"":true,""proxy.port.configured"":true,""proxy.username.configured"":true,""proxy.password.configured"":true,""proxy.domain.configured"":true,""agent.put_for_data_sent"":true,""slow_sql.enabled"":true,""transaction_tracer.explain_threshold"":""00:20:34"",""transaction_tracer.explain_enabled"":true,""transaction_tracer.max_explain_plans"":1234,""transaction_tracer.max_sql_statements"":4321,""transaction_tracer.sql_traces_per_period"":1234,""transaction_tracer.max_stack_trace_lines"":4321,""error_collector.ignore_status_codes"":[""ignore1"",""ignore2"",""ignore3""],""agent.thread_profiling_methods_to_ignore"":[""ignoreMethod1"",""ignoreMethod2"",""ignoreMethod3""],""custom_events.enabled"":true,""custom_events.enabled_source"":""CustomEventsEnabledSource"",""custom_events.attributes_enabled"":true,""custom_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""custom_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""custom_events.max_samples_stored"":1234,""custom_events.harvest_cycle"":""00:20:34"",""agent.disable_samplers"":true,""thread_profiler.enabled"":true,""transaction_events.enabled"":true,""transaction_events.max_samples_stored"":4321,""transaction_events.harvest_cycle"":""01:12:01"",""transaction_events.transactions_enabled"":true,""transaction_name.regex_rules"":[{""MatchExpression"":""matchTrans1"",""Replacement"":""replacementTrans1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchTrans1"",""Options"":3}},{""MatchExpression"":""matchTrans2"",""Replacement"":""replacementTrans2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchTrans2"",""Options"":3}}],""transaction_name.whitelist_rules"":{""nine"":[""nine1"",""nine2""],""ten"":[""ten1"",""ten2""]},""transaction_tracer.apdex_f"":""00:20:34"",""transaction_tracer.apdex_t"":""01:12:01"",""transaction_tracer.transaction_threshold"":""00:20:34"",""transaction_tracer.enabled"":true,""transaction_tracer.max_segments"":1234,""transaction_tracer.record_sql"":""TransactionTracerRecordSql"",""transaction_tracer.record_sql_source"":""TransactionTracerRecordSqlSource"",""transaction_tracer.max_stack_traces"":4321,""agent.trusted_account_ids"":[1,2,3],""agent.server_side_config_enabled"":true,""agent.ignore_server_side_config"":true,""agent.url_regex_rules"":[{""MatchExpression"":""matchUrl1"",""Replacement"":""replacementUrl1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchUrl1"",""Options"":3}},{""MatchExpression"":""matchUrl2"",""Replacement"":""replacementUrl2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchUrl2"",""Options"":3}}],""agent.request_path_exclusion_list"":[{""Pattern"":""asdf"",""Options"":0},{""Pattern"":""qwerty"",""Options"":1},{""Pattern"":""yolo"",""Options"":4}],""agent.web_transactions_apdex"":{""first"":1.0,""second"":2.0},""agent.wrapper_exception_limit"":1234,""utilization.detect_aws_enabled"":true,""utilization.detect_azure_enabled"":true,""utilization.detect_gcp_enabled"":true,""utilization.detect_pcf_enabled"":true,""utilization.detect_docker_enabled"":true,""utilization.detect_kubernetes_enabled"":true,""utilization.logical_processors"":22,""utilization.total_ram_mib"":33,""utilization.billing_host"":""UtilizationBillingHost"",""utilization.hostname"":""UtilizationHostName"",""utilization.full_hostname"":""UtilizationFullHostName"",""diagnostics.capture_agent_timing_enabled"":true,""diagnostics.capture_agent_timing_frequency"":1234,""agent.use_resource_based_naming_for_wcf_enabled"":true,""agent.event_listener_samplers_enabled"":true,""agent.sampling_target"":1234,""span_events.max_samples_stored"":4321,""agent.sampling_target_period_in_seconds"":1234,""agent.payload_success_metrics_enabled"":true,""agent.process_host_display_name"":""ProcessHostDisplayName"",""transaction_tracer.database_statement_cache_capacity"":1234,""agent.force_synchronous_timing_calculation_for_http_client"":true,""agent.exclude_new_relic_header"":true,""application_logging.enabled"":true,""application_logging.metrics.enabled"":true,""application_logging.forwarding.enabled"":true,""application_logging.forwarding.max_samples_stored"":1234,""application_logging.forwarding.log_level_denylist"":[""testlevel1, testlevel2""],""application_logging.harvest_cycle"":""00:20:34"",""application_logging.local_decorating.enabled"":true,""agent.app_domain_caching_disabled"":true,""agent.force_new_transaction_on_new_thread_enabled"":true,""agent.code_level_metrics_enabled"":true,""agent.app_settings"":{""hello"":""friend"",""we"":""made"",""it"":""to"",""the"":""end""},""application_logging.forwarding.context_data.enabled"":true,""application_logging.forwarding.context_data.include"":[""attr1"",""attr2""],""application_logging.forwarding.context_data.exclude"":[""attr1"",""attr2""],""metrics.harvest_cycle"":""00:01:00"",""transaction_traces.harvest_cycle"":""00:01:00"",""error_traces.harvest_cycle"":""00:01:00"",""get_agent_commands.cycle"":""00:01:00"",""default.harvest_cycle"":""00:01:00"",""sql_traces.harvest_cycle"":""00:01:00"",""update_loaded_modules.cycle"":""00:01:00"",""stackexchangeredis_cleanup.cycle"":""00:01:00""},""metadata"":{""hello"":""there""},""utilization"":{""metadata_version"":5,""logical_processors"":2,""total_ram_mib"":0,""hostname"":""myHost2"",""full_hostname"":""myHost2.domain.com"",""ip_address"":[""1.2.3.4"",""5.6.7.8""],""config"":{""hostname"":""my-host"",""logical_processors"":1,""total_ram_mib"":2048},""vendors"":{""aws"":{""availabilityZone"":""myZone"",""instanceId"":""myInstanceId"",""instanceType"":""myInstanceType""},""azure"":{""location"":""myLocation"",""name"":""myName"",""vmId"":""myVmId"",""vmSize"":""myVmSize""},""gcp"":{""id"":""myId"",""machineType"":""myMachineType"",""name"":""myName"",""zone"":""myZone""},""pcf"":{""cf_instance_guid"":""myInstanceGuid"",""cf_instance_ip"":""myInstanceIp"",""memory_limit"":""myMemoryLimit""},""kubernetes"":{""kubernetes_service_host"":""10.96.0.1""}}},""security_policies"":{""record_sql"":{""enabled"":false},""attributes_include"":{""enabled"":true},""allow_raw_exception_messages"":{""enabled"":false},""custom_events"":{""enabled"":true},""custom_parameters"":{""enabled"":false},""custom_instrumentation_editor"":{""enabled"":true}}}";
+                const string expectedJson = @"{""pid"":1,""language"":""dotnet"",""display_host"":""customHostName"",""host"":""myHost"",""app_name"":[""name1"",""name2""],""agent_version"":""1.0"",""agent_version_timestamp"":0,""security_settings"":{""transaction_tracer"":{""record_sql"":""raw""}},""high_security"":true,""event_harvest_config"":{""harvest_limits"":{""analytic_event_data"":4321,""custom_event_data"":1234,""error_event_data"":1234,""span_event_data"":4321,""log_event_data"":1234}},""identifier"":""myIdentifier"",""labels"":[{""label_type"":""type1"",""label_value"":""value1""}],""settings"":{""agent.name"":"".NET Agent"",""agent.run_id"":""AgentRunId"",""agent.enabled"":true,""agent.license_key.configured"":true,""agent.application_names"":[""name1"",""name2"",""name3""],""agent.application_names_source"":""ApplicationNameSource"",""agent.auto_start"":true,""browser_monitoring.application_id"":""BrowserMonitoringApplicationId"",""browser_monitoring.auto_instrument"":true,""browser_monitoring.beacon_address"":""BrowserMonitoringBeaconAddress"",""browser_monitoring.error_beacon_address"":""BrowserMonitoringErrorBeaconAddress"",""browser_monitoring.javascript_agent.populated"":true,""browser_monitoring.javascript_agent_file"":""BrowserMonitoringJavaScriptAgentFile"",""browser_monitoring.loader"":""BrowserMonitoringJavaScriptAgentLoaderType"",""browser_monitoring.loader_debug"":false,""browser_monitoring.monitoring_key.populated"":true,""browser_monitoring.use_ssl"":true,""security.policies_token"":""SecurityPoliciesToken"",""security.policies_token_exists"":true,""agent.allow_all_request_headers"":true,""agent.attributes_enabled"":true,""agent.can_use_attributes_includes"":true,""agent.can_use_attributes_includes_source"":""CanUseAttributesIncludesSource"",""agent.attributes_include"":[""include1"",""include2"",""include3""],""agent.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""agent.attributes_default_excludes"":[""defaultExclude1"",""defaultExclude2"",""defaultExclude3""],""transaction_events.attributes_enabled"":false,""transaction_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""transaction_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""transaction_trace.attributes_enabled"":true,""transaction_trace.attributes_include"":[""include1"",""include2"",""include3""],""transaction_trace.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""error_collector.attributes_enabled"":false,""error_collector.attributes_include"":[""include1"",""include2"",""include3""],""error_collector.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""browser_monitoring.attributes_enabled"":false,""browser_monitoring.attributes_include"":[""include1"",""include2"",""include3""],""browser_monitoring.attributes_exclude"":[""exclude1"",""exclude2"",""exclude3""],""custom_parameters.enabled"":false,""custom_parameters.source"":""CaptureCustomParametersSource"",""collector.host"":""CollectorHost"",""collector.port"":1234,""collector.send_data_on_exit"":true,""collector.send_data_on_exit_threshold"":4321.0,""collector.send_environment_info"":true,""collector.sync_startup"":true,""collector.timeout"":1234,""collector.max_payload_size_in_bytes"":4321,""agent.complete_transactions_on_thread"":true,""agent.compressed_content_encoding"":""CompressedContentEncoding"",""agent.configuration_version"":1234,""cross_application_tracer.cross_process_id"":""CrossApplicationTracingCrossProcessId"",""cross_application_tracer.enabled"":true,""distributed_tracing.enabled"":true,""span_events.enabled"":true,""span_events.harvest_cycle"":""00:20:34"",""span_events.attributes_enabled"":true,""span_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""span_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""infinite_tracing.trace_count_consumers"":1234,""infinite_tracing.trace_observer_host"":""InfiniteTracingTraceObserverHost"",""infinite_tracing.trace_observer_port"":""InfiniteTracingTraceObserverPort"",""infinite_tracing.trace_observer_ssl"":""InfiniteTracingTraceObserverSsl"",""infinite_tracing.dev.test_flaky"":1234.0,""infinite_tracing.dev.test_flaky_code"":4321,""infinite_tracing.dev.test_delay_ms"":1234,""infinite_tracing.spans_queue_size"":4321,""infinite_tracing.spans_partition_count"":1234,""infinite_tracing.spans_batch_size"":4321,""infinite_tracing.connect_timeout_ms"":1234,""infinite_tracing.send_data_timeout_ms"":4321,""infinite_tracing.exit_timeout_ms"":1234,""infinite_tracing.compression"":true,""agent.primary_application_id"":""PrimaryApplicationId"",""agent.trusted_account_key"":""TrustedAccountKey"",""agent.account_id"":""AccountId"",""datastore_tracer.name_reporting_enabled"":true,""datastore_tracer.query_parameters_enabled"":true,""error_collector.enabled"":true,""error_collector.capture_events_enabled"":true,""error_collector.max_samples_stored"":1234,""error_collector.harvest_cycle"":""00:20:34"",""error_collector.max_per_period"":4321,""error_collector.expected_classes"":[""expected1"",""expected2"",""expected3""],""error_collector.expected_messages"":{""first"":[""first1"",""first2""],""second"":[""second1"",""second2""]},""error_collector.expected_status_codes"":[""expectedError1"",""expectedError2"",""expectedError3""],""error_collector.expected_errors_config"":{""third"":[""third1"",""third2""],""fourth"":[""fourth1"",""fourth2""]},""error_collector.ignore_errors_config"":{""fifth"":[""fifth1"",""fifth2""],""sixth"":[""sixth1"",""sixth2""]},""error_collector.ignore_classes"":[""ignoreError1"",""ignoreError2"",""ignoreError3""],""error_collector.ignore_messages"":{""seven"":[""seven1"",""seven2""],""eight"":[""eight1"",""eight2""]},""agent.request_headers_map"":{""one"":""1"",""two"":""2""},""cross_application_tracer.encoding_key"":""EncodingKey"",""agent.entity_guid"":""EntityGuid"",""agent.high_security_mode_enabled"":true,""agent.custom_instrumentation_editor_enabled"":true,""agent.custom_instrumentation_editor_enabled_source"":""CustomInstrumentationEditorEnabledSource"",""agent.strip_exception_messages"":true,""agent.strip_exception_messages_source"":""StripExceptionMessagesSource"",""agent.instance_reporting_enabled"":true,""agent.instrumentation_logging_enabled"":true,""agent.labels"":""Labels"",""agent.metric_name_regex_rules"":[{""MatchExpression"":""match1"",""Replacement"":""replacement1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""match1"",""Options"":3}},{""MatchExpression"":""match2"",""Replacement"":""replacement2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""match2"",""Options"":3}}],""agent.new_relic_config_file_path"":""NewRelicConfigFilePath"",""agent.app_settings_config_file_path"":""AppSettingsConfigFilePath"",""proxy.host.configured"":true,""proxy.uri_path.configured"":true,""proxy.port.configured"":true,""proxy.username.configured"":true,""proxy.password.configured"":true,""proxy.domain.configured"":true,""agent.put_for_data_sent"":true,""slow_sql.enabled"":true,""transaction_tracer.explain_threshold"":""00:20:34"",""transaction_tracer.explain_enabled"":true,""transaction_tracer.max_explain_plans"":1234,""transaction_tracer.max_sql_statements"":4321,""transaction_tracer.sql_traces_per_period"":1234,""transaction_tracer.max_stack_trace_lines"":4321,""error_collector.ignore_status_codes"":[""ignore1"",""ignore2"",""ignore3""],""agent.thread_profiling_methods_to_ignore"":[""ignoreMethod1"",""ignoreMethod2"",""ignoreMethod3""],""custom_events.enabled"":true,""custom_events.enabled_source"":""CustomEventsEnabledSource"",""custom_events.attributes_enabled"":true,""custom_events.attributes_include"":[""attributeInclude1"",""attributeInclude2"",""attributeInclude3""],""custom_events.attributes_exclude"":[""attributeExclude1"",""attributeExclude2"",""attributeExclude3""],""custom_events.max_samples_stored"":1234,""custom_events.harvest_cycle"":""00:20:34"",""agent.disable_samplers"":true,""thread_profiler.enabled"":true,""transaction_events.enabled"":true,""transaction_events.max_samples_stored"":4321,""transaction_events.harvest_cycle"":""01:12:01"",""transaction_events.transactions_enabled"":true,""transaction_name.regex_rules"":[{""MatchExpression"":""matchTrans1"",""Replacement"":""replacementTrans1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchTrans1"",""Options"":3}},{""MatchExpression"":""matchTrans2"",""Replacement"":""replacementTrans2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchTrans2"",""Options"":3}}],""transaction_name.whitelist_rules"":{""nine"":[""nine1"",""nine2""],""ten"":[""ten1"",""ten2""]},""transaction_tracer.apdex_f"":""00:20:34"",""transaction_tracer.apdex_t"":""01:12:01"",""transaction_tracer.transaction_threshold"":""00:20:34"",""transaction_tracer.enabled"":true,""transaction_tracer.max_segments"":1234,""transaction_tracer.record_sql"":""TransactionTracerRecordSql"",""transaction_tracer.record_sql_source"":""TransactionTracerRecordSqlSource"",""transaction_tracer.max_stack_traces"":4321,""agent.trusted_account_ids"":[1,2,3],""agent.server_side_config_enabled"":true,""agent.ignore_server_side_config"":true,""agent.url_regex_rules"":[{""MatchExpression"":""matchUrl1"",""Replacement"":""replacementUrl1"",""Ignore"":true,""EvaluationOrder"":1,""TerminateChain"":true,""EachSegment"":true,""ReplaceAll"":true,""MatchRegex"":{""Pattern"":""matchUrl1"",""Options"":3}},{""MatchExpression"":""matchUrl2"",""Replacement"":""replacementUrl2"",""Ignore"":false,""EvaluationOrder"":2,""TerminateChain"":false,""EachSegment"":false,""ReplaceAll"":false,""MatchRegex"":{""Pattern"":""matchUrl2"",""Options"":3}}],""agent.request_path_exclusion_list"":[{""Pattern"":""asdf"",""Options"":0},{""Pattern"":""qwerty"",""Options"":1},{""Pattern"":""yolo"",""Options"":4}],""agent.web_transactions_apdex"":{""first"":1.0,""second"":2.0},""agent.wrapper_exception_limit"":1234,""utilization.detect_aws_enabled"":true,""utilization.detect_azure_enabled"":true,""utilization.detect_gcp_enabled"":true,""utilization.detect_pcf_enabled"":true,""utilization.detect_docker_enabled"":true,""utilization.detect_kubernetes_enabled"":true,""utilization.logical_processors"":22,""utilization.total_ram_mib"":33,""utilization.billing_host"":""UtilizationBillingHost"",""utilization.hostname"":""UtilizationHostName"",""utilization.full_hostname"":""UtilizationFullHostName"",""diagnostics.capture_agent_timing_enabled"":true,""diagnostics.capture_agent_timing_frequency"":1234,""agent.use_resource_based_naming_for_wcf_enabled"":true,""agent.event_listener_samplers_enabled"":true,""agent.sampling_target"":1234,""span_events.max_samples_stored"":4321,""agent.sampling_target_period_in_seconds"":1234,""agent.payload_success_metrics_enabled"":true,""agent.process_host_display_name"":""ProcessHostDisplayName"",""transaction_tracer.database_statement_cache_capacity"":1234,""agent.force_synchronous_timing_calculation_for_http_client"":true,""agent.enable_asp_net_core_6plus_browser_injection"":true,""agent.exclude_new_relic_header"":true,""application_logging.enabled"":true,""application_logging.metrics.enabled"":true,""application_logging.forwarding.enabled"":true,""application_logging.forwarding.max_samples_stored"":1234,""application_logging.forwarding.log_level_denylist"":[""testlevel1, testlevel2""],""application_logging.harvest_cycle"":""00:20:34"",""application_logging.local_decorating.enabled"":true,""agent.app_domain_caching_disabled"":true,""agent.force_new_transaction_on_new_thread_enabled"":true,""agent.code_level_metrics_enabled"":true,""agent.app_settings"":{""hello"":""friend"",""we"":""made"",""it"":""to"",""the"":""end""},""application_logging.forwarding.context_data.enabled"":true,""application_logging.forwarding.context_data.include"":[""attr1"",""attr2""],""application_logging.forwarding.context_data.exclude"":[""attr1"",""attr2""],""metrics.harvest_cycle"":""00:01:00"",""transaction_traces.harvest_cycle"":""00:01:00"",""error_traces.harvest_cycle"":""00:01:00"",""get_agent_commands.cycle"":""00:01:00"",""default.harvest_cycle"":""00:01:00"",""sql_traces.harvest_cycle"":""00:01:00"",""update_loaded_modules.cycle"":""00:01:00"",""stackexchangeredis_cleanup.cycle"":""00:01:00"",""agent.logging_enabled"":true},""metadata"":{""hello"":""there""},""utilization"":{""metadata_version"":5,""logical_processors"":2,""total_ram_mib"":0,""hostname"":""myHost2"",""full_hostname"":""myHost2.domain.com"",""ip_address"":[""1.2.3.4"",""5.6.7.8""],""config"":{""hostname"":""my-host"",""logical_processors"":1,""total_ram_mib"":2048},""vendors"":{""aws"":{""availabilityZone"":""myZone"",""instanceId"":""myInstanceId"",""instanceType"":""myInstanceType""},""azure"":{""location"":""myLocation"",""name"":""myName"",""vmId"":""myVmId"",""vmSize"":""myVmSize""},""gcp"":{""id"":""myId"",""machineType"":""myMachineType"",""name"":""myName"",""zone"":""myZone""},""pcf"":{""cf_instance_guid"":""myInstanceGuid"",""cf_instance_ip"":""myInstanceIp"",""memory_limit"":""myMemoryLimit""},""kubernetes"":{""kubernetes_service_host"":""10.96.0.1""}}},""security_policies"":{""record_sql"":{""enabled"":false},""attributes_include"":{""enabled"":true},""allow_raw_exception_messages"":{""enabled"":false},""custom_events"":{""enabled"":true},""custom_parameters"":{""enabled"":false},""custom_instrumentation_editor"":{""enabled"":true}}}";
 
                 // Confirm that JsonIgnored properties are present, but not serialized
                 Assert.NotNull(agentSettings.AgentLicenseKey);
diff --git a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ExhaustiveTestConfiguration.cs b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ExhaustiveTestConfiguration.cs
index b241ddc806..86b2ba8324 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ExhaustiveTestConfiguration.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ExhaustiveTestConfiguration.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
@@ -401,6 +401,8 @@ public class ExhaustiveTestConfiguration : IConfiguration
 
         public bool ForceSynchronousTimingCalculationHttpClient => true;
 
+        public bool EnableAspNetCore6PlusBrowserInjection => true;
+
         public bool ExcludeNewrelicHeader => true;
 
         public bool ApplicationLoggingEnabled => true;
@@ -455,5 +457,7 @@ public IReadOnlyDictionary<string, string> GetAppSettings()
                 { "the", "end" }
             };
         }
+
+        public bool LoggingEnabled => true;
     }
 }
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Logging/AuditLogTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Logging/AuditLogTests.cs
index 1a72e83450..cfed0c3e7c 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Logging/AuditLogTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Logging/AuditLogTests.cs
@@ -1,4 +1,4 @@
-// Copyright 2020 New Relic, Inc. All rights reserved.
+// Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using NUnit.Framework;
@@ -30,26 +30,6 @@ public void TearDown()
             AuditLog.ResetLazyLogger();
         }
 
-        [Test]
-        public void IncludeOnlyAuditLog_EnablesAuditLog()
-        {
-            Assert.False(AuditLog.IsAuditLogEnabled);
-
-            var _ = new LoggerConfiguration().IncludeOnlyAuditLog();
-
-            Assert.True(AuditLog.IsAuditLogEnabled);
-        }
-
-        [Test]
-        public void ExcludeAuditLog_DisablesAuditLog()
-        {
-            AuditLog.IsAuditLogEnabled = true;
-
-            var _ = new LoggerConfiguration().ExcludeAuditLog();
-
-            Assert.False(AuditLog.IsAuditLogEnabled);
-        }
-
         [TestCase(true)]
         [TestCase(false)]
         public void Log_OnlyLogsWhenAuditLogEnabled(bool logEnabled)
diff --git a/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs b/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs
index 95dc4f1fd0..09449c2198 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs
@@ -7,6 +7,7 @@
 using NUnit.Framework;
 using System.IO;
 using NewRelic.Testing.Assertions;
+using System.Collections.Generic;
 
 namespace NewRelic.Agent.Core
 {
@@ -14,6 +15,41 @@ namespace NewRelic.Agent.Core
     [TestFixture]
     public class LoggerBootstrapperTest
     {
+        private Func<string, string> _originalGetEnvironmentVar;
+        private Dictionary<string, string> _envVars = new Dictionary<string, string>();
+
+        private void SetEnvironmentVar(string name, string value)
+        {
+            _envVars[name] = value;
+        }
+
+        private void ClearEnvironmentVars() =>_envVars.Clear();
+
+        private string MockGetEnvironmentVar(string name)
+        {
+            if (_envVars.TryGetValue(name, out var value)) return value;
+            return null;
+        }
+
+        [OneTimeSetUp]
+        public void OneTimeSetUp()
+        {
+            _originalGetEnvironmentVar = ConfigurationLoader.GetEnvironmentVar;
+            ConfigurationLoader.GetEnvironmentVar = MockGetEnvironmentVar;
+        }
+
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            ConfigurationLoader.GetEnvironmentVar = _originalGetEnvironmentVar;
+        }
+
+        [SetUp]
+        public void Setup()
+        {
+            ClearEnvironmentVars();
+        }
+
         [Test]
         public static void No_log_levels_are_enabled_when_config_log_is_off()
         {
@@ -111,6 +147,66 @@ public static void Config_IsConsoleEnabled_for_config_is_false_when_not_added_to
             Assert.IsFalse(config.Console);
         }
 
+        [Test]
+        public static void Fatal_exception_can_be_recorded()
+        {
+            Assert.IsFalse(Log.FileLoggingHasFailed);
+            Log.FileLoggingHasFailed = true;
+            Assert.IsTrue(Log.FileLoggingHasFailed);
+        }
+
+        [Test]
+        [TestCase(null, false, false)]
+        [TestCase("0", true, false)]
+        [TestCase("0", false, false)]
+        [TestCase("false", true, false)]
+        [TestCase("false", false, false)]
+        [TestCase("1", true, true)]
+        [TestCase("1", false, true)]
+        [TestCase("true", true, true)]
+        [TestCase("true", false, true)]
+        [TestCase("not a valid bool", true, true)]
+        [TestCase("not a valid bool", false, false)]
+        public void test_ways_to_disable_logging(string envVarValue, bool logsEnabledInConfig, bool expectedLogConfig)
+        {
+            ILogConfig config;
+
+            if (envVarValue != null)
+            {
+                SetEnvironmentVar("NEW_RELIC_LOG_ENABLED", envVarValue);
+            }
+            config = LogConfigFixtureWithLogEnabled(logsEnabledInConfig);
+            Assert.AreEqual(config.Enabled, expectedLogConfig);
+        }
+
+        [Test]
+        [TestCase(null, false, false)]
+        [TestCase("0", true, false)]
+        [TestCase("0", false, false)]
+        [TestCase("false", true, false)]
+        [TestCase("false", false, false)]
+        [TestCase("1", true, true)]
+        [TestCase("1", false, true)]
+        [TestCase("true", true, true)]
+        [TestCase("true", false, true)]
+        [TestCase("not a valid bool", true, true)]
+        [TestCase("not a valid bool", false, false)]
+        public void test_ways_to_enable_console_logging(string envVarValue, bool consoleLogEnabledInConfig, bool expectedConsoleLogConfig)
+        {
+            ILogConfig config;
+
+            config = LogConfigFixtureWithConsoleEnabled(true);
+            Assert.IsTrue(config.Console);
+
+            if (envVarValue != null)
+            {
+                SetEnvironmentVar("NEW_RELIC_LOG_CONSOLE", envVarValue);
+            }
+            config = LogConfigFixtureWithConsoleEnabled(consoleLogEnabledInConfig);
+            Assert.AreEqual(config.Console, expectedConsoleLogConfig);
+        }
+
+
         private static ILogConfig GetLogConfig(string logLevel)
         {
             var xml = string.Format(
@@ -164,6 +260,43 @@ private static ILogConfig LogConfigFixtureWithConsoleLogEnabled(string logLevel)
             var xsdFile = Path.Combine(TestContext.CurrentContext.TestDirectory, "Configuration.xsd");
             Func<string> configSchemaSource = () => File.ReadAllText(xsdFile);
 
+            var configuration = ConfigurationLoader.InitializeFromXml(xml, configSchemaSource);
+            return configuration.LogConfig;
+        }
+        private static ILogConfig LogConfigFixtureWithLogEnabled(bool enabled)
+        {
+            var xml = string.Format(
+                "<configuration xmlns=\"urn:newrelic-config\">" +
+                "   <service licenseKey=\"dude\"/>" +
+                "   <application>" +
+                "       <name>Test</name>" +
+                "   </application>" +
+                "   <log level=\"debug\" console=\"true\" enabled=\"{0}\" />" +
+                "</configuration>",
+                enabled.ToString().ToLower());
+
+            var xsdFile = Path.Combine(TestContext.CurrentContext.TestDirectory, "Configuration.xsd");
+            Func<string> configSchemaSource = () => File.ReadAllText(xsdFile);
+
+            var configuration = ConfigurationLoader.InitializeFromXml(xml, configSchemaSource);
+            return configuration.LogConfig;
+        }
+
+        private static ILogConfig LogConfigFixtureWithConsoleEnabled(bool enabled)
+        {
+            var xml = string.Format(
+                "<configuration xmlns=\"urn:newrelic-config\">" +
+                "   <service licenseKey=\"dude\"/>" +
+                "   <application>" +
+                "       <name>Test</name>" +
+                "   </application>" +
+                "   <log level=\"debug\" console=\"{0}\" />" +
+                "</configuration>",
+                enabled.ToString().ToLower());
+
+            var xsdFile = Path.Combine(TestContext.CurrentContext.TestDirectory, "Configuration.xsd");
+            Func<string> configSchemaSource = () => File.ReadAllText(xsdFile);
+
             var configuration = ConfigurationLoader.InitializeFromXml(xml, configSchemaSource);
             return configuration.LogConfig;
         }
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Segments/SegmentTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Segments/SegmentTests.cs
index d5f2a9bb8c..7fbadda62f 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Segments/SegmentTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Segments/SegmentTests.cs
@@ -5,6 +5,7 @@
 using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data;
 using NUnit.Framework;
 using System;
+using NewRelic.Agent.Core.Metrics;
 
 namespace NewRelic.Agent.Core.Segments.Tests
 {
@@ -22,5 +23,17 @@ public void End_WithException_HasErrorData()
             Assert.AreEqual("System.Exception", segment.ErrorData.ErrorTypeName);
             Assert.AreEqual("Unhandled exception", segment.ErrorData.ErrorMessage);
         }
+
+        [Test]
+        public void SetMessageBrokerDestination_SetsDestination_IfSegmentData_IsMessageBrokerSegmentData()
+        {
+            var segment = new Segment(TransactionSegmentStateHelpers.GetItransactionSegmentState(), new MethodCallData("Type", "Method", 1));
+            var messageBrokerSegmentData = new MessageBrokerSegmentData("broker", "unknown", MetricNames.MessageBrokerDestinationType.Topic, MetricNames.MessageBrokerAction.Consume);
+            segment.SetSegmentData(messageBrokerSegmentData);
+
+            segment.SetMessageBrokerDestination("destination");
+
+            Assert.AreEqual("destination", ((MessageBrokerSegmentData)segment.SegmentData).Destination );
+        }
     }
 }
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs
index d24eaff41d..f9612dee4c 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs
@@ -64,6 +64,7 @@ public class SpanEventMakerTests
         private string _transactionGuid;
         private DateTime _startTime;
         private Segment _baseGenericSegment;
+        private Segment _baseGenericAsyncSegment;
         private Segment _childGenericSegment;
         private Segment _baseDatastoreSegment;
         private Segment _baseHttpSegment;
@@ -158,11 +159,14 @@ public void SetUp()
             _baseGenericSegment = new Segment(CreateTransactionSegmentState(3, null, 777), new MethodCallData(MethodCallType, MethodCallMethod, 1));
             _baseGenericSegment.SetSegmentData(new SimpleSegmentData(SegmentName));
 
+            _baseGenericAsyncSegment = new Segment(CreateTransactionSegmentState(5, null, 888), new MethodCallData(MethodCallType, MethodCallMethod, 1, true));
+            _baseGenericAsyncSegment.SetSegmentData(new SimpleSegmentData(SegmentName));
+
             _childGenericSegment = new Segment(CreateTransactionSegmentState(4, 3, 777), new MethodCallData(MethodCallType, MethodCallMethod, 1));
             _childGenericSegment.SetSegmentData(new SimpleSegmentData(SegmentName));
 
             // Datastore Segments
-            _connectionInfo = new ConnectionInfo("localhost", "1234", "default", "maininstance");
+            _connectionInfo = new ConnectionInfo(DatastoreVendor.MSSQL.ToKnownName(), "localhost", 1234, "default", "maininstance");
             _parsedSqlStatement = SqlParser.GetParsedDatabaseStatement(DatastoreVendor.MSSQL, System.Data.CommandType.Text, ShortQuery);
 
             _obfuscatedSql = _databaseService.GetObfuscatedSql(ShortQuery, DatastoreVendor.MSSQL);
@@ -440,8 +444,10 @@ public void GetSpanEvent_ReturnsSpanEventPerSegment_ValidateDatastoreValues()
             (
                 () => Assert.AreEqual(DatastoreCategory, (string)spanEventIntrinsicAttributes["category"]),
                 () => Assert.AreEqual(DatastoreVendor.MSSQL.ToString(), (string)spanEventIntrinsicAttributes["component"]),
-                () => Assert.AreEqual(_parsedSqlStatement.Model, (string)spanEventAgentAttributes["db.collection"]),
-
+                () => Assert.AreEqual(DatastoreVendor.MSSQL.ToKnownName(), (string)spanEventAgentAttributes["db.system"]),
+                () => Assert.AreEqual(_parsedSqlStatement.Operation, (string)spanEventAgentAttributes["db.operation"]),
+                () => Assert.AreEqual(_connectionInfo.Host, (string)spanEventAgentAttributes["server.address"]),
+                () => Assert.AreEqual(_connectionInfo.Port.Value, spanEventAgentAttributes["server.port"]),
 
                 //This also tests the lazy instantiation on span event attrib values
                 () => Assert.AreEqual(_obfuscatedSql, (string)spanEventAgentAttributes["db.statement"]),
@@ -459,7 +465,7 @@ public void Do_Not_Generate_DbCollection_Attribute_When_Model_IsNullOrEmpty()
             var testSegment = new Segment(CreateTransactionSegmentState(3, null, 777), new MethodCallData(MethodCallType, MethodCallMethod, 1));
             testSegment.SetSegmentData(new DatastoreSegmentData(_databaseService,
                 parsedSqlStatement: new ParsedSqlStatement(DatastoreVendor.CosmosDB, string.Empty, "ReadDatabase"),
-                connectionInfo: new ConnectionInfo("localhost", "1234", "default", "maininstance")));
+                connectionInfo: new ConnectionInfo("none", "localhost", "1234", "default", "maininstance")));
 
             // ARRANGE
             var segments = new List<Segment>()
@@ -713,7 +719,7 @@ public void GetSpanEvent_ReturnsSpanEventPerSegment_ValidateHttpValues()
 
             // ASSERT
             Assert.AreEqual(HttpUri, (string)spanEventAgentAttributes["http.url"]);
-            Assert.AreEqual(HttpMethod, (string)spanEventAgentAttributes["http.method"]);
+            Assert.AreEqual(HttpMethod, (string)spanEventAgentAttributes["http.request.method"]);
             Assert.AreEqual("type", (string)spanEventIntrinsicAttributes["component"]);
             Assert.AreEqual("client", (string)spanEventIntrinsicAttributes["span.kind"]);
         }
@@ -765,6 +771,42 @@ public void GetSpanEvent_ReturnsSpanEventPerSegment_HasHttpStatusCode()
 
         #endregion
 
+        [Test]
+        public void GetSpanEvent_CheckThreadIdAttribute()
+        {
+            var segments = new List<Segment>()
+            {
+                _baseGenericSegment.CreateSimilar(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5), new List<KeyValuePair<string, object>>())
+            };
+            var immutableTransaction = BuildTestTransaction(segments, true, false);
+            var transactionMetricName = _transactionMetricNameMaker.GetTransactionMetricName(immutableTransaction.TransactionName);
+            var metricStatsCollection = new TransactionMetricStatsCollection(transactionMetricName);
+            var transactionAttribs = _transactionAttribMaker.GetAttributes(immutableTransaction, transactionMetricName, TimeSpan.FromSeconds(1), immutableTransaction.Duration, metricStatsCollection);
+
+            var spanEvents = _spanEventMaker.GetSpanEvents(immutableTransaction, TransactionName, transactionAttribs);
+            var spanEvent = spanEvents.ToList()[1];
+
+            Assert.AreEqual(777, spanEvent.IntrinsicAttributes()["thread.id"]);
+        }
+
+        [Test]
+        public void GetSpanEvent_CheckMissingThreadIdAttribute()
+        {
+            var segments = new List<Segment>()
+            {
+                _baseGenericAsyncSegment.CreateSimilar(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5), new List<KeyValuePair<string, object>>())
+            };
+            var immutableTransaction = BuildTestTransaction(segments, true, false);
+            var transactionMetricName = _transactionMetricNameMaker.GetTransactionMetricName(immutableTransaction.TransactionName);
+            var metricStatsCollection = new TransactionMetricStatsCollection(transactionMetricName);
+            var transactionAttribs = _transactionAttribMaker.GetAttributes(immutableTransaction, transactionMetricName, TimeSpan.FromSeconds(1), immutableTransaction.Duration, metricStatsCollection);
+
+            var spanEvents = _spanEventMaker.GetSpanEvents(immutableTransaction, TransactionName, transactionAttribs);
+            var spanEvent = spanEvents.ToList()[1];
+
+            Assert.IsFalse(spanEvent.IntrinsicAttributes().ContainsKey("thread.id"));
+        }
+
         private ImmutableTransaction BuildTestTransaction(List<Segment> segments, bool sampled, bool hasIncomingPayload)
         {
             var builder = new ImmutableTransactionBuilder()
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventWireModelTests.cs
index 43c5a19a95..e2ebe601f3 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventWireModelTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventWireModelTests.cs
@@ -70,7 +70,7 @@ public void SpanEventWireModelTests_Serialization()
                 },
                 new Dictionary<string, object>
                 {
-                    { "http.method","GET" }
+                    { "http.request.method","GET" }
                 }
             };
 
@@ -113,7 +113,7 @@ public void SpanEventWireModelTests_MultipleEvents_Serialization()
                     },
                     new Dictionary<string, object>
                     {
-                        { "http.method","GET" }
+                        { "http.request.method","GET" }
                     }
                 },
                 new[] {
@@ -130,7 +130,7 @@ public void SpanEventWireModelTests_MultipleEvents_Serialization()
                     },
                     new Dictionary<string, object>
                     {
-                        { "http.method","POST" }
+                        { "http.request.method","POST" }
                     }
                 }
             };
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/DatastoreSegmentTransformerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/DatastoreSegmentTransformerTests.cs
index 1005e58b30..9d67a4aeda 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/DatastoreSegmentTransformerTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/DatastoreSegmentTransformerTests.cs
@@ -283,7 +283,7 @@ private Segment GetSegment(DatastoreVendor vendor, string operation, string mode
         private Segment GetSegment(DatastoreVendor vendor, string operation, string model, double duration, CrossApplicationResponseData catResponseData = null, string host = null, string portPathOrId = null)
         {
             var methodCallData = new MethodCallData("foo", "bar", 1);
-            var data = new DatastoreSegmentData(_databaseService, new ParsedSqlStatement(vendor, model, operation), null, new ConnectionInfo(host, portPathOrId, null));
+            var data = new DatastoreSegmentData(_databaseService, new ParsedSqlStatement(vendor, model, operation), null, new ConnectionInfo("none", host, portPathOrId, null));
             var segment = new Segment(TransactionSegmentStateHelpers.GetItransactionSegmentState(), methodCallData);
             segment.SetSegmentData(data);
 
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SqlTraceMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SqlTraceMakerTests.cs
index b79cc0958a..1f5414bf10 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SqlTraceMakerTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SqlTraceMakerTests.cs
@@ -152,7 +152,7 @@ private ImmutableTransaction BuildTestTransaction(string uri = null, string guid
         private Segment BuildSegment(DatastoreVendor vendor, string model, string commandText, TimeSpan startTime = new TimeSpan(), TimeSpan? duration = null, string name = "", MethodCallData methodCallData = null, IEnumerable<KeyValuePair<string, object>> parameters = null, string host = null, string portPathOrId = null, string databaseName = null)
         {
             var data = new DatastoreSegmentData(_databaseService, new ParsedSqlStatement(vendor, model, null), commandText,
-                new ConnectionInfo(host, portPathOrId, databaseName));
+                new ConnectionInfo("none", host, portPathOrId, databaseName));
             methodCallData = methodCallData ?? new MethodCallData("typeName", "methodName", 1);
 
             var segment = new Segment(TransactionSegmentStateHelpers.GetItransactionSegmentState(), methodCallData);
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TestTransactions.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TestTransactions.cs
index b15e100f38..67a9d2e04c 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TestTransactions.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TestTransactions.cs
@@ -118,7 +118,7 @@ public static ImmutableTransaction CreateTestTransactionWithSegments(IEnumerable
                 txSegmentState = TransactionSegmentStateHelpers.GetItransactionSegmentState();
 
             methodCallData = methodCallData ?? new MethodCallData("typeName", "methodName", 1);
-            var data = new DatastoreSegmentData(_databaseService, new ParsedSqlStatement(vendor, model, null), commandText, new ConnectionInfo(host, portPathOrId, databaseName));
+            var data = new DatastoreSegmentData(_databaseService, new ParsedSqlStatement(vendor, model, null), commandText, new ConnectionInfo("none", host, portPathOrId, databaseName));
             var segment = new Segment(txSegmentState, methodCallData);
             segment.SetSegmentData(data);
 
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionMetricNameMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionMetricNameMakerTests.cs
index 080ead795e..56dee2c851 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionMetricNameMakerTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionMetricNameMakerTests.cs
@@ -118,5 +118,27 @@ public void BuiltTransactionName_RunsThroughMetricNameService()
             Assert.IsFalse(builtName.ShouldIgnore);
             Assert.AreEqual("WebTransaction/NewName", builtName.PrefixedName);
         }
+
+        [Test]
+        public void BuiltTransactionName_BuildsKafkaMessageBrokerTransactionMetricNameWithQueueName()
+        {
+            var transactionName = TransactionName.ForKafkaBrokerTransaction(Extensions.Providers.Wrapper.MessageBrokerDestinationType.Queue, "bar", "baz");
+
+            var builtName = _transactionMetricNameMaker.GetTransactionMetricName(transactionName);
+
+            Assert.IsFalse(builtName.ShouldIgnore);
+            Assert.AreEqual("OtherTransaction/Message/bar/Queue/Consume/Named/baz", builtName.PrefixedName);
+        }
+
+        [Test]
+        public void BuiltTransactionName_BuildsKafkaMessageBrokerTransactionMetricNameWithTemp_IfEmptyDestinationSpecified()
+        {
+            var transactionName = TransactionName.ForKafkaBrokerTransaction(Extensions.Providers.Wrapper.MessageBrokerDestinationType.Queue, "bar", "");
+
+            var builtName = _transactionMetricNameMaker.GetTransactionMetricName(transactionName);
+
+            Assert.IsFalse(builtName.ShouldIgnore);
+            Assert.AreEqual("OtherTransaction/Message/bar/Queue/Consume/Named/Temp", builtName.PrefixedName);
+        }
     }
 }
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTraceMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTraceMakerTests.cs
index b58f14ee13..2fe5614845 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTraceMakerTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTraceMakerTests.cs
@@ -338,7 +338,7 @@ private static ImmutableSegmentTreeNode BuildNode(ImmutableTransaction transacti
 
             var data = new DatastoreSegmentData(_databaseService, new ParsedSqlStatement(DatastoreVendor.MSSQL, "test_table", "SELECT"),
                 "SELECT * FROM test_table",
-                new ConnectionInfo("My Host", "My Port", "My Database"));
+                new ConnectionInfo("My Vendor", "My Host", "My Port", "My Database"));
 
             var segment = new Segment(TransactionSegmentStateHelpers.GetItransactionSegmentState(), methodCallData);
             segment.SetSegmentData(data);
diff --git a/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs
index 12e2c8b932..6ee017e9ee 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs
@@ -715,6 +715,52 @@ public void BuildSupportabilityLoggingEventsDroppedMetric()
             );
         }
 
+        [Test]
+        public void BuildCountMetric()
+        {
+            const string metricName = "Some/Metric/Name";
+            const int count = 999;
+
+            var actual = _metricBuilder.TryBuildCountMetric(metricName, count);
+
+            NrAssert.Multiple(
+                () => Assert.AreEqual(metricName, actual.MetricName.Name),
+                () => Assert.IsNull(actual.MetricName.Scope),
+                () => Assert.AreEqual(count, actual.Data.Value0)
+            );
+        }
+
+        [Test]
+        public void BuildByteMetric()
+        {
+            const string metricName = "Some/Metric/Name";
+            const long byteCount = 1024 * 1024 * 1024;
+
+            var actual = _metricBuilder.TryBuildByteMetric(metricName, byteCount);
+
+            NrAssert.Multiple(
+                () => Assert.AreEqual(metricName, actual.MetricName.Name),
+                () => Assert.IsNull(actual.MetricName.Scope),
+                () => Assert.AreEqual(MetricDataWireModel.BuildByteData(byteCount), actual.Data)
+            );
+        }
+
+        [Test]
+        public void BuildByteMetric_WithExclusiveBytes()
+        {
+            const string metricName = "Some/Metric/Name";
+            const long totalBytes = 1024 * 1024 * 1024;
+            const long exclusiveBytes = 1024 * 1024 * 128;
+
+            var actual = _metricBuilder.TryBuildByteMetric(metricName, totalBytes, exclusiveBytes);
+
+            NrAssert.Multiple(
+                () => Assert.AreEqual(metricName, actual.MetricName.Name),
+                () => Assert.IsNull(actual.MetricName.Scope),
+                () => Assert.AreEqual(MetricDataWireModel.BuildByteData(totalBytes, exclusiveBytes), actual.Data)
+            );
+        }
+
         #endregion
 
         #region DistributedTracing
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs
index 70f4e0646e..3b9370aa04 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs
@@ -290,6 +290,19 @@ public void SetMessageBrokerTransactionName_SetsMessageBrokerTransactionName()
             Assert.AreEqual(false, addedTransactionName.IsWeb);
         }
 
+        [Test]
+        public void SetKafkaMessageBrokerTransactionName_SetsKafkaMessageBrokerTransactionName()
+        {
+            const TransactionNamePriority priority = TransactionNamePriority.FrameworkHigh;
+            SetupTransaction();
+
+            _agent.CurrentTransaction.SetKafkaMessageBrokerTransactionName(MessageBrokerDestinationType.Topic, "broker", "dest", priority);
+
+            var addedTransactionName = _transaction.CandidateTransactionName.CurrentTransactionName;
+            Assert.AreEqual("Message/broker/Topic/Consume/Named/dest", addedTransactionName.UnprefixedName);
+            Assert.AreEqual(false, addedTransactionName.IsWeb);
+        }
+
         [Test]
         public void SetOtherTransactionName_SetsOtherTransactionName()
         {
@@ -415,7 +428,7 @@ public void StartTransactionSegment_ReturnsAnOpaqueSimpleSegmentBuilder()
 
             var invocationTarget = new object();
             var method = new Method(typeof(string), "methodName", "parameterTypeNames");
-            var methodCall = new MethodCall(method, invocationTarget, new object[0]);
+            var methodCall = new MethodCall(method, invocationTarget, new object[0], false);
             var opaqueSegment = _agent.CurrentTransaction.StartTransactionSegment(methodCall, "foo");
             Assert.NotNull(opaqueSegment);
 
@@ -443,7 +456,7 @@ public void StartTransactionSegment_PushesNewSegmentUniqueIdToCallStack()
             Mock.Arrange(() => _callStackManager.Push(Arg.IsAny<int>()))
                 .DoInstead<object>(pushed => pushedUniqueId = pushed);
 
-            var opaqueSegment = _agent.CurrentTransaction.StartTransactionSegment(new MethodCall(new Method(typeof(string), "", ""), "", new object[0]), "foo");
+            var opaqueSegment = _agent.CurrentTransaction.StartTransactionSegment(new MethodCall(new Method(typeof(string), "", ""), "", new object[0], false), "foo");
             Assert.NotNull(opaqueSegment);
 
             var segment = opaqueSegment as Segment;
@@ -458,7 +471,7 @@ public void StartExternalSegment_Throws_IfUriIsNotAbsolute()
         {
             SetupTransaction();
             var uri = new Uri("/test", UriKind.Relative);
-            NrAssert.Throws<ArgumentException>(() => _agent.CurrentTransaction.StartExternalRequestSegment(new MethodCall(new Method(typeof(string), "", ""), "", new object[0]), uri, "GET"));
+            NrAssert.Throws<ArgumentException>(() => _agent.CurrentTransaction.StartExternalRequestSegment(new MethodCall(new Method(typeof(string), "", ""), "", new object[0], false), uri, "GET"));
         }
 
         #endregion Segments
@@ -470,7 +483,7 @@ public void EndSegment_RemovesSegmentFromCallStack()
         {
             SetupTransaction();
 
-            var opaqueSegment = _agent.CurrentTransaction.StartTransactionSegment(new MethodCall(new Method(typeof(string), "", ""), "", new object[0]), "foo");
+            var opaqueSegment = _agent.CurrentTransaction.StartTransactionSegment(new MethodCall(new Method(typeof(string), "", ""), "", new object[0], false), "foo");
             var segment = opaqueSegment as Segment;
             var expectedUniqueId = segment.UniqueId;
             var expectedParentId = segment.ParentUniqueId;
@@ -1351,7 +1364,50 @@ public void RecordLogMessage_NoTransaction_NoMessage_WithException_Success()
         }
 
         [Test]
-        public void RecordLogMessage_NoTransaction_NoMessage_NoException_DropsEvent()
+        public void RecordLogMessage_NoTransaction_NoMessage_NoException_WithContextData_Success()
+        {
+            Mock.Arrange(() => _configurationService.Configuration.LogEventCollectorEnabled)
+                .Returns(true);
+            Mock.Arrange(() => _configurationService.Configuration.ContextDataEnabled)
+                .Returns(true);
+
+            var timestamp = DateTime.Now;
+            var timestampUnix = timestamp.ToUnixTimeMilliseconds();
+            var level = "DEBUG";
+            string message = null;
+            var contextData = new Dictionary<string, object>() { { "key1", "value1" }, { "key2", 1 } };
+
+            Func<object, string> getLevelFunc = (l) => level;
+            Func<object, DateTime> getTimestampFunc = (l) => timestamp;
+            Func<object, string> getMessageFunc = (l) => message;
+            Func<object, Exception> getLogExceptionFunc = (l) => null;
+            Func<object, Dictionary<string, object>> getContextDataFunc = (l) => contextData;
+
+            var spanId = "spanid";
+            var traceId = "traceid";
+            var loggingFramework = "testFramework";
+
+            var xapi = _agent as IAgentExperimental;
+            xapi.RecordLogMessage(loggingFramework, new object(), getTimestampFunc, getLevelFunc, getMessageFunc, getLogExceptionFunc, getContextDataFunc, spanId, traceId);
+
+            // Access the private collection of events to get the number of add attempts.
+            var privateAccessor = new PrivateAccessor(_logEventAggregator);
+            var logEvents = privateAccessor.GetField("_logEvents") as ConcurrentPriorityQueue<PrioritizedNode<LogEventWireModel>>;
+
+            var logEvent = logEvents?.FirstOrDefault()?.Data;
+            Assert.AreEqual(1, logEvents.Count);
+            Assert.IsNotNull(logEvent);
+            Assert.AreEqual(timestampUnix, logEvent.TimeStamp);
+            Assert.AreEqual(level, logEvent.Level);
+            Assert.AreEqual(message, logEvent.Message);
+            Assert.AreEqual(spanId, logEvent.SpanId);
+            Assert.AreEqual(traceId, logEvent.TraceId);
+            Assert.AreEqual(contextData, logEvent.ContextData);
+            Assert.IsNotNull(logEvent.Priority);
+        }
+
+        [Test]
+        public void RecordLogMessage_NoTransaction_NoMessage_NoException_NoContextData_DropsEvent()
         {
             Mock.Arrange(() => _configurationService.Configuration.LogEventCollectorEnabled)
                 .Returns(true);
@@ -1473,7 +1529,51 @@ public void RecordLogMessage_WithTransaction_NoMessage_WithException_Success()
         }
 
         [Test]
-        public void RecordLogMessage_WithTransaction_NoMessage_NoException_DropsEvent()
+        public void RecordLogMessage_WithTransaction_NoMessage_NoException_WithContextData_Success()
+        {
+            Mock.Arrange(() => _configurationService.Configuration.LogEventCollectorEnabled)
+                .Returns(true);
+            Mock.Arrange(() => _configurationService.Configuration.ContextDataEnabled)
+                .Returns(true);
+
+            var timestamp = DateTime.Now;
+            var timestampUnix = timestamp.ToUnixTimeMilliseconds();
+            var level = "DEBUG";
+            string message = null;
+            var contextData = new Dictionary<string, object>() { { "key1", "value1" }, { "key2", 1 } };
+
+            Func<object, string> getLevelFunc = (l) => level;
+            Func<object, DateTime> getTimestampFunc = (l) => timestamp;
+            Func<object, string> getMessageFunc = (l) => message;
+            Func<object, Exception> getLogExceptionFunc = (l) => null;
+            Func<object, Dictionary<string, object>> getContextDataFunc = (l) => contextData;
+
+            var spanId = "spanid";
+            var traceId = "traceid";
+            var loggingFramework = "testFramework";
+
+            SetupTransaction();
+            var transaction = _transactionService.GetCurrentInternalTransaction();
+            var priority = transaction.Priority;
+
+            var xapi = _agent as IAgentExperimental;
+            xapi.RecordLogMessage(loggingFramework, new object(), getTimestampFunc, getLevelFunc, getMessageFunc, getLogExceptionFunc, getContextDataFunc, spanId, traceId);
+
+            var harvestedLogEvents = transaction.HarvestLogEvents();
+            var logEvent = harvestedLogEvents.FirstOrDefault();
+            Assert.AreEqual(1, harvestedLogEvents.Count);
+            Assert.IsNotNull(logEvent);
+            Assert.AreEqual(timestampUnix, logEvent.TimeStamp);
+            Assert.AreEqual(level, logEvent.Level);
+            Assert.AreEqual(message, logEvent.Message);
+            Assert.AreEqual(spanId, logEvent.SpanId);
+            Assert.AreEqual(traceId, logEvent.TraceId);
+            Assert.AreEqual(contextData, logEvent.ContextData);
+            Assert.AreEqual(priority, logEvent.Priority);
+        }
+
+        [Test]
+        public void RecordLogMessage_WithTransaction_NoMessage_NoException_NoContextData_DropsEvent()
         {
             Mock.Arrange(() => _configurationService.Configuration.LogEventCollectorEnabled)
                 .Returns(true);
diff --git a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/WrapperService.cs b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/WrapperService.cs
index e130ad51cd..4b951cd12a 100644
--- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/WrapperService.cs
+++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/WrapperService.cs
@@ -69,7 +69,7 @@ public void BeforeWrappedMethod_PassesCorrectParametersToWrapperLoader()
             _wrapperService.BeforeWrappedMethod(type, methodName, string.Empty, target, arguments, tracerFactoryName, null, EmptyTracerArgs, 0);
 
             var method = new Method(type, methodName, string.Empty);
-            var expectedMethodCall = new MethodCall(method, target, arguments);
+            var expectedMethodCall = new MethodCall(method, target, arguments, false);
             var instrumetedMethodInfo = new InstrumentedMethodInfo(0, expectedMethodCall.Method, tracerFactoryName, false, null, null, false);
 
             Mock.Assert(() => _wrapperMap.Get(instrumetedMethodInfo));
@@ -182,7 +182,7 @@ public void BeforeWrappedMethod_SetsNoOpWhenThrowsExceptionTooManyTimes()
             var metricName = string.Empty;
 
             var method = new Method(type, methodName, argumentSignature);
-            var methodCall = new MethodCall(method, invocationTarget, arguments);
+            var methodCall = new MethodCall(method, invocationTarget, arguments, false);
             var info = new InstrumentedMethodInfo(0, methodCall.Method, tracerFactoryName, false, null, null, false);
             Mock.Arrange(() => wrapper.CanWrap(info)).Returns(new CanWrapResponse(true));
 
@@ -234,7 +234,7 @@ public void AfterWrappedMethod_SetsNoOpWhenThrowsExceptionTooManyTimes()
             var metricName = string.Empty;
 
             var method = new Method(type, methodName, argumentSignature);
-            var methodCall = new MethodCall(method, invocationTarget, arguments);
+            var methodCall = new MethodCall(method, invocationTarget, arguments, false);
             var info = new InstrumentedMethodInfo(0, methodCall.Method, tracerFactoryName, false, null, null, false);
             Mock.Arrange(() => wrapper.CanWrap(info)).Returns(new CanWrapResponse(true));
 
diff --git a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Helpers/MassTransitHelperTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Helpers/MassTransitHelperTests.cs
new file mode 100644
index 0000000000..f2382773a4
--- /dev/null
+++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Helpers/MassTransitHelperTests.cs
@@ -0,0 +1,44 @@
+// Copyright 2020 New Relic, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using NUnit.Framework;
+using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.Agent.Extensions.Helpers;
+
+namespace Agent.Extensions.Tests.Helpers
+{
+    [TestFixture]
+    public class MassTransitHelperTests
+    {
+
+        [Test]
+        [TestCase("rabbitmq://localhost/SomeHostname_MassTransitTest_bus_myqueuename?temporary=true", "myqueuename")]
+        [TestCase("rabbitmq://localhost/SomeHostname_MassTransitTest_bus_myqueuename", "myqueuename")]
+        [TestCase("rabbitmq://localhost/bogus", "Unknown")]
+        [TestCase(null, "Unknown")]
+        public void GetQueueName(Uri uri, string expectedQueueName)
+        {
+            // Act
+            var queueName = MassTransitHelpers.GetQueueData(uri).QueueName;
+
+            // Assert
+            Assert.AreEqual(expectedQueueName, queueName, "Did not get expected queue name");
+        }
+
+        [Test]
+        [TestCase("rabbitmq://localhost/NRHXPSQL3_MassTransitTest_bus_myqueuename?temporary=true", MessageBrokerDestinationType.TempQueue)]
+        [TestCase("rabbitmq://localhost/NRHXPSQL3_MassTransitTest_bus_myqueuename?temporary=false", MessageBrokerDestinationType.Queue)]
+        [TestCase("rabbitmq://localhost/NRHXPSQL3_MassTransitTest_bus_myqueuename", MessageBrokerDestinationType.Queue)]
+        [TestCase(null, MessageBrokerDestinationType.Queue)]
+        public void GetBrokerDestinationType(Uri uri, MessageBrokerDestinationType expectedDestType)
+        {
+            // Act
+            var destType = MassTransitHelpers.GetQueueData(uri).DestinationType;
+
+            // Assert
+            Assert.AreEqual(expectedDestType, destType, "Did not get expected queue type");
+        }
+    }
+
+}
diff --git a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/MethodExtensionsTest.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/MethodExtensionsTest.cs
index 1f92bd76c2..5522d8c692 100644
--- a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/MethodExtensionsTest.cs
+++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/MethodExtensionsTest.cs
@@ -4,7 +4,7 @@
 using NewRelic.Agent.Extensions.Providers.Wrapper;
 using NUnit.Framework;
 
-namespace Agent.Extensions.Test
+namespace Agent.Extensions.Tests
 {
     public class MethodExtensionsTest
     {
@@ -13,7 +13,7 @@ public void MatchesAny_MethodName_Success()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", string.Empty);
 
@@ -26,7 +26,7 @@ public void MatchesAny_MethodName_Failure()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "NotSoSimpleMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", string.Empty);
 
@@ -39,7 +39,7 @@ public void MatchesAny_MethodName_Failure_Different_Case()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "simpleMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", string.Empty);
 
@@ -52,7 +52,7 @@ public void MatchesAny_MethodName_SingleParameter_SingleParameterSignature_Succe
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.String";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
@@ -66,7 +66,7 @@ public void MatchesAny_MethodName_SingleParameter_SingleParameterSignature_Accep
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
 
@@ -79,7 +79,7 @@ public void MatchesAny_MethodName_SingleParameter_SingleParameterSignature_Failu
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.Int32";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
@@ -93,7 +93,7 @@ public void MatchesAny_MethodName_SingleParameter_SingleParameterSignature_Failu
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "system.string";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
@@ -107,7 +107,7 @@ public void MatchesAny_MethodName_TwoParameters_SingleParameterSignature_Success
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.String,System.Int32";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String,System.Int32");
@@ -121,7 +121,7 @@ public void MatchesAny_MethodName_TwoParameters_SingleParameterSignature_AcceptA
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String,System.Int32");
 
@@ -134,7 +134,7 @@ public void MatchesAny_MethodName_TwoParameters_SingleParameterSignature_Failure
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.String,System.Double";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String,System.Int32");
@@ -148,7 +148,7 @@ public void MatchesAny_MethodName_TwoParameters_SingleParameterSignature_Failure
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.String,System.Int32,System.Threading.Timer";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String,System.Int32");
@@ -162,7 +162,7 @@ public void MatchesAny_MethodName__TwoParameterSignatures_Success()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature1 = "System.Object";
             const string expectedParamSignature2 = "System.String,System.Int32";
@@ -177,7 +177,7 @@ public void MatchesAny_MethodName__TwoParameterSignatures_Success_On_No_Paramete
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature1 = "System.Object";
             var expectedParamSignature2 = string.Empty;
@@ -192,7 +192,7 @@ public void MatchesAny_MethodName__TwoParameterSignatures_Failure_Different_Meth
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "ComplexMethod";
             const string expectedParamSignature1 = "System.Object";
             const string expectedParamSignature2 = "System.String,System.Int32";
@@ -207,7 +207,7 @@ public void MatchesAny_MethodName__TwoParameterSignatures_Failure_No_Match_Actua
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "ComplexMethod";
             const string expectedParamSignature1 = "System.Object";
             const string expectedParamSignature2 = "System.String,System.Int32";
@@ -222,7 +222,7 @@ public void MatchesAny_MethodName__TwoParameterSignatures_Failure_No_Match_Actua
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "ComplexMethod";
             const string expectedParamSignature1 = "System.Object";
             const string expectedParamSignature2 = "System.String,System.Int32";
@@ -238,7 +238,7 @@ public void MatchesAny_MultipleTypes_Success()
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
             const string expectedTypeName1 = "Circus.Bozo.Clowning";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
 
@@ -266,7 +266,7 @@ public void MatchesAny_MultipleTypes_Failure_Different_Method()
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
             const string expectedTypeName1 = "Circus.Bozo.Clowning";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "ComplexMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
 
@@ -280,7 +280,7 @@ public void MatchesAny_MultipleTypes_Failure_Different_Case()
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
             const string expectedTypeName1 = "Circus.Bozo.Clowning";
-            const string expectedTypeName2 = "Agent.extensions.test.SimpleClass";
+            const string expectedTypeName2 = "Agent.extensions.tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
 
@@ -295,7 +295,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_MultipleMethods_SinglePa
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName1 = "SimpleMethod";
             const string expectedMethodName2 = "ComplexMethod";
             const string expectedParamSignature = "System.String";
@@ -312,7 +312,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_MultipleMethods_SinglePa
             const string expectedAssemblyName1 = "Science.Physics.Electromagnetism";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName1 = "SimpleMethod";
             const string expectedMethodName2 = "ComplexMethod";
             const string expectedParamSignature = "System.String";
@@ -329,7 +329,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_MultipleMethods_SinglePa
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.WonkyClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.WonkyClass";
             const string expectedMethodName1 = "SimpleMethod";
             const string expectedMethodName2 = "ComplexMethod";
             const string expectedParamSignature = "System.String";
@@ -346,7 +346,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_MultipleMethods_SinglePa
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName1 = "SimpleMethod";
             const string expectedMethodName2 = "ComplexMethod";
             const string expectedParamSignature = "System.String";
@@ -363,7 +363,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_MultipleMethods_SinglePa
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName1 = "SimpleMethod";
             const string expectedMethodName2 = "ComplexMethod";
             const string expectedParamSignature = "System.String";
@@ -380,7 +380,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_MultipleMethods_SinglePa
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.test";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName1 = "SimpleMethod";
             const string expectedMethodName2 = "ComplexMethod";
             const string expectedParamSignature = "System.String";
@@ -397,7 +397,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_SingleMethod_SingleParam
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.String";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
@@ -413,7 +413,7 @@ public void MatchesAny_MultipleAssemblies_MultipleTypes_SingleMethod_SingleParam
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
             const string expectedTypeName1 = "Constants";
-            const string expectedTypeName2 = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName2 = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "ComplexMethod";
             const string expectedParamSignature = "System.String";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
@@ -428,7 +428,7 @@ public void MatchesAny_MultipleAssemblies_SingeType_SingleMethod_SingleParameter
             // ARRANGE
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.String";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
@@ -443,7 +443,7 @@ public void MatchesAny_MultipleAssemblies_SingeType_SingleMethod_SingleParameter
             // ARRANGE
             const string expectedAssemblyName1 = "NewRelic.Agent.Extensions.Tests";
             const string expectedAssemblyName2 = "Universe.Galaxy.SolarSystem";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClassYo";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClassYo";
             const string expectedMethodName = "SimpleMethod";
             const string expectedParamSignature = "System.String";
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String");
@@ -457,7 +457,7 @@ public void MatchesAny_SingleMethodSignature_NoParams_Success()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             var methodSignature = new MethodSignature("SimpleMethod", string.Empty);
             var method = new Method(typeof(SimpleClass), "SimpleMethod", string.Empty);
 
@@ -470,7 +470,7 @@ public void MatchesAny_SingleMethodSignature_NoParams_Failure_Different_MethodNa
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             var methodSignature = new MethodSignature("NotSoSimpleMethod", string.Empty);
             var method = new Method(typeof(SimpleClass), "SimpleMethod", string.Empty);
 
@@ -483,7 +483,7 @@ public void MatchesAny_SingleMethodSignature_NoParams_Failure_ExpectedHasParams(
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             var methodSignature = new MethodSignature("NotSoSimpleMethod", "System.String");
             var method = new Method(typeof(SimpleClass), "SimpleMethod", string.Empty);
 
@@ -496,7 +496,7 @@ public void MatchesAny_SingleMethodSignature_WithParams_Success()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             var methodSignature = new MethodSignature("SimpleMethod", "System.String,System.Thread.Timer,System.Double,System.Boolean");
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String,System.Thread.Timer,System.Double,System.Boolean");
 
@@ -509,7 +509,7 @@ public void MatchesAny_SingleMethodSignature_WithParams_AcceptAnyParamSignature_
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             var methodSignature = new MethodSignature("SimpleMethod");
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String,System.Thread.Timer,System.Double,System.Boolean");
 
@@ -522,7 +522,7 @@ public void MatchesAny_MultipleMethodSignatures_NoParams_Success()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
 
             // Note: 
             var methodSignature1 = new MethodSignature("SimpleMethod", string.Empty);
@@ -538,7 +538,7 @@ public void MatchesAny_MultipleMethodSignatures_WithParams_AcceptAnyParamSignatu
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
 
             // Note: 
             var methodSignature1 = new MethodSignature("SimpleMethod");
@@ -554,7 +554,7 @@ public void MatchesAny_MultipleMethodSignatures_NoParams_Failure_ExpectedHasPara
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
 
             // Note: 
             var methodSignature1 = new MethodSignature("SimpleMethod", "System.Int32");
@@ -570,7 +570,7 @@ public void MatchesAny_MultipleMethodSignature_WithParams_Success()
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             var methodSignature1 = new MethodSignature("SimpleMethod", "System.String,System.Thread.Timer,System.Double");
             var methodSignature2 = new MethodSignature("SimpleMethod", "System.String,System.Thread.Timer,System.Double,System.Boolean");
             var method = new Method(typeof(SimpleClass), "SimpleMethod", "System.String,System.Thread.Timer,System.Double,System.Boolean");
@@ -584,7 +584,7 @@ public void MatchesAny_MultipleMethodSignature_SomeWith_SomeWithout_Params_Match
         {
             // ARRANGE
             const string expectedAssemblyName = "NewRelic.Agent.Extensions.Tests";
-            const string expectedTypeName = "Agent.Extensions.Test.SimpleClass";
+            const string expectedTypeName = "Agent.Extensions.Tests.SimpleClass";
             var methodSignature1 = new MethodSignature("SimpleMethod", "System.String,System.Thread.Timer,System.Double");
             var methodSignature2 = new MethodSignature("SimpleMethod", "System.String,System.Thread.Timer,System.Double,System.Boolean");
             var methodSignature3 = new MethodSignature("NotSoSimpleMethod", "System.Object,System.String");
diff --git a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj
index b3dae4d6c5..95ef5e07a0 100644
--- a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj
+++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj
@@ -7,11 +7,11 @@
     <RunSettingsFilePath>$(SolutionDir)test.runsettings</RunSettingsFilePath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/TestClasses.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/TestClasses.cs
index 17ebdb5b60..9dc2e83b06 100644
--- a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/TestClasses.cs
+++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/TestClasses.cs
@@ -1,7 +1,7 @@
 // Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-namespace Agent.Extensions.Test
+namespace Agent.Extensions.Tests
 {
     public class SimpleClass
     {
diff --git a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj
index 79e2357c41..dcbb694701 100644
--- a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj
+++ b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj
@@ -5,12 +5,12 @@
     <AssemblyName>NewRelic.Agent.TestUtilities</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
   </ItemGroup>
diff --git a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj
index 4c33ad2ac4..084bac5f7c 100644
--- a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj
+++ b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj
@@ -19,12 +19,12 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="NUnit" Version="3.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs
index 5e9e54cd9a..aa5537df9c 100644
--- a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs
+++ b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs
@@ -9,143 +9,7 @@ namespace NewRelic.Testing.Assertions.UnitTests
     [TestFixture]
     public class NrAssertTests
     {
-        #region Multiple
-
-        [Test]
-        public void Multiple_DoesNotThrow_IfAllAssertionsPass()
-        {
-            NrAssert.Multiple(
-                () => Assert.IsTrue(true),
-                () => Assert.IsFalse(false)
-                );
-
-            // Getting to the end of this test without throwing constitutes success, no further assertions needed
-        }
-
-        [Test]
-        public void Multiple_Throws_IfAnyAssertionFails()
-        {
-            TestFailureException expectedException = null;
-
-            try
-            {
-                NrAssert.Multiple(
-                    () => Assert.IsTrue(true),
-                    () => Assert.IsTrue(false)
-                    );
-            }
-            catch (TestFailureException ex)
-            {
-                expectedException = ex;
-            }
-
-            Assert.NotNull(expectedException);
-            Assert.IsTrue(expectedException.Message.IndexOf("assertion", StringComparison.InvariantCultureIgnoreCase) > -1);
-        }
-
-        [Test]
-        public void Multiple_ContainsAllAssertionFailures_IfMultipleAssertionsFail()
-        {
-            TestFailureException expectedException = null;
-
-            try
-            {
-                NrAssert.Multiple(
-                    () => Assert.IsTrue(false),
-                    () => Assert.IsTrue(true),
-                    () => Assert.IsTrue(false)
-                    );
-            }
-            catch (TestFailureException ex)
-            {
-                expectedException = ex;
-            }
-
-            Assert.NotNull(expectedException);
-
-            var failure1Index = expectedException.Message.IndexOf("assertion", StringComparison.InvariantCultureIgnoreCase);
-            var failure2Index = expectedException.Message.IndexOf("assertion", failure1Index + 1, StringComparison.InvariantCultureIgnoreCase);
-
-            Assert.IsTrue(failure1Index > -1);
-            Assert.IsTrue(failure2Index > -1);
-        }
-
-        [Test]
-        public void Multiple_Throws_IfAnyActionThrows()
-        {
-            TestFailureException expectedException = null;
-
-            try
-            {
-                NrAssert.Multiple(
-                    () => Assert.IsTrue(true),
-                    () => { throw new IndexOutOfRangeException(); }
-                    );
-            }
-            catch (TestFailureException ex)
-            {
-                expectedException = ex;
-            }
-
-            Assert.NotNull(expectedException);
-            Assert.IsTrue(expectedException.Message.IndexOf("IndexOutOfRangeException", StringComparison.InvariantCultureIgnoreCase) > -1);
-        }
-
-        [Test]
-        public void Multiple_ContainsAllExceptions_IfMultipleActionsThrow()
-        {
-            TestFailureException expectedException = null;
-
-            try
-            {
-                NrAssert.Multiple(
-                    () => { throw new IndexOutOfRangeException(); },
-                    () => Assert.IsTrue(true),
-                    () => { throw new NullReferenceException(); }
-                    );
-            }
-            catch (TestFailureException ex)
-            {
-                expectedException = ex;
-            }
-
-            Assert.NotNull(expectedException);
-
-            var exception1Index = expectedException.Message.IndexOf("IndexOutOfRangeException", StringComparison.InvariantCultureIgnoreCase);
-            var exception2Index = expectedException.Message.IndexOf("NullReferenceException", exception1Index + 1, StringComparison.InvariantCultureIgnoreCase);
-
-            Assert.IsTrue(exception1Index > -1);
-            Assert.IsTrue(exception2Index > -1);
-        }
-
-        [Test]
-        public void Multiple_ContainsAllExceptionsAndAssertionFailures_IfAssertionsFailureAndThrowAtTheSameTime()
-        {
-            TestFailureException expectedException = null;
-
-            try
-            {
-                NrAssert.Multiple(
-                    () => { throw new IndexOutOfRangeException(); },
-                    () => Assert.IsTrue(true),
-                    () => Assert.IsTrue(false)
-                    );
-            }
-            catch (TestFailureException ex)
-            {
-                expectedException = ex;
-            }
-
-            Assert.NotNull(expectedException);
-
-            var exceptionIndex = expectedException.Message.IndexOf("IndexOutOfRangeException", StringComparison.InvariantCultureIgnoreCase);
-            var failureIndex = expectedException.Message.IndexOf("assertion", exceptionIndex + 1, StringComparison.InvariantCultureIgnoreCase);
-
-            Assert.IsTrue(exceptionIndex > -1);
-            Assert.IsTrue(failureIndex > -1);
-        }
-
-        #endregion Multiple
+        // Note: Intentionally not testing `NrAssert.Multiple()`, as it's now just a pass-through to `NUnit.Framework.Assert.Multiple()`
 
         #region Throws
 
diff --git a/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj b/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj
index 5066807312..0fa097750f 100644
--- a/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj
+++ b/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj
@@ -7,11 +7,11 @@
     <RunSettingsFilePath>$(SolutionDir)test.runsettings</RunSettingsFilePath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj b/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj
index a451d4f536..ab9370df85 100644
--- a/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj
+++ b/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="JustMock" Version="2020.1.113.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj b/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj
index cf7bb68590..950e27bae1 100644
--- a/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj
+++ b/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj
@@ -25,11 +25,11 @@
     <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.101.8" />
     <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.3.101.7" />
     <PackageReference Include="AWSSDK.SQS" Version="3.3.100.18" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 1f89c424d5..198a9cd3e2 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -4,5 +4,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'FullAgent.sln'))\build\StyleCop.props" />
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 </Project>
diff --git a/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj b/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj
index 480e84acf5..2eb966dac0 100644
--- a/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj
+++ b/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj
@@ -4,12 +4,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="JustMock" Version="2020.1.113.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/tests/UnitTests.runsettings b/tests/UnitTests.runsettings
index 89c71f9587..3106ac98b6 100644
--- a/tests/UnitTests.runsettings
+++ b/tests/UnitTests.runsettings
@@ -20,7 +20,7 @@
                     <!-- See https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/VSTestIntegration.md#advanced-options-supported-via-runsettings
                      and https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/MSBuildIntegration.md#excluding-from-coverage -->
                     <Exclude>[NewRelic.OpenTracing.AmazonLambda*]*</Exclude>
-                    <ExcludeByFile>**/tests/**/*, **/NativeMethods.cs, **/NewRelic.Api.Agent/NewRelic.cs, **/AgentManager.cs, **/Agent/Extensions/Providers/**/*</ExcludeByFile>
+                    <ExcludeByFile>**/tests/**/*, **/NativeMethods.cs, **/NewRelic.Api.Agent/*, **/AgentManager.cs, **/Agent/Extensions/Providers/**/*</ExcludeByFile>
                     <ExcludeByAttribute>NrExcludeFromCodeCoverage,Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute</ExcludeByAttribute>
                 </Configuration>
             </DataCollector>