Merge branch '1.6.x' into 1.7.x

# Conflicts: # implementations/micrometer-registry-graphite/gradle.lockfile # implementations/micrometer-registry-statsd/gradle.lockfile # micrometer-core/gradle.lockfile # micrometer-test/gradle.lockfile # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile
micrometer-metrics · Nov 10, 2021 · 4bfef57 · 4bfef57
2 parents 8d1e9ef + ebcb509
commit 4bfef57
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 104 deletions.
diff --git a/implementations/micrometer-registry-graphite/gradle.lockfile b/implementations/micrometer-registry-graphite/gradle.lockfile
diff --git a/implementations/micrometer-registry-statsd/gradle.lockfile b/implementations/micrometer-registry-statsd/gradle.lockfile
diff --git a/implementations/micrometer-registry-wavefront/gradle.lockfile b/implementations/micrometer-registry-wavefront/gradle.lockfile
diff --git a/...-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontMeterRegistryTest.java b/...-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontMeterRegistryTest.java
@@ -172,8 +172,8 @@ public Duration step() {
         WavefrontClient sender = builder.build();
         assertThat(builder).hasFieldOrPropertyWithValue("flushInterval", 15_000L);
         assertThat(builder).hasFieldOrPropertyWithValue("flushIntervalTimeUnit", TimeUnit.MILLISECONDS);
-        assertThat(sender).extracting("reportingService").hasFieldOrPropertyWithValue("uri", URI.create("https://example.com"));
-        assertThat(sender).extracting("reportingService").hasFieldOrPropertyWithValue("token", "apiToken");
+        assertThat(sender).extracting("metricsReportingService").hasFieldOrPropertyWithValue("uri", URI.create("https://example.com"));
+        assertThat(sender).extracting("metricsReportingService").hasFieldOrPropertyWithValue("token", "apiToken");
         assertThat(sender).hasFieldOrPropertyWithValue("batchSize", 20);
     }
 

diff --git a/micrometer-core/gradle.lockfile b/micrometer-core/gradle.lockfile
diff --git a/micrometer-test/gradle.lockfile b/micrometer-test/gradle.lockfile