Skip to content

Commit 2339571

Browse files
breedx-splkbreedx-splk
committed
wire up attribute key constants
1 parent 751c32b commit 2339571

File tree

12 files changed

+85
-85
lines changed

12 files changed

+85
-85
lines changed

‎ibm-mq-metrics/src/integrationTest/java/io/opentelemetry/ibm/mq/integration/tests/WMQMonitorIntegrationTest.java‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package io.opentelemetry.ibm.mq.integration.tests;
77

8+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
9+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.MESSAGING_DESTINATION_NAME;
810
import static org.assertj.core.api.Assertions.assertThat;
911
import static org.assertj.core.api.Assertions.fail;
1012
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -16,7 +18,6 @@
1618
import com.ibm.mq.headers.pcf.PCFException;
1719
import com.ibm.mq.headers.pcf.PCFMessage;
1820
import com.ibm.mq.headers.pcf.PCFMessageAgent;
19-
import io.opentelemetry.api.common.AttributeKey;
2021
import io.opentelemetry.api.metrics.Meter;
2122
import io.opentelemetry.ibm.mq.config.QueueManager;
2223
import io.opentelemetry.ibm.mq.opentelemetry.ConfigWrapper;
@@ -191,46 +192,46 @@ void test_monitor_with_full_config() throws Exception {
191192
}
192193
Set<String> metricNames = metrics.keySet();
193194
// this value is read from the active channels count:
194-
assertThat(metricNames).contains("mq.manager.active.channels");
195+
assertThat(metricNames).contains("ibm.mq.manager.active.channels");
195196
// this value is read from the configuration queue.
196-
assertThat(metricNames).contains("mq.manager.max.handles");
197+
assertThat(metricNames).contains("ibm.mq.manager.max.handles");
197198
// this value is read from the queue manager events, for unauthorized events.
198-
assertThat(metricNames).contains("mq.unauthorized.event");
199+
assertThat(metricNames).contains("ibm.mq.unauthorized.event");
199200
// this value is read from the performance event queue.
200-
assertThat(metricNames).contains("mq.queue.depth.full.event");
201+
assertThat(metricNames).contains("ibm.mq.queue.depth.full.event");
201202
// this value is read from the performance event queue.
202-
assertThat(metricNames).contains("mq.queue.depth.high.event");
203-
assertThat(metricNames).contains("mq.queue.depth.low.event");
203+
assertThat(metricNames).contains("ibm.mq.queue.depth.high.event");
204+
assertThat(metricNames).contains("ibm.mq.queue.depth.low.event");
204205
// reads a value from the heartbeat gauge
205-
assertThat(metricNames).contains("mq.heartbeat");
206-
assertThat(metricNames).contains("mq.oldest.msg.age");
207-
if (metrics.get("mq.oldest.msg.age") != null) {
206+
assertThat(metricNames).contains("ibm.mq.heartbeat");
207+
assertThat(metricNames).contains("ibm.mq.oldest.msg.age");
208+
if (metrics.get("ibm.mq.oldest.msg.age") != null) {
208209
Set<String> queueNames =
209-
metrics.get("mq.oldest.msg.age").getLongGaugeData().getPoints().stream()
210-
.map(pt -> pt.getAttributes().get(AttributeKey.stringKey("queue.name")))
210+
metrics.get("ibm.mq.oldest.msg.age").getLongGaugeData().getPoints().stream()
211+
.map(pt -> pt.getAttributes().get(MESSAGING_DESTINATION_NAME))
211212
.collect(Collectors.toSet());
212213
assertThat(queueNames).contains("smallqueue");
213214
}
214215
// make sure we get MQ manager status
215-
assertThat(metricNames).contains("mq.manager.status");
216-
if (metrics.get("mq.manager.status") != null) {
216+
assertThat(metricNames).contains("ibm.mq.manager.status");
217+
if (metrics.get("ibm.mq.manager.status") != null) {
217218
Set<String> queueManagers =
218-
metrics.get("mq.manager.status").getLongGaugeData().getPoints().stream()
219-
.map(pt -> pt.getAttributes().get(AttributeKey.stringKey("queue.manager")))
219+
metrics.get("ibm.mq.manager.status").getLongGaugeData().getPoints().stream()
220+
.map(pt -> pt.getAttributes().get(IBM_MQ_QUEUE_MANAGER))
220221
.collect(Collectors.toSet());
221222
assertThat(queueManagers).contains("QM1");
222223
}
223224

224-
assertThat(metricNames).contains("mq.onqtime.2");
225-
if (metrics.get("mq.onqtime.2") != null) {
225+
assertThat(metricNames).contains("ibm.mq.onqtime.2");
226+
if (metrics.get("ibm.mq.onqtime.2") != null) {
226227
Set<String> queueNames =
227-
metrics.get("mq.onqtime.2").getLongGaugeData().getPoints().stream()
228-
.map(pt -> pt.getAttributes().get(AttributeKey.stringKey("queue.name")))
228+
metrics.get("ibm.mq.onqtime.2").getLongGaugeData().getPoints().stream()
229+
.map(pt -> pt.getAttributes().get(MESSAGING_DESTINATION_NAME))
229230
.collect(Collectors.toSet());
230231
assertThat(queueNames).contains("smallqueue");
231232
Set<String> queueManagers =
232-
metrics.get("mq.manager.status").getLongGaugeData().getPoints().stream()
233-
.map(pt -> pt.getAttributes().get(AttributeKey.stringKey("queue.manager")))
233+
metrics.get("ibm.mq.manager.status").getLongGaugeData().getPoints().stream()
234+
.map(pt -> pt.getAttributes().get(IBM_MQ_QUEUE_MANAGER))
234235
.collect(Collectors.toSet());
235236
assertThat(queueManagers).contains("QM1");
236237
// TODO: Add more asserts about data values, units, attributes, etc, not just names
@@ -267,17 +268,17 @@ void test_otlphttp() throws Exception {
267268
metricNames.add(metricData.getName());
268269
}
269270
// this value is read from the active channels count:
270-
assertThat(metricNames).contains("mq.manager.active.channels");
271+
assertThat(metricNames).contains("ibm.mq.manager.active.channels");
271272
// this value is read from the configuration queue.
272-
assertThat(metricNames).contains("mq.manager.max.handles");
273+
assertThat(metricNames).contains("ibm.mq.manager.max.handles");
273274
// this value is read from the queue manager events, for unauthorized events.
274-
assertThat(metricNames).contains("mq.unauthorized.event");
275+
assertThat(metricNames).contains("ibm.mq.unauthorized.event");
275276
// this value is read from the performance event queue.
276-
assertThat(metricNames).contains("mq.queue.depth.full.event");
277+
assertThat(metricNames).contains("ibm.mq.queue.depth.full.event");
277278
// this value is read from the performance event queue.
278-
assertThat(metricNames).contains("mq.queue.depth.high.event");
279-
assertThat(metricNames).contains("mq.queue.depth.low.event");
279+
assertThat(metricNames).contains("ibm.mq.queue.depth.high.event");
280+
assertThat(metricNames).contains("ibm.mq.queue.depth.low.event");
280281
// reads a value from the heartbeat gauge
281-
assertThat(metricNames).contains("mq.heartbeat");
282+
assertThat(metricNames).contains("ibm.mq.heartbeat");
282283
}
283284
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
package io.opentelemetry.ibm.mq;
77

8+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
9+
810
import com.fasterxml.jackson.databind.ObjectMapper;
911
import com.ibm.mq.MQQueueManager;
1012
import com.ibm.mq.headers.pcf.PCFMessageAgent;
11-
import io.opentelemetry.api.common.AttributeKey;
1213
import io.opentelemetry.api.common.Attributes;
1314
import io.opentelemetry.api.metrics.LongGauge;
1415
import io.opentelemetry.api.metrics.Meter;
@@ -65,7 +66,7 @@ public WmqMonitor(ConfigWrapper config, ExecutorService threadPool, Meter meter)
6566

6667
this.metricsConfig = new MetricsConfig(config);
6768

68-
this.heartbeatGauge = meter.gaugeBuilder("mq.heartbeat").setUnit("1").ofLongs().build();
69+
this.heartbeatGauge = meter.gaugeBuilder("ibm.mq.heartbeat").setUnit("1").ofLongs().build();
6970
this.threadPool = threadPool;
7071

7172
jobs.add(new QueueManagerMetricsCollector(meter));
@@ -108,8 +109,7 @@ public void run(QueueManager queueManager) {
108109
} finally {
109110
if (this.metricsConfig.isIbmMqHeartbeatEnabled()) {
110111
heartbeatGauge.set(
111-
heartBeatMetricValue,
112-
Attributes.of(AttributeKey.stringKey("queue.manager"), queueManagerName));
112+
heartBeatMetricValue, Attributes.of(IBM_MQ_QUEUE_MANAGER, queueManagerName));
113113
}
114114
cleanUp(ibmQueueManager, agent);
115115
long endTime = System.currentTimeMillis() - startTime;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
import static com.ibm.mq.constants.CMQC.MQRC_SELECTOR_ERROR;
99
import static com.ibm.mq.constants.CMQCFC.MQRCCF_CHL_STATUS_NOT_FOUND;
10+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
1011

1112
import com.ibm.mq.constants.CMQC;
1213
import com.ibm.mq.constants.CMQCFC;
1314
import com.ibm.mq.headers.pcf.PCFException;
1415
import com.ibm.mq.headers.pcf.PCFMessage;
15-
import io.opentelemetry.api.common.AttributeKey;
1616
import io.opentelemetry.api.common.Attributes;
1717
import io.opentelemetry.api.metrics.LongGauge;
1818
import io.opentelemetry.api.metrics.Meter;
@@ -158,8 +158,7 @@ public void accept(MetricsCollectorContext context) {
158158
logger.info(
159159
"Active Channels in queueManager {} are {}", context.getQueueManagerName(), activeChannels);
160160
activeChannelsGauge.set(
161-
activeChannels.size(),
162-
Attributes.of(AttributeKey.stringKey("queue.manager"), context.getQueueManagerName()));
161+
activeChannels.size(), Attributes.of(IBM_MQ_QUEUE_MANAGER, context.getQueueManagerName()));
163162

164163
long exitTime = System.currentTimeMillis() - entryTime;
165164
logger.debug("Time taken to publish metrics for all channels is {} milliseconds", exitTime);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55

66
package io.opentelemetry.ibm.mq.metricscollector;
77

8+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
9+
810
import com.ibm.mq.constants.CMQC;
911
import com.ibm.mq.constants.CMQCFC;
1012
import com.ibm.mq.constants.MQConstants;
1113
import com.ibm.mq.headers.pcf.MQCFIL;
1214
import com.ibm.mq.headers.pcf.PCFMessage;
13-
import io.opentelemetry.api.common.AttributeKey;
1415
import io.opentelemetry.api.common.Attributes;
1516
import io.opentelemetry.api.metrics.LongGauge;
1617
import io.opentelemetry.api.metrics.Meter;
@@ -62,8 +63,7 @@ public void accept(MetricsCollectorContext context) {
6263
if (context.getMetricsConfig().isIbmMqManagerStatisticsIntervalEnabled()) {
6364
int interval = responses.get(0).getIntParameterValue(CMQC.MQIA_STATISTICS_INTERVAL);
6465
statisticsIntervalGauge.set(
65-
interval,
66-
Attributes.of(AttributeKey.stringKey("queue.manager"), context.getQueueManagerName()));
66+
interval, Attributes.of(IBM_MQ_QUEUE_MANAGER, context.getQueueManagerName()));
6767
}
6868
} catch (Exception e) {
6969
logger.error("Error collecting QueueManagerCmd metrics", e);

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55

66
package io.opentelemetry.ibm.mq.metricscollector;
77

8+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
9+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.MESSAGING_DESTINATION_NAME;
10+
811
import com.ibm.mq.constants.CMQC;
912
import com.ibm.mq.constants.CMQCFC;
1013
import com.ibm.mq.headers.MQDataException;
1114
import com.ibm.mq.headers.pcf.PCFException;
1215
import com.ibm.mq.headers.pcf.PCFMessage;
13-
import io.opentelemetry.api.common.AttributeKey;
1416
import io.opentelemetry.api.common.Attributes;
1517
import io.opentelemetry.api.metrics.LongGauge;
1618
import io.opentelemetry.api.metrics.Meter;
@@ -112,9 +114,9 @@ private void extractMetrics(
112114
throws PCFException {
113115
Attributes attributes =
114116
Attributes.of(
115-
AttributeKey.stringKey("messaging.destination.name"),
117+
MESSAGING_DESTINATION_NAME,
116118
topicString,
117-
AttributeKey.stringKey("ibm.mq.queue.manager"),
119+
IBM_MQ_QUEUE_MANAGER,
118120
context.getQueueManagerName());
119121
if (context.getMetricsConfig().isIbmMqPublishCountEnabled()) {
120122
int publisherCount = 0;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55

66
package io.opentelemetry.ibm.mq.metricscollector;
77

8+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_LISTENER_NAME;
9+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
10+
811
import com.ibm.mq.constants.CMQCFC;
912
import com.ibm.mq.headers.pcf.PCFException;
1013
import com.ibm.mq.headers.pcf.PCFMessage;
11-
import io.opentelemetry.api.common.AttributeKey;
1214
import io.opentelemetry.api.common.Attributes;
1315
import io.opentelemetry.api.metrics.LongGauge;
1416
import io.opentelemetry.api.metrics.Meter;
@@ -102,9 +104,9 @@ private void updateMetrics(
102104
listenerStatusGauge.set(
103105
status,
104106
Attributes.of(
105-
AttributeKey.stringKey("listener.name"),
107+
IBM_MQ_LISTENER_NAME,
106108
listenerName,
107-
AttributeKey.stringKey("queue.manager"),
109+
IBM_MQ_QUEUE_MANAGER,
108110
context.getQueueManagerName()));
109111
}
110112
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
package io.opentelemetry.ibm.mq.metricscollector;
77

8+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
9+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.MESSAGING_DESTINATION_NAME;
10+
811
import com.ibm.mq.MQException;
912
import com.ibm.mq.MQGetMessageOptions;
1013
import com.ibm.mq.MQMessage;
@@ -13,7 +16,6 @@
1316
import com.ibm.mq.constants.MQConstants;
1417
import com.ibm.mq.headers.pcf.PCFException;
1518
import com.ibm.mq.headers.pcf.PCFMessage;
16-
import io.opentelemetry.api.common.AttributeKey;
1719
import io.opentelemetry.api.common.Attributes;
1820
import io.opentelemetry.api.metrics.LongCounter;
1921
import io.opentelemetry.api.metrics.Meter;
@@ -82,9 +84,9 @@ private void incrementCounterByEventType(MetricsCollectorContext context, PCFMes
8284
String queueName = receivedMsg.getStringParameterValue(CMQC.MQCA_BASE_OBJECT_NAME).trim();
8385
Attributes attributes =
8486
Attributes.of(
85-
AttributeKey.stringKey("queue.manager"),
87+
IBM_MQ_QUEUE_MANAGER,
8688
context.getQueueManagerName(),
87-
AttributeKey.stringKey("queue.name"),
89+
MESSAGING_DESTINATION_NAME,
8890
queueName);
8991
switch (receivedMsg.getReason()) {
9092
case CMQC.MQRC_Q_FULL:

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import static com.ibm.mq.constants.CMQC.MQQT_LOCAL;
1111
import static com.ibm.mq.constants.CMQC.MQQT_MODEL;
1212
import static com.ibm.mq.constants.CMQC.MQQT_REMOTE;
13+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
14+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_TYPE;
15+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.MESSAGING_DESTINATION_NAME;
1316

1417
import com.ibm.mq.constants.CMQC;
1518
import com.ibm.mq.constants.CMQCFC;
@@ -19,7 +22,6 @@
1922
import com.ibm.mq.headers.pcf.PCFException;
2023
import com.ibm.mq.headers.pcf.PCFMessage;
2124
import com.ibm.mq.headers.pcf.PCFParameter;
22-
import io.opentelemetry.api.common.AttributeKey;
2325
import io.opentelemetry.api.common.Attributes;
2426
import io.opentelemetry.api.metrics.LongGauge;
2527
import io.opentelemetry.api.metrics.Meter;
@@ -271,11 +273,11 @@ private void updateMetrics(
271273
PCFParameter pcfParam = pcfMessage.getParameter(constantValue);
272274
Attributes attributes =
273275
Attributes.of(
274-
AttributeKey.stringKey("queue.name"),
276+
MESSAGING_DESTINATION_NAME,
275277
queueName,
276-
AttributeKey.stringKey("queue.type"),
278+
IBM_MQ_QUEUE_TYPE,
277279
queueType,
278-
AttributeKey.stringKey("queue.manager"),
280+
IBM_MQ_QUEUE_MANAGER,
279281
context.getQueueManagerName());
280282

281283
if (pcfParam instanceof MQCFIN) {

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
package io.opentelemetry.ibm.mq.metricscollector;
77

8+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
9+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.SERVICE_NAME;
10+
import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.USER_NAME;
11+
812
import com.ibm.mq.MQException;
913
import com.ibm.mq.MQGetMessageOptions;
1014
import com.ibm.mq.MQMessage;
@@ -13,7 +17,6 @@
1317
import com.ibm.mq.constants.CMQCFC;
1418
import com.ibm.mq.constants.MQConstants;
1519
import com.ibm.mq.headers.pcf.PCFMessage;
16-
import io.opentelemetry.api.common.AttributeKey;
1720
import io.opentelemetry.api.common.Attributes;
1821
import io.opentelemetry.api.metrics.LongCounter;
1922
import io.opentelemetry.api.metrics.Meter;
@@ -58,11 +61,11 @@ private void readEvents(MetricsCollectorContext context, String queueManagerEven
5861
authorityEventCounter.add(
5962
1,
6063
Attributes.of(
61-
AttributeKey.stringKey("queue.manager"),
64+
IBM_MQ_QUEUE_MANAGER,
6265
context.getQueueManagerName(),
63-
AttributeKey.stringKey("user.name"),
66+
USER_NAME,
6467
username,
65-
AttributeKey.stringKey("service.name"),
68+
SERVICE_NAME,
6669
applicationName));
6770
}
6871
} else {

0 commit comments

Comments
 (0)