From fb7abbdead1e80bfe87d84d19595b48a7fb474e0 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 4 Oct 2024 17:27:30 +0200 Subject: [PATCH 01/19] Fix test setup. --- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 12 +++++++++++- .../cloud/netflix/eureka/EurekaClientSuite.java | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 2f0b2e924..670c6d49a 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -92,7 +92,17 @@ spring-boot-starter-test test - + + org.junit.platform + junit-platform-suite-api + test + + + org.junit.platform + junit-platform-suite-engine + test + + org.junit.vintage junit-vintage-engine diff --git a/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientSuite.java b/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientSuite.java index a6c054b63..3f9eca14b 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientSuite.java +++ b/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientSuite.java @@ -16,8 +16,8 @@ package org.springframework.cloud.netflix.eureka; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * We need to use a suite cause we need to first run all the Eureka Servers, then close @@ -26,8 +26,8 @@ import org.junit.runners.Suite; * That means that when the new context starts we will fail cause the executor service is * already shutdown. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ EurekaClientTests.class, RestTemplateEurekaClientTests.class }) +@SelectClasses({ EurekaClientTests.class, RestTemplateEurekaClientTests.class }) +@Suite public class EurekaClientSuite { } From 3c093dcc0466761e342612869c1fc22a32396d50 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 25 Nov 2024 12:47:34 +0100 Subject: [PATCH 02/19] Change timeouts in flaky tests. --- .../cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java | 2 +- .../EurekaInstanceMonitorWithCustomTagsProviderTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java index a5740752e..eec1cca7e 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java @@ -158,7 +158,7 @@ class EurekaInstanceMonitorTests { } private void assertEurekaInstance(Map meterRegistryCounts) { - await().atMost(5, SECONDS) + await().atMost(10, SECONDS) .pollInterval(fibonacci()) .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java index c7ea689dc..3feabec88 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java @@ -89,7 +89,7 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { } private void assertEurekaInstance(Map meterRegistryCounts) { - await().atMost(5, SECONDS) + await().atMost(10, SECONDS) .pollInterval(fibonacci()) .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) From c25dc8fd7710573fb846d3cdcdedb867c3693eb2 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 25 Nov 2024 13:38:21 +0100 Subject: [PATCH 03/19] Temporarily disable test. --- .../netflix/eureka/server/EurekaInstanceMonitorTests.java | 2 +- .../EurekaInstanceMonitorWithCustomTagsProviderTests.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java index eec1cca7e..a5740752e 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java @@ -158,7 +158,7 @@ class EurekaInstanceMonitorTests { } private void assertEurekaInstance(Map meterRegistryCounts) { - await().atMost(10, SECONDS) + await().atMost(5, SECONDS) .pollInterval(fibonacci()) .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java index 3feabec88..6ea8d9609 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java @@ -21,7 +21,9 @@ import java.util.Map; import com.netflix.appinfo.InstanceInfo; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; +import io.micrometer.core.instrument.search.MeterNotFoundException; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -76,6 +78,7 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { } @Test + @Disabled void testMultipleRegistrations() { instanceRegistry.register(firstInstanceInfo, false); instanceRegistry.register(secondInstanceInfo, false); @@ -89,8 +92,9 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { } private void assertEurekaInstance(Map meterRegistryCounts) { - await().atMost(10, SECONDS) + await().atMost(5, SECONDS) .pollInterval(fibonacci()) + .ignoreException(MeterNotFoundException.class) .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) .isEqualTo(count))); From 6f35b0e9f5418c1a22c68012cd82187849f816b0 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 25 Nov 2024 14:41:10 +0100 Subject: [PATCH 04/19] Aggregate instance info with Executor. Fixes gh-4374. --- .../server/metrics/EurekaInstanceMonitor.java | 18 +++++++++++------ ...nceMonitorWithCustomTagsProviderTests.java | 20 ++++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java index 5442ec232..2b35b8d33 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java @@ -71,12 +71,18 @@ public class EurekaInstanceMonitor implements SmartApplicationListener { @Override public void onApplicationEvent(ApplicationEvent event) { - final Map aggregatedCounts = instanceRegistry.getApplications() - .getRegisteredApplications() - .stream() - .flatMap(application -> application.getInstances().stream()) - .collect(Collectors.groupingBy(tagProvider::eurekaInstanceTags, Collectors.counting())); - executor.execute(() -> registerMetrics(aggregatedCounts)); + executor.execute(() -> { + Map aggregatedCounts = collectAggregatedCounts(); + registerMetrics(aggregatedCounts); + }); + } + + private Map collectAggregatedCounts() { + return instanceRegistry.getApplications() + .getRegisteredApplications() + .stream() + .flatMap(application -> application.getInstances().stream()) + .collect(Collectors.groupingBy(tagProvider::eurekaInstanceTags, Collectors.counting())); } private void registerMetrics(Map aggregatedCounts) { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java index 6ea8d9609..f5baf519e 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java @@ -21,9 +21,7 @@ import java.util.Map; import com.netflix.appinfo.InstanceInfo; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; -import io.micrometer.core.instrument.search.MeterNotFoundException; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +36,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.awaitility.pollinterval.FibonacciPollInterval.fibonacci; +import static org.junit.jupiter.api.Assertions.assertAll; import static org.springframework.cloud.netflix.eureka.server.EurekaInstanceFixture.getInstanceInfo; import static org.springframework.cloud.netflix.eureka.server.EurekaInstanceFixture.getLeaseInfo; @@ -49,7 +48,8 @@ import static org.springframework.cloud.netflix.eureka.server.EurekaInstanceFixt */ @SpringBootTest(classes = EurekaInstanceMonitorWithCustomTagsProviderTests.Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - value = { "spring.application.name=eureka", "eureka.server.metrics.enabled=true" }) + value = {"spring.application.name=eureka", "eureka.server.metrics.enabled=true", + "eureka.client.register-with-eureka=false", "eureka.client.fetch-registry=false"}) class EurekaInstanceMonitorWithCustomTagsProviderTests { private static final String APP_NAME = "FOO-APP-NAME"; @@ -78,7 +78,7 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { } @Test - @Disabled +// @Disabled void testMultipleRegistrations() { instanceRegistry.register(firstInstanceInfo, false); instanceRegistry.register(secondInstanceInfo, false); @@ -93,11 +93,13 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { private void assertEurekaInstance(Map meterRegistryCounts) { await().atMost(5, SECONDS) - .pollInterval(fibonacci()) - .ignoreException(MeterNotFoundException.class) - .untilAsserted(() -> meterRegistryCounts.forEach((tags, - count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) - .isEqualTo(count))); + .pollInterval(fibonacci()) + .untilAsserted(() -> meterRegistryCounts.forEach((tags, + count) -> assertAll(() -> assertThat((long) meterRegistry.get("eureka.server.instances") + .tags(tags).gauge().value()).isNotNull(), + () -> assertThat((long) meterRegistry.get("eureka.server.instances") + .tags(tags).gauge().value()) + .isEqualTo(count)))); } @Configuration(proxyBeanMethods = false) From a96375bd12fb3dbbee5e27c394ee928f5628f2cd Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 25 Nov 2024 14:46:25 +0100 Subject: [PATCH 05/19] Remove comment. --- .../server/EurekaInstanceMonitorWithCustomTagsProviderTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java index f5baf519e..5bd3c65d3 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java @@ -78,7 +78,6 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { } @Test -// @Disabled void testMultipleRegistrations() { instanceRegistry.register(firstInstanceInfo, false); instanceRegistry.register(secondInstanceInfo, false); From b9740eb452cce72ab8b9117cf835c5c4b297af1e Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 25 Nov 2024 16:19:32 +0100 Subject: [PATCH 06/19] Fix test. --- ...stanceMonitorWithCustomTagsProviderTests.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java index 5bd3c65d3..b85cb7993 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java @@ -21,6 +21,7 @@ import java.util.Map; import com.netflix.appinfo.InstanceInfo; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; +import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -33,10 +34,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.awaitility.Awaitility.await; import static org.awaitility.pollinterval.FibonacciPollInterval.fibonacci; -import static org.junit.jupiter.api.Assertions.assertAll; import static org.springframework.cloud.netflix.eureka.server.EurekaInstanceFixture.getInstanceInfo; import static org.springframework.cloud.netflix.eureka.server.EurekaInstanceFixture.getLeaseInfo; @@ -94,11 +94,15 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { await().atMost(5, SECONDS) .pollInterval(fibonacci()) .untilAsserted(() -> meterRegistryCounts.forEach((tags, - count) -> assertAll(() -> assertThat((long) meterRegistry.get("eureka.server.instances") - .tags(tags).gauge().value()).isNotNull(), - () -> assertThat((long) meterRegistry.get("eureka.server.instances") + count) -> { + SoftAssertions softAssertions = new SoftAssertions(); + softAssertions.assertThat((long) meterRegistry.get("eureka.server.instances") + .tags(tags).gauge().value()).isNotNull(); + softAssertions.assertThat((long) meterRegistry.get("eureka.server.instances") .tags(tags).gauge().value()) - .isEqualTo(count)))); + .isEqualTo(count); + softAssertions.assertAll(); + })); } @Configuration(proxyBeanMethods = false) From 96c7ec7072e9f368ce5c67d49643eac89134ddf4 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 25 Nov 2024 16:59:21 +0100 Subject: [PATCH 07/19] Increase timeout. --- .../cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java index a5740752e..eec1cca7e 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java @@ -158,7 +158,7 @@ class EurekaInstanceMonitorTests { } private void assertEurekaInstance(Map meterRegistryCounts) { - await().atMost(5, SECONDS) + await().atMost(10, SECONDS) .pollInterval(fibonacci()) .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) From 4236eb2af327bb547b2b2801499261bd6428e5c0 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 25 Nov 2024 16:10:35 +0000 Subject: [PATCH 08/19] Bumping versions --- .../server/metrics/EurekaInstanceMonitor.java | 8 +++--- ...nceMonitorWithCustomTagsProviderTests.java | 26 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java index 2b35b8d33..50d2ff98f 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java @@ -79,10 +79,10 @@ public class EurekaInstanceMonitor implements SmartApplicationListener { private Map collectAggregatedCounts() { return instanceRegistry.getApplications() - .getRegisteredApplications() - .stream() - .flatMap(application -> application.getInstances().stream()) - .collect(Collectors.groupingBy(tagProvider::eurekaInstanceTags, Collectors.counting())); + .getRegisteredApplications() + .stream() + .flatMap(application -> application.getInstances().stream()) + .collect(Collectors.groupingBy(tagProvider::eurekaInstanceTags, Collectors.counting())); } private void registerMetrics(Map aggregatedCounts) { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java index b85cb7993..d86e7a271 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java @@ -48,8 +48,8 @@ import static org.springframework.cloud.netflix.eureka.server.EurekaInstanceFixt */ @SpringBootTest(classes = EurekaInstanceMonitorWithCustomTagsProviderTests.Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - value = {"spring.application.name=eureka", "eureka.server.metrics.enabled=true", - "eureka.client.register-with-eureka=false", "eureka.client.fetch-registry=false"}) + value = { "spring.application.name=eureka", "eureka.server.metrics.enabled=true", + "eureka.client.register-with-eureka=false", "eureka.client.fetch-registry=false" }) class EurekaInstanceMonitorWithCustomTagsProviderTests { private static final String APP_NAME = "FOO-APP-NAME"; @@ -92,17 +92,17 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { private void assertEurekaInstance(Map meterRegistryCounts) { await().atMost(5, SECONDS) - .pollInterval(fibonacci()) - .untilAsserted(() -> meterRegistryCounts.forEach((tags, - count) -> { - SoftAssertions softAssertions = new SoftAssertions(); - softAssertions.assertThat((long) meterRegistry.get("eureka.server.instances") - .tags(tags).gauge().value()).isNotNull(); - softAssertions.assertThat((long) meterRegistry.get("eureka.server.instances") - .tags(tags).gauge().value()) - .isEqualTo(count); - softAssertions.assertAll(); - })); + .pollInterval(fibonacci()) + .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> { + SoftAssertions softAssertions = new SoftAssertions(); + softAssertions + .assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) + .isNotNull(); + softAssertions + .assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) + .isEqualTo(count); + softAssertions.assertAll(); + })); } @Configuration(proxyBeanMethods = false) From 1dd38faa4a7e4a7082a3508bd136dd7b8410808d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 26 Nov 2024 17:07:48 +0100 Subject: [PATCH 09/19] Update pom.xml --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 654cd8145..2b2fa4b51 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,6 +21,7 @@ none + src/main/asciidoc From 6f38cfe510bf9903a34ea136f421c8f1debbb508 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:41:50 +0000 Subject: [PATCH 10/19] Update SNAPSHOT to 4.1.4 --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2b2fa4b51..7f2c78ae4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.4 .. jar diff --git a/pom.xml b/pom.xml index bc19d8bed..e3a664369 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.4 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.4 @@ -21,8 +21,8 @@ netflix - 4.1.5-SNAPSHOT - 4.1.4-SNAPSHOT + 4.1.5 + 4.1.4 1.20.4 5.15.0 diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 11c13f9bc..7b9ae0406 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-netflix-dependencies - 4.1.4-SNAPSHOT + 4.1.4 pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 670c6d49a..88fe2047a 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.4 .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index d4a2b1275..65f37454a 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.4 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 5da81a111..e0782e5aa 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.4 .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index c20719aea..77ecf573c 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index fc04c3601..b3d0beae9 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.4 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 9cf585c11912c42573450e04a429458f846a1fdc Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:42:33 +0000 Subject: [PATCH 11/19] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7f2c78ae4..2b2fa4b51 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.4-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index e3a664369..bc19d8bed 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 4.1.4 + 4.1.4-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.4-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 4.1.5 - 4.1.4 + 4.1.5-SNAPSHOT + 4.1.4-SNAPSHOT 1.20.4 5.15.0 diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 7b9ae0406..11c13f9bc 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-netflix-dependencies - 4.1.4 + 4.1.4-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 88fe2047a..670c6d49a 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.4-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index 65f37454a..d4a2b1275 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.4-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index e0782e5aa..5da81a111 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.4-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 77ecf573c..c20719aea 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index b3d0beae9..fc04c3601 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.4-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From d005cab913a254c95cf2dace409dffd5aab35c8f Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:42:34 +0000 Subject: [PATCH 12/19] Bumping versions to 4.1.5-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-netflix-dependencies/pom.xml | 2 +- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2b2fa4b51..2ea2bf75c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index bc19d8bed..0753cefb8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 11c13f9bc..ab79afe86 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-netflix-dependencies - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 670c6d49a..380651557 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index d4a2b1275..d6623137f 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 5da81a111..18c250d38 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index c20719aea..65f7ee8f8 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index fc04c3601..7ca9272cf 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From fe44b40dc452ccad57552b9bb2638c0e8312e140 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 26 Nov 2024 16:43:23 +0000 Subject: [PATCH 13/19] Bumping dependency versions after release --- pom.xml | 6 +++--- spring-cloud-netflix-dependencies/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0753cefb8..3237c49bf 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 4.1.5-SNAPSHOT - 4.1.4-SNAPSHOT + 4.1.6-SNAPSHOT + 4.1.5-SNAPSHOT 1.20.4 5.15.0 diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index ab79afe86..352a50be3 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT spring-cloud-netflix-dependencies From 6267dfc5778c3fab4e282f1df8d8de0333d64dc2 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 27 Nov 2024 01:44:00 +0000 Subject: [PATCH 14/19] Update SNAPSHOT to 4.1.4 --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2ea2bf75c..7f2c78ae4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.5-SNAPSHOT + 4.1.4 .. jar diff --git a/pom.xml b/pom.xml index 3237c49bf..e3a664369 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 4.1.5-SNAPSHOT + 4.1.4 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.4 @@ -21,8 +21,8 @@ netflix - 4.1.6-SNAPSHOT - 4.1.5-SNAPSHOT + 4.1.5 + 4.1.4 1.20.4 5.15.0 diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 352a50be3..7b9ae0406 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.5-SNAPSHOT + 4.1.4 spring-cloud-netflix-dependencies - 4.1.5-SNAPSHOT + 4.1.4 pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 380651557..88fe2047a 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.5-SNAPSHOT + 4.1.4 .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index d6623137f..65f37454a 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.5-SNAPSHOT + 4.1.4 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 18c250d38..e0782e5aa 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.5-SNAPSHOT + 4.1.4 .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 65f7ee8f8..77ecf573c 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.5-SNAPSHOT + 4.1.4 spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 7ca9272cf..b3d0beae9 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.5-SNAPSHOT + 4.1.4 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 950553d9a108052f65c49c4c929484850725d90c Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 27 Nov 2024 01:44:48 +0000 Subject: [PATCH 15/19] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7f2c78ae4..2ea2bf75c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.5-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index e3a664369..3237c49bf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 4.1.4 + 4.1.5-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 4.1.4 + 4.1.5-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 4.1.5 - 4.1.4 + 4.1.6-SNAPSHOT + 4.1.5-SNAPSHOT 1.20.4 5.15.0 diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 7b9ae0406..352a50be3 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.4 + 4.1.5-SNAPSHOT spring-cloud-netflix-dependencies - 4.1.4 + 4.1.5-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 88fe2047a..380651557 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.5-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index 65f37454a..d6623137f 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.5-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index e0782e5aa..18c250d38 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.5-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 77ecf573c..65f7ee8f8 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.5-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index b3d0beae9..7ca9272cf 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 4.1.4 + 4.1.5-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From e4ab5faafddcb387af049d50812ebe52dd5b0bf3 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Nov 2024 18:01:22 +0100 Subject: [PATCH 16/19] Revert "Update pom.xml" This reverts commit 1dd38faa4a7e4a7082a3508bd136dd7b8410808d. --- docs/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2ea2bf75c..d77b49223 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,6 @@ none - src/main/asciidoc From 00fa8e0f5289a00ffeb1adfb5cce2510d08127a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:23:20 +0100 Subject: [PATCH 17/19] Bump antora from 3.2.0-alpha.6 to 3.2.0-alpha.8 in /docs (#4388) Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.6 to 3.2.0-alpha.8. - [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc) - [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.6...v3.2.0-alpha.8) --- updated-dependencies: - dependency-name: antora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 2054ec1c5..bbb4d80dc 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-alpha.6", + "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.0-beta.5", "@asciidoctor/tabs": "1.0.0-beta.6", From 76e6104b4be1025b48a6b985dad5ec50e77240c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 14:04:31 +0100 Subject: [PATCH 18/19] Bump @antora/collector-extension from 1.0.0-beta.5 to 1.0.1 in /docs (#4385) --- updated-dependencies: - dependency-name: "@antora/collector-extension" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index bbb4d80dc..567c1f3a6 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.8", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-beta.5", + "@antora/collector-extension": "1.0.1", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From 883ec871abcceeb0036956b7f0b776b2356027f1 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 11 Dec 2024 14:19:27 +0100 Subject: [PATCH 19/19] Adjust awaitility config. --- .../netflix/eureka/server/EurekaInstanceMonitorTests.java | 4 +++- .../EurekaInstanceMonitorWithCustomTagsProviderTests.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java index eec1cca7e..7d63a2e25 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java @@ -31,6 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.netflix.eureka.server.metrics.EurekaInstanceMonitor; import org.springframework.context.annotation.Configuration; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -158,7 +159,8 @@ class EurekaInstanceMonitorTests { } private void assertEurekaInstance(Map meterRegistryCounts) { - await().atMost(10, SECONDS) + await().pollDelay(5, MILLISECONDS) + .atMost(10, SECONDS) .pollInterval(fibonacci()) .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> assertThat((long) meterRegistry.get("eureka.server.instances").tags(tags).gauge().value()) diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java index d86e7a271..fac5c604c 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java @@ -33,6 +33,7 @@ import org.springframework.cloud.netflix.eureka.server.metrics.EurekaInstanceTag import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.awaitility.Awaitility.await; @@ -91,7 +92,8 @@ class EurekaInstanceMonitorWithCustomTagsProviderTests { } private void assertEurekaInstance(Map meterRegistryCounts) { - await().atMost(5, SECONDS) + await().pollDelay(5, MILLISECONDS) + .atMost(5, SECONDS) .pollInterval(fibonacci()) .untilAsserted(() -> meterRegistryCounts.forEach((tags, count) -> { SoftAssertions softAssertions = new SoftAssertions();