Skip to content

MessagesViewIndex change #4831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ramonsmits wants to merge 12 commits into from
Closed

MessagesViewIndex change #4831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3aaeb80
MessagesViewIndex change
ramonsmits Feb 22, 2025
9263d15
use let to reduce code
ramonsmits Mar 11, 2025
b0aaab1
Small optimization on string.Join
ramonsmits Mar 11, 2025
f29d91e
Use `let` to reduce code and improve readability
ramonsmits Mar 11, 2025
b39f674
Fix potential NullReferenceException and added comment why cannot use…
ramonsmits Mar 11, 2025
0e16305
Code formatting
ramonsmits Mar 11, 2025
5bcee0f
Resolve error CS0019: Operator '!=' cannot be applied to operands of …
ramonsmits Mar 11, 2025
0fa5bba
error CS1503: Argument 2: cannot convert from 'System.Collections.Gen…
ramonsmits Mar 11, 2025
c6a4a78
Revert "error CS1503: Argument 2: cannot convert from 'System.Collect…
ramonsmits Mar 11, 2025
63d35f2
Revert "Resolve error CS0019: Operator '!=' cannot be applied to oper…
ramonsmits Mar 11, 2025
02d06e9
Revert "Code formatting"
ramonsmits Mar 11, 2025
dd793a1
Revert "Fix potential NullReferenceException and added comment why ca…
ramonsmits Mar 11, 2025
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
29 changes: 15 additions & 14 deletions src/ServiceControl.Audit.Persistence.RavenDB/Indexes/MessagesViewIndex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,24 @@ public MessagesViewIndex()
{
Map = messages =>
from message in messages
let metadata = message.MessageMetadata
Copy link
Member Author

@ramonsmits ramonsmits Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mauroservienti I was banging my head against the wall... but I think let somehow is not supported. Could you quickly review the CI build? The error is about object but it does not make sense to me.

Issue it to that I for some reason cannot run these test locally so I cannot easily run them

select new SortAndFilterOptions
{
MessageId = (string)message.MessageMetadata["MessageId"],
MessageType = (string)message.MessageMetadata["MessageType"],
IsSystemMessage = (bool)message.MessageMetadata["IsSystemMessage"],
Status = (bool)message.MessageMetadata["IsRetried"] ? MessageStatus.ResolvedSuccessfully : MessageStatus.Successful,
TimeSent = (DateTime)message.MessageMetadata["TimeSent"],
MessageId = (string)metadata["MessageId"],
MessageType = (string)metadata["MessageType"],
IsSystemMessage = (bool)metadata["IsSystemMessage"],
Status = (bool)metadata["IsRetried"] ? MessageStatus.ResolvedSuccessfully : MessageStatus.Successful,
TimeSent = (DateTime)metadata["TimeSent"],
ProcessedAt = message.ProcessedAt,
ReceivingEndpointName = ((EndpointDetails)message.MessageMetadata["ReceivingEndpoint"]).Name,
CriticalTime = (TimeSpan?)message.MessageMetadata["CriticalTime"],
ProcessingTime = (TimeSpan?)message.MessageMetadata["ProcessingTime"],
DeliveryTime = (TimeSpan?)message.MessageMetadata["DeliveryTime"],
Query = message.MessageMetadata.Select(_ => _.Value.ToString()).Union(new[]
{
string.Join(" ", message.Headers.Select(x => x.Value))
}).ToArray(),
ConversationId = (string)message.MessageMetadata["ConversationId"]
ReceivingEndpointName = ((EndpointDetails)metadata["ReceivingEndpoint"]).Name,
CriticalTime = (TimeSpan?)metadata["CriticalTime"],
ProcessingTime = (TimeSpan?)metadata["ProcessingTime"],
DeliveryTime = (TimeSpan?)metadata["DeliveryTime"],
Query = new[] {
string.Join(' ', message.Headers.Values),
string.Join(' ', metadata.Values.Select(v => v.ToString() ?? string.Empty))
},
ConversationId = (string)metadata["ConversationId"]
};

Index(x => x.Query, FieldIndexing.Search);
Expand Down
19 changes: 10 additions & 9 deletions src/ServiceControl.Persistence.RavenDB/Indexes/MessagesViewIndex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,27 @@ public MessagesViewIndex()

from message in messages
let last = message.ProcessingAttempts.Last()
let metadata = last.MessageMetadata
select new SortAndFilterOptions
{
MessageId = last.MessageId,
MessageType = (string)last.MessageMetadata["MessageType"],
IsSystemMessage = (bool)last.MessageMetadata["IsSystemMessage"],
MessageType = (string)metadata["MessageType"],
IsSystemMessage = (bool)metadata["IsSystemMessage"],
Status = message.Status == FailedMessageStatus.Archived
? MessageStatus.ArchivedFailure
: message.Status == FailedMessageStatus.Resolved
? MessageStatus.ResolvedSuccessfully
: message.ProcessingAttempts.Count == 1
? MessageStatus.Failed
: MessageStatus.RepeatedFailure,
TimeSent = (DateTime)last.MessageMetadata["TimeSent"],
TimeSent = (DateTime)metadata["TimeSent"],
ProcessedAt = last.AttemptedAt,
ReceivingEndpointName = ((EndpointDetails)last.MessageMetadata["ReceivingEndpoint"]).Name,
CriticalTime = (TimeSpan?)last.MessageMetadata["CriticalTime"],
ProcessingTime = (TimeSpan?)last.MessageMetadata["ProcessingTime"],
DeliveryTime = (TimeSpan?)last.MessageMetadata["DeliveryTime"],
Query = last.MessageMetadata.Select(_ => _.Value.ToString()).Union(new[] { string.Join(" ", last.Headers.Select(x => x.Value)) }).ToArray(),
ConversationId = (string)last.MessageMetadata["ConversationId"]
ReceivingEndpointName = ((EndpointDetails)metadata["ReceivingEndpoint"]).Name,
CriticalTime = (TimeSpan?)metadata["CriticalTime"],
ProcessingTime = (TimeSpan?)metadata["ProcessingTime"],
DeliveryTime = (TimeSpan?)metadata["DeliveryTime"],
Query = metadata.Select(_ => _.Value.ToString()).Union(new[] { string.Join(" ", last.Headers.Select(x => x.Value)) }).ToArray(),
ConversationId = (string)metadata["ConversationId"]
};

// StandardAnalyzer is the default analyzer, so no follow-up Analyze() call is needed here
Expand Down
Loading