Move cache and http core classes back to core (#3050)

Core should contain the classes needed to write instrumentation, and binders should have instrumentation that we maintain. Therefore, the `CacheMeterBinder` and HTTP-related classes should remain in core. Related to fixing the cache stuff, this also moves the cache TCK implementations to micrometer-binders where the implementations of the cache binders are.
micrometer-metrics · Mar 3, 2022 · dadb6bb · dadb6bb
1 parent 87f3f63
commit dadb6bb
Show file tree

Hide file tree

Showing 51 changed files with 39 additions and 1,399 deletions.
diff --git a/implementations/micrometer-registry-health/build.gradle b/implementations/micrometer-registry-health/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api project(':micrometer-core')
-    api project(':micrometer-binders')
+    implementation project(':micrometer-binders')
 
     implementation 'org.slf4j:slf4j-api'
 

diff --git a/implementations/micrometer-registry-statsd/build.gradle b/implementations/micrometer-registry-statsd/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     api project(':micrometer-core')
-    api project(':micrometer-binders')
+    implementation project(':micrometer-binders')
 
     implementation 'io.projectreactor:reactor-core'
     implementation('io.projectreactor.netty:reactor-netty-core') {

diff --git a/micrometer-binders/build.gradle b/micrometer-binders/build.gradle
@@ -1,14 +1,6 @@
-plugins {
-    id 'idea'
-}
+description 'Instrumentation of components using Micrometer'
 
 dependencies {
-    // TODO(anuraaga): HdrHistogram is exposed in the micrometer API but probably shouldn't be
-    api 'org.hdrhistogram:HdrHistogram'
-    implementation('org.latencyutils:LatencyUtils') {
-        exclude group: 'org.hdrhistogram', module: 'HdrHistogram'
-    }
-
     api project(':micrometer-core')
 
     // cache monitoring
@@ -39,7 +31,6 @@ dependencies {
     optionalApi 'ch.qos.logback:logback-classic'
     optionalApi 'org.apache.logging.log4j:log4j-core'
 
-    // @Timed AOP
     optionalApi 'com.squareup.okhttp3:okhttp'
 
     optionalApi 'org.mongodb:mongodb-driver-sync'
@@ -103,6 +94,8 @@ dependencies {
     testImplementation 'org.postgresql:postgresql'
 
     testImplementation 'org.testcontainers:mongodb'
+
+    testImplementation 'org.jsr107.ri:cache-ri-impl'
 }
 
 task shenandoahTest(type: Test) {

diff --git a/micrometer-binders/src/main/java/io/micrometer/binder/cache/CacheMeterBinder.java b/micrometer-binders/src/main/java/io/micrometer/binder/cache/CacheMeterBinder.java
diff --git a/micrometer-binders/src/main/java/io/micrometer/binder/cache/CaffeineCacheMetrics.java b/micrometer-binders/src/main/java/io/micrometer/binder/cache/CaffeineCacheMetrics.java
@@ -29,6 +29,7 @@
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.TimeGauge;
+import io.micrometer.core.instrument.binder.cache.CacheMeterBinder;
 import io.micrometer.core.lang.NonNullApi;
 import io.micrometer.core.lang.NonNullFields;
 import io.micrometer.core.lang.Nullable;

diff --git a/micrometer-binders/src/main/java/io/micrometer/binder/cache/EhCache2Metrics.java b/micrometer-binders/src/main/java/io/micrometer/binder/cache/EhCache2Metrics.java
@@ -24,6 +24,7 @@
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.binder.BaseUnits;
+import io.micrometer.core.instrument.binder.cache.CacheMeterBinder;
 import io.micrometer.core.lang.NonNullApi;
 import io.micrometer.core.lang.NonNullFields;
 import io.micrometer.core.lang.Nullable;

diff --git a/micrometer-binders/src/main/java/io/micrometer/binder/cache/GuavaCacheMetrics.java b/micrometer-binders/src/main/java/io/micrometer/binder/cache/GuavaCacheMetrics.java
@@ -27,6 +27,7 @@
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.TimeGauge;
+import io.micrometer.core.instrument.binder.cache.CacheMeterBinder;
 import io.micrometer.core.lang.NonNullApi;
 import io.micrometer.core.lang.NonNullFields;
 import io.micrometer.core.lang.Nullable;

diff --git a/micrometer-binders/src/main/java/io/micrometer/binder/cache/HazelcastCacheMetrics.java b/micrometer-binders/src/main/java/io/micrometer/binder/cache/HazelcastCacheMetrics.java
@@ -27,6 +27,7 @@
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.binder.BaseUnits;
 import io.micrometer.binder.cache.HazelcastIMapAdapter.LocalMapStats;
+import io.micrometer.core.instrument.binder.cache.CacheMeterBinder;
 import io.micrometer.core.lang.NonNullApi;
 import io.micrometer.core.lang.NonNullFields;
 import io.micrometer.core.lang.Nullable;

diff --git a/micrometer-binders/src/main/java/io/micrometer/binder/cache/JCacheMetrics.java b/micrometer-binders/src/main/java/io/micrometer/binder/cache/JCacheMetrics.java
@@ -32,6 +32,7 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.binder.cache.CacheMeterBinder;
 import io.micrometer.core.instrument.config.InvalidConfigurationException;
 import io.micrometer.core.lang.NonNullApi;
 import io.micrometer.core.lang.NonNullFields;

diff --git a/...inders/src/main/java/io/micrometer/binder/http/DefaultHttpServletRequestTagsProvider.java b/...inders/src/main/java/io/micrometer/binder/http/DefaultHttpServletRequestTagsProvider.java
diff --git a/micrometer-binders/src/main/java/io/micrometer/binder/http/HttpRequestTags.java b/micrometer-binders/src/main/java/io/micrometer/binder/http/HttpRequestTags.java