From 561abc137070b96c02a8d495f6b66fea0003e322 Mon Sep 17 00:00:00 2001
From: Alex Hemsath <ahemsath@newrelic.com>
Date: Fri, 27 Oct 2023 15:42:06 -0700
Subject: [PATCH] Updated 7x instrumentation with version ranges

Not quite working, integration tests are failing for StartBus with v7.0.0 due to transaction scope oddness
---
 .../MassTransitLegacy/Instrumentation.xml        | 16 +++++++++++-----
 .../MassTransit/MassTransitTests.cs              |  1 +
 .../MultiFunctionApplicationHelpers.csproj       | 13 +++++++------
 3 files changed, 19 insertions(+), 11 deletions(-)

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 cf00b0a35c..723b48e201 100644
--- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml
+++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/Instrumentation.xml
@@ -9,16 +9,22 @@ 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">
+<!--See https://github.com/MassTransit/MassTransit/compare/v7.0.7...v7.1 for changes between 7.0.7 and 7.1.0-->
+
+      <!--TransportRegistrationBusFactory became a generic type with one type parameter between 7.0.7 and 7.1.0 -->
+      <match assemblyName="MassTransit" className="MassTransit.Registration.TransportRegistrationBusFactory" minVersion="7.0.0" maxVersion="7.1.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">
+      <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" maxVersion="8.0.0">
+      <!--The number and types of parameters to the Build method changed between 7.0.7 and 7.1.0-->
+      <match assemblyName="MassTransit" className="MassTransit.BusFactoryExtensions" minVersion="7.0.0" maxVersion="7.1.0">
+        <exactMethodMatcher methodName="Build" parameters="MassTransit.IBusFactory,System.Collections.Generic.IEnumerable`1[GreenPipes.ISpecification]" />
+      </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>
diff --git a/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
index 1e1075b3b4..f8ee122780 100644
--- a/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTests/MassTransit/MassTransitTests.cs
@@ -71,6 +71,7 @@ public void Test()
             var massTransitConsumeMetricNameRegex = massTransitMetricNameRegexBase + @"Consume\/" + queueNameRegex;
 
             var metrics = _fixture.AgentLog.GetMetrics().ToList();
+            //Metric named MessageBroker\/MassTransit\/Queue\/Consume\/Named\/(.{26}) scoped to OtherTransaction\/Message\/MassTransit\/Queue\/Named\/(.{26}) was not found in the metric payload
 
             var expectedMetrics = new List<Assertions.ExpectedMetric>
             {
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
index 691dddac80..197216b2e8 100644
--- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
+++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
@@ -263,21 +263,22 @@
   </ItemGroup>
 
   <!--MassTransit-->
+  <!--7.0.0 -> 7.0.7 have a different instrumentation point than 7.1.0 -> 7.3.1 (newest 7.x)-->
   <ItemGroup>
-    <PackageReference Include="MassTransit" Version="7.3.1" Condition="'$(TargetFramework)' == 'net462'" />
-    <PackageReference Include="MassTransit" Version="7.3.1" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="MassTransit" Version="7.0.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.3.1" Condition="'$(TargetFramework)' == 'net462'" />
-    <PackageReference Include="MassTransit.AspNetCore" Version="7.3.1" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="MassTransit.AspNetCore" Version="7.0.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.3.1" Condition="'$(TargetFramework)' == 'net462'" />
-    <PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="7.3.1" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="7.0.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'" />