fix: Revert RabbitMQ HandleBasicDeliver instrumentation change from #1972. Resolves #2047 (#2118)

Author: tippmar-nr

src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/Instrumentation.xml

@@ -30,7 +30,7 @@ SPDX-License-Identifier: Apache-2.0
 
     <!-- Consume  Push / Event / Subscribe -->
 		<tracerFactory name="HandleBasicDeliverWrapper">
-      <match assemblyName="RabbitMQ.Client" className="RabbitMQ.Client.Impl.ModelBase">
+      <match assemblyName="RabbitMQ.Client" className="RabbitMQ.Client.Events.EventingBasicConsumer">
         <exactMethodMatcher methodName="HandleBasicDeliver" />
       </match>
 		</tracerFactory>

tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/RabbitMQ.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
 
 // See this project's .csproj file for target framework => RabbitMQ.Client version mappings
@@ -227,11 +227,20 @@ void handler(object ch, BasicDeliverEventArgs basicDeliverEventArgs)
 #endif
                     VerifyHeaders(basicDeliverEventArgs.BasicProperties.Headers);
 
+                    InstrumentedChildMethod(); // to verify we're getting a child span
+
                     manualResetEvent.Set();
                 }
             }
         }
 
+        [Trace]
+        [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
+        private void InstrumentedChildMethod()
+        {
+            Thread.Sleep(100);
+        }
+
         private void VerifyHeaders(IDictionary<string, object> headers)
         {
             foreach (var userHeader in userHeaders)

tests/Agent/IntegrationTests/UnboundedIntegrationTests/RabbitMq/RabbitMqDistributedTracingTests.cs

@@ -53,7 +53,9 @@ public void Test()
             {
                 new Assertions.ExpectedMetric { metricName = "Supportability/DistributedTrace/CreatePayload/Success", callCount = 3 },
                 new Assertions.ExpectedMetric { metricName = "Supportability/TraceContext/Create/Success", callCount = 3 },
-                new Assertions.ExpectedMetric { metricName = "Supportability/TraceContext/Accept/Success", callCount = 2 }
+                new Assertions.ExpectedMetric { metricName = "Supportability/TraceContext/Accept/Success", callCount = 2 },
+                new Assertions.ExpectedMetric { metricName = "DotNet/MultiFunctionApplicationHelpers.NetStandardLibraries.RabbitMQ/InstrumentedChildMethod"} ,
+                new Assertions.ExpectedMetric { metricName = "DotNet/MultiFunctionApplicationHelpers.NetStandardLibraries.RabbitMQ/InstrumentedChildMethod", metricScope = "OtherTransaction/Message/RabbitMQ/Queue/Named/integrationTestQueue.*", IsRegexScope = true}
             };
 
             var metrics = _fixture.AgentLog.GetMetrics();