This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/3.1 by this push: new efd502ed12 removed uneeded replication meter filter (#5027) efd502ed12 is described below commit efd502ed121a3143f12a7717339989d7584749aa Author: Keith Turner <ktur...@apache.org> AuthorDate: Mon Nov 4 11:16:47 2024 -0500 removed uneeded replication meter filter (#5027) There was a meter filter related to the replication metrics that no longer exists. This filter should be removed. --- .../accumulo/server/metrics/MetricsInfoImpl.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java index 2a175c2902..8c924ba3c8 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java @@ -20,7 +20,6 @@ package org.apache.accumulo.server.metrics; import static org.apache.hadoop.util.StringUtils.getTrimmedStrings; -import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -33,13 +32,11 @@ import org.apache.accumulo.core.metrics.MetricsInfo; import org.apache.accumulo.core.metrics.MetricsProducer; import org.apache.accumulo.core.spi.metrics.MeterRegistryFactory; import org.apache.accumulo.server.ServerContext; -import org.checkerframework.checker.nullness.qual.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; -import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Tag; @@ -50,8 +47,6 @@ import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics; import io.micrometer.core.instrument.binder.logging.Log4j2Metrics; import io.micrometer.core.instrument.binder.logging.LogbackMetrics; import io.micrometer.core.instrument.binder.system.ProcessorMetrics; -import io.micrometer.core.instrument.config.MeterFilter; -import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; public class MetricsInfoImpl implements MetricsInfo { @@ -137,18 +132,6 @@ public class MetricsInfoImpl implements MetricsInfo { boolean jvmMetricsEnabled = context.getConfiguration().getBoolean(Property.GENERAL_MICROMETER_JVM_METRICS_ENABLED); - MeterFilter replicationFilter = new MeterFilter() { - @Override - public DistributionStatisticConfig configure(Meter.Id id, - @NonNull DistributionStatisticConfig config) { - if (id.getName().equals("replicationQueue")) { - return DistributionStatisticConfig.builder().percentiles(0.5, 0.75, 0.9, 0.95, 0.99) - .expiry(Duration.ofMinutes(10)).build().merge(config); - } - return config; - } - }; - // user specified registries String userRegistryFactories = context.getConfiguration().get(Property.GENERAL_MICROMETER_FACTORY); @@ -156,7 +139,6 @@ public class MetricsInfoImpl implements MetricsInfo { for (String factoryName : getTrimmedStrings(userRegistryFactories)) { try { MeterRegistry registry = getRegistryFromFactory(factoryName, context); - registry.config().meterFilter(replicationFilter); registry.config().commonTags(commonTags); Metrics.globalRegistry.add(registry); } catch (ReflectiveOperationException ex) {