From 058b9d866d8cc1f2da9e7daa46ab1cc499049c50 Mon Sep 17 00:00:00 2001 From: izeye Date: Wed, 10 Feb 2021 21:43:22 +0900 Subject: [PATCH 1/3] Log ExecutorServiceMetrics.bindTo() failure See gh-2426 --- .../core/instrument/binder/jvm/ExecutorServiceMetrics.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java index e2d3b0c683..eb4fcbee3a 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java @@ -25,6 +25,8 @@ import io.micrometer.core.lang.NonNullApi; import io.micrometer.core.lang.NonNullFields; import io.micrometer.core.lang.Nullable; +import io.micrometer.core.util.internal.logging.InternalLogger; +import io.micrometer.core.util.internal.logging.InternalLoggerFactory; import java.lang.reflect.Field; import java.util.concurrent.*; @@ -43,6 +45,9 @@ @NonNullApi @NonNullFields public class ExecutorServiceMetrics implements MeterBinder { + + private final static InternalLogger log = InternalLoggerFactory.getInstance(JvmGcMetrics.class); + static final String DEFAULT_EXECUTOR_METRIC_PREFIX = ""; @Nullable private final ExecutorService executorService; @@ -277,6 +282,8 @@ public void bindTo(MeterRegistry registry) { monitor(registry, unwrapThreadPoolExecutor(executorService, executorService.getClass().getSuperclass())); } else if (executorService instanceof ForkJoinPool) { monitor(registry, (ForkJoinPool) executorService); + } else { + log.warn("Failed to bind as {} is unsupported.", className); } } From ade0ef9a93e0f246475e385399724c6b53f0c22b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 11 Feb 2021 11:27:25 +0900 Subject: [PATCH 2/3] Fix a wrong class reference for a logger Co-authored-by: Jonatan Ivanov --- .../core/instrument/binder/jvm/ExecutorServiceMetrics.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java index eb4fcbee3a..42cb531880 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java @@ -46,7 +46,7 @@ @NonNullFields public class ExecutorServiceMetrics implements MeterBinder { - private final static InternalLogger log = InternalLoggerFactory.getInstance(JvmGcMetrics.class); + private final static InternalLogger log = InternalLoggerFactory.getInstance(ExecutorServiceMetrics.class); static final String DEFAULT_EXECUTOR_METRIC_PREFIX = ""; @Nullable From 9c7f6e4a8b14ba383910513b109f459bf0e21feb Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 11 Feb 2021 11:31:05 +0900 Subject: [PATCH 3/3] Use conventional order for modifiers Co-authored-by: Jonatan Ivanov --- .../core/instrument/binder/jvm/ExecutorServiceMetrics.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java index 42cb531880..3b088adcac 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java @@ -46,7 +46,7 @@ @NonNullFields public class ExecutorServiceMetrics implements MeterBinder { - private final static InternalLogger log = InternalLoggerFactory.getInstance(ExecutorServiceMetrics.class); + private static final InternalLogger log = InternalLoggerFactory.getInstance(ExecutorServiceMetrics.class); static final String DEFAULT_EXECUTOR_METRIC_PREFIX = ""; @Nullable