This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit c6f7c91d829c6b30ac28f3f18f705913f611e25c
Merge: 0d40533307 d46ef7cdc6
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Mon May 6 21:40:51 2024 +0000
Merge remote-tracking branch 'upstream/main' into elasticity
.../server/metrics/NoOpDistributionSummary.java | 83 ++++++++++++++++++++++
.../accumulo/server/metrics/ThriftMetrics.java | 4 +-
.../metrics/NoOpDistributionSummaryTest.java} | 38 ++++------
.../accumulo/server/metrics/ThriftMetricsTest.java | 62 ++++++++++++++++
.../tserver/metrics/TabletServerScanMetrics.java | 5 +-
.../tserver/metrics/TabletServerUpdateMetrics.java | 3 +-
.../accumulo/test/functional/ZombieTServer.java | 10 +--
7 files changed, 170 insertions(+), 35 deletions(-)
diff --cc
test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index bc10568f7c,dce3d5dda1..38e93abb4c
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@@ -143,6 -140,10 +138,11 @@@ public class ZombieTServer
ServiceLock zlock = new ServiceLock(zoo.getZooKeeper(), zLockPath,
UUID.randomUUID());
+ MetricsInfo metricsInfo = context.getMetricsInfo();
- metricsInfo.addServiceTags("zombie.server", serverPort.address);
++ metricsInfo.addServiceTags("zombie.server", serverPort.address,
++ Constants.DEFAULT_RESOURCE_GROUP_NAME);
+ metricsInfo.init();
+
LockWatcher lw = new LockWatcher() {
@SuppressFBWarnings(value = "DM_EXIT",
