Skip to content

Merge master into v7 (deadlock backport tests) - #124

Merged
christopherread merged 7 commits into
v7from
v7-merge-master
Oct 25, 2026
Merged

christopherread merged 7 commits into
v7from
v7-merge-master

Conversation

@christopherread

Copy link
Copy Markdown
Owner

Merge with "Create a merge commit", not squash. A squash merge leaves master's commits looking unmerged. That happened with #111, which is why #97 and #110 show up again here, and it would make the next merge repeat these conflicts.

Brings master's v6 fixes since v7 branched into v7:

Conflicts

v7 already has each of those changes in its own form, so every conflict keeps v7's side:

File master's side Kept
Obvs.RabbitMQ/MessageSource.cs without a using v7 needs v7
Obvs.Kafka/MessageSource.cs the same ObserveOn fix, without v7's comment v7
.github/workflows/dotnet.yml without v7's Azure Service Bus test line v7
docs/v7-design.md the first version of the doc v7

The ActiveMQ MessageSource.cs and TestMessageSource.cs merged cleanly, because both branches made identical changes. Each transport's task-pool hand-off appears once, and there are no duplicate usings.

What's new to v7

Only master's backport tests, which reproduce each deadlock through the v6 API:

  • Obvs.RabbitMQ.Tests/TestServiceBus.cs: ShouldNotDeadlockWhenCodeAfterAwaitingAMessageDisposesTheBus
  • Obvs.Kafka.Tests/TestMessageSendAndReceive.cs: ShouldNotDeadlockWhenASubscriberDisposesItsSubscription
  • Obvs.ActiveMQ.Tests/TestServiceBus.cs: ShouldNotDeadlockWhenASubscriberDisposesTheBus

Tests

  • Broker tests: every broker test in the three projects passed against local brokers, the merged backport tests included: RabbitMQ 10, Kafka 11, ActiveMQ 8.
  • Build and unit tests: the solution builds with 0 warnings, and all 227 unit tests pass.

🤖 Generated with Claude Code

christopherread and others added 7 commits October 25, 2026 09:26
* Add v7 'AI native' design doc

Proposes how v7 changes configuration, message registration, handlers,
testing, errors, observability, contracts, packaging and docs so AI
coding agents (and people) can use Obvs correctly first time. Each
change links to its tracking issue in the v7 milestone (#84-#95).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Design doc: frame the async APIs as layers over the observable core

Section 4 now explains why v7 stays observable-first: handlers, RequestAsync
and IAsyncEnumerable are thin adapters over IObservable, Rx stays first
class for stream composition, and analyzer OBVS006 catches Subscribe(async).
Resolves the open question on Rx: it stays in the core package.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Design doc: describe the bus lifetime under dependency injection

Section 1 now covers how the singleton bus is registered and owned, scoped
handlers, repeated AddObvs calls, keyed buses, and why one bus per
container needs a per-bus instance ID in broker-side names instead of the
process ID used by v6.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
MessageSource started its receive loop with Task.Run. The loop blocks for
as long as the subscription lasts, so each subscription held a thread-pool
thread, and Subscribe waited until the loop got one. On CI's small runners,
the NetMQ tests start a dozen subscriptions at once; the pool added threads
slowly, subscribers took over 5 seconds to connect, publishers stopped
waiting for them, and the first messages were dropped. The loop now runs as
a LongRunning task on a dedicated thread.

TestMessageSourceThreading saturates the thread pool and checks that
subscribing doesn't wait for it. It failed before this change.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hread (#113)

MessageSource passed each message to subscribers synchronously on
RabbitMQ.Client's consumer-dispatch thread. Code running after a message
arrived, including code after awaiting one (the continuation runs inline
there), could deadlock it: disposing the bus closes the connection, which
waits for that same thread. Messages are still deserialized on the
dispatch thread, while the body's buffer is valid, then handed to
subscribers on the task pool, in order.

TestServiceBus.ShouldNotDeadlockWhenASubscriberDisposesTheBus disposes the
bus from a message callback; it timed out before this change.

Backport of the fix in v7 PR #112.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Microsoft's download origin returns 409 for the new SDK 10.0.403 and
runtime 10.0.14, so setup-dotnet fails to install 10.0.x. Go back to
10.0.x once that release downloads.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
MessageSource called observer.OnNext on its consume thread, the task
started by Task.Run in Messages. Disposing the subscription cancels the
token and then waits for that task, so a subscriber that disposed the bus
or its subscription from a message callback waited on itself forever.
Messages are now handed to subscribers on the task pool, in order.

TestMessageSendAndReceive.ShouldNotDeadlockWhenASubscriberDisposesItsSubscription
disposes the subscription from a message callback; the message arrived but
the dispose timed out before this change.

Backport of the fix in v7 PR #119; the same fix for RabbitMQ was #113.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…thread (#122)

MessageSource passed each message to subscribers synchronously on the NMS
session's dispatch thread. Code that ran after awaiting a message could
then run on that thread, and deadlock it by disposing the bus: stopping
the connection waits for the dispatch thread, forever. NMS skips that
wait only for code in the dispatch's own execution context, which an
await continuation isn't. Messages are now handed to subscribers on the
task pool, in order.

TestServiceBus.ShouldNotDeadlockWhenCodeAfterAwaitingAMessageDisposesTheBus
hung before this change. Five TestMessageSource tests now wait for
delivery instead of expecting it on the listener's thread. CI runs the
ActiveMQ broker tests against apache/activemq-classic.

Backport of the fix in v7 PR #121.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Brings in master's v6 fixes since v7 branched: the RabbitMQ, Kafka and ActiveMQ
dispose-deadlock backports (#113, #120, #122), the NetMQ receive-loop thread (#110),
the SDK pin (#117) and the design doc (#97).

v7 already has each of those changes in its own form, so every conflict keeps v7's
side: the transports' MessageSource files, the workflow and the design doc. What's
new to v7 is the backports' tests, which exercise the deadlock through the v6 API:
Obvs.RabbitMQ.Tests/TestServiceBus.cs, Obvs.Kafka.Tests/TestMessageSendAndReceive.cs
and Obvs.ActiveMQ.Tests/TestServiceBus.cs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@christopherread christopherread added this to the v7 milestone Oct 25, 2026
@christopherread christopherread self-assigned this Oct 25, 2026
@christopherread
christopherread merged commit cedefe4 into v7 Oct 25, 2026
1 check passed
@christopherread
christopherread deleted the v7-merge-master branch October 25, 2026 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant