Skip to content

Commit bfbc35d

Browse files
breedx-splkbreedx-splk
committed
fix tests
1 parent b7afbcb commit bfbc35d

File tree

7 files changed

+87
-85
lines changed

7 files changed

+87
-85
lines changed

‎ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/ChannelMetricsCollectorTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,37 +71,37 @@ void testPublishMetrics() throws Exception {
7171
List<String> metricsList =
7272
new ArrayList<>(
7373
Arrays.asList(
74-
"mq.message.count",
75-
"mq.status",
76-
"mq.byte.sent",
77-
"mq.byte.received",
78-
"mq.buffers.sent",
79-
"mq.buffers.received"));
74+
"ibm.mq.message.count",
75+
"ibm.mq.status",
76+
"ibm.mq.byte.sent",
77+
"ibm.mq.byte.received",
78+
"ibm.mq.buffers.sent",
79+
"ibm.mq.buffers.received"));
8080

8181
for (MetricData metric : otelTesting.getMetrics()) {
8282
if (metricsList.remove(metric.getName())) {
83-
if (metric.getName().equals("mq.message.count")) {
83+
if (metric.getName().equals("ibm.mq.message.count")) {
8484
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
8585
.isEqualTo(17);
8686
}
8787

88-
if (metric.getName().equals("mq.status")) {
88+
if (metric.getName().equals("ibm.mq.status")) {
8989
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
9090
.isEqualTo(3);
9191
}
92-
if (metric.getName().equals("mq.byte.sent")) {
92+
if (metric.getName().equals("ibm.mq.byte.sent")) {
9393
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
9494
.isEqualTo(6984);
9595
}
96-
if (metric.getName().equals("mq.byte.received")) {
96+
if (metric.getName().equals("ibm.mq.byte.received")) {
9797
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
9898
.isEqualTo(5772);
9999
}
100-
if (metric.getName().equals("mq.buffers.sent")) {
100+
if (metric.getName().equals("ibm.mq.buffers.sent")) {
101101
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
102102
.isEqualTo(19);
103103
}
104-
if (metric.getName().equals("mq.buffers.received")) {
104+
if (metric.getName().equals("ibm.mq.buffers.received")) {
105105
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
106106
.isEqualTo(20);
107107
}
@@ -214,7 +214,7 @@ void testPublishMetrics_pfException(Exception exceptionToThrow) throws Exception
214214

215215
List<MetricData> exported = otelTesting.getMetrics();
216216
assertThat(exported.get(0).getLongGaugeData().getPoints()).hasSize(1);
217-
assertThatMetric(exported.get(0), 0).hasName("mq.manager.active.channels").hasValue(0);
217+
assertThatMetric(exported.get(0), 0).hasName("ibm.mq.manager.active.channels").hasValue(0);
218218
}
219219

220220
static Stream<Arguments> exceptionsToThrow() {

‎ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/InquireChannelCmdCollectorTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,20 @@ public void testProcessPCFRequestAndPublishQMetricsForInquireQStatusCmd() throws
6262
List<String> metricsList =
6363
new ArrayList<>(
6464
Arrays.asList(
65-
"mq.message.retry.count", "mq.message.received.count", "mq.message.sent.count"));
65+
"ibm.mq.message.retry.count",
66+
"ibm.mq.message.received.count",
67+
"ibm.mq.message.sent.count"));
6668
for (MetricData metric : otelTesting.getMetrics()) {
6769
if (metricsList.remove(metric.getName())) {
68-
if (metric.getName().equals("mq.message.retry.count")) {
70+
if (metric.getName().equals("ibm.mq.message.retry.count")) {
6971
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
7072
.isEqualTo(22);
7173
}
72-
if (metric.getName().equals("mq.message.received.count")) {
74+
if (metric.getName().equals("ibm.mq.message.received.count")) {
7375
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
7476
.isEqualTo(42);
7577
}
76-
if (metric.getName().equals("mq.message.sent.count")) {
78+
if (metric.getName().equals("ibm.mq.message.sent.count")) {
7779
assertThat(metric.getLongGaugeData().getPoints().iterator().next().getValue())
7880
.isEqualTo(64);
7981
}

‎ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/ListenerMetricsCollectorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void testPublishMetrics() throws Exception {
5959
classUnderTest.accept(context);
6060

6161
MetricData metric = otelTesting.getMetrics().get(0);
62-
assertThat(metric.getName()).isEqualTo("mq.listener.status");
62+
assertThat(metric.getName()).isEqualTo("ibm.mq.listener.status");
6363
Set<Long> values = new HashSet<>();
6464
values.add(2L);
6565
values.add(3L);

‎ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/QueueCollectionBuddyTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ void testProcessPcfRequestAndPublishQMetricsForInquireQStatusCmd() throws Except
7272
"DEV.DEAD.LETTER.QUEUE",
7373
new HashMap<>(
7474
ImmutableMap.of(
75-
"mq.oldest.msg.age", -1L,
76-
"mq.uncommitted.messages", 0L,
77-
"mq.onqtime.1", -1L,
78-
"mq.onqtime.2", -1L,
79-
"mq.queue.depth", 0L)),
75+
"ibm.mq.oldest.msg.age", -1L,
76+
"ibm.mq.uncommitted.messages", 0L,
77+
"ibm.mq.onqtime.1", -1L,
78+
"ibm.mq.onqtime.2", -1L,
79+
"ibm.mq.queue.depth", 0L)),
8080
"DEV.QUEUE.1",
8181
new HashMap<String, Long>(
8282
ImmutableMap.of(
83-
"mq.oldest.msg.age", -1L,
84-
"mq.uncommitted.messages", 10L,
85-
"mq.onqtime.1", -1L,
86-
"mq.onqtime.2", -1L,
87-
"mq.queue.depth", 1L))));
83+
"ibm.mq.oldest.msg.age", -1L,
84+
"ibm.mq.uncommitted.messages", 10L,
85+
"ibm.mq.onqtime.1", -1L,
86+
"ibm.mq.onqtime.2", -1L,
87+
"ibm.mq.queue.depth", 1L))));
8888

8989
for (MetricData metric : otelTesting.getMetrics()) {
9090
for (LongPointData d : metric.getLongGaugeData().getPoints()) {
@@ -113,17 +113,17 @@ void testProcessPcfRequestAndPublishQMetricsForInquireQCmd() throws Exception {
113113
"DEV.DEAD.LETTER.QUEUE",
114114
new HashMap<>(
115115
ImmutableMap.of(
116-
"mq.queue.depth", 2L,
117-
"mq.max.queue.depth", 5000L,
118-
"mq.open.input.count", 2L,
119-
"mq.open.output.count", 2L)),
116+
"ibm.mq.queue.depth", 2L,
117+
"ibm.mq.max.queue.depth", 5000L,
118+
"ibm.mq.open.input.count", 2L,
119+
"ibm.mq.open.output.count", 2L)),
120120
"DEV.QUEUE.1",
121121
new HashMap<>(
122122
ImmutableMap.of(
123-
"mq.queue.depth", 3L,
124-
"mq.max.queue.depth", 5000L,
125-
"mq.open.input.count", 3L,
126-
"mq.open.output.count", 3L))));
123+
"ibm.mq.queue.depth", 3L,
124+
"ibm.mq.max.queue.depth", 5000L,
125+
"ibm.mq.open.input.count", 3L,
126+
"ibm.mq.open.output.count", 3L))));
127127

128128
for (MetricData metric : otelTesting.getMetrics()) {
129129
for (LongPointData d : metric.getLongGaugeData().getPoints()) {

‎ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/QueueManagerMetricsCollectorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void testProcessPCFRequestAndPublishQMetricsForInquireQStatusCmd() throws
5858
new QueueManagerMetricsCollector(
5959
otelTesting.getOpenTelemetry().getMeter("opentelemetry.io/mq"));
6060
classUnderTest.accept(context);
61-
List<String> metricsList = new ArrayList<>(singletonList("mq.manager.status"));
61+
List<String> metricsList = new ArrayList<>(singletonList("ibm.mq.manager.status"));
6262

6363
for (MetricData metric : otelTesting.getMetrics()) {
6464
if (metricsList.remove(metric.getName())) {

‎ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/TopicMetricsCollectorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ void testPublishMetrics() throws Exception {
6363
classUnderTest.accept(context);
6464

6565
List<String> metricsList =
66-
new ArrayList<>(Arrays.asList("mq.publish.count", "mq.subscription.count"));
66+
new ArrayList<>(Arrays.asList("ibm.mq.publish.count", "ibm.mq.subscription.count"));
6767

6868
for (MetricData metric : otelTesting.getMetrics()) {
6969
if (metricsList.remove(metric.getName())) {
70-
if (metric.getName().equals("mq.publish.count")) {
70+
if (metric.getName().equals("ibm.mq.publish.count")) {
7171
Set<Long> values = new HashSet<>();
7272
values.add(2L);
7373
values.add(3L);
@@ -77,7 +77,7 @@ void testPublishMetrics() throws Exception {
7777
.collect(Collectors.toSet()))
7878
.isEqualTo(values);
7979
}
80-
if (metric.getName().equals("mq.subscription.count")) {
80+
if (metric.getName().equals("ibm.mq.subscription.count")) {
8181
Set<Long> values = new HashSet<>();
8282
values.add(3L);
8383
values.add(4L);

‎ibm-mq-metrics/src/test/resources/conf/config.yml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -102,95 +102,95 @@ queueManagers:
102102
values: ["system","$SYS"]
103103

104104
metrics:
105-
"mq.message.retry.count": # Number of message retries
105+
"ibm.mq.message.retry.count": # Number of message retries
106106
enabled: true
107-
"mq.status": # Channel status
107+
"ibm.mq.status": # Channel status
108108
enabled: true
109-
"mq.max.sharing.conversations": # Maximum number of conversations permitted on this channel instance.
109+
"ibm.mq.max.sharing.conversations": # Maximum number of conversations permitted on this channel instance.
110110
enabled: true
111-
"mq.current.sharing.conversations": # Current number of conversations permitted on this channel instance.
111+
"ibm.mq.current.sharing.conversations": # Current number of conversations permitted on this channel instance.
112112
enabled: true
113-
"mq.byte.received": # Number of bytes received
113+
"ibm.mq.byte.received": # Number of bytes received
114114
enabled: true
115-
"mq.byte.sent": # Number of bytes sent
115+
"ibm.mq.byte.sent": # Number of bytes sent
116116
enabled: true
117-
"mq.buffers.received": # Buffers received
117+
"ibm.mq.buffers.received": # Buffers received
118118
enabled: true
119-
"mq.buffers.sent": # Buffers sent
119+
"ibm.mq.buffers.sent": # Buffers sent
120120
enabled: true
121-
"mq.message.count": # Message count
121+
"ibm.mq.message.count": # Message count
122122
enabled: true
123-
"mq.open.input.count": # Count of applications sending messages to the queue
123+
"ibm.mq.open.input.count": # Count of applications sending messages to the queue
124124
enabled: true
125-
"mq.open.output.count": # Count of applications consuming messages from the queue
125+
"ibm.mq.open.output.count": # Count of applications consuming messages from the queue
126126
enabled: true
127-
"mq.high.queue.depth": # The current high queue depth
127+
"ibm.mq.high.queue.depth": # The current high queue depth
128128
enabled: true
129-
"mq.service.interval": # The queue service interval
129+
"ibm.mq.service.interval": # The queue service interval
130130
enabled: true
131-
"mq.queue.depth.full.event": # The number of full queue events
131+
"ibm.mq.queue.depth.full.event": # The number of full queue events
132132
enabled: true
133-
"mq.queue.depth.high.event": # The number of high queue events
133+
"ibm.mq.queue.depth.high.event": # The number of high queue events
134134
enabled: true
135-
"mq.queue.depth.low.event": # The number of low queue events
135+
"ibm.mq.queue.depth.low.event": # The number of low queue events
136136
enabled: true
137-
"mq.uncommitted.messages": # Number of uncommitted messages
137+
"ibm.mq.uncommitted.messages": # Number of uncommitted messages
138138
enabled: true
139-
"mq.oldest.msg.age": # Queue message oldest age
139+
"ibm.mq.oldest.msg.age": # Queue message oldest age
140140
enabled: true
141-
"mq.current.max.queue.filesize": # Current maximum queue file size
141+
"ibm.mq.current.max.queue.filesize": # Current maximum queue file size
142142
enabled: true
143-
"mq.current.queue.filesize": # Current queue file size
143+
"ibm.mq.current.queue.filesize": # Current queue file size
144144
enabled: true
145-
"mq.instances.per.client": # Instances per client
145+
"ibm.mq.instances.per.client": # Instances per client
146146
enabled: true
147-
"mq.message.deq.count": # Message dequeue count
147+
"ibm.mq.message.deq.count": # Message dequeue count
148148
enabled: true
149-
"mq.message.enq.count": # Message enqueue count
149+
"ibm.mq.message.enq.count": # Message enqueue count
150150
enabled: true
151-
"mq.queue.depth": # Current queue depth
151+
"ibm.mq.queue.depth": # Current queue depth
152152
enabled: true
153-
"mq.service.interval.event": # Queue service interval event
153+
"ibm.mq.service.interval.event": # Queue service interval event
154154
enabled: true
155-
"mq.reusable.log.size": # The amount of space occupied, in megabytes, by log extents available to be reused.
155+
"ibm.mq.reusable.log.size": # The amount of space occupied, in megabytes, by log extents available to be reused.
156156
enabled: true
157-
"mq.manager.active.channels": # The queue manager active maximum channels limit
157+
"ibm.mq.manager.active.channels": # The queue manager active maximum channels limit
158158
enabled: true
159-
"mq.restart.log.size": # Size of the log data required for restart recovery in megabytes.
159+
"ibm.mq.restart.log.size": # Size of the log data required for restart recovery in megabytes.
160160
enabled: true
161-
"mq.max.queue.depth": # Maximum queue depth
161+
"ibm.mq.max.queue.depth": # Maximum queue depth
162162
enabled: true
163-
"mq.onqtime.1": # Amount of time, in microseconds, that a message spent on the queue, over a short period
163+
"ibm.mq.onqtime.1": # Amount of time, in microseconds, that a message spent on the queue, over a short period
164164
enabled: true
165-
"mq.onqtime.2": # Amount of time, in microseconds, that a message spent on the queue, over a longer period
165+
"ibm.mq.onqtime.2": # Amount of time, in microseconds, that a message spent on the queue, over a longer period
166166
enabled: true
167-
"mq.message.received.count": # Number of messages received
167+
"ibm.mq.message.received.count": # Number of messages received
168168
enabled: true
169-
"mq.message.sent.count": # Number of messages sent
169+
"ibm.mq.message.sent.count": # Number of messages sent
170170
enabled: true
171-
"mq.max.instances": # Max channel instances
171+
"ibm.mq.max.instances": # Max channel instances
172172
enabled: true
173-
"mq.connection.count": # Active connections count
173+
"ibm.mq.connection.count": # Active connections count
174174
enabled: true
175-
"mq.manager.status": # Queue manager status
175+
"ibm.mq.manager.status": # Queue manager status
176176
enabled: true
177-
"mq.heartbeat": # Queue manager heartbeat
177+
"ibm.mq.heartbeat": # Queue manager heartbeat
178178
enabled: true
179-
"mq.archive.log.size": # Queue manager archive log size
179+
"ibm.mq.archive.log.size": # Queue manager archive log size
180180
enabled: true
181-
"mq.manager.max.active.channels": # Queue manager max active channels
181+
"ibm.mq.manager.max.active.channels": # Queue manager max active channels
182182
enabled: true
183-
"mq.manager.statistics.interval": # Queue manager statistics interval
183+
"ibm.mq.manager.statistics.interval": # Queue manager statistics interval
184184
enabled: true
185-
"mq.publish.count": # Topic publication count
185+
"ibm.mq.publish.count": # Topic publication count
186186
enabled: true
187-
"mq.subscription.count": # Topic subscription count
187+
"ibm.mq.subscription.count": # Topic subscription count
188188
enabled: true
189-
"mq.listener.status": # Listener status
189+
"ibm.mq.listener.status": # Listener status
190190
enabled: true
191-
"mq.unauthorized.event": # Number of authentication error events
191+
"ibm.mq.unauthorized.event": # Number of authentication error events
192192
enabled: true
193-
"mq.manager.max.handles": # Max open handles
193+
"ibm.mq.manager.max.handles": # Max open handles
194194
enabled: true
195195

196196
#Run it as a scheduled task instead of running every minute.

0 commit comments

Comments
 (0)