Merge branch '1.9.x' into 1.10.x

Author: shakuzen

implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/types/DynatraceSummarySnapshotSupport.java

@@ -26,11 +26,12 @@
 public interface DynatraceSummarySnapshotSupport {
 
     /**
-     * @deprecated This method might lead to problems with a race condition if values are
-     * added to the summary after reading the number of values already recorded. Take a
-     * snapshot and use {@link DynatraceSummarySnapshot#getCount()} instead.
+     * @deprecated since 1.9.8. This method might lead to problems with a race condition
+     * if values are added to the summary after reading the number of values already
+     * recorded. Take a snapshot and use {@link DynatraceSummarySnapshot#getCount()}
+     * instead.
      */
-    @Deprecated()
+    @Deprecated
     boolean hasValues();
 
     DynatraceSummarySnapshot takeSummarySnapshot();

implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/types/DynatraceDistributionSummaryTest.java

@@ -72,7 +72,7 @@ void testDynatraceDistributionSummary_NegativeValuesAreIgnored() {
         ds.record(-1.23);
         ds.record(-100.3);
 
-        assertMinMaxSumCount(ds, 0., 0., 0., 0);
+        assertMinMaxSumCount(ds, 0.0, 0.0, 0.0, 0);
     }
 
     @Test
@@ -81,7 +81,7 @@ void testDynatraceDistributionSummary_NaNValuesAreIgnored() {
 
         ds.record(Double.NaN);
 
-        assertMinMaxSumCount(ds, 0., 0., 0., 0);
+        assertMinMaxSumCount(ds, 0.0, 0.0, 0.0, 0);
     }
 
     @Test

implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/types/DynatraceTimerTest.java

@@ -62,7 +62,6 @@ void testTimerCount() {
 
         timer.takeSummarySnapshotAndReset(BASE_TIME_UNIT);
         assertThat(timer.count()).isZero();
-
     }
 
     @Test
@@ -140,7 +139,7 @@ void testConvertIfNecessary() {
         TimeUnit unit = TimeUnit.MILLISECONDS;
         DynatraceTimer timer = new DynatraceTimer(ID, CLOCK, DISTRIBUTION_STATISTIC_CONFIG, PAUSE_DETECTOR, unit);
 
-        DynatraceSummarySnapshot snapshot = new DynatraceSummarySnapshot(1000., 2000., 3000., 2);
+        DynatraceSummarySnapshot snapshot = new DynatraceSummarySnapshot(1000.0, 2000.0, 3000.0, 2);
         DynatraceSummarySnapshot unconverted = timer.convertIfNecessary(snapshot, unit);
         assertThat(unconverted).isEqualTo(snapshot);
 

implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/v1/DynatraceExporterV1Test.java

@@ -495,11 +495,11 @@ void trySendHttpRequestThrows() throws Throwable {
         verify(reqBuilder).send();
         // assert that an error is logged that does not contain the token.
         assertThat(LOGGER.getLogEvents()).hasSize(1).extracting(LogEvent::getMessage)
-                .containsExactlyInAnyOrder("failed to send metrics to Dynatrace").noneMatch(x -> x.contains(apiToken));
+                .containsExactly("failed to send metrics to Dynatrace").noneMatch(x -> x.contains(apiToken));
     }
 
     private DynatraceExporterV1 getDynatraceExporterV1(HttpSender httpClient, String url, String apiToken) {
-        DynatraceExporterV1 exporter = FACTORY.injectLogger(() -> new DynatraceExporterV1(new DynatraceConfig() {
+        return FACTORY.injectLogger(() -> new DynatraceExporterV1(new DynatraceConfig() {
             @Override
             public String get(String key) {
                 return null;
@@ -515,7 +515,6 @@ public String uri() {
                 return url;
             }
         }, clock, httpClient));
-        return exporter;
     }
 
     private DynatraceExporterV1 createExporter(HttpSender httpClient) {

micrometer-core/build.gradle

@@ -150,8 +150,6 @@ dependencies {
         exclude group: "org.slf4j", module: "jcl-over-slf4j"
     }
     testImplementation("org.apache.maven.resolver:maven-resolver-connector-basic:latest.release")
-    testImplementation("org.springframework:spring-core")
-
     // gRPC
     testImplementation("io.grpc:grpc-core")
     testImplementation("io.grpc:grpc-testing-proto")

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java

@@ -241,8 +241,9 @@ public Builder observationConvention(ApacheHttpClientObservationConvention conve
         }
 
         /**
-         * @return Creates an instance of {@link MicrometerHttpRequestExecutor} with all
-         * the configured properties.
+         * Creates an instance of {@link MicrometerHttpRequestExecutor} with all the
+         * configured properties.
+         * @return an instance of {@link MicrometerHttpRequestExecutor}
          */
         public MicrometerHttpRequestExecutor build() {
             return new MicrometerHttpRequestExecutor(waitForContinue, registry, uriMapper, extraTags,

micrometer-core/src/test/java/io/micrometer/core/instrument/composite/CompositeMeterRegistryTest.java

@@ -150,7 +150,7 @@ void namingConventions() {
     void commonTags() {
         simple.config().commonTags("instance", "local"); // added alongside other common
                                                          // tags in the composite
-        simple.config().commonTags("region", "us-west-1"); // overriden by the composite
+        simple.config().commonTags("region", "us-west-1"); // overridden by the composite
 
         composite.config().commonTags("region", "us-east-1");
         composite.add(simple);