Add support for RabbitMQ AMQP 1.0 by eddumelendez · Pull Request #46608 · spring-projects/spring-boot

eddumelendez · 2025-07-31T00:58:12Z

Add support for RabbitMQ AMQP 1.0
Add smoke test for RabbitMQ AMQP 1.0

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

module/spring-boot-amqp/build.gradle

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java

smoke-test/spring-boot-smoke-test-rabbit-amqp/src/main/java/smoketest/amqp/Sender.java

artembilan · 2025-08-04T14:46:13Z

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java

+ * @author Eddú Meléndez
+ * @since 4.0.0
+ */
+@AutoConfiguration


I think need to make before = RabbitAutoConfiguration.class and make that one conditional on something missing from this RabbitAmqpAutoConfiguration.
This is an addition to my previous point: the AMQP 1.0 is by default.
If we don't make them conditional on each other, then both protocols are going to be enabled and connected.
Especially, I worry about RabbitAmqpAdmin and RabbitAdmin which are going to handle topology in parallel but in different connections.
I don't think that we need to give a choice to be able to have both protocols in one Spring Boot application.

artembilan · 2025-08-04T20:32:03Z

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java

+
+	private final RabbitProperties properties;
+
+	RabbitAmqpAutoConfiguration(RabbitProperties properties) {


I think we need to look into a separate RabbitAmqpProperties abstraction.
Even if some duplication is possible, a bunch of existing properties are not going to be used for AMQP 1.0 at all.
And might cause confusion.

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan · 2025-08-07T16:38:45Z

...-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java

 @AutoConfiguration
 @ConditionalOnClass({ RabbitTemplate.class, Channel.class })
+@ConditionalOnMissingClass({ "com.rabbitmq.client.amqp.Connection",
+		"org.springframework.amqp.rabbitmq.client.RabbitAmqpTemplate" })


I don't think this is correct.
We may still have those classes on classpath, but opt-in to use AMQP 0.9.1.
For example, via auto-configuration exclusion for that our new RabbitAmqpAutoConfiguration.
Why not conditional on bean?

Switched to conditional on missing bean

.../src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java

...org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java

starter/spring-boot-starter-rabbitmq/build.gradle

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan

LGTM.

Might be some docs also required, but so far this is great.

Thank you!

snicoll · 2025-11-19T10:16:48Z

@artembilan and I brainstormed a bit and things should be in a different state than what's been discussed thus far:

It feels that AMQP 0.9 and AMQP 1.0 support should live in separate modules. The reason for the separate module is that it should be possible to connect to RabbitMQ with both protocols. Having to add an explicit module is a strong enough signal to do so (vs. the situation in this PR).
AMQP 0.9 is due for deprecation at some point so it'd be easier to handle that if the code is in a separate module.
At this time, Spring AMQP has only support for RabbitMQ with AMQP 1.0. spring-boot-rabbitmq could be a potential name for the new API. Spring AMQP will add support for "generic" AMQP support with 1.0 though.

Things are a bit blurry at this point given that we can merge this in SB 4.1 at the earliest. By then, Spring AMQP may have support for other brokers so that suggested name above wouldn't work.

I've flagged this for team meeting to see what the team thinks. If we want to go with two separate modules, then we might rename the current one spring-amqp-classic and have the existing spring-boot-amqp module with the 1.0 support. We've used the classic term quite a bit in the past but I am not sure if that matches the community usage of AMQP 0.9.

snicoll · 2025-12-12T13:52:34Z

@eddumelendez this is what the conclusion we came to in preparation for the next version of Spring AMQP:

Code from spring-boot-amqp(+ starters, etc) move as is to spring-boot-rabbitmq.
The existing spring-boot-amqp module can now be used to host the AMQP 1.0 implementation.

Auto-configuration of both a 0.9 client and a 1.0 client is possible if you add the two modules on the classpath (contrary to what's been discussed during the review).

Do you want to explore this option and amend your PR? If not, no worries and please let me know either way.

eddumelendez · 2025-12-12T14:08:16Z

Thanks for sharing, @snicoll! I'll work on this changes

snicoll · 2026-01-30T16:04:09Z

Heya @eddumelendez, any update for us? If you're still working on it, no worries. I just want to avoid adding a change like that in the RC.

eddumelendez · 2026-01-30T16:44:49Z

Hi @snicoll, yes, still working on it. Should have an update next week.

eddumelendez added 2 commits July 30, 2025 18:59

Add support for Rabbitmq AMQP 1.0

91b9044

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

Add smoke test for RabbitMQ AMQP 1.0

02ba888

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

eddumelendez force-pushed the rabbitmq-amqp branch from 77d69d9 to 02ba888 Compare July 31, 2025 00:59

eddumelendez changed the title ~~rabbitmq amqp~~ Add support for Rabbitmq AMQP 1.0 Jul 31, 2025

spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Jul 31, 2025

Fix checks

93d232d

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

eddumelendez changed the title ~~Add support for Rabbitmq AMQP 1.0~~ Add support for RabbitMQ AMQP 1.0 Jul 31, 2025

eddumelendez mentioned this pull request Jul 31, 2025

rabbitmq-amqp-java-client amqp 1.0 support spring-projects/spring-amqp#2919

Closed

artembilan suggested changes Aug 4, 2025

View reviewed changes

Fix comments

6572c36

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

eddumelendez force-pushed the rabbitmq-amqp branch from 4c79b2e to 6572c36 Compare August 5, 2025 03:55

Fix format

a3913a1

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan suggested changes Aug 6, 2025

View reviewed changes

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java Show resolved Hide resolved

eddumelendez added 4 commits August 6, 2025 15:47

Autoconfigure only AMQP 1.0 or 0.9

f983ae2

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

Add new starter for rabbitmq 0.9

db45892

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

Use new starter

b6ec014

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

Update smoke test rabbit amqp

58692fb

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan suggested changes Aug 7, 2025

View reviewed changes

Fix starter's description

2644bc2

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

eddumelendez force-pushed the rabbitmq-amqp branch 2 times, most recently from 05bec25 to 2be167a Compare August 12, 2025 18:21

Switch to ConditionalOnMissingBean

b3b1d45

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

eddumelendez force-pushed the rabbitmq-amqp branch from 2be167a to b3b1d45 Compare August 12, 2025 18:24

Fix checkstyle

b97cd48

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan approved these changes Aug 12, 2025

View reviewed changes

bclozel added the for: team-meeting An issue we'd like to discuss as a team to make progress label Oct 9, 2025

philwebb added type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged for: team-meeting An issue we'd like to discuss as a team to make progress labels Oct 16, 2025

philwebb added this to the 4.x milestone Oct 16, 2025

snicoll self-assigned this Nov 17, 2025

snicoll added the for: team-attention An issue we'd like other members of the team to review label Nov 19, 2025

snicoll removed the for: team-attention An issue we'd like other members of the team to review label Dec 26, 2025

snicoll removed their assignment Jan 6, 2026

snicoll self-assigned this Jan 30, 2026


		private final RabbitProperties properties;

		RabbitAmqpAutoConfiguration(RabbitProperties properties) {

Conversation

eddumelendez commented Jul 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

artembilan Aug 4, 2025

Choose a reason for hiding this comment

Uh oh!

artembilan Aug 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

artembilan Aug 7, 2025

Choose a reason for hiding this comment

Uh oh!

eddumelendez Aug 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

artembilan left a comment

Choose a reason for hiding this comment

Uh oh!

snicoll commented Nov 19, 2025

Uh oh!

snicoll commented Dec 12, 2025

Uh oh!

eddumelendez commented Dec 12, 2025

Uh oh!

snicoll commented Jan 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eddumelendez commented Jan 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

eddumelendez commented Jul 31, 2025 •

edited

Loading

snicoll commented Jan 30, 2026 •

edited

Loading