Skip to content

[dotnet-code] Consolidate delivery mapping construction #988

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
Quim Muntal (qmuntal) merged 2 commits into from
Sep 7, 2026
+14 −12
Merged

[dotnet-code] Consolidate delivery mapping construction #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d539d5
Consolidate delivery mapping construction
github-actions[bot] Sep 2, 2026
a57c364
Merge branch 'main' into copilot/dotnet-code-delivery-mapping-1788388…
michelle-clayton-work Sep 4, 2026
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: 3 additions & 12 deletions workflow/internal/execution/edgerunner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,7 @@ func (em *EdgeRunner) PrepareDeliveryForEdge(ctx context.Context, edge workflow.
return nil, nil
}
span.SetDeliveryStatus(observability.DeliveryStatusDelivered)
return &DeliveryMapping{
Targets: targets,
Envelopes: envelopes,
}, nil
return newDeliveryMapping(envelopes, targets), nil
}

func (em *EdgeRunner) filterEnvelopesForTarget(ctx context.Context, envelopes []*MessageEnvelope, target *workflow.Executor) ([]*MessageEnvelope, error) {
Expand Down Expand Up @@ -399,10 +396,7 @@ func (em *EdgeRunner) PrepareDeliveryForInput(ctx context.Context, envelope *Mes
return nil, nil
}
span.SetDeliveryStatus(observability.DeliveryStatusDelivered)
return &DeliveryMapping{
Targets: []*workflow.Executor{target},
Envelopes: []*MessageEnvelope{envelope},
}, nil
return newSingleDeliveryMapping(envelope, target), nil
}

// PrepareDeliveryForResponse prepares delivery of an external response to
Expand Down Expand Up @@ -438,10 +432,7 @@ func (em *EdgeRunner) PrepareDeliveryForResponse(ctx context.Context, response *
return nil, nil
}
span.SetDeliveryStatus(observability.DeliveryStatusDelivered)
return &DeliveryMapping{
Targets: []*workflow.Executor{target},
Envelopes: []*MessageEnvelope{envelope},
}, nil
return newSingleDeliveryMapping(envelope, target), nil
}

func edgeGroupMetadata(edge workflow.Edge) observability.EdgeGroupMetadata {
Expand Down
11 changes: 11 additions & 0 deletions workflow/internal/execution/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ type DeliveryMapping struct {
Targets []*workflow.Executor
}

func newDeliveryMapping(envelopes []*MessageEnvelope, targets []*workflow.Executor) *DeliveryMapping {
return &DeliveryMapping{
Envelopes: envelopes,
Targets: targets,
}
}

func newSingleDeliveryMapping(envelope *MessageEnvelope, target *workflow.Executor) *DeliveryMapping {
return newDeliveryMapping([]*MessageEnvelope{envelope}, []*workflow.Executor{target})
}

func (d DeliveryMapping) MapInto(nextStep *StepContext) {
for _, target := range d.Targets {
messageQueue := nextStep.MessagesFor(target.ID)
Expand Down
Loading