This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 82513b0bd92f2b3c5739621b5a6d1ec9b93c86c0
Merge: 9b22be23d5 ba14ad0101
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Thu Oct 24 13:41:49 2024 +0000
Merge branch '2.1' into 3.1
.../org/apache/accumulo/core/metrics/MetricsInfo.java | 16 +++++++++++++++-
.../apache/accumulo/server/metrics/MetricsInfoImpl.java | 13 ++++++-------
.../accumulo/coordinator/CompactionCoordinator.java | 2 +-
.../java/org/apache/accumulo/compactor/Compactor.java | 2 +-
.../org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../main/java/org/apache/accumulo/manager/Manager.java | 2 +-
.../main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
.../java/org/apache/accumulo/tserver/ScanServer.java | 5 +----
.../java/org/apache/accumulo/tserver/TabletServer.java | 2 +-
.../apache/accumulo/test/functional/ZombieTServer.java | 2 +-
10 files changed, 29 insertions(+), 19 deletions(-)
diff --cc
server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
index 49b95ae34d,dacd145a31..df11e31fd3
---
a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
+++
b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
@@@ -269,8 -275,7 +269,8 @@@ public class CompactionCoordinator exte
}
MetricsInfo metricsInfo = getContext().getMetricsInfo();
- metricsInfo.addServiceTags(getApplicationName(), clientAddress);
+ metricsInfo.addServiceTags(getApplicationName(), clientAddress, "");
+ metricsInfo.addMetricsProducers(this);
metricsInfo.init();
// On a re-start of the coordinator it's possible that external
compactions are in-progress.
diff --cc
server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index 1d49cf4f8f,e52b9bdb91..777104d95a
---
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@@ -676,9 -686,9 +676,9 @@@ public class Compactor extends Abstract
}
MetricsInfo metricsInfo = getContext().getMetricsInfo();
- metricsInfo.addServiceTags(getApplicationName(), clientAddress);
+ metricsInfo.addServiceTags(getApplicationName(), clientAddress,
queueName);
- metricsInfo.addMetricsProducers(this);
+ metricsInfo.addMetricsProducers(this, pausedMetrics);
metricsInfo.init();
var watcher = new CompactionWatcher(getConfiguration());
diff --cc
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 893a629ccf,45263d1744..3b34a0ff66
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -155,9 -167,9 +155,9 @@@ public class SimpleGarbageCollector ext
}
MetricsInfo metricsInfo = getContext().getMetricsInfo();
- metricsInfo.addServiceTags(getApplicationName(), address);
+ metricsInfo.addServiceTags(getApplicationName(), address, "");
- metricsInfo.addMetricsProducers(new GcMetrics(this));
+ metricsInfo.addMetricsProducers(this, new GcMetrics(this));
metricsInfo.init();
try {
long delay = getStartDelay();
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 189d42622a,0ed4fd73db..4ae6ee2ca2
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -497,8 -498,7 +497,8 @@@ public class Monitor extends AbstractSe
}
MetricsInfo metricsInfo = getContext().getMetricsInfo();
- metricsInfo.addServiceTags(getApplicationName(), monitorHostAndPort);
+ metricsInfo.addServiceTags(getApplicationName(), monitorHostAndPort, "");
+ metricsInfo.addMetricsProducers(this);
metricsInfo.init();
try {
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index d5eef0321c,beeee98708..253f138f81
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@@ -129,10 -125,7 +129,8 @@@ import com.github.benmanes.caffeine.cac
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
+import com.google.common.net.HostAndPort;
- import io.micrometer.core.instrument.Tag;
-
public class ScanServer extends AbstractServer
implements TabletScanClientService.Iface, TabletHostingServer {
