CAMEL-24387: Add createSingletonService() and migrate all tests to singletons - #22294
Merged
Merged
Conversation
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
gnodet
changed the title
github-actions
Bot
added
components
components-azure
components-jms
components-ai
labels
gnodet
changed the title
github-actions
Bot
removed
components
components-azure
components-jms
components-ai
labels
gnodet
changed the title
github-actions
Bot
added
components
components-azure
components-jms
components-ai
labels
gnodet
force-pushed
the
mesquite-planet
branch
5 times, most recently
from
March 27, 2026 15:22
4061f61 to
36d7b4f
Compare
Contributor
|
LGTM, but this one likely needs a full CI test to make sure it runs fine. |
Contributor
Author
Yes, I'm running tests locally for each modified factory to make sure it works. It's not completely done yet... |
gnodet
force-pushed
the
mesquite-planet
branch
3 times, most recently
from
March 27, 2026 20:40
3f7fe53 to
d68f67d
Compare
gnodet
changed the title
gnodet
force-pushed
the
mesquite-planet
branch
3 times, most recently
from
March 27, 2026 21:45
16de556 to
fdb9557
Compare
gnodet
changed the title
gnodet
force-pushed
the
mesquite-planet
branch
5 times, most recently
from
April 2, 2026 15:39
7ced72a to
633b0ae
Compare
Contributor
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 241 tested, 27 compile-only — current: 239 all testedMaveniverse Scalpel detected 268 affected modules (current approach: 239).
|
gnodet
changed the title
Add a createSingletonService() method to all test-infra service factories. These return a JVM-wide singleton instance backed by SingletonService, which prevents duplicate container startups when multiple test classes share the same service (especially useful for parallel test execution via mvnd). Each factory's singleton wrapper delegates all service-specific interface methods to the underlying service instance. Also change SingletonService.shutdown() from throwing IllegalArgumentException to a debug-level no-op, since JUnit's @RegisterExtension lifecycle calls shutdown() after each test class. The actual cleanup happens via JVM shutdown hook. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ce() Switch all integration test classes to use the new singleton service factories. This ensures each Testcontainers service is started only once per JVM, which: - Speeds up test suites by avoiding redundant container startups - Enables parallel test execution (mvnd) without container conflicts - Reduces CI resource consumption Test isolation fixes for shared singleton instances: - ZooKeeper ConsumeDataIT: use deleteAll() instead of delete() to handle nodes with children from shared instances - Google PubSub: catch AlreadyExistsException for topics/subscriptions that may already exist in the shared emulator - Hashicorp Vault: use per-class secretPath() to avoid data collisions between tests sharing the same Vault instance - Consul ConsulHealthIT: use @RegisterExtension instead of manual lifecycle management - Google PubSub ITs: use unique topic/subscription names per test class Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
davsclaus
force-pushed
the
mesquite-planet
branch
from
August 13, 2026 07:20
9d607c8 to
840839f
Compare
davsclaus
changed the title
Contributor
|
Hi @gnodet, I rebased the branch on latest main (only one conflict in Also created CAMEL-24387 to track this. While rebasing I checked for gaps — there are 9 service factories still missing Existed before the PR (missed):
Added after the PR was created:
Claude Code on behalf of Claus Ibsen |
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Claus Ibsen <claus.ibsen@gmail.com>
Contributor
|
I added
The other 6 from my earlier comment don't need it:
Claude Code on behalf of Claus Ibsen |
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Claus Ibsen <claus.ibsen@gmail.com>
…leton services Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Claus Ibsen <claus.ibsen@gmail.com>
davsclaus
marked this pull request as ready for review
August 13, 2026 07:31
Contributor
|
⏺ The CI failure is not related to the singleton changes. Here's what happened:
The PR's changes (test-infra singletons) compiled and ran fine — the failure is in an unrelated component (camel-paho-mqtt5) that was included in the CI build matrix but wasn't modified by this PR. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Add
createSingletonService()to 32 test-infra service factories and migrate all integration tests to use them. This ensures each Testcontainers service is started only once per JVM, enabling parallel test execution via mvnd without container conflicts.Commit 1: Add createSingletonService() to 32 test-infra service factories
createSingletonService()method to all test-infra service factories, returning a JVM-wide singleton backed bySingletonServicewith lazy initialization (holder idiom) and JVM shutdown hook cleanupSingletonService.shutdown()from throwingIllegalArgumentExceptionto a debug-level no-op, since JUnit's@RegisterExtensionlifecycle callsshutdown()after each test classCommit 2: Migrate all test classes from createService() to createSingletonService()
ConsumeDataIT: usedeleteAll()instead ofdelete()to handle nodes with childrenAlreadyExistsExceptionfor topics/subscriptions in shared emulatorsecretPath()to avoid data collisionsConsulHealthIT: use@RegisterExtensioninstead of manual lifecycleTest plan