This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new e34f7fe1ce Add instance name tag to metrics (#3998)
e34f7fe1ce is described below
commit e34f7fe1ce5c04f39e63782e3fdb7394a7f7204c
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Nov 30 12:53:37 2023 -0500
Add instance name tag to metrics (#3998)
---
.../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 --git
a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
index b7e3ff5ae4..b84d1fc0f5 100644
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
@@ -53,18 +53,19 @@ public class MetricsUtil {
private static List<Tag> commonTags;
public static void initializeMetrics(final AccumuloConfiguration conf, final
String appName,
- final HostAndPort address) throws ClassNotFoundException,
InstantiationException,
- IllegalAccessException, IllegalArgumentException,
InvocationTargetException,
- NoSuchMethodException, SecurityException {
+ final HostAndPort address, final String instanceName) throws
ClassNotFoundException,
+ InstantiationException, IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
initializeMetrics(conf.getBoolean(Property.GENERAL_MICROMETER_ENABLED),
conf.getBoolean(Property.GENERAL_MICROMETER_JVM_METRICS_ENABLED),
- conf.get(Property.GENERAL_MICROMETER_FACTORY), appName, address);
+ conf.get(Property.GENERAL_MICROMETER_FACTORY), appName, address,
instanceName);
}
private static void initializeMetrics(boolean enabled, boolean
jvmMetricsEnabled,
- String factoryClass, String appName, HostAndPort address) throws
ClassNotFoundException,
- InstantiationException, IllegalAccessException, IllegalArgumentException,
- InvocationTargetException, NoSuchMethodException, SecurityException {
+ String factoryClass, String appName, HostAndPort address, String
instanceName)
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException,
NoSuchMethodException,
+ SecurityException {
LOG.info("initializing metrics, enabled:{}, class:{}", enabled,
factoryClass);
@@ -77,6 +78,7 @@ public class MetricsUtil {
}
List<Tag> tags = new ArrayList<>();
+ tags.add(Tag.of("instance.name", instanceName));
tags.add(Tag.of("process.name", processName));
if (address != null) {
diff --git
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
index 914f4fe112..88df289a56 100644
---
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
@@ -268,7 +268,7 @@ public class CompactionCoordinator extends AbstractServer
try {
MetricsUtil.initializeMetrics(getContext().getConfiguration(),
this.applicationName,
- clientAddress);
+ clientAddress, getContext().getInstanceName());
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException
| IllegalArgumentException | InvocationTargetException |
NoSuchMethodException
| SecurityException e1) {
diff --git
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index d9cc4789d7..9662757d3d 100644
---
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -616,7 +616,7 @@ public class Compactor extends AbstractServer implements
MetricsProducer, Compac
try {
MetricsUtil.initializeMetrics(getContext().getConfiguration(),
this.applicationName,
- clientAddress);
+ clientAddress, getContext().getInstanceName());
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException
| IllegalArgumentException | InvocationTargetException |
NoSuchMethodException
| SecurityException e1) {
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 550b3426a5..0c22c4b50a 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -168,7 +168,8 @@ public class SimpleGarbageCollector extends AbstractServer
implements Iface {
}
try {
- MetricsUtil.initializeMetrics(getContext().getConfiguration(),
this.applicationName, address);
+ MetricsUtil.initializeMetrics(getContext().getConfiguration(),
this.applicationName, address,
+ getContext().getInstanceName());
MetricsUtil.initializeProducers(new GcMetrics(this));
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException
| IllegalArgumentException | InvocationTargetException |
NoSuchMethodException
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 196b50d76c..9d71e542f9 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -1099,7 +1099,7 @@ public class Manager extends AbstractServer
try {
MetricsUtil.initializeMetrics(getContext().getConfiguration(),
this.applicationName,
- sa.getAddress());
+ sa.getAddress(), getContext().getInstanceName());
ManagerMetrics.init(getConfiguration(), this);
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException
| IllegalArgumentException | InvocationTargetException |
NoSuchMethodException
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index 19698afad0..a34c2b1adc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@ -372,7 +372,7 @@ public class ScanServer extends AbstractServer
try {
MetricsUtil.initializeMetrics(getContext().getConfiguration(),
this.applicationName,
- clientAddress);
+ clientAddress, getContext().getInstanceName());
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException
| IllegalArgumentException | InvocationTargetException |
NoSuchMethodException
| SecurityException e1) {
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 08287c1e08..9c7bad0557 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -763,8 +763,8 @@ public class TabletServer extends AbstractServer implements
TabletHostingServer
}
try {
- MetricsUtil.initializeMetrics(context.getConfiguration(),
this.applicationName,
- clientAddress);
+ MetricsUtil.initializeMetrics(context.getConfiguration(),
this.applicationName, clientAddress,
+ getContext().getInstanceName());
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException
| IllegalArgumentException | InvocationTargetException |
NoSuchMethodException
| SecurityException e1) {
diff --git a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
index eb248090ec..df872a3a9c 100644
--- a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
@@ -20,6 +20,7 @@ package org.apache.accumulo.test.metrics;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -190,6 +191,7 @@ public class MetricsIT extends ConfigurableMacBase
implements MetricsProducer {
log.trace("METRICS, name: '{}' num tags: {}, tags: {}",
a.getName(), t.size(), t);
// check hostname is always set and is valid
assertNotEquals("0.0.0.0", a.getTags().get("host"));
+ assertNotNull(a.getTags().get("instance.name"));
// check the length of the tag value is sane
final int MAX_EXPECTED_TAG_LEN = 128;
