Skip to content

Commit c26bffd

Browse files
committed
[jmx-scraper] Create weaver model for jmx-scraper metrics #2072
- fixed the updated desc in JvmIntegrationTest
1 parent 9101837 commit c26bffd

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ protected MetricsVerifier createMetricsVerifier() {
186186
"jvm.threads.count",
187187
metric ->
188188
metric
189-
.hasDescription("number of threads")
189+
.hasDescription("current number of thread count")
190190
.hasUnit("{thread}")
191191
.isGauge()
192192
.hasDataPointsWithoutAttributes());

jmx-scraper/src/main/resources/jvm.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ rules:
7575
mapping:
7676
Usage.committed:
7777
metric: jvm.memory.pool.committed
78-
desc: current memory pool usage
78+
desc: current memory pool size
7979
Usage.init:
8080
metric: jvm.memory.pool.init
81-
desc: current memory pool usage
81+
desc: initial memory pool size
8282
Usage.max:
8383
metric: jvm.memory.pool.max
84-
desc: current memory pool usage
84+
desc: max memory pool size
8585
Usage.used:
8686
metric: jvm.memory.pool.used
8787
desc: current memory pool usage
@@ -92,4 +92,4 @@ rules:
9292
ThreadCount:
9393
metric: jvm.threads.count
9494
unit: "{thread}"
95-
desc: number of threads
95+
desc: current number of thread count

jmx-scraper/templates/registry/rules/jvm.yaml.j2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,19 @@ rules:
9898
{%- if m.id == jvm_memory_prefix + "pool.committed" %}
9999
Usage.committed:
100100
metric: {{ m.id | safe }}
101-
desc: current memory pool usage
101+
desc: {{ m.brief | safe }}
102102
{%- elif m.id == jvm_memory_prefix + "pool.init" %}
103103
Usage.init:
104104
metric: {{ m.id | safe }}
105-
desc: current memory pool usage
105+
desc: {{ m.brief | safe }}
106106
{%- elif m.id == jvm_memory_prefix + "pool.max" %}
107107
Usage.max:
108108
metric: {{ m.id | safe }}
109-
desc: current memory pool usage
109+
desc: {{ m.brief | safe }}
110110
{%- elif m.id == jvm_memory_prefix + "pool.used" %}
111111
Usage.used:
112112
metric: {{ m.id | safe }}
113-
desc: current memory pool usage
113+
desc: {{ m.brief | safe }}
114114
{%- endif %}
115115
{%- endfor %}
116116

@@ -121,4 +121,4 @@ rules:
121121
{%- set m_threads_count = (ctx.groups | selectattr("id", "equalto", "jvm.threads.count") | first) %}
122122
metric: {{ m_threads_count.id | safe}}
123123
unit: "{{ m_threads_count.unit | safe }}"
124-
desc: number of threads
124+
desc: {{ m_threads_count.brief | safe }}

0 commit comments

Comments
 (0)