From dddd53f16210cea2317df2b86b546d4ffa885dd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:25:51 +0900 Subject: [PATCH 1/7] Bump dropwizard-metrics from 4.2.26 to 4.2.27 (#5411) Bumps `dropwizard-metrics` from 4.2.26 to 4.2.27. Updates `io.dropwizard.metrics:metrics-core` from 4.2.26 to 4.2.27 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.26...v4.2.27) Updates `io.dropwizard.metrics:metrics-graphite` from 4.2.26 to 4.2.27 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.26...v4.2.27) Updates `io.dropwizard.metrics:metrics-jmx` from 4.2.26 to 4.2.27 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.26...v4.2.27) --- updated-dependencies: - dependency-name: io.dropwizard.metrics:metrics-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-graphite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-jmx 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> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e05c19517f..8f68132845 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ caffeine = "2.9.3" cloudwatch2 = "2.18.41" colt = "1.2.0" dagger = "2.11" -dropwizard-metrics = "4.2.26" +dropwizard-metrics = "4.2.27" dropwizard-metrics5 = "5.0.0" dynatrace-utils = "1.5.0" ehcache2 = "2.10.9.2" From e5a5d13ad93af82b27f8340ad773b65a1df90d33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:26:25 +0900 Subject: [PATCH 2/7] Bump spring from 5.3.37 to 5.3.39 (#5417) Bumps `spring` from 5.3.37 to 5.3.39. Updates `org.springframework:spring-context` from 5.3.37 to 5.3.39 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.37...v5.3.39) Updates `org.springframework:spring-core` from 5.3.37 to 5.3.39 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.37...v5.3.39) --- updated-dependencies: - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core 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> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8f68132845..1388ae1781 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -66,7 +66,7 @@ rest-assured = "5.3.2" signalfx = "1.0.44" slf4j = "1.7.36" spectator-atlas = "1.3.10" -spring = "5.3.37" +spring = "5.3.39" spring-javaformat = "0.0.42" testcontainers = "1.19.8" tomcat = "8.5.100" From a6ae355b81edc38f929429c96578812b13058891 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:26:44 +0900 Subject: [PATCH 3/7] Bump io.projectreactor:reactor-bom from 2020.0.46 to 2020.0.47 (#5416) Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2020.0.46 to 2020.0.47. - [Release notes](https://github.com/reactor/reactor/releases) - [Commits](https://github.com/reactor/reactor/compare/2020.0.46...2020.0.47) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-bom 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> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1388ae1781..0b23f76d86 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -61,7 +61,7 @@ newrelic-api = "5.14.0" okhttp = "4.11.0" postgre = "42.3.10" prometheus = "0.15.0" -reactor = "2020.0.46" +reactor = "2020.0.47" rest-assured = "5.3.2" signalfx = "1.0.44" slf4j = "1.7.36" From 43066e02eb5094aca80539376d9d2770d19f7e44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:27:05 +0900 Subject: [PATCH 4/7] Bump io.spring.develocity.conventions from 0.0.19 to 0.0.20 (#5413) Bumps [io.spring.develocity.conventions](https://github.com/spring-io/develocity-conventions) from 0.0.19 to 0.0.20. - [Release notes](https://github.com/spring-io/develocity-conventions/releases) - [Commits](https://github.com/spring-io/develocity-conventions/compare/v0.0.19...v0.0.20) --- updated-dependencies: - dependency-name: io.spring.develocity.conventions 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> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 3db53fe3ba..a5e169f7ca 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { plugins { id 'com.gradle.develocity' version '3.17.6' - id 'io.spring.develocity.conventions' version '0.0.19' + id 'io.spring.develocity.conventions' version '0.0.20' id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' } From 2a69ebdd5eb892e2be2502a6da5124be4e920149 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:27:21 +0900 Subject: [PATCH 5/7] Bump com.signalfx.public:signalfx-java from 1.0.44 to 1.0.45 (#5412) Bumps [com.signalfx.public:signalfx-java](https://github.com/signalfx/signalfx-java) from 1.0.44 to 1.0.45. - [Release notes](https://github.com/signalfx/signalfx-java/releases) - [Commits](https://github.com/signalfx/signalfx-java/compare/v1.0.44...v1.0.45) --- updated-dependencies: - dependency-name: com.signalfx.public:signalfx-java 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> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0b23f76d86..0772423028 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -63,7 +63,7 @@ postgre = "42.3.10" prometheus = "0.15.0" reactor = "2020.0.47" rest-assured = "5.3.2" -signalfx = "1.0.44" +signalfx = "1.0.45" slf4j = "1.7.36" spectator-atlas = "1.3.10" spring = "5.3.39" From bbb2b7d4d8563bd59dbaf40d41d85b33b5e4ae7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:27:40 +0900 Subject: [PATCH 6/7] Bump com.amazonaws:aws-java-sdk-cloudwatch from 1.12.767 to 1.12.770 (#5415) Bumps [com.amazonaws:aws-java-sdk-cloudwatch](https://github.com/aws/aws-sdk-java) from 1.12.767 to 1.12.770. - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.767...1.12.770) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-cloudwatch 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> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0772423028..ec104b1003 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ aspectjweaver = "1.8.14" assertj = "3.24.2" awaitility = "4.2.2" # legacy SDK -aws-cloudwatch = "1.12.767" +aws-cloudwatch = "1.12.770" caffeine = "2.9.3" cloudwatch2 = "2.18.41" colt = "1.2.0" From 936c7168eb377b4aadc81ca6742ee5baa9725471 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:55:04 +0900 Subject: [PATCH 7/7] Bump spring-javaformat from 0.0.42 to 0.0.43 (#5414) * Bump spring-javaformat from 0.0.42 to 0.0.43 Bumps `spring-javaformat` from 0.0.42 to 0.0.43. Updates `io.spring.javaformat:spring-javaformat-checkstyle` from 0.0.42 to 0.0.43 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.42...v0.0.43) Updates `io.spring.javaformat:spring-javaformat-gradle-plugin` from 0.0.42 to 0.0.43 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.42...v0.0.43) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Fix checkstyle violations --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> (cherry picked from commit e2a77964ff727f0bc7c7f88406a1e37d8a5cd9d0) Closes gh-5414 --- gradle/libs.versions.toml | 2 +- .../core/instrument/binder/jetty/JettyClientMetricsTest.java | 2 +- .../java/io/micrometer/core/tck/DefaultLongTaskTimerTest.java | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ec104b1003..f6d5275776 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -67,7 +67,7 @@ signalfx = "1.0.45" slf4j = "1.7.36" spectator-atlas = "1.3.10" spring = "5.3.39" -spring-javaformat = "0.0.42" +spring-javaformat = "0.0.43" testcontainers = "1.19.8" tomcat = "8.5.100" wavefront = "3.0.4" diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jetty/JettyClientMetricsTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jetty/JettyClientMetricsTest.java index 4d0404cd21..51db51e50d 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jetty/JettyClientMetricsTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jetty/JettyClientMetricsTest.java @@ -38,7 +38,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; -public class JettyClientMetricsTest { +class JettyClientMetricsTest { private SimpleMeterRegistry registry = new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock()); diff --git a/micrometer-test/src/main/java/io/micrometer/core/tck/DefaultLongTaskTimerTest.java b/micrometer-test/src/main/java/io/micrometer/core/tck/DefaultLongTaskTimerTest.java index d92e6830ba..15c536320a 100644 --- a/micrometer-test/src/main/java/io/micrometer/core/tck/DefaultLongTaskTimerTest.java +++ b/micrometer-test/src/main/java/io/micrometer/core/tck/DefaultLongTaskTimerTest.java @@ -35,8 +35,12 @@ import static io.micrometer.core.instrument.MockClock.clock; import static org.assertj.core.api.Assertions.assertThat; +// Test class is public and in main code... by mistake? +//CHECKSTYLE:OFF public class DefaultLongTaskTimerTest { + // CHECKSTYLE:ON + @Test @DisplayName("supports sending histograms of active task duration") void histogram() {