Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start building against Micrometer 1.8.0-M3 snapshots

Browse Source 
See gh-27931
This commit is contained in:
Stephane Nicoll
2021-09-10 23:33:33 +02:00
parent 0b26ac213f
commit 726a2591fb
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java
View File

@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics;
import java.io.File;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.binder.jvm.DiskSpaceMetrics;
import io.micrometer.core.instrument.binder.system.DiskSpaceMetrics;
import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
import io.micrometer.core.instrument.binder.system.UptimeMetrics;

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics;
import java.io.File;
import io.micrometer.core.instrument.binder.jvm.DiskSpaceMetrics;
import io.micrometer.core.instrument.binder.system.DiskSpaceMetrics;
import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
import io.micrometer.core.instrument.binder.system.UptimeMetrics;

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/CaffeineCacheMeterBinderProvider.java vendored
View File

@@ -32,7 +32,7 @@ public class CaffeineCacheMeterBinderProvider implements CacheMeterBinderProvide
@Override
public MeterBinder getMeterBinder(CaffeineCache cache, Iterable<Tag> tags) {
return new CaffeineCacheMetrics(cache.getNativeCache(), cache.getName(), tags);
return new CaffeineCacheMetrics<>(cache.getNativeCache(), cache.getName(), tags);
}
}

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/JCacheCacheMeterBinderProvider.java vendored
View File

@@ -32,7 +32,7 @@ public class JCacheCacheMeterBinderProvider implements CacheMeterBinderProvider<
@Override
public MeterBinder getMeterBinder(JCacheCache cache, Iterable<Tag> tags) {
return new JCacheMetrics(cache.getNativeCache(), tags);
return new JCacheMetrics<>(cache.getNativeCache(), tags);
}
}

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetrics.java vendored
View File

@@ -32,7 +32,7 @@ import org.springframework.data.redis.cache.RedisCache;
* @author Stephane Nicoll
* @since 2.4.0
*/
public class RedisCacheMetrics extends CacheMeterBinder {
public class RedisCacheMetrics extends CacheMeterBinder<RedisCache> {
private final RedisCache cache;

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -1211,7 +1211,7 @@ bom {
]
}
}
library("Micrometer", "1.8.0-M2") {
library("Micrometer", "1.8.0-SNAPSHOT") {
group("io.micrometer") {
modules = [
"micrometer-registry-stackdriver" {