fix: fix send context when using Dispatch()

office.go

@@ -40,6 +40,7 @@ type Transport interface {
 }
 
 type dispatchJob struct {
+	values    context.Context
 	letter    letter.Letter
 	transport string
 }
@@ -213,7 +214,10 @@ func (o *Office) Send(ctx context.Context, let letter.Letter) error {
 // Available options:
 //	DispatchWith(): Set the name of the transport to use.
 func (o *Office) Dispatch(ctx context.Context, let letter.Letter, opts ...DispatchOption) error {
-	job := dispatchJob{letter: let}
+	job := dispatchJob{
+		values: ctx,
+		letter: let,
+	}
 	for _, opt := range opts {
 		opt(&job)
 	}
@@ -273,15 +277,32 @@ func (o *Office) run(ctx context.Context, wg *sync.WaitGroup) {
 		case <-ctx.Done():
 			return
 		case job := <-o.queue:
+			dispatchCtx := &dispatchContext{
+				Context: ctx,
+				values:  job.values,
+			}
+
 			if job.transport == "" {
-				o.Send(ctx, job.letter)
+				o.Send(dispatchCtx, job.letter)
 			} else {
-				o.SendWith(ctx, job.transport, job.letter)
+				o.SendWith(dispatchCtx, job.transport, job.letter)
 			}
 		}
 	}
 }
 
+type dispatchContext struct {
+	context.Context
+	values context.Context
+}
+
+func (ctx *dispatchContext) Value(key interface{}) interface{} {
+	if val := ctx.Context.Value(key); val != nil {
+		return val
+	}
+	return ctx.values.Value(key)
+}
+
 func (o *Office) log(v ...interface{}) {
 	if o.cfg.Logger == nil {
 		return

office_test.go

@@ -483,9 +483,9 @@ func TestOffice_Run(t *testing.T) {
 
 	let1, let2, let3 := letter.Write(), letter.Write(), letter.Write()
 
-	trans.EXPECT().Send(ctx, let1)
-	trans.EXPECT().Send(ctx, let2)
-	trans.EXPECT().Send(ctx, let3)
+	trans.EXPECT().Send(gomock.Any(), let1).Return(nil)
+	trans.EXPECT().Send(gomock.Any(), let2).Return(nil)
+	trans.EXPECT().Send(gomock.Any(), let3).Return(nil)
 
 	assert.Nil(t, off.Dispatch(context.Background(), let1))
 	assert.Nil(t, off.Dispatch(context.Background(), let2))