Update RabbitMQ HandleBasicDeliver instrumentation

newrelic · Oct 9, 2023 · e5100a6 · e5100a6
1 parent 2a1060a
commit e5100a6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/Instrumentation.xml
@@ -6,29 +6,33 @@ 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[]"/>
 				<exactMethodMatcher methodName="_Private_BasicPublish" parameters="System.String,System.String,System.Boolean,RabbitMQ.Client.IBasicProperties,System.ReadOnlyMemory`1[System.Byte]"/>
 			</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">