Skip to content

Commit b54e818

Browse files
author
Guy Baron
authored
Merge branch 'master' into v1.x
2 parents fa87818 + d227a86 commit b54e818

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

gbus/abstractions.go

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ type Deadlettering interface {
138138
ReturnDeadToQueue(ctx context.Context, publishing *amqp.Publishing) error
139139
}
140140

141+
141142
//RawMessageHandling provides the ability to consume and send raq amqp messages with the transactional guarantees that the bus provides
142143
type RawMessageHandling interface {
143144
/*

gbus/bus.go

+1
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ func (b *DefaultBus) HandleDeadletter(handler RawMessageHandler) {
554554
b.registerDeadLetterHandler(handler)
555555
}
556556

557+
557558
//SetGlobalRawMessageHandler implements RawMessageHandling.SetGlobalRawMessageHandler
558559
func (b *DefaultBus) SetGlobalRawMessageHandler(handler RawMessageHandler) {
559560
metrics.AddHandlerMetrics(handler.Name())

gbus/saga/instance.go

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func (si *Instance) invoke(exchange, routingKey string, invocation *sagaInvocati
4949
}).Info("invoking method on saga")
5050

5151
span, sctx := opentracing.StartSpanFromContext(invocation.Ctx(), methodName)
52+
5253
// replace the original context with the conext built around the span so we ca
5354
// trace the saga handler that is invoked
5455
invocation.ctx = sctx

tests/testMessages.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ var _ gbus.Message = &Reply2{}
99
var _ gbus.Message = &Event1{}
1010
var _ gbus.Message = &Event2{}
1111

12+
1213
//PoisonMessage is a malformed message to test poison pill scenarios
1314
type PoisonMessage struct {
1415
}

0 commit comments

Comments
 (0)