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

Start building against Micrometer 1.14.0 snapshots

Browse Source 
See gh-42137
This commit is contained in:
Andy Wilkinson
2024-09-04 14:48:01 +01:00
parent f88f8f26fd
commit 9f79769030
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,7 +51,9 @@ class CacheMetricsAutoConfigurationTests {
@Test
void autoConfiguredCacheManagerIsInstrumented() {
this.contextRunner.withPropertyValues("spring.cache.type=caffeine", "spring.cache.cache-names=cache1,cache2")
this.contextRunner
.withPropertyValues("spring.cache.type=caffeine", "spring.cache.cache-names=cache1,cache2",
"spring.cache.caffeine.spec=recordStats")
.run((context) -> {
MeterRegistry registry = context.getBean(MeterRegistry.class);
registry.get("cache.gets").tags("name", "cache1").tags("cache.manager", "cacheManager").meter();

14
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/cache/CacheMetricsRegistrarTests.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,9 @@ class CacheMetricsRegistrarTests {
void bindToSupportedCache() {
CacheMetricsRegistrar registrar = new CacheMetricsRegistrar(this.meterRegistry,
Collections.singleton(new CaffeineCacheMeterBinderProvider()));
assertThat(registrar.bindCacheToRegistry(new CaffeineCache("test", Caffeine.newBuilder().build()))).isTrue();
assertThat(
registrar.bindCacheToRegistry(new CaffeineCache("test", Caffeine.newBuilder().recordStats().build())))
.isTrue();
assertThat(this.meterRegistry.get("cache.gets").tags("name", "test").meter()).isNotNull();
}
@@ -49,8 +51,8 @@ class CacheMetricsRegistrarTests {
void bindToSupportedCacheWrappedInTransactionProxy() {
CacheMetricsRegistrar registrar = new CacheMetricsRegistrar(this.meterRegistry,
Collections.singleton(new CaffeineCacheMeterBinderProvider()));
assertThat(registrar.bindCacheToRegistry(
new TransactionAwareCacheDecorator(new CaffeineCache("test", Caffeine.newBuilder().build()))))
assertThat(registrar.bindCacheToRegistry(new TransactionAwareCacheDecorator(
new CaffeineCache("test", Caffeine.newBuilder().recordStats().build()))))
.isTrue();
assertThat(this.meterRegistry.get("cache.gets").tags("name", "test").meter()).isNotNull();
}
@@ -58,7 +60,9 @@ class CacheMetricsRegistrarTests {
@Test
void bindToUnsupportedCache() {
CacheMetricsRegistrar registrar = new CacheMetricsRegistrar(this.meterRegistry, Collections.emptyList());
assertThat(registrar.bindCacheToRegistry(new CaffeineCache("test", Caffeine.newBuilder().build()))).isFalse();
assertThat(
registrar.bindCacheToRegistry(new CaffeineCache("test", Caffeine.newBuilder().recordStats().build())))
.isFalse();
assertThat(this.meterRegistry.find("cache.gets").tags("name", "test").meter()).isNull();
}

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

@@ -1301,7 +1301,7 @@ bom {
]
}
}
library("Micrometer", "1.14.0-M2") {
library("Micrometer", "1.14.0-SNAPSHOT") {
considerSnapshots()
group("io.micrometer") {
modules = [