Skip to content

Commit d39dcb8

Browse files
breedx-splkbreedx-splk
committed
fix units to bytes instead of mib
1 parent 3bf27da commit d39dcb8

File tree

6 files changed

+37
-21
lines changed

6 files changed

+37
-21
lines changed

‎ibm-mq-metrics/docs/metrics.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342

343343
| Name | Instrument Type | Unit (UCUM) | Description | Stability |
344344
| -------- | --------------- | ----------- | -------------- | --------- |
345-
| `ibm.mq.current.max.queue.filesize` | Gauge | `mib` | Current maximum queue file size | ![Development](https://img.shields.io/badge/-development-blue) |
345+
| `ibm.mq.current.max.queue.filesize` | Gauge | `By` | Current maximum queue file size | ![Development](https://img.shields.io/badge/-development-blue) |
346346

347347

348348
### `ibm.mq.current.max.queue.filesize` Attributes
@@ -361,7 +361,7 @@
361361

362362
| Name | Instrument Type | Unit (UCUM) | Description | Stability |
363363
| -------- | --------------- | ----------- | -------------- | --------- |
364-
| `ibm.mq.current.queue.filesize` | Gauge | `mib` | Current queue file size | ![Development](https://img.shields.io/badge/-development-blue) |
364+
| `ibm.mq.current.queue.filesize` | Gauge | `By` | Current queue file size | ![Development](https://img.shields.io/badge/-development-blue) |
365365

366366

367367
### `ibm.mq.current.queue.filesize` Attributes
@@ -475,7 +475,7 @@
475475

476476
| Name | Instrument Type | Unit (UCUM) | Description | Stability |
477477
| -------- | --------------- | ----------- | -------------- | --------- |
478-
| `ibm.mq.reusable.log.size` | Gauge | `mib` | The amount of space occupied, in megabytes, by log extents available to be reused. | ![Development](https://img.shields.io/badge/-development-blue) |
478+
| `ibm.mq.reusable.log.size` | Gauge | `By` | The amount of space occupied, in megabytes, by log extents available to be reused. | ![Development](https://img.shields.io/badge/-development-blue) |
479479

480480

481481
### `ibm.mq.reusable.log.size` Attributes
@@ -505,7 +505,7 @@
505505

506506
| Name | Instrument Type | Unit (UCUM) | Description | Stability |
507507
| -------- | --------------- | ----------- | -------------- | --------- |
508-
| `ibm.mq.restart.log.size` | Gauge | `mib` | Size of the log data required for restart recovery in megabytes. | ![Development](https://img.shields.io/badge/-development-blue) |
508+
| `ibm.mq.restart.log.size` | Gauge | `By` | Size of the log data required for restart recovery in megabytes. | ![Development](https://img.shields.io/badge/-development-blue) |
509509

510510

511511
### `ibm.mq.restart.log.size` Attributes
@@ -673,7 +673,7 @@
673673

674674
| Name | Instrument Type | Unit (UCUM) | Description | Stability |
675675
| -------- | --------------- | ----------- | -------------- | --------- |
676-
| `ibm.mq.archive.log.size` | Gauge | `mib` | Queue manager archive log size | ![Development](https://img.shields.io/badge/-development-blue) |
676+
| `ibm.mq.archive.log.size` | Gauge | `By` | Queue manager archive log size | ![Development](https://img.shields.io/badge/-development-blue) |
677677

678678

679679
### `ibm.mq.archive.log.size` Attributes

‎ibm-mq-metrics/model/metrics.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ groups:
283283
stability: development
284284
brief: "Current maximum queue file size"
285285
instrument: gauge
286-
unit: "mib"
286+
unit: "By"
287287
attributes:
288288
- ref: ibm.mq.queue.manager
289289
requirement_level: required
@@ -297,7 +297,7 @@ groups:
297297
stability: development
298298
brief: "Current queue file size"
299299
instrument: gauge
300-
unit: "mib"
300+
unit: "By"
301301
attributes:
302302
- ref: ibm.mq.queue.manager
303303
requirement_level: required
@@ -381,7 +381,7 @@ groups:
381381
stability: development
382382
brief: "The amount of space occupied, in megabytes, by log extents available to be reused."
383383
instrument: gauge
384-
unit: "mib"
384+
unit: "By"
385385
attributes:
386386
- ref: ibm.mq.queue.manager
387387
requirement_level: required
@@ -401,7 +401,7 @@ groups:
401401
stability: development
402402
brief: "Size of the log data required for restart recovery in megabytes."
403403
instrument: gauge
404-
unit: "mib"
404+
unit: "By"
405405
attributes:
406406
- ref: ibm.mq.queue.manager
407407
requirement_level: required
@@ -525,7 +525,7 @@ groups:
525525
stability: development
526526
brief: "Queue manager archive log size"
527527
instrument: gauge
528-
unit: "mib"
528+
unit: "By"
529529
attributes:
530530
- ref: ibm.mq.queue.manager
531531
requirement_level: required

‎ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metrics/Metrics.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
import io.opentelemetry.api.metrics.LongCounter;
99
import io.opentelemetry.api.metrics.LongGauge;
1010
import io.opentelemetry.api.metrics.Meter;
11+
import java.util.function.Function;
1112

1213
// This file is generated using weaver. Do not edit manually.
1314

1415
/** Metric definitions generated from a Weaver model. Do not edit manually. */
1516
public final class Metrics {
17+
public static final Function<Integer, Long> MIBY_TO_BYTES = x -> x * 1024L * 1024L;
18+
1619
private Metrics() {}
1720

1821
public static LongGauge createIbmMqMessageRetryCount(Meter meter) {
@@ -178,7 +181,7 @@ public static LongGauge createIbmMqCurrentMaxQueueFilesize(Meter meter) {
178181
return meter
179182
.gaugeBuilder("ibm.mq.current.max.queue.filesize")
180183
.ofLongs()
181-
.setUnit("mib")
184+
.setUnit("By")
182185
.setDescription("Current maximum queue file size")
183186
.build();
184187
}
@@ -187,7 +190,7 @@ public static LongGauge createIbmMqCurrentQueueFilesize(Meter meter) {
187190
return meter
188191
.gaugeBuilder("ibm.mq.current.queue.filesize")
189192
.ofLongs()
190-
.setUnit("mib")
193+
.setUnit("By")
191194
.setDescription("Current queue file size")
192195
.build();
193196
}
@@ -241,7 +244,7 @@ public static LongGauge createIbmMqReusableLogSize(Meter meter) {
241244
return meter
242245
.gaugeBuilder("ibm.mq.reusable.log.size")
243246
.ofLongs()
244-
.setUnit("mib")
247+
.setUnit("By")
245248
.setDescription(
246249
"The amount of space occupied, in megabytes, by log extents available to be reused.")
247250
.build();
@@ -260,7 +263,7 @@ public static LongGauge createIbmMqRestartLogSize(Meter meter) {
260263
return meter
261264
.gaugeBuilder("ibm.mq.restart.log.size")
262265
.ofLongs()
263-
.setUnit("mib")
266+
.setUnit("By")
264267
.setDescription("Size of the log data required for restart recovery in megabytes.")
265268
.build();
266269
}
@@ -352,7 +355,7 @@ public static LongGauge createIbmMqArchiveLogSize(Meter meter) {
352355
return meter
353356
.gaugeBuilder("ibm.mq.archive.log.size")
354357
.ofLongs()
355-
.setUnit("mib")
358+
.setUnit("By")
356359
.setDescription("Queue manager archive log size")
357360
.build();
358361
}

‎ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/QueueCollectionBuddy.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
1414
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_TYPE;
1515
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.MESSAGING_DESTINATION_NAME;
16+
import static io.opentelemetry.ibm.mq.metrics.Metrics.MIBY_TO_BYTES;
1617

1718
import com.ibm.mq.constants.CMQC;
1819
import com.ibm.mq.constants.CMQCFC;
@@ -55,9 +56,16 @@ private interface AllowedGauge {
5556

5657
private static AllowedGauge createAllowedGauge(
5758
LongGauge gauge, Function<MetricsConfig, Boolean> allowed) {
59+
return createAllowedGauge(gauge, allowed, Integer::longValue /*identity*/);
60+
}
61+
62+
private static AllowedGauge createAllowedGauge(
63+
LongGauge gauge,
64+
Function<MetricsConfig, Boolean> allowed,
65+
Function<Integer, Long> unitMangler) {
5866
return (context, val, attributes) -> {
5967
if (allowed.apply(context.getMetricsConfig())) {
60-
gauge.set(val, attributes);
68+
gauge.set(unitMangler.apply(val), attributes);
6169
}
6270
};
6371
}
@@ -118,12 +126,14 @@ private static AllowedGauge createAllowedGauge(
118126
CMQCFC.MQIACF_CUR_Q_FILE_SIZE,
119127
createAllowedGauge(
120128
Metrics.createIbmMqCurrentQueueFilesize(meter),
121-
MetricsConfig::isIbmMqCurrentQueueFilesizeEnabled));
129+
MetricsConfig::isIbmMqCurrentQueueFilesizeEnabled,
130+
MIBY_TO_BYTES));
122131
gauges.put(
123132
CMQCFC.MQIACF_CUR_MAX_FILE_SIZE,
124133
createAllowedGauge(
125134
Metrics.createIbmMqCurrentMaxQueueFilesize(meter),
126-
MetricsConfig::isIbmMqCurrentMaxQueueFilesizeEnabled));
135+
MetricsConfig::isIbmMqCurrentMaxQueueFilesizeEnabled,
136+
MIBY_TO_BYTES));
127137

128138
this.onqtimeShort = Metrics.createIbmMqOnqtime1(meter);
129139
this.onqtimeLong = Metrics.createIbmMqOnqtime2(meter);

‎ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/QueueManagerMetricsCollector.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.ibm.mq.metricscollector;
77

88
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
9+
import static io.opentelemetry.ibm.mq.metrics.Metrics.MIBY_TO_BYTES;
910

1011
import com.ibm.mq.constants.CMQCFC;
1112
import com.ibm.mq.headers.pcf.PCFMessage;
@@ -76,15 +77,15 @@ public void accept(MetricsCollectorContext context) {
7677
}
7778
if (context.getMetricsConfig().isIbmMqRestartLogSizeEnabled()) {
7879
int logSize = responses.get(0).getIntParameterValue(CMQCFC.MQIACF_RESTART_LOG_SIZE);
79-
restartLogSizeGauge.set(logSize, attributes);
80+
restartLogSizeGauge.set(MIBY_TO_BYTES.apply(logSize), attributes);
8081
}
8182
if (context.getMetricsConfig().isIbmMqReusableLogSizeEnabled()) {
8283
int logSize = responses.get(0).getIntParameterValue(CMQCFC.MQIACF_REUSABLE_LOG_SIZE);
83-
reuseLogSizeGauge.set(logSize, attributes);
84+
reuseLogSizeGauge.set(MIBY_TO_BYTES.apply(logSize), attributes);
8485
}
8586
if (context.getMetricsConfig().isIbmMqArchiveLogSizeEnabled()) {
8687
int logSize = responses.get(0).getIntParameterValue(CMQCFC.MQIACF_ARCHIVE_LOG_SIZE);
87-
archiveLogSizeGauge.set(logSize, attributes);
88+
archiveLogSizeGauge.set(MIBY_TO_BYTES.apply(logSize), attributes);
8889
}
8990
if (context.getMetricsConfig().isIbmMqManagerMaxActiveChannelsEnabled()) {
9091
int maxActiveChannels = context.getQueueManager().getMaxActiveChannels();

‎ibm-mq-metrics/templates/registry/java/Metrics.java.j2‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ package io.opentelemetry.ibm.mq.metrics;
77
import io.opentelemetry.api.metrics.LongCounter;
88
import io.opentelemetry.api.metrics.LongGauge;
99
import io.opentelemetry.api.metrics.Meter;
10+
import java.util.function.Function;
1011

1112
// This file is generated using weaver. Do not edit manually.
1213

1314
/** Metric definitions generated from a Weaver model. Do not edit manually. */
1415
public final class Metrics {
16+
public final static Function<Integer, Long> MIBY_TO_BYTES = x -> x * 1024L * 1024L;
1517
private Metrics(){
1618
}
1719
{% for metric in ctx %}

0 commit comments

Comments
 (0)