This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 3960ee2f46 Fixes NPE in QueueMetrics (#5020) add d888cd809e Simplifies metrics initialization (#5021) add a143ec1f9e Merge branch '2.1' into 3.1 new 7673a66689 Merge branch '3.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/accumulo/core/metrics/MetricsInfo.java | 39 +--- .../accumulo/server/metrics/MetricsInfoImpl.java | 253 ++++++--------------- .../org/apache/accumulo/compactor/Compactor.java | 10 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 5 +- .../java/org/apache/accumulo/manager/Manager.java | 4 +- .../compaction/CompactionCoordinatorTest.java | 4 +- .../java/org/apache/accumulo/monitor/Monitor.java | 4 +- .../org/apache/accumulo/tserver/ScanServer.java | 4 +- .../org/apache/accumulo/tserver/TabletServer.java | 7 +- .../accumulo/test/functional/ZombieTServer.java | 5 +- .../accumulo/test/metrics/TestStatsDSink.java | 33 +-- 11 files changed, 128 insertions(+), 240 deletions(-)