Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Plugins/RabbitMQ/Logger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ public static partial class Logger
[LoggerMessage(EventId = 10004, Level = LogLevel.Information, Message = "Sending message acknowledgement for message {messageId}.")]
public static partial void SendingAcknowledgement(this ILogger logger, string messageId);

[LoggerMessage(EventId = 10005, Level = LogLevel.Information, Message = "Ackowledge sent for message {messageId}.")]
public static partial void AcknowledgementSent(this ILogger logger, string messageId);
[LoggerMessage(EventId = 10005, Level = LogLevel.Information, Message = "Ackowledge sent for message {messageId}. Event Duration {durationMilliseconds}")]
public static partial void AcknowledgementSent(this ILogger logger, string messageId, double durationMilliseconds);

[LoggerMessage(EventId = 10006, Level = LogLevel.Information, Message = "Sending nack message {messageId} and requeuing.")]
public static partial void SendingNAcknowledgement(this ILogger logger, string messageId);
Expand Down
4 changes: 4 additions & 0 deletions src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Messaging\Monai.Deploy.Messaging.csproj" />
</ItemGroup>
Expand Down
45 changes: 42 additions & 3 deletions src/Plugins/RabbitMQ/RabbitMqMessageSubscriberService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Globalization;
using System.Threading;
Expand Down Expand Up @@ -44,6 +45,7 @@ public class RabbitMQMessageSubscriberService : IMessageBrokerSubscriberService
private readonly string _portNumber;
private readonly IModel _channel;
private bool _disposedValue;
private static readonly ConcurrentDictionary<string, DateTime> MessageTimings = new();

public string Name => ConfigurationKeys.SubscriberServiceName;

Expand Down Expand Up @@ -209,10 +211,12 @@ public void SubscribeAsync(string[] topics, string queue, Func<MessageReceivedEv
{
["MessageId"] = eventArgs.BasicProperties.MessageId,
["ApplicationId"] = eventArgs.BasicProperties.AppId,
["CorrelationId"] = eventArgs.BasicProperties.CorrelationId

["CorrelationId"] = eventArgs.BasicProperties.CorrelationId,
["RecievedTime"] = DateTime.UtcNow
});

TimeNewMessage(eventArgs.BasicProperties.MessageId);

_logger.MessageReceivedFromQueue(queueDeclareResult.QueueName, eventArgs.RoutingKey);

MessageReceivedEventArgs messageReceivedEventArgs;
Expand All @@ -227,6 +231,7 @@ public void SubscribeAsync(string[] topics, string queue, Func<MessageReceivedEv
_logger.SendingNAcknowledgement(eventArgs.BasicProperties.MessageId);
_channel.BasicNack(eventArgs.DeliveryTag, multiple: false, requeue: false);
_logger.NAcknowledgementSent(eventArgs.BasicProperties.MessageId, false);
RemoveTimeMessage(eventArgs.BasicProperties.MessageId);
return;
}
try
Expand All @@ -249,7 +254,14 @@ public void Acknowledge(MessageBase message)

_logger.SendingAcknowledgement(message.MessageId);
_channel.BasicAck(ulong.Parse(message.DeliveryTag, CultureInfo.InvariantCulture), multiple: false);
_logger.AcknowledgementSent(message.MessageId);
var eventDuration = GetMessageDuration(message.MessageId);

using var loggingScope = _logger.BeginScope(new Dictionary<string, object>
{
["EventDuration"] = eventDuration
});
_logger.AcknowledgementSent(message.MessageId, eventDuration);
RemoveTimeMessage(message.MessageId);
}

public async Task RequeueWithDelay(MessageBase message)
Expand All @@ -274,6 +286,7 @@ public void Reject(MessageBase message, bool requeue = true)
_logger.SendingNAcknowledgement(message.MessageId);
_channel.BasicNack(ulong.Parse(message.DeliveryTag, CultureInfo.InvariantCulture), multiple: false, requeue: requeue);
_logger.NAcknowledgementSent(message.MessageId, requeue);
RemoveTimeMessage(message.MessageId);
}

protected virtual void Dispose(bool disposing)
Expand Down Expand Up @@ -342,5 +355,31 @@ private static MessageReceivedEventArgs CreateMessage(string topic, BasicDeliver
deliveryTag: eventArgs.DeliveryTag.ToString(CultureInfo.InvariantCulture)),
CancellationToken.None);
}

private static void TimeNewMessage(string messageId)
{
if (MessageTimings.ContainsKey(messageId))
{
RemoveTimeMessage(messageId);
}
MessageTimings.TryAdd(messageId, DateTime.UtcNow);
}

private static void RemoveTimeMessage(string messageId)
{
if (MessageTimings.ContainsKey(messageId))
{
MessageTimings.TryRemove(messageId, out _);
}
}

private static double GetMessageDuration(string messageId)
{
if (MessageTimings.ContainsKey(messageId))
{
return (DateTime.UtcNow - MessageTimings[messageId]).TotalMilliseconds;
}
return 0;
}
}
}