From e71e95b841a1c37bafb69dd1fc355a5541a9bc65 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 7 Mar 2025 13:01:35 -0800 Subject: [PATCH] util/eventbus: don't allow publishers to skip events while debugging If any debugging hook might see an event, Publisher.ShouldPublish should tell its caller to publish even if there are no ordinary subscribers. Updates #15160 Signed-off-by: David Anderson --- util/eventbus/bus.go | 4 ++++ util/eventbus/client.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/util/eventbus/bus.go b/util/eventbus/bus.go index fc497add2..96cafc98b 100644 --- a/util/eventbus/bus.go +++ b/util/eventbus/bus.go @@ -173,6 +173,10 @@ func (b *Bus) dest(t reflect.Type) []*subscribeState { } func (b *Bus) shouldPublish(t reflect.Type) bool { + if b.routeDebug.active() { + return true + } + b.topicsMu.Lock() defer b.topicsMu.Unlock() return len(b.topics[t]) > 0 diff --git a/util/eventbus/client.go b/util/eventbus/client.go index 5cf7f97f5..a9ef40771 100644 --- a/util/eventbus/client.go +++ b/util/eventbus/client.go @@ -93,7 +93,7 @@ func (c *Client) publish() chan<- PublishedEvent { } func (c *Client) shouldPublish(t reflect.Type) bool { - return c.bus.shouldPublish(t) + return c.publishDebug.active() || c.bus.shouldPublish(t) } // Subscribe requests delivery of events of type T through the given