(accumulo) 01/01: Merge remote-tracking branch 'upstream/2.1'

[edcoleman]

This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit d46ef7cdc65165eab0fe4a264e572a3e1ffc62e0
Merge: a41366bbd2 5d5339559d
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Mon May 6 21:08:46 2024 +0000

    Merge remote-tracking branch 'upstream/2.1'

 .../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    |  8 +--
 7 files changed, 169 insertions(+), 34 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index d7562f78c1,30d8331c93..dce3d5dda1
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@@ -132,11 -129,6 +132,7 @@@ public class ZombieTServer 
          HostAndPort.fromParts("0.0.0.0", port));
  
      String addressString = serverPort.address.toString();
 +
-     MetricsInfo metricsInfo = context.getMetricsInfo();
-     metricsInfo.addServiceTags("zombie.server", serverPort.address);
-     metricsInfo.init();
- 
      var zLockPath =
          ServiceLock.path(context.getZooKeeperRoot() + Constants.ZTSERVERS + 
"/" + addressString);
      ZooReaderWriter zoo = context.getZooReaderWriter();