This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 3018c2295a Enable metrics by default to enable correct function of
Monitor (#6364)
3018c2295a is described below
commit 3018c2295ab56febec400c3a4b0698fc3e0962b7
Author: Dave Marion <[email protected]>
AuthorDate: Thu May 14 15:59:20 2026 -0400
Enable metrics by default to enable correct function of Monitor (#6364)
This change removes the LoggingMeterRegistryFactory from the
default value of the general.micrometer.factory property and
replaces it with a new MeterRegistryFactory that is used for the
Monitor. This change also modifies the default value of
`general.micrometer.enabled` from false to true.
---
.../accumulo/core/clientImpl/ClientContext.java | 2 +-
.../org/apache/accumulo/core/conf/Property.java | 12 +-
.../apache/accumulo/core/metrics/MetricsInfo.java | 12 ++
.../AccumuloMonitorMeterRegistryFactory.java | 32 ++++++
.../apache/accumulo/core/conf/PropertyTest.java | 6 +-
.../miniclusterImpl/MiniAccumuloConfigImpl.java | 7 +-
.../org/apache/accumulo/server/AbstractServer.java | 8 +-
.../accumulo/server/metrics/MetricsInfoImpl.java | 19 +++-
.../java/org/apache/accumulo/manager/Manager.java | 24 ++--
.../java/org/apache/accumulo/test/BalanceIT.java | 2 -
.../BalanceInPresenceOfOfflineTableIT.java | 2 -
.../test/functional/OnDemandTabletUnloadingIT.java | 1 -
.../accumulo/test/metrics/MetricsDisabledIT.java | 126 +++++++++++++++++++++
.../apache/accumulo/test/metrics/MetricsIT.java | 7 ++
14 files changed, 226 insertions(+), 34 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index 90ff9a166e..a51bcf0d98 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -1208,7 +1208,7 @@ public class ClientContext implements AccumuloClient {
ensureOpen();
if (caches == null) {
caches = Caches.getInstance();
- if (micrometer != null
+ if (micrometer != null &&
getConfiguration().getBoolean(Property.GENERAL_MICROMETER_ENABLED)
&&
getConfiguration().getBoolean(Property.GENERAL_MICROMETER_CACHE_METRICS_ENABLED))
{
caches.registerMetrics(micrometer);
}
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 980552e5b8..f5f8cde9f3 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -353,10 +353,14 @@ public enum Property {
"The maximum amount of time that a Scanner should wait before retrying a
failed RPC.",
"1.7.3"),
GENERAL_MICROMETER_CACHE_METRICS_ENABLED("general.micrometer.cache.metrics.enabled",
"false",
- PropertyType.BOOLEAN, "Enables Caffeine Cache metrics functionality
using Micrometer.",
+ PropertyType.BOOLEAN,
+ "Enables Caffeine Cache metrics functionality using Micrometer. Requires
"
+ + " property 'general.micrometer.enabled' to be set to 'true' to
take effect.",
"4.0.0"),
- GENERAL_MICROMETER_ENABLED("general.micrometer.enabled", "false",
PropertyType.BOOLEAN,
- "Enables metrics collection and reporting functionality using
Micrometer.", "2.1.0"),
+ GENERAL_MICROMETER_ENABLED("general.micrometer.enabled", "true",
PropertyType.BOOLEAN,
+ "Enables metrics collection and reporting functionality using
Micrometer. The Monitor"
+ + " is dependent on metrics being enabled to function correctly.",
+ "2.1.0"),
GENERAL_MICROMETER_JVM_METRICS_ENABLED("general.micrometer.jvm.metrics.enabled",
"false",
PropertyType.BOOLEAN,
"Enables additional JVM metrics collection and reporting using
Micrometer. Requires "
@@ -369,7 +373,7 @@ public enum Property {
'log4j2' or 'logback'.
""", "2.1.4"),
GENERAL_MICROMETER_FACTORY("general.micrometer.factory",
- "org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory",
+
"org.apache.accumulo.core.spi.metrics.AccumuloMonitorMeterRegistryFactory",
PropertyType.CLASSNAMELIST,
"""
A comma separated list of one or more class names that implements \
diff --git
a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsInfo.java
b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsInfo.java
index 8045ca50c7..c000cac6eb 100644
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsInfo.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.core.data.ResourceGroupId;
import com.google.common.net.HostAndPort;
+import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;
public interface MetricsInfo {
@@ -91,6 +92,17 @@ public interface MetricsInfo {
boolean isMetricsEnabled();
+ /**
+ * @return true if the MonitorMeterRegistry has been enabled.
+ */
+ public boolean isMonitorRegistryEnabled();
+
+ /**
+ *
+ * @return Monitor MeterRegistry, or null
+ */
+ public MeterRegistry getMonitorRegistry();
+
/**
* Common tags for all services.
*/
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/metrics/AccumuloMonitorMeterRegistryFactory.java
b/core/src/main/java/org/apache/accumulo/core/spi/metrics/AccumuloMonitorMeterRegistryFactory.java
new file mode 100644
index 0000000000..b0a76c9db8
--- /dev/null
+++
b/core/src/main/java/org/apache/accumulo/core/spi/metrics/AccumuloMonitorMeterRegistryFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.spi.metrics;
+
+import org.apache.accumulo.core.metrics.MonitorMeterRegistry;
+
+import io.micrometer.core.instrument.MeterRegistry;
+
+public class AccumuloMonitorMeterRegistryFactory implements
MeterRegistryFactory {
+
+ @Override
+ public MeterRegistry create(InitParameters params) {
+ return new MonitorMeterRegistry();
+ }
+
+}
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
index 40faf625f8..be100685e8 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
@@ -323,8 +323,10 @@ public class PropertyTest {
@Test
public void testFixedPropertiesNonNull() {
Property.FIXED_PROPERTIES.forEach(p -> {
- assertNotNull(p.getDefaultValue());
- assertFalse(p.getDefaultValue().isBlank());
+ assertNotNull(p.getDefaultValue(), "Default value is null: " +
p.getKey());
+ if (!p.equals(Property.GENERAL_MICROMETER_FACTORY)) {
+ assertFalse(p.getDefaultValue().isBlank(), "Default value is blank: "
+ p.getKey());
+ }
});
}
}
diff --git
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
index 434fb5303b..684395b501 100644
---
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
@@ -174,8 +174,11 @@ public class MiniAccumuloConfigImpl {
mergeProp(Property.INSTANCE_SECRET.getKey(), DEFAULT_INSTANCE_SECRET);
}
- // enable metrics reporting - by default will appear in standard log
files.
- mergeProp(Property.GENERAL_MICROMETER_ENABLED.getKey(), "true");
+ // Disable metrics for MiniAccumulo if not specifically enabled
+ if
(!siteConfig.containsKey(Property.GENERAL_MICROMETER_ENABLED.getKey())) {
+ setProperty(Property.GENERAL_MICROMETER_ENABLED, "false");
+ setProperty(Property.GENERAL_MICROMETER_FACTORY, "");
+ }
mergeProp(Property.TSERV_DATACACHE_SIZE.getKey(), "10M");
mergeProp(Property.TSERV_INDEXCACHE_SIZE.getKey(), "10M");
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
index a1a4bacfe0..f3f0ad603a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
@@ -41,6 +41,7 @@ import org.apache.accumulo.core.conf.SiteConfiguration;
import org.apache.accumulo.core.data.ResourceGroupId;
import org.apache.accumulo.core.lock.ServiceLock;
import org.apache.accumulo.core.metrics.Metric;
+import org.apache.accumulo.core.metrics.MetricsInfo;
import org.apache.accumulo.core.metrics.MetricsProducer;
import org.apache.accumulo.core.process.thrift.MetricResponse;
import org.apache.accumulo.core.process.thrift.MetricSource;
@@ -53,7 +54,6 @@ import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.util.threads.Threads;
import org.apache.accumulo.server.mem.LowMemoryDetector;
import org.apache.accumulo.server.metrics.MetricResponseWrapper;
-import org.apache.accumulo.server.metrics.MetricsInfoImpl;
import org.apache.accumulo.server.metrics.ProcessMetrics;
import org.apache.accumulo.server.rpc.ServerAddress;
import org.apache.accumulo.server.security.SecurityUtil;
@@ -405,9 +405,9 @@ public abstract class AbstractServer
response.setResourceGroup(getResourceGroup().canonical());
response.setTimestamp(System.currentTimeMillis());
- var registry = MetricsInfoImpl.MONITOR_REGISTRY.get();
- if (registry != null) {
- registry.getMeters().forEach(m -> {
+ final MetricsInfo mi = getContext().getMetricsInfo();
+ if (mi.isMonitorRegistryEnabled()) {
+ mi.getMonitorRegistry().getMeters().forEach(m -> {
if (m.getId().getName().startsWith("accumulo.")
|| m.getId().getName().equals(Metric.EXECUTOR_COMPLETED.getName())
|| m.getId().getName().equals(Metric.EXECUTOR_QUEUED.getName())) {
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 9bb8b2cae6..f943d3ea3f 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
@@ -67,11 +67,10 @@ public class MetricsInfoImpl implements MetricsInfo {
private AutoCloseable logMetrics;
private final boolean metricsEnabled;
+ private final AtomicReference<MeterRegistry> monitorRegistry = new
AtomicReference<>();
private final List<MetricsProducer> producers = new ArrayList<>();
- public static final AtomicReference<MeterRegistry> MONITOR_REGISTRY = new
AtomicReference<>();
-
public MetricsInfoImpl(final ServerContext context) {
this.context = context;
metricsEnabled =
context.getConfiguration().getBoolean(Property.GENERAL_MICROMETER_ENABLED);
@@ -97,6 +96,16 @@ public class MetricsInfoImpl implements MetricsInfo {
return metricsEnabled;
}
+ @Override
+ public boolean isMonitorRegistryEnabled() {
+ return monitorRegistry.get() != null;
+ }
+
+ @Override
+ public MeterRegistry getMonitorRegistry() {
+ return monitorRegistry.get();
+ }
+
@Override
public synchronized void addMetricsProducers(MetricsProducer... producer) {
if (!metricsEnabled) {
@@ -162,6 +171,9 @@ public class MetricsInfoImpl implements MetricsInfo {
for (String factoryName : getTrimmedStrings(userRegistryFactories)) {
try {
MeterRegistry registry = getRegistryFromFactory(factoryName, context);
+ if (registry.getClass().equals(MonitorMeterRegistry.class)) {
+ monitorRegistry.compareAndSet(null, registry);
+ }
registry.config().commonTags(commonTags);
Metrics.globalRegistry.add(registry);
} catch (ReflectiveOperationException ex) {
@@ -169,9 +181,6 @@ public class MetricsInfoImpl implements MetricsInfo {
}
}
- MONITOR_REGISTRY.set(new MonitorMeterRegistry());
- Metrics.globalRegistry.add(MONITOR_REGISTRY.get());
-
// Set the MeterRegistry on the ThreadPools
ThreadPools.getServerThreadPools().setMeterRegistry(Metrics.globalRegistry);
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 233902b243..659e2a4214 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -904,17 +904,19 @@ public class Manager extends AbstractServer
// This is called after getting the primary manager lock
private void setupPrimaryMetrics() {
MetricsInfo metricsInfo = getContext().getMetricsInfo();
- metricsInfo.addMetricsProducers(balanceManager.getMetrics());
- // ensure all tablet group watchers are setup
- Preconditions.checkState(watchers.size() == DataLevel.values().length);
- watchers.forEach(watcher ->
metricsInfo.addMetricsProducers(watcher.getMetrics()));
- metricsInfo.addMetricsProducers(requireNonNull(compactionCoordinator));
- // ensure fate is completely setup
- metricsInfo.addMetricsProducers(new MetaFateMetrics(getContext(),
-
getConfiguration().getTimeInMillis(Property.MANAGER_FATE_METRICS_MIN_UPDATE_INTERVAL)));
- metricsInfo.addMetricsProducers(new UserFateMetrics(getContext(),
-
getConfiguration().getTimeInMillis(Property.MANAGER_FATE_METRICS_MIN_UPDATE_INTERVAL)));
- metricsInfo.addMetricsProducers(this);
+ if (metricsInfo.isMetricsEnabled()) {
+ metricsInfo.addMetricsProducers(balanceManager.getMetrics());
+ // ensure all tablet group watchers are setup
+ Preconditions.checkState(watchers.size() == DataLevel.values().length);
+ watchers.forEach(watcher ->
metricsInfo.addMetricsProducers(watcher.getMetrics()));
+ metricsInfo.addMetricsProducers(requireNonNull(compactionCoordinator));
+ // ensure fate is completely setup
+ metricsInfo.addMetricsProducers(new MetaFateMetrics(getContext(),
+
getConfiguration().getTimeInMillis(Property.MANAGER_FATE_METRICS_MIN_UPDATE_INTERVAL)));
+ metricsInfo.addMetricsProducers(new UserFateMetrics(getContext(),
+
getConfiguration().getTimeInMillis(Property.MANAGER_FATE_METRICS_MIN_UPDATE_INTERVAL)));
+ metricsInfo.addMetricsProducers(this);
+ }
}
@Override
diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
b/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
index 6bf1a70764..26e74f958d 100644
--- a/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BalanceIT.java
@@ -56,8 +56,6 @@ public class BalanceIT extends ConfigurableMacBase {
public void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
Map<String,String> siteConfig = cfg.getSiteConfig();
siteConfig.put(Property.TSERV_MAXMEM.getKey(), "10K");
- siteConfig.put(Property.GENERAL_MICROMETER_ENABLED.getKey(), "true");
- siteConfig.put("general.custom.metrics.opts.logging.step", "0.5s");
cfg.setSiteConfig(siteConfig);
cfg.getClusterServerConfiguration().setNumDefaultTabletServers(2);
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
index 1a0276a980..83d7faaa10 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
@@ -72,8 +72,6 @@ public class BalanceInPresenceOfOfflineTableIT extends
AccumuloClusterHarness {
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
Map<String,String> siteConfig = cfg.getSiteConfig();
siteConfig.put(Property.TSERV_MAXMEM.getKey(), "10K");
- siteConfig.put(Property.GENERAL_MICROMETER_ENABLED.getKey(), "true");
- siteConfig.put("general.custom.metrics.opts.logging.step", "0.5s");
cfg.setSiteConfig(siteConfig);
// ensure we have two tservers
if (cfg.getClusterServerConfiguration().getTabletServerConfiguration()
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
index 560583ab35..418092bfdf 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
@@ -106,7 +106,6 @@ public class OnDemandTabletUnloadingIT extends
SharedMiniClusterBase {
// Tell the server processes to use a StatsDMeterRegistry that will be
configured
// to push all metrics to the sink we started.
-
cfg.setProperty(Property.GENERAL_MICROMETER_ENABLED, "true");
cfg.setProperty(Property.GENERAL_MICROMETER_FACTORY,
TestStatsDRegistryFactory.class.getName());
diff --git
a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsDisabledIT.java
b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsDisabledIT.java
new file mode 100644
index 0000000000..5604dce6b0
--- /dev/null
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsDisabledIT.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.test.metrics;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.accumulo.core.client.Accumulo;
+import org.apache.accumulo.core.client.AccumuloClient;
+import org.apache.accumulo.core.conf.ConfigurationCopy;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.metrics.MetricsProducer;
+import org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory;
+import org.apache.accumulo.core.util.Timer;
+import org.apache.accumulo.minicluster.ServerType;
+import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
+import org.apache.accumulo.test.fate.FateTestUtil;
+import org.apache.accumulo.test.fate.SlowFateSplitManager;
+import org.apache.accumulo.test.functional.ConfigurableMacBase;
+import org.apache.hadoop.conf.Configuration;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import io.micrometer.core.instrument.MeterRegistry;
+
+public class MetricsDisabledIT extends ConfigurableMacBase implements
MetricsProducer {
+ private static TestStatsDSink sink;
+ private static final int numFateThreadsPool1 = 5;
+ private static final String allOpsFateExecutorName = "pool1";
+
+ @Override
+ protected Duration defaultTimeout() {
+ return Duration.ofMinutes(3);
+ }
+
+ @BeforeAll
+ public static void before() throws Exception {
+ sink = new TestStatsDSink();
+ }
+
+ @AfterAll
+ public static void after() throws Exception {
+ sink.close();
+ }
+
+ @Override
+ protected void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
+ cfg.setProperty(Property.GC_CYCLE_START, "1s");
+ cfg.setProperty(Property.GC_CYCLE_DELAY, "1s");
+ cfg.setProperty(Property.MANAGER_FATE_METRICS_MIN_UPDATE_INTERVAL, "1s");
+ // Tell the server processes to use a StatsDMeterRegistry and the simple
logging registry
+ // that will be configured to push all metrics to the sink we started.
+ cfg.setProperty(Property.GENERAL_MICROMETER_USER_TAGS,
"tag1=value1,tag2=value2");
+ cfg.setProperty(Property.GENERAL_MICROMETER_CACHE_METRICS_ENABLED, "true");
+ cfg.setProperty(Property.GENERAL_MICROMETER_JVM_METRICS_ENABLED, "true");
+ cfg.setProperty("general.custom.metrics.opts.logging.step", "10s");
+ String clazzList = LoggingMeterRegistryFactory.class.getName() + ","
+ + TestStatsDRegistryFactory.class.getName();
+ cfg.setProperty(Property.GENERAL_MICROMETER_FACTORY, clazzList);
+ Map<String,String> sysProps =
Map.of(TestStatsDRegistryFactory.SERVER_HOST, "127.0.0.1",
+ TestStatsDRegistryFactory.SERVER_PORT,
Integer.toString(sink.getPort()));
+ cfg.setSystemProperties(sysProps);
+ // custom config for the fate thread pools.
+ var fatePoolsConfig = FateTestUtil.updateFateConfig(new
ConfigurationCopy(),
+ numFateThreadsPool1, allOpsFateExecutorName);
+ cfg.setProperty(Property.MANAGER_FATE_USER_CONFIG.getKey(),
+ fatePoolsConfig.get(Property.MANAGER_FATE_USER_CONFIG));
+ cfg.setProperty(Property.MANAGER_FATE_META_CONFIG.getKey(),
+ fatePoolsConfig.get(Property.MANAGER_FATE_META_CONFIG));
+ // Make splits run slowly, used for testing the fate metrics
+ cfg.setServerClass(ServerType.MANAGER, r -> SlowFateSplitManager.class);
+ }
+
+ @Test
+ public void confirmNoMetricsPublished() throws Exception {
+
+ AtomicReference<Exception> error = new AtomicReference<>();
+ Thread workerThread = new Thread(() -> {
+ try (AccumuloClient client =
Accumulo.newClient().from(getClientProperties()).build()) {
+ MetricsIT.doWorkToGenerateMetrics(client, getClass());
+ } catch (Exception e) {
+ error.set(e);
+ }
+ });
+ workerThread.start();
+
+ Timer t = Timer.startNew();
+
+ // GENERAL_MICROMETER_ENABLED is set to false in MiniAccumuloConfigImpl
+ // We should not see any metrics.
+ while (t.elapsed(TimeUnit.SECONDS) < 60) {
+ List<String> lines = sink.getLines();
+ assertTrue(lines.isEmpty(), "Encountered the following metrics when
disabled: " + lines);
+ }
+ workerThread.join();
+ assertNull(error.get());
+ }
+
+ @Override
+ public void registerMetrics(MeterRegistry registry) {
+ // unused; this class only extends MetricsProducer to easily reference its
methods/constants
+ }
+}
diff --git a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
index 255fb463c1..598edaf037 100644
--- a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
@@ -53,6 +53,7 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -524,6 +525,7 @@ public class MetricsIT extends ConfigurableMacBase
implements MetricsProducer {
cluster.stop();
List<String> statsDMetrics;
+ AtomicBoolean sawSomeMetrics = new AtomicBoolean(false);
// loop until we run out of lines or until we see all expected metrics
while (!(statsDMetrics = sink.getLines()).isEmpty()) {
@@ -549,8 +551,10 @@ public class MetricsIT extends ConfigurableMacBase
implements MetricsProducer {
// check the length of the tag value is sane
final int MAX_EXPECTED_TAG_LEN = 128;
a.getTags().forEach((k, v) -> assertTrue(v.length() <
MAX_EXPECTED_TAG_LEN));
+ sawSomeMetrics.compareAndSet(false, true);
});
}
+ assertTrue(sawSomeMetrics.get(), "Never saw metrics");
}
@Test
@@ -561,6 +565,7 @@ public class MetricsIT extends ConfigurableMacBase
implements MetricsProducer {
cluster.stop();
List<String> statsDMetrics;
+ AtomicBoolean sawSomeFateMetrics = new AtomicBoolean(false);
while (!(statsDMetrics = sink.getLines()).isEmpty()) {
statsDMetrics.stream().filter(line ->
line.startsWith("accumulo.fate.tx"))
@@ -578,7 +583,9 @@ public class MetricsIT extends ConfigurableMacBase
implements MetricsProducer {
FateInstanceType type =
FateInstanceType.valueOf(a.getTags().get("instanceType").toUpperCase());
assertNotNull(type);
+ sawSomeFateMetrics.compareAndSet(false, true);
});
}
+ assertTrue(sawSomeFateMetrics.get(), "Never saw fate metrics");
}
}
