diff --git a/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/AbstractCaffeineCache.java b/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/AbstractCaffeineCache.java index efd88477c..457a5438e 100644 --- a/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/AbstractCaffeineCache.java +++ b/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/AbstractCaffeineCache.java @@ -1,6 +1,5 @@ package ru.tinkoff.kora.cache.caffeine; -import org.jetbrains.annotations.ApiStatus.Internal; import reactor.core.publisher.Mono; import javax.annotation.Nonnull; @@ -11,7 +10,6 @@ import java.util.Set; import java.util.function.Function; -@Internal public abstract class AbstractCaffeineCache implements CaffeineCache { private final String name; diff --git a/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/CaffeineCacheTelemetry.java b/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/CaffeineCacheTelemetry.java index f4019b933..94dccd445 100644 --- a/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/CaffeineCacheTelemetry.java +++ b/cache/cache-caffeine/src/main/java/ru/tinkoff/kora/cache/caffeine/CaffeineCacheTelemetry.java @@ -9,7 +9,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -//TODO caffeine metrics??? public final class CaffeineCacheTelemetry { private static final String ORIGIN = "caffeine"; diff --git a/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/AbstractRedisCache.java b/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/AbstractRedisCache.java index 8bd0f6c49..1ee0f2856 100644 --- a/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/AbstractRedisCache.java +++ b/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/AbstractRedisCache.java @@ -1,6 +1,5 @@ package ru.tinkoff.kora.cache.redis; -import org.jetbrains.annotations.ApiStatus.Internal; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import ru.tinkoff.kora.cache.Cache; @@ -12,7 +11,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -@Internal public abstract class AbstractRedisCache implements Cache { private final String name; diff --git a/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/client/LettuceClientFactory.java b/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/client/LettuceClientFactory.java index 3a998f9df..94f13b3f9 100644 --- a/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/client/LettuceClientFactory.java +++ b/cache/cache-redis/src/main/java/ru/tinkoff/kora/cache/redis/client/LettuceClientFactory.java @@ -5,14 +5,12 @@ import io.lettuce.core.cluster.RedisClusterClient; import io.lettuce.core.cluster.RedisClusterURIUtil; import io.lettuce.core.protocol.ProtocolVersion; -import org.jetbrains.annotations.ApiStatus.Internal; import javax.annotation.Nonnull; import java.net.URI; import java.time.Duration; import java.util.List; -@Internal public final class LettuceClientFactory { @Nonnull diff --git a/dependencies.gradle b/dependencies.gradle index 39bea08e9..d8930b39c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -102,7 +102,7 @@ dependencyResolutionManagement { DependencyResolutionManagement it -> library('lettuce-core', 'io.lettuce', 'lettuce-core').version('6.2.0.RELEASE') - library('caffeine', 'com.github.ben-manes.caffeine', 'caffeine').version('3.1.1') + library('caffeine', 'com.github.ben-manes.caffeine', 'caffeine').version('3.1.7') library("awaitility", "org.awaitility", "awaitility").version("4.2.0") library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").version("5.9.1") diff --git a/micrometer/micrometer-module/build.gradle b/micrometer/micrometer-module/build.gradle index 6362c044b..8fad64fba 100644 --- a/micrometer/micrometer-module/build.gradle +++ b/micrometer/micrometer-module/build.gradle @@ -3,6 +3,9 @@ dependencies { api libs.micrometer.registry.prometheus api libs.prometheus.jmx.collector api libs.opentelemetry.semconv + api(libs.prometheus.collector.caffeine) { + exclude group: "com.github.ben-manes.caffeine" + } annotationProcessor project(':config:config-annotation-processor') compileOnly project(':http:http-server-common') @@ -16,5 +19,4 @@ dependencies { compileOnly project(':resilient:resilient-kora') compileOnly project(':cache:cache-common') compileOnly project(':cache:cache-caffeine') - compileOnly libs.prometheus.collector.caffeine } diff --git a/micrometer/micrometer-module/src/main/java/ru/tinkoff/kora/micrometer/module/MetricsModule.java b/micrometer/micrometer-module/src/main/java/ru/tinkoff/kora/micrometer/module/MetricsModule.java index a97b5faa7..78895d194 100644 --- a/micrometer/micrometer-module/src/main/java/ru/tinkoff/kora/micrometer/module/MetricsModule.java +++ b/micrometer/micrometer-module/src/main/java/ru/tinkoff/kora/micrometer/module/MetricsModule.java @@ -160,11 +160,6 @@ default MicrometerCacheMetrics micrometerCacheMetrics(MeterRegistry meterRegistr return new MicrometerCacheMetrics(meterRegistry); } - @DefaultComponent - default MicrometerCacheMetrics micrometerCaffeineCacheMetrics(MeterRegistry meterRegistry) { - return new MicrometerCacheMetrics(meterRegistry); - } - @DefaultComponent default CacheMetricsCollector cacheMetricsCollector() { return new CacheMetricsCollector().register();