From f24164eca3a4ad161e335a305045c209feb2cf8f Mon Sep 17 00:00:00 2001
From: Alex Hemsath <ahemsath@newrelic.com>
Date: Thu, 26 Oct 2023 15:38:49 -0700
Subject: [PATCH] Expanded tests, updated instrumentation for v7

---
 .../MassTransitLegacy/Instrumentation.xml     |  6 ++
 ...sitConsumeTests.cs => MassTransitTests.cs} | 58 +++++++++++++++----
 2 files changed, 53 insertions(+), 11 deletions(-)
 rename tests/Agent/IntegrationTests/IntegrationTests/MassTransit/{MassTransitConsumeTests.cs => MassTransitTests.cs} (61%)

diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml
index e9e2c757d8..cf00b0a35c 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml
@@ -9,9 +9,15 @@ SPDX-License-Identifier: Apache-2.0
 
     <tracerFactory name="TransportConfigLegacyWrapper">
 
+<!--This classname works for MassTransit v7.0.0-->
       <match assemblyName="MassTransit" className="MassTransit.Registration.TransportRegistrationBusFactory" maxVersion="8.0.0">
         <exactMethodMatcher methodName="CreateBus" />
       </match>
+<!--This classname works for MassTransit v7.3.1-->
+      <match assemblyName="MassTransit" className="MassTransit.Registration.TransportRegistrationBusFactory`1" maxVersion="8.0.0">
+        <exactMethodMatcher methodName="CreateBus" />
+      </match>
+
       <match assemblyName="MassTransit" className="MassTransit.BusFactoryExtensions" maxVersion="8.0.0">
         <exactMethodMatcher methodName="Build" parameters="MassTransit.IBusFactory,MassTransit.Configuration.IBusConfiguration,System.Collections.Generic.IEnumerable`1[GreenPipes.ValidationResult]" />
       </match>
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitConsumeTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
similarity index 61%
rename from tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitConsumeTests.cs
rename to tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
index 536990e2cc..b47e6f642d 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitConsumeTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
@@ -11,12 +11,12 @@
 
 namespace NewRelic.Agent.IntegrationTests.MassTransit
 {
-    public abstract class MassTransitConsumeTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
+    public abstract class MassTransitTestsBase<TFixture> : NewRelicIntegrationTest<TFixture>
         where TFixture : ConsoleDynamicMethodFixture
     {
         private readonly TFixture _fixture;
 
-        public MassTransitConsumeTestsBase(TFixture fixture, ITestOutputHelper output, bool useStartBus) : base(fixture)
+        public MassTransitTestsBase(TFixture fixture, ITestOutputHelper output, bool useStartBus) : base(fixture)
         {
             _fixture = fixture;
             _fixture.SetTimeout(TimeSpan.FromMinutes(2));
@@ -84,35 +84,71 @@ public void Test()
             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 MassTransitConsumeTestsFW462 : MassTransitConsumeTestsBase<ConsoleDynamicMethodFixtureFW462>
+    public class MassTransitTests_StartBus_FW462 : MassTransitTestsBase<ConsoleDynamicMethodFixtureFW462>
     {
-        public MassTransitConsumeTestsFW462(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
+        public MassTransitTests_StartBus_FW462(ConsoleDynamicMethodFixtureFW462 fixture, ITestOutputHelper output)
             : base(fixture, output, true)
         {
         }
     }
     [NetFrameworkTest]
-    public class MassTransitConsumeTestsFWLatest : MassTransitConsumeTestsBase<ConsoleDynamicMethodFixtureFWLatest>
+    public class MassTransitTests_StartBus_FWLatest : MassTransitTestsBase<ConsoleDynamicMethodFixtureFWLatest>
     {
-        public MassTransitConsumeTestsFWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
+        public MassTransitTests_StartBus_FWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output)
             : base(fixture, output, true)
         {
         }
     }
     [NetCoreTest]
-    public class MassTransitConsumeTestsCore60 : MassTransitConsumeTestsBase<ConsoleDynamicMethodFixtureCore60>
+    public class MassTransitTests_StartBus_Core60 : MassTransitTestsBase<ConsoleDynamicMethodFixtureCore60>
     {
-        public MassTransitConsumeTestsCore60(ConsoleDynamicMethodFixtureCore60 fixture, ITestOutputHelper output)
+        public MassTransitTests_StartBus_Core60(ConsoleDynamicMethodFixtureCore60 fixture, ITestOutputHelper output)
             : base(fixture, output, true)
         {
         }
     }
     [NetCoreTest]
-    public class MassTransitConsumeTestsCoreLatest : MassTransitConsumeTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
+    public class MassTransitTests_StartBus_CoreLatest : MassTransitTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
     {
-        public MassTransitConsumeTestsCoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
-            : base(fixture, output, false)
+        public MassTransitTests_StartBus_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
+            : base(fixture, output, true)
         {
         }
     }