Skip to content

Commit 9f07105

Browse files
committed
Unit descriptions tuning
1 parent 8ad8974 commit 9f07105

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

instrumentation/jmx-metrics/library/src/main/resources/jmx/rules/tomcat.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ rules:
6363
metric: session.active.limit
6464
type: updowncounter
6565
unit: "{session}"
66-
desc: Maximum number of active sessions.
66+
desc: Maximum possible number of active sessions.
6767

6868
- beans:
6969
- Catalina:type=ThreadPool,name=*
@@ -79,7 +79,7 @@ rules:
7979
desc: Total thread count of the thread pool.
8080
maxThreads:
8181
metric: limit
82-
desc: Maximum thread count of the thread pool.
82+
desc: Maximum possible number of threads in the thread pool.
8383
currentThreadsBusy:
8484
metric: busy.count
8585
desc: Number of busy threads in the thread pool.

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private static MetricsVerifier createMetricsVerifier() {
122122
"tomcat.session.active.limit",
123123
metric ->
124124
metric
125-
.hasDescription("Maximum number of active sessions.")
125+
.hasDescription("Maximum possible number of active sessions.")
126126
.hasUnit("{session}")
127127
.isUpDownCounter()
128128
.hasDataPointsWithOneAttribute(attributeWithAnyValue("tomcat.context")))
@@ -138,7 +138,7 @@ private static MetricsVerifier createMetricsVerifier() {
138138
"tomcat.thread.limit",
139139
metric ->
140140
metric
141-
.hasDescription("Maximum thread count of the thread pool.")
141+
.hasDescription("Maximum possible number of threads in the thread pool.")
142142
.hasUnit("{thread}")
143143
.isUpDownCounter()
144144
.hasDataPointsWithOneAttribute(threadPoolNameAttribute))

instrumentation/jmx-metrics/library/tomcat.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
Here is the list of metrics based on MBeans exposed by Tomcat.
44

5-
| Metric Name | Type | Attributes | Description |
6-
|-----------------------------|---------------|-----------------------------------------------------|--------------------------------------------|
7-
| tomcat.session.active.count | UpDownCounter | tomcat.context | The number of currently active sessions. |
8-
| tomcat.session.active.limit | UpDownCounter | tomcat.context | Maximum number of active sessions. |
9-
| tomcat.error.count | Counter | tomcat.request.processor.name | The number of errors. |
10-
| tomcat.request.count | Counter | tomcat.request.processor.name | The number of requests processed. |
11-
| tomcat.request.duration.max | Gauge | tomcat.request.processor.name | The longest request processing time. |
12-
| tomcat.request.duration.sum | Counter | tomcat.request.processor.name | Total time of processing all requests. |
13-
| tomcat.network.io | Counter | tomcat.request.processor.name, network.io.direction | The number of bytes transmitted. |
14-
| tomcat.thread.count | UpDownCounter | tomcat.thread.pool.name | Total thread count of the thread pool. |
15-
| tomcat.thread.limit | UpDownCounter | tomcat.thread.pool.name | Maximum thread count of the thread pool. |
16-
| tomcat.thread.busy.count | UpDownCounter | tomcat.thread.pool.name | Number of busy threads in the thread pool. |
5+
| Metric Name | Type | Attributes | Description |
6+
|-----------------------------|---------------|-----------------------------------------------------|--------------------------------------------------------|
7+
| tomcat.session.active.count | UpDownCounter | tomcat.context | The number of currently active sessions. |
8+
| tomcat.session.active.limit | UpDownCounter | tomcat.context | Maximum possible number of active sessions. |
9+
| tomcat.error.count | Counter | tomcat.request.processor.name | The number of errors. |
10+
| tomcat.request.count | Counter | tomcat.request.processor.name | The number of requests processed. |
11+
| tomcat.request.duration.max | Gauge | tomcat.request.processor.name | The longest request processing time. |
12+
| tomcat.request.duration.sum | Counter | tomcat.request.processor.name | Total time of processing all requests. |
13+
| tomcat.network.io | Counter | tomcat.request.processor.name, network.io.direction | The number of bytes transmitted. |
14+
| tomcat.thread.count | UpDownCounter | tomcat.thread.pool.name | Total thread count of the thread pool. |
15+
| tomcat.thread.limit | UpDownCounter | tomcat.thread.pool.name | Maximum possible number of threads in the thread pool. |
16+
| tomcat.thread.busy.count | UpDownCounter | tomcat.thread.pool.name | Number of busy threads in the thread pool. |

0 commit comments

Comments
 (0)