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

Jump to bottom

Add Prefer: reply Header to subscriber request if spec.reply is set #5764

Merged
merged 2 commits into from
Sep 30, 2021
Merged

Add Prefer: reply Header to subscriber request if spec.reply is set #5764

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
f31d9f8
initial approach, clone headers for dest and add prefer:reply
salaboy Sep 28, 2021
adbd44a
add Prefer: reply always
salaboy Sep 30, 2021
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
7 changes: 6 additions & 1 deletion pkg/channel/message_dispatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,17 @@ func (d *MessageDispatcherImpl) DispatchMessageWithRetries(ctx context.Context,
var responseMessage cloudevents.Message
var responseAdditionalHeaders nethttp.Header
var dispatchExecutionInfo *DispatchExecutionInfo

if destination != nil {
var err error
// Try to send to destination
messagesToFinish = append(messagesToFinish, message)

ctx, responseMessage, responseAdditionalHeaders, dispatchExecutionInfo, err = d.executeRequest(ctx, destination, message, additionalHeaders, retriesConfig, transformers...)
// Add `Prefer: reply` header no matter if a reply destination is provided. Discussion: https://github.com/knative/eventing/pull/5764
additionalHeadersForDestination := additionalHeaders.Clone()
additionalHeadersForDestination.Add("Prefer", "reply")

ctx, responseMessage, responseAdditionalHeaders, dispatchExecutionInfo, err = d.executeRequest(ctx, destination, message, additionalHeadersForDestination, retriesConfig, transformers...)
if err != nil {
// If DeadLetter is configured, then send original message with knative error extensions
if deadLetter != nil {
Expand Down
9 changes: 9 additions & 0 deletions pkg/channel/message_dispatcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -133,6 +134,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -233,6 +235,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -269,6 +272,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -310,6 +314,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -370,6 +375,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -437,6 +443,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -550,6 +557,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down Expand Up @@ -645,6 +653,7 @@ func TestDispatchMessage(t *testing.T) {
"x-request-id": {"id123"},
"knative-1": {"knative-1-value"},
"knative-2": {"knative-2-value"},
"prefer": {"reply"},
"traceparent": {"ignored-value-header"},
"ce-abc": {`"ce-abc-value"`},
"ce-id": {"ignored-value-header"},
Expand Down