From d84daee64088ba9628cbe36d964c1fe6d31fd230 Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Mon, 20 Nov 2023 12:47:11 +0100 Subject: [PATCH] Gather traces for TestChannelDeadLetterSinkExtensions (#7441) Also make sure that a dead letter sink is resolved for channel before the source actually sends the event (moving this check from Requirement phase to Setup). --- test/rekt/channel_test.go | 2 ++ test/rekt/features/channel/features.go | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/rekt/channel_test.go b/test/rekt/channel_test.go index 5f9f77f759d..e3ea7df9b18 100644 --- a/test/rekt/channel_test.go +++ b/test/rekt/channel_test.go @@ -32,6 +32,7 @@ import ( "knative.dev/reconciler-test/pkg/k8s" "knative.dev/reconciler-test/pkg/knative" "knative.dev/reconciler-test/pkg/manifest" + "knative.dev/reconciler-test/pkg/tracing" "knative.dev/eventing/test/rekt/features/channel" ch "knative.dev/eventing/test/rekt/resources/channel" @@ -312,6 +313,7 @@ func TestChannelDeadLetterSinkExtensions(t *testing.T) { knative.WithLoggingConfig, knative.WithTracingConfig, k8s.WithEventListener, + tracing.WithGatherer(t), environment.Managed(t), ) diff --git a/test/rekt/features/channel/features.go b/test/rekt/features/channel/features.go index 2ad23866a9d..c130f4b1591 100644 --- a/test/rekt/features/channel/features.go +++ b/test/rekt/features/channel/features.go @@ -358,6 +358,7 @@ func channelSubscriberUnreachable(createSubscriberFn func(ref *duckv1.KReference f.Setup("channel is ready", channel_impl.IsReady(channelName)) f.Setup("channel is addressable", channel_impl.IsAddressable(channelName)) f.Setup("subscription is ready", subscription.IsReady(sub)) + f.Setup("channel has dead letter sink uri", channel_impl.HasDeadLetterSinkURI(channelName, channel_impl.GVR())) f.Requirement("install source", eventshub.Install( sourceName, @@ -365,8 +366,6 @@ func channelSubscriberUnreachable(createSubscriberFn func(ref *duckv1.KReference eventshub.InputEvent(ev), )) - f.Requirement("Channel has dead letter sink uri", channel_impl.HasDeadLetterSinkURI(channelName, channel_impl.GVR())) - f.Assert("Receives dls extensions when subscriber is unreachable", eventasssert.OnStore(sink). MatchEvent( test.HasExtension("knativeerrordest", subscriberUri)). @@ -403,6 +402,7 @@ func channelSubscriberReturnedErrorNoData(createSubscriberFn func(ref *duckv1.KR f.Setup("channel is ready", channel_impl.IsReady(channelName)) f.Setup("channel is addressable", channel_impl.IsAddressable(channelName)) f.Setup("subscription is ready", subscription.IsReady(sub)) + f.Setup("channel has dead letter sink uri", channel_impl.HasDeadLetterSinkURI(channelName, channel_impl.GVR())) f.Requirement("install source", eventshub.Install( sourceName, @@ -410,8 +410,6 @@ func channelSubscriberReturnedErrorNoData(createSubscriberFn func(ref *duckv1.KR eventshub.InputEvent(ev), )) - f.Requirement("Channel has dead letter sink uri", channel_impl.HasDeadLetterSinkURI(channelName, channel_impl.GVR())) - f.Assert("Receives dls extensions without errordata", assertEnhancedWithKnativeErrorExtensions( sink, func(ctx context.Context) test.EventMatcher { @@ -454,6 +452,7 @@ func channelSubscriberReturnedErrorWithData(createSubscriberFn func(ref *duckv1. f.Setup("channel is ready", channel_impl.IsReady(channelName)) f.Setup("channel is addressable", channel_impl.IsAddressable(channelName)) f.Setup("subscription is ready", subscription.IsReady(sub)) + f.Setup("channel has dead letter sink uri", channel_impl.HasDeadLetterSinkURI(channelName, channel_impl.GVR())) f.Requirement("install source", eventshub.Install( sourceName, @@ -461,8 +460,6 @@ func channelSubscriberReturnedErrorWithData(createSubscriberFn func(ref *duckv1. eventshub.InputEvent(ev), )) - f.Requirement("Channel has dead letter sink uri", channel_impl.HasDeadLetterSinkURI(channelName, channel_impl.GVR())) - f.Assert("Receives dls extensions with errordata Base64encoding", assertEnhancedWithKnativeErrorExtensions( sink, func(ctx context.Context) test.EventMatcher {