Revert "Deprecating core.instrument.binder and move classes to binder…

… package (#3043)" This reverts commit 598a6b4.
micrometer-metrics · Mar 2, 2022 · 54d524a · 54d524a
1 parent 598a6b4
commit 54d524a
Show file tree

Hide file tree

Showing 276 changed files with 47 additions and 24,058 deletions.
diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
@@ -5,11 +5,9 @@
 <suppressions>
 	<suppress files="io[\\/]micrometer[\\/]core[\\/]instrument[\\/]binder[\\/]logging[\\/].+" checks="IllegalImport" />
 	<suppress files="io[\\/]micrometer[\\/]core[\\/]util[\\/]internal[\\/]logging[\\/].+" checks="IllegalImport" />
-	<suppress files="io[\\/]micrometer[\\/]binder[\\/]logging[\\/].+" checks="IllegalImport" />
 	<suppress files="implementations[\\/].+" id="SLF4JIllegalImportCheck" />
 	<suppress files="samples[\\/].+" checks="IllegalImport" />
 	<suppress files="test[\\/]java[\\/]io[\\/]micrometer[\\/]jersey.+" checks="IllegalImport" />
 	<suppress files="test[\\/]java[\\/]io[\\/]micrometer[\\/]core[\\/]instrument[\\/]binder[\\/]jersey[\\/]server.+" checks="(IllegalImport)" />
-	<suppress files="test[\\/]java[\\/]io[\\/]micrometer[\\/]binder[\\/]jersey[\\/]server.+" checks="(IllegalImport)" />
 	<suppress files="LogbackMetricsAutoConfiguration" checks="IllegalImport" />
 </suppressions>
diff --git a/implementations/micrometer-registry-health/build.gradle b/implementations/micrometer-registry-health/build.gradle
@@ -1,6 +1,5 @@
 dependencies {
     api project(':micrometer-core')
-    api project(':micrometer-binders')
 
     implementation 'org.slf4j:slf4j-api'
 

diff --git a/...istry-health/src/main/java/io/micrometer/health/objectives/JvmServiceLevelObjectives.java b/...istry-health/src/main/java/io/micrometer/health/objectives/JvmServiceLevelObjectives.java
@@ -15,9 +15,9 @@
  */
 package io.micrometer.health.objectives;
 
-import io.micrometer.binder.jvm.JvmGcMetrics;
-import io.micrometer.binder.jvm.JvmHeapPressureMetrics;
-import io.micrometer.binder.jvm.JvmMemoryMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.health.ServiceLevelObjective;
 
 import java.time.Duration;

diff --git a/.../src/main/java/io/micrometer/health/objectives/OperatingSystemServiceLevelObjectives.java b/.../src/main/java/io/micrometer/health/objectives/OperatingSystemServiceLevelObjectives.java
@@ -15,7 +15,7 @@
  */
 package io.micrometer.health.objectives;
 
-import io.micrometer.binder.system.FileDescriptorMetrics;
+import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
 import io.micrometer.health.ServiceLevelObjective;
 
 /**

diff --git a/...icrometer-registry-health/src/test/java/io/micrometer/health/HealthMeterRegistryTest.java b/...icrometer-registry-health/src/test/java/io/micrometer/health/HealthMeterRegistryTest.java
@@ -18,7 +18,7 @@
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.MockClock;
 import io.micrometer.core.instrument.Timer;
-import io.micrometer.binder.jvm.JvmMemoryMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.health.objectives.JvmServiceLevelObjectives;
 import org.junit.jupiter.api.Test;

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

diff --git a/...statsd/src/main/java/io/micrometer/statsd/internal/LogbackMetricsSuppressingFluxSink.java b/...statsd/src/main/java/io/micrometer/statsd/internal/LogbackMetricsSuppressingFluxSink.java
@@ -17,7 +17,7 @@
 
 import java.util.function.LongConsumer;
 
-import io.micrometer.binder.logging.LogbackMetrics;
+import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
 import reactor.core.Disposable;
 import reactor.core.publisher.FluxSink;
 import reactor.util.context.Context;

diff --git a/...icrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryTest.java b/...icrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryTest.java
@@ -19,7 +19,7 @@
 import ch.qos.logback.classic.Logger;
 import io.micrometer.core.Issue;
 import io.micrometer.core.instrument.*;
-import io.micrometer.binder.logging.LogbackMetrics;
+import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
 import io.micrometer.core.instrument.config.NamingConvention;
 import io.micrometer.core.lang.Nullable;
 import org.junit.jupiter.api.AfterEach;

diff --git a/micrometer-binders/build.gradle b/micrometer-binders/build.gradle
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