From 7d37e1c8994f7375b6c7a094c5491ccc8accc11c Mon Sep 17 00:00:00 2001 From: Jacob Affinito Date: Fri, 26 Jul 2024 06:30:41 -0700 Subject: [PATCH] Attempt to push up changes round 2. --- .../Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs | 4 ++-- .../Providers/Wrapper/RabbitMq/BasicPublishWrapper.cs | 4 ++-- .../Providers/Wrapper/RabbitMq/BasicPublishWrapperLegacy.cs | 2 +- .../Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs | 2 +- .../Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs index 8f6535ad0b..29e554f33f 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs @@ -30,8 +30,8 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins MessageBrokerAction.Consume, RabbitMqHelper.VendorName, destName, - serverAddress: RabbitMqHelper.GetServerAddress(instrumentedMethodCall), - serverPort: RabbitMqHelper.GetServerPort(instrumentedMethodCall), + serverAddress: RabbitMqHelper.GetServerAddress(instrumentedMethodCall, agent), + serverPort: RabbitMqHelper.GetServerPort(instrumentedMethodCall, agent), routingKey: queue); // no way to get routing key from BasicGet return Delegates.GetDelegateFor( diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapper.cs index feaeaf4c6a..815eabd0bd 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapper.cs @@ -25,8 +25,8 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins // 3.6.0+ (5.1.0+) (IModel)void BasicPublish(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body) var segment = (RabbitMqHelper.GetRabbitMQVersion(instrumentedMethodCall) >= 6) ? - RabbitMqHelper.CreateSegmentForPublishWrappers6Plus(instrumentedMethodCall, transaction, BasicPropertiesIndex) : - RabbitMqHelper.CreateSegmentForPublishWrappers(instrumentedMethodCall, transaction, BasicPropertiesIndex); + RabbitMqHelper.CreateSegmentForPublishWrappers6Plus(instrumentedMethodCall, transaction, BasicPropertiesIndex, agent) : + RabbitMqHelper.CreateSegmentForPublishWrappers(instrumentedMethodCall, transaction, BasicPropertiesIndex, agent); return Delegates.GetDelegateFor(segment); } diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapperLegacy.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapperLegacy.cs index 8b75b367ce..8cde703189 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapperLegacy.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicPublishWrapperLegacy.cs @@ -22,7 +22,7 @@ public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo) public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction) { // 3.5.X (IModel)void BasicPublish(string exchange, string routingKey, bool mandatory, bool immediate, IBasicProperties basicProperties, byte[] body) - var segment = RabbitMqHelper.CreateSegmentForPublishWrappers(instrumentedMethodCall, transaction, BasicPropertiesIndex); + var segment = RabbitMqHelper.CreateSegmentForPublishWrappers(instrumentedMethodCall, transaction, BasicPropertiesIndex, agent); return Delegates.GetDelegateFor(segment); } } diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs index c18b362334..ea02b4f4a1 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs @@ -52,7 +52,7 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins agent.CurrentTransaction.AcceptDistributedTraceHeaders(headers, GetHeaderValue, TransportType.AMQP); - GetServerDetails(instrumentedMethodCall, out var hostname, out var port); + GetServerDetails(instrumentedMethodCall, out var hostname, out var port, agent); var segment = transaction.StartMessageBrokerSegment( instrumentedMethodCall.MethodCall, diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs index d2cead7920..714a59a71c 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs @@ -31,8 +31,8 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins MessageBrokerAction.Purge, RabbitMqHelper.VendorName, destName, - serverAddress: RabbitMqHelper.GetServerAddress(instrumentedMethodCall), - serverPort: RabbitMqHelper.GetServerPort(instrumentedMethodCall)); + serverAddress: RabbitMqHelper.GetServerAddress(instrumentedMethodCall, agent), + serverPort: RabbitMqHelper.GetServerPort(instrumentedMethodCall, agent)); // Routing key is not available for this method. // It only returns uint and invocationTarget does not have the value.