This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a03d36463257f1a911812f76015b22da2f33110a Merge: a47ee0b77d e34f7fe1ce Author: Dave Marion <[email protected]> AuthorDate: Thu Nov 30 18:11:37 2023 +0000 Merge branch '2.1' .../org/apache/accumulo/core/metrics/MetricsUtil.java | 16 +++++++++------- .../accumulo/coordinator/CompactionCoordinator.java | 2 +- .../java/org/apache/accumulo/compactor/Compactor.java | 2 +- .../org/apache/accumulo/gc/SimpleGarbageCollector.java | 3 ++- .../main/java/org/apache/accumulo/manager/Manager.java | 2 +- .../java/org/apache/accumulo/tserver/ScanServer.java | 2 +- .../java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- .../java/org/apache/accumulo/test/metrics/MetricsIT.java | 2 ++ 8 files changed, 19 insertions(+), 14 deletions(-) diff --cc server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java index ef84295540,88df289a56..cb7c4731bb --- 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 @@@ -266,8 -268,7 +266,8 @@@ public class CompactionCoordinator exte try { MetricsUtil.initializeMetrics(getContext().getConfiguration(), this.applicationName, - clientAddress); + clientAddress, getContext().getInstanceName()); + MetricsUtil.initializeProducers(this); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e1) { diff --cc server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java index fc7d6a0234,9662757d3d..682437d298 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java @@@ -608,9 -616,7 +608,9 @@@ public class Compactor extends Abstract try { MetricsUtil.initializeMetrics(getContext().getConfiguration(), this.applicationName, - clientAddress); + clientAddress, getContext().getInstanceName()); + pausedMetrics = new PausedCompactionMetrics(); + MetricsUtil.initializeProducers(this, pausedMetrics); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e1) { diff --cc server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 01198752d7,0c22c4b50a..7152016d73 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@@ -157,8 -168,9 +157,9 @@@ public class SimpleGarbageCollector ext } try { - MetricsUtil.initializeMetrics(getContext().getConfiguration(), this.applicationName, address); + MetricsUtil.initializeMetrics(getContext().getConfiguration(), this.applicationName, address, + getContext().getInstanceName()); - MetricsUtil.initializeProducers(new GcMetrics(this)); + MetricsUtil.initializeProducers(this, new GcMetrics(this)); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e1) { diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java index b75c8601c4,9d71e542f9..7d3806840f --- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java @@@ -1103,9 -1099,8 +1103,9 @@@ public class Manager extends AbstractSe try { MetricsUtil.initializeMetrics(getContext().getConfiguration(), this.applicationName, - sa.getAddress()); + sa.getAddress(), getContext().getInstanceName()); - ManagerMetrics.init(getConfiguration(), this); + ManagerMetrics mm = new ManagerMetrics(getConfiguration(), this); + MetricsUtil.initializeProducers(this, mm); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e1) { diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java index 8868065aa4,a34c2b1adc..fe227959f7 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java @@@ -370,9 -372,7 +370,9 @@@ public class ScanServer extends Abstrac try { MetricsUtil.initializeMetrics(getContext().getConfiguration(), this.applicationName, - clientAddress); + clientAddress, getContext().getInstanceName()); + scanMetrics = new TabletServerScanMetrics(); + MetricsUtil.initializeProducers(this, scanMetrics); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e1) { diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 4b610d72ca,9c7bad0557..5df7c75169 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@@ -712,18 -763,8 +712,18 @@@ public class TabletServer extends Abstr } try { - MetricsUtil.initializeMetrics(context.getConfiguration(), this.applicationName, - clientAddress); + MetricsUtil.initializeMetrics(context.getConfiguration(), this.applicationName, clientAddress, + getContext().getInstanceName()); + + metrics = new TabletServerMetrics(this); + updateMetrics = new TabletServerUpdateMetrics(); + scanMetrics = new TabletServerScanMetrics(); + mincMetrics = new TabletServerMinCMetrics(); + ceMetrics = new CompactionExecutorsMetrics(); + pausedMetrics = new PausedCompactionMetrics(); + MetricsUtil.initializeProducers(this, metrics, updateMetrics, scanMetrics, mincMetrics, + ceMetrics, pausedMetrics); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e1) {
