Skip to content
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

Add support for messageId, correlationId, and type in RabbitMQ bindings #3661

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+58 −0
Open

Add support for messageId, correlationId, and type in RabbitMQ bindings #3661

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
15 changes: 15 additions & 0 deletions bindings/rabbitmq/rabbitmq.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,21 @@ func (r *RabbitMQ) Invoke(ctx context.Context, req *bindings.InvokeRequest) (*bi
pub.Priority = priority
}

messageId, ok := metadata.TryGetMessageId(req.Metadata)
if ok {
pub.MessageId = messageId
}

correlationId, ok := metadata.TryGetCorrelationId(req.Metadata)
if ok {
pub.CorrelationId = correlationId
}

aType, ok := metadata.TryGetType(req.Metadata)
if ok {
pub.Type = aType
}

err = ch.PublishWithContext(ctx, "", r.metadata.QueueName, false, false, pub)
if err != nil {
return nil, fmt.Errorf("failed to publish message: %w", err)
Expand Down
23 changes: 23 additions & 0 deletions metadata/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,21 @@ func IsRawPayload(props map[string]string) (bool, error) {

return false, nil
}
func TryGetMessageId(props map[string]string) (string, bool) {
if val, ok := props["messageId"]; ok && val != "" {
return val, true
}

return "", false
}

func TryGetCorrelationId(props map[string]string) (string, bool) {
if val, ok := props["correlationId"]; ok && val != "" {
return val, true
}

return "", false
}

func TryGetContentType(props map[string]string) (string, bool) {
if val, ok := props[ContentType]; ok && val != "" {
Expand All @@ -122,6 +137,14 @@ func TryGetContentType(props map[string]string) (string, bool) {
return "", false
}

func TryGetType(props map[string]string) (string, bool) {
if val, ok := props["type"]; ok && val != "" {
return val, true
}

return "", false
}

func TryGetQueryIndexName(props map[string]string) (string, bool) {
if val, ok := props[QueryIndexName]; ok && val != "" {
return val, true
Expand Down
20 changes: 20 additions & 0 deletions pubsub/rabbitmq/rabbitmq.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,26 @@ func (r *rabbitMQ) publishSync(ctx context.Context, req *pubsub.PublishRequest)
p.Priority = priority
}

contentType, ok := metadata.TryGetContentType(req.Metadata)
if ok {
p.ContentType = contentType
}

messageId, ok := metadata.TryGetMessageId(req.Metadata)
if ok {
p.MessageId = messageId
}

correlationId, ok := metadata.TryGetCorrelationId(req.Metadata)
if ok {
p.CorrelationId = correlationId
}

aType, ok := metadata.TryGetType(req.Metadata)
if ok {
p.Type = aType
}

confirm, err := r.channel.PublishWithDeferredConfirmWithContext(ctx, req.Topic, routingKey, false, false, p)
if err != nil {
r.logger.Errorf("%s publishing to %s failed in channel.Publish: %v", logMessagePrefix, req.Topic, err)
Expand Down