This is an automated email from the ASF dual-hosted git repository. williamsong pushed a commit to branch snapshot-branch2 in repository https://gitbox.apache.org/repos/asf/ratis.git
commit a18abf50171e943710ab12b7d8b882ef6b2bc4f8 Author: szywilliam <[email protected]> AuthorDate: Tue Jul 18 10:27:31 2023 +0800 revert 3f354a2411d4d54aae63c338749f7c3f8b9b4ee7 --- .../ratis/metrics/MetricRegistriesLoader.java | 49 +++++++--------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistriesLoader.java b/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistriesLoader.java index ba5ee2cf5..0837b0bdd 100644 --- a/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistriesLoader.java +++ b/ratis-metrics/src/main/java/org/apache/ratis/metrics/MetricRegistriesLoader.java @@ -19,17 +19,15 @@ package org.apache.ratis.metrics; +import java.util.ArrayList; +import java.util.List; +import java.util.ServiceLoader; + import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting; import org.apache.ratis.util.ReflectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.ServiceLoader; -import java.util.function.Predicate; - public final class MetricRegistriesLoader { private static final Logger LOG = LoggerFactory.getLogger(MetricRegistries.class); @@ -72,37 +70,18 @@ public final class MetricRegistriesLoader { throw new RuntimeException(e); } } else { - return pickUserDefinedMetricRegistries(availableImplementations); - } - } - - static MetricRegistries pickUserDefinedMetricRegistries(List<MetricRegistries> availableImplementations) { - MetricRegistries userDefined = null; - if (availableImplementations.size() == 2) { - final Predicate<MetricRegistries> nonDefault = m -> !m.getClass().getCanonicalName().equals(DEFAULT_CLASS); - Optional<MetricRegistries> potential = - availableImplementations.stream(). - filter(nonDefault).findAny(); - if (potential.isPresent()) { - userDefined = potential.get(); - LOG.info("Found user-defined MetricRegistries Implementation: " + userDefined.getClass().getCanonicalName()); - } - } - if (userDefined != null) { - return userDefined; - } - - // Tell the user they're doing something wrong, and choose the first impl. - StringBuilder sb = new StringBuilder(); - for (MetricRegistries factory : availableImplementations) { - if (sb.length() > 0) { - sb.append(", "); + // Tell the user they're doing something wrong, and choose the first impl. + StringBuilder sb = new StringBuilder(); + for (MetricRegistries factory : availableImplementations) { + if (sb.length() > 0) { + sb.append(", "); + } + sb.append(factory.getClass()); } - sb.append(factory.getClass()); + LOG.warn("Found multiple MetricRegistries implementations: " + sb + + ". Using first found implementation: " + availableImplementations.get(0)); + return availableImplementations.get(0); } - LOG.warn("Found multiple MetricRegistries implementations: " + sb - + ". Using first found implementation: " + availableImplementations.get(0)); - return availableImplementations.get(0); } private static List<MetricRegistries> getDefinedImplementations() {
