Skip to content

Commit

Permalink
Merge pull request #33211 from vespa-engine/bjorncs/micrometer
Browse files Browse the repository at this point in the history 
Add additional metics
  • Loading branch information
@bjorncs
bjorncs authored Jan 31, 2025
2 parents 285ac01 + f552c97 commit 5ba3713
Showing 1 changed file with 27 additions and 12 deletions.
39 changes: 27 additions & 12 deletions metrics/src/main/java/ai/vespa/metrics/set/MicrometerMetrics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,27 @@
import static ai.vespa.metrics.Suffix.sum;

public enum MicrometerMetrics implements VespaMetrics {
JVM_MEMORY_COMMITTED("jvm.memory.committed",Unit.BYTE, "The amount of memory in bytes that is committed for the Java virtual machine to use"),
JVM_MEMORY_MAX("jvm.memory.max", Unit.BYTE, "The maximum amount of memory in bytes that can be used for memory management"),
JVM_MEMORY_USED("jvm.memory.used",Unit.BYTE, "The amount of used memory"),
JVM_BUFFER_COUNT("jvm.buffer.count",Unit.BUFFER, "An estimate of the number of buffers in the pool"),
JVM_BUFFER_MEMORY_USED("jvm.buffer.memory.used",Unit.BYTE, "An estimate of the memory that the Java virtual machine is using for this buffer pool"),
JVM_BUFFER_TOTAL_CAPACITY("jvm.buffer.total.capacity",Unit.BYTE, "An estimate of the total capacity of the buffers in this pool"),
JVM_CLASSES_LOADED("jvm.classes.loaded",Unit.CLASS, "The number of classes that are currently loaded in the Java virtual machine"),
JVM_CLASSES_UNLOADED("jvm.classes.unloaded",Unit.CLASS, "The total number of classes unloaded since the Java virtual machine has started execution"),
JVM_GC_CONCURRENT_PHASE_TIME("jvm.gc.concurrent.phase.time", Unit.SECOND, "Time spent in concurrent phase"),
JVM_GC_LIVE_DATA_SIZE("jvm.gc.live.data.size", Unit.BYTE, "Size of long-lived heap memory pool after reclamation"),
JVM_GC_MAX_DATA_SIZE("jvm.gc.max.data.size", Unit.BYTE, "Max size of long-lived heap memory pool"),
JVM_GC_MEMORY_ALLOCATED("jvm.gc.memory.allocated", Unit.BYTE, "Incremented for an increase in the size of the (young) heap memory pool after one GC to before the next"),
JVM_GC_MEMORY_PROMOTED("jvm.gc.memory.promoted", Unit.BYTE, "Count of positive increases in the size of the old generation memory pool before GC to after GC"),
JVM_GC_OVERHEAD("jvm.gc.overhead",Unit.PERCENTAGE, "An approximation of the percent of CPU time used by GC activities"),
JVM_GC_PAUSE("jvm.gc.pause",Unit.SECOND, "Time spent in GC pause"),
JVM_MEMORY_COMMITTED("jvm.memory.committed",Unit.BYTE, "The amount of memory in bytes that is committed for the Java virtual machine to use"),
JVM_MEMORY_MAX("jvm.memory.max", Unit.BYTE, "The maximum amount of memory in bytes that can be used for memory management"),
JVM_MEMORY_USAGE_AFTER_GC("jvm.memory.usage.after.gc",Unit.PERCENTAGE, "The percentage of long-lived heap pool used after the last GC event"),
JVM_MEMORY_USED("jvm.memory.used",Unit.BYTE, "The amount of used memory"),
JVM_THREADS_DAEMON("jvm.threads.daemon",Unit.THREAD, "The current number of live daemon threads"),
JVM_THREADS_LIVE("jvm.threads.live",Unit.THREAD, "The current number of live threads including both daemon and non-daemon threads"),
JVM_THREADS_STATES("jvm.threads.states",Unit.THREAD, "The current number of threads (in each state)"),
JVM_GC_OVERHEAD("jvm.gc.overhead",Unit.PERCENTAGE, "An approximation of the percent of CPU time used by GC activities"),
JVM_MEMORY_USAGE_AFTER_GC("jvm.memory.usage.after.gc",Unit.PERCENTAGE, "The percentage of long-lived heap pool used after the last GC event");
JVM_THREADS_PEAK("jvm.threads.peak",Unit.THREAD, "The peak live thread count since the Java virtual machine started or peak was reset"),
JVM_THREADS_STARTED("jvm.threads.started",Unit.THREAD, "The total number of application threads started in the JVM"),
JVM_THREADS_STATES("jvm.threads.states",Unit.THREAD, "The current number of threads (in each state)");

MicrometerMetrics(String name, Unit unit, String description) {
this.name = name;
Expand All @@ -43,20 +51,27 @@ public enum MicrometerMetrics implements VespaMetrics {

public static MetricSet asMetricSet() {
return new MetricSet.Builder("default-micrometer")
.metric(JVM_MEMORY_COMMITTED, EnumSet.of(sum, count, max))
.metric(JVM_MEMORY_MAX, EnumSet.of(sum, count, max))
.metric(JVM_MEMORY_USED, EnumSet.of(sum, count, max))
.metric(JVM_BUFFER_COUNT, EnumSet.of(sum, count, max))
.metric(JVM_BUFFER_MEMORY_USED, EnumSet.of(sum, count, max))
.metric(JVM_BUFFER_TOTAL_CAPACITY, EnumSet.of(sum, count, max))
.metric(JVM_CLASSES_LOADED, EnumSet.of(sum, count, max))
.metric(JVM_CLASSES_UNLOADED, EnumSet.of(last))
.metric(JVM_GC_CONCURRENT_PHASE_TIME, EnumSet.of(sum, count, max))
.metric(JVM_GC_LIVE_DATA_SIZE, EnumSet.of(sum, count, max))
.metric(JVM_GC_MAX_DATA_SIZE, EnumSet.of(sum, count, max))
.metric(JVM_GC_MEMORY_ALLOCATED, EnumSet.of(last))
.metric(JVM_GC_MEMORY_PROMOTED, EnumSet.of(last))
.metric(JVM_GC_OVERHEAD, EnumSet.of(sum, count, max))
.metric(JVM_GC_PAUSE, EnumSet.of(sum, count, max))
.metric(JVM_THREADS_LIVE, EnumSet.of(sum, count, max))
.metric(JVM_THREADS_STATES, EnumSet.of(sum, count, max))
.metric(JVM_MEMORY_COMMITTED, EnumSet.of(sum, count, max))
.metric(JVM_GC_OVERHEAD, EnumSet.of(sum, count, max))
.metric(JVM_MEMORY_MAX, EnumSet.of(sum, count, max))
.metric(JVM_MEMORY_USAGE_AFTER_GC, EnumSet.of(sum, count, max))
.metric(JVM_MEMORY_USED, EnumSet.of(sum, count, max))
.metric(JVM_THREADS_DAEMON, EnumSet.of(sum, count, max))
.metric(JVM_THREADS_LIVE, EnumSet.of(sum, count, max))
.metric(JVM_THREADS_PEAK, EnumSet.of(sum, count, max))
.metric(JVM_THREADS_STARTED, EnumSet.of(last))
.metric(JVM_THREADS_STATES, EnumSet.of(sum, count, max))
.build();
}

Expand Down

0 comments on commit 5ba3713

Please sign in to comment.