This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 7211081310 Merge branch '2.1' add 04f5aaf7c2 Improves log message for missing iterator class (#4591) add 38d9da710b Use micrometer noop classes for default meter initialization (#4542) new 510cfda7b6 Merge remote-tracking branch 'upstream/2.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: .../server/metrics/NoOpDistributionSummary.java | 83 ---------------------- .../accumulo/server/metrics/NoopMetrics.java | 79 ++++++++++++++++++++ .../accumulo/server/metrics/ThriftMetrics.java | 4 +- ...butionSummaryTest.java => NoopMetricsTest.java} | 20 +++++- .../accumulo/server/metrics/ThriftMetricsTest.java | 3 +- .../apache/accumulo/tserver/ScanServerMetrics.java | 5 +- .../tserver/metrics/TabletServerMinCMetrics.java | 5 +- .../tserver/metrics/TabletServerScanMetrics.java | 9 +-- .../tserver/metrics/TabletServerUpdateMetrics.java | 10 +-- .../apache/accumulo/test/metrics/MetricsIT.java | 16 +++-- 10 files changed, 128 insertions(+), 106 deletions(-) delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/metrics/NoOpDistributionSummary.java create mode 100644 server/base/src/main/java/org/apache/accumulo/server/metrics/NoopMetrics.java rename server/base/src/test/java/org/apache/accumulo/server/metrics/{NoOpDistributionSummaryTest.java => NoopMetricsTest.java} (67%)