aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-17 11:20:16 +0100
committerGitHub <noreply@github.com>2023-01-17 11:20:16 +0100
commitac5731a0f22a9e843edf1404d8ac2b444510e9f9 (patch)
tree57280e6de499ddad3804a2a7b1b5b6358d7f9e02
parent319cbde398f507748601346b0ee49148330fc19c (diff)
parent213bbf16fd29fde454c34d1407f542e6a7ce8a3a (diff)
Merge pull request #25595 from vespa-engine/yngveaasheim/Better-description-for-jdisc.jvm
Better description for 'jdisc.jvm'
-rw-r--r--container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java2
-rw-r--r--container-core/src/main/java/com/yahoo/metrics/Unit.java6
2 files changed, 5 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java
index d921ee6c20f..f2ef7f5b0e0 100644
--- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java
+++ b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java
@@ -13,7 +13,7 @@ public enum ContainerMetrics {
JDISC_GC_COUNT("jdisc.gc.count", Unit.OPERATION, "Number of JVM garbage collections done"),
JDISC_GC_MS("jdisc.gc.ms", Unit.MILLISECOND, "Time spent in JVM garbage collection"),
- JDISC_JVM("jdisc.jvm", Unit.ITEM, "Unspecified: jdisc.JVM"),
+ JDISC_JVM("jdisc.jvm", Unit.VERSION, "JVM runtime version"),
JDISC_MEMORY_MAPPINGS("jdisc.memory_mappings", Unit.OPERATION, "JDISC Memory mappings"),
JDISC_OPEN_FILE_DESCRIPTORS("jdisc.open_file_descriptors.max", Unit.ITEM, "JDISC Open file descriptors"),
diff --git a/container-core/src/main/java/com/yahoo/metrics/Unit.java b/container-core/src/main/java/com/yahoo/metrics/Unit.java
index 6f60ce9056b..5a4a0108534 100644
--- a/container-core/src/main/java/com/yahoo/metrics/Unit.java
+++ b/container-core/src/main/java/com/yahoo/metrics/Unit.java
@@ -23,7 +23,8 @@ public enum Unit {
RESPONSE_PER_SECOND(BaseUnit.RESPONSE, BaseUnit.SECOND),
SCORE(BaseUnit.SCORE),
SECOND(BaseUnit.SECOND),
- THREAD(BaseUnit.THREAD);
+ THREAD(BaseUnit.THREAD),
+ VERSION(BaseUnit.VERSION);
private final BaseUnit unit;
@@ -65,7 +66,8 @@ public enum Unit {
RESPONSE("response"),
SCORE("score"),
SECOND("second", "s"),
- THREAD("thread");
+ THREAD("thread"),
+ VERSION("version");
private final String fullName;
private final String shortName;