Skip to content

Replace CombGuid with Guid.CreateVersion7 for message ID generation #5839

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

Merged
johnsimons merged 1 commit into from
Sep 2, 2026
+2 −48
Merged

Replace CombGuid with Guid.CreateVersion7 for message ID generation #5839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 0 additions & 45 deletions src/ServiceControl/CombGuid.cs
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions src/ServiceControl/Recoverability/Editing/EditHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Contracts.MessageFailures;
using Infrastructure.Auth;
using Infrastructure.DomainEvents;
using MessageFailures;
using Microsoft.Extensions.Logging;
using NServiceBus;
using NServiceBus.Routing;
Expand Down Expand Up @@ -80,10 +79,10 @@ await domainEvents.Raise(new MessageEditedAndRetried

OutgoingMessage BuildMessage(EditAndSend message)
{
var messageId = CombGuid.Generate().ToString();
var messageId = Guid.CreateVersion7().ToString("D");
var headers = HeaderFilter.RemoveErrorMessageHeaders(message.NewHeaders);
corruptedReplyToHeaderStrategy.FixCorruptedReplyToHeader(headers);
headers[Headers.MessageId] = Guid.NewGuid().ToString("D");

@johnsimons johnsimons Sep 1, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I also updated this, which was wrong!

headers[Headers.MessageId] = messageId;

var body = Convert.FromBase64String(message.NewBody);
var outgoingMessage = new OutgoingMessage(messageId, headers, body);
Expand Down
Loading