From f8e0b8516ea26d2550cb3f9db56008d80311f0fa Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 21 Jan 2020 13:44:17 +0000 Subject: [PATCH 1/6] Bumping versions --- pom.xml | 2 +- spring-cloud-bus-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4dee905..10d4b8e 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 2.2.2.BUILD-SNAPSHOT - Horsham.SR1 + Horsham.BUILD-SNAPSHOT bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 4c139cb..7e7181e 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.1.RELEASE + 2.2.2.BUILD-SNAPSHOT spring-cloud-bus-dependencies From 22ba14a285b99129a05267eb4a34bc812065d129 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 15:48:58 +0000 Subject: [PATCH 2/6] Update SNAPSHOT to 2.2.1.RELEASE --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus-tests/pom.xml | 2 +- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c962f9e..3c8fccc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 10d4b8e..03076a8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE @@ -28,8 +28,8 @@ - 2.2.2.BUILD-SNAPSHOT - Horsham.BUILD-SNAPSHOT + 2.2.2.RELEASE + Horsham.SR3 bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 7e7181e..89b0709 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE spring-cloud-bus-dependencies - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus-tests/pom.xml b/spring-cloud-bus-tests/pom.xml index 91af377..f9b111d 100644 --- a/spring-cloud-bus-tests/pom.xml +++ b/spring-cloud-bus-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 46bffa7..ab46dc2 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 66c293f..6f14411 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 6bec9b7..efbd288 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. spring-cloud-starter-bus-kafka From d0aaf8ca43ab491eca260d78dda5f654a7f2dccf Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 15:50:34 +0000 Subject: [PATCH 3/6] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus-tests/pom.xml | 2 +- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3c8fccc..c962f9e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 03076a8..10d4b8e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.2.3.RELEASE + 2.2.2.BUILD-SNAPSHOT @@ -28,8 +28,8 @@ - 2.2.2.RELEASE - Horsham.SR3 + 2.2.2.BUILD-SNAPSHOT + Horsham.BUILD-SNAPSHOT bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 89b0709..7e7181e 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.3.RELEASE + 2.2.2.BUILD-SNAPSHOT spring-cloud-bus-dependencies - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus-tests/pom.xml b/spring-cloud-bus-tests/pom.xml index f9b111d..91af377 100644 --- a/spring-cloud-bus-tests/pom.xml +++ b/spring-cloud-bus-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index ab46dc2..46bffa7 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 6f14411..66c293f 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index efbd288..6bec9b7 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. spring-cloud-starter-bus-kafka From bd08a6b7bdac553ef85220dd62f625a16fd2ee8c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 15:50:34 +0000 Subject: [PATCH 4/6] Bumping versions to 2.2.2.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus-tests/pom.xml | 2 +- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c962f9e..ba2b36c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 10d4b8e..cc8a65e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT pom spring-cloud-bus-parent @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE @@ -28,8 +28,8 @@ - 2.2.2.BUILD-SNAPSHOT - Horsham.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + Horsham.SR3 bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index 7e7181e..0f3d1aa 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.2.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT spring-cloud-bus-dependencies - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus-tests/pom.xml b/spring-cloud-bus-tests/pom.xml index 91af377..15ad465 100644 --- a/spring-cloud-bus-tests/pom.xml +++ b/spring-cloud-bus-tests/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 46bffa7..2b3aa76 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 66c293f..646bd0f 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 6bec9b7..869e956 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-bus-kafka From aff31fed9af0fab517f96bc870a3f2cb76926efe Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 6 Mar 2020 12:48:17 -0500 Subject: [PATCH 5/6] Updates docs branches --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index ba2b36c..7718f6c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -16,7 +16,7 @@ spring-cloud-bus ${basedir}/.. - 1.1.x,1.2.x,1.3.x,2.1.x + 2.1.x,2.2.x spring.cloud.bus.* From d5985ac16d86226a93e5bc8482ed9871e6b48a6d Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 10 Mar 2020 16:18:17 -0400 Subject: [PATCH 6/6] Adds minimal logging for bus events. fixes gh-217 --- .../cloud/bus/BusAutoConfiguration.java | 13 +++++++++++++ ...EnvironmentChangeRemoteApplicationEvent.java | 11 +++++++++++ .../cloud/bus/event/RemoteApplicationEvent.java | 9 +++++++++ .../event/UnknownRemoteApplicationEvent.java | 17 ++++++++++++++++- 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java index d8e5e88..14d3030 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java @@ -18,6 +18,9 @@ package org.springframework.cloud.bus; import javax.annotation.PostConstruct; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; @@ -69,6 +72,8 @@ import org.springframework.util.PathMatcher; // so actuator endpoints have needed dependencies public class BusAutoConfiguration implements ApplicationEventPublisherAware { + private static final Log log = LogFactory.getLog(BusAutoConfiguration.class); + /** * Name of the Bus path matcher. */ @@ -140,6 +145,9 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware { public void acceptLocal(RemoteApplicationEvent event) { if (this.serviceMatcher.isFromSelf(event) && !(event instanceof AckRemoteApplicationEvent)) { + if (log.isDebugEnabled()) { + log.debug("Sending remote event on bus: " + event); + } this.cloudBusOutboundChannel.send(MessageBuilder.withPayload(event).build()); } } @@ -154,6 +162,11 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware { // If it's an ACK we are finished processing at this point return; } + + if (log.isDebugEnabled()) { + log.debug("Received remote event from bus: " + event); + } + if (this.serviceMatcher.isForSelf(event) && this.applicationEventPublisher != null) { if (!this.serviceMatcher.isFromSelf(event)) { diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java index 9548510..d80ebda 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java @@ -18,6 +18,8 @@ package org.springframework.cloud.bus.event; import java.util.Map; +import org.springframework.core.style.ToStringCreator; + /** * @author Spencer Gibb */ @@ -73,4 +75,13 @@ public class EnvironmentChangeRemoteApplicationEvent extends RemoteApplicationEv return true; } + @Override + public String toString() { + return new ToStringCreator(this).append("id", getId()) + .append("originService", getOriginService()) + .append("destinationService", getDestinationService()) + .append("values", values).toString(); + + } + } diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java index e768d99..8fe5cce 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.springframework.context.ApplicationEvent; +import org.springframework.core.style.ToStringCreator; import org.springframework.util.StringUtils; /** @@ -134,4 +135,12 @@ public abstract class RemoteApplicationEvent extends ApplicationEvent { return true; } + @Override + public String toString() { + return new ToStringCreator(this).append("id", id) + .append("originService", originService) + .append("destinationService", destinationService).toString(); + + } + } diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/UnknownRemoteApplicationEvent.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/UnknownRemoteApplicationEvent.java index 5c859dc..c1fbbbf 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/UnknownRemoteApplicationEvent.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/UnknownRemoteApplicationEvent.java @@ -16,6 +16,8 @@ package org.springframework.cloud.bus.event; +import org.springframework.core.style.ToStringCreator; + /** * @author Stefan Pfeiffer */ @@ -49,7 +51,20 @@ public class UnknownRemoteApplicationEvent extends RemoteApplicationEvent { } public String getPayloadAsString() { - return new String(this.payload); + if (this.payload != null) { + return new String(this.payload); + } + return null; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("id", getId()) + .append("originService", getOriginService()) + .append("destinationService", getDestinationService()) + .append("typeInfo", typeInfo).append("payload", getPayloadAsString()) + .toString(); + } }