additional attribute constants

Author: breedx-splk

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

@@ -7,6 +7,10 @@
 
 import static com.ibm.mq.constants.CMQC.MQRC_SELECTOR_ERROR;
 import static com.ibm.mq.constants.CMQCFC.MQRCCF_CHL_STATUS_NOT_FOUND;
+import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_CHANNEL_NAME;
+import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_CHANNEL_START_TIME;
+import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_CHANNEL_TYPE;
+import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_JOB_NAME;
 import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
 
 import com.ibm.mq.constants.CMQC;
@@ -175,11 +179,11 @@ private void updateMetrics(
       throws PCFException {
     Attributes attributes =
         Attributes.builder()
-            .put("channel.name", channelName)
-            .put("channel.type", channelType)
-            .put("queue.manager", context.getQueueManagerName())
-            .put("channel.start.time", channelStartTime)
-            .put("job.name", jobName)
+            .put(IBM_MQ_CHANNEL_NAME, channelName)
+            .put(IBM_MQ_CHANNEL_TYPE, channelType)
+            .put(IBM_MQ_QUEUE_MANAGER, context.getQueueManagerName())
+            .put(IBM_MQ_CHANNEL_START_TIME, channelStartTime)
+            .put(IBM_MQ_JOB_NAME, jobName)
             .build();
     if (context.getMetricsConfig().isIbmMqMessageCountEnabled()) {
       int received = message.getIntParameterValue(CMQCFC.MQIACH_MSGS);

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

@@ -5,6 +5,10 @@
 
 package io.opentelemetry.ibm.mq.metricscollector;
 
+import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_CHANNEL_NAME;
+import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_CHANNEL_TYPE;
+import static io.opentelemetry.ibm.mq.metrics.IbmMqAttributes.IBM_MQ_QUEUE_MANAGER;
+
 import com.ibm.mq.constants.CMQCFC;
 import com.ibm.mq.constants.MQConstants;
 import com.ibm.mq.headers.pcf.MQCFIL;
@@ -106,9 +110,9 @@ private void updateMetrics(
       throws PCFException {
     Attributes attributes =
         Attributes.builder()
-            .put("channel.name", channelName)
-            .put("channel.type", channelType)
-            .put("queue.manager", context.getQueueManagerName())
+            .put(IBM_MQ_CHANNEL_NAME, channelName)
+            .put(IBM_MQ_CHANNEL_TYPE, channelType)
+            .put(IBM_MQ_QUEUE_MANAGER, context.getQueueManagerName())
             .build();
     if (context.getMetricsConfig().isIbmMqMaxInstancesEnabled()
         && message.getParameter(CMQCFC.MQIACH_MAX_INSTANCES) != null) {

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

@@ -67,7 +67,7 @@ void testProcessPcfRequestAndPublishQMetricsForInquireQStatusCmd() throws Except
         collectorContext, request, "*", InquireQStatusCmdCollector.ATTRIBUTES);
 
     Map<String, Map<String, Long>> expectedValues =
-        new HashMap<String, Map<String, Long>>(
+        new HashMap<>(
             ImmutableMap.of(
                 "DEV.DEAD.LETTER.QUEUE",
                 new HashMap<>(
@@ -78,7 +78,7 @@ void testProcessPcfRequestAndPublishQMetricsForInquireQStatusCmd() throws Except
                         "ibm.mq.onqtime.2", -1L,
                         "ibm.mq.queue.depth", 0L)),
                 "DEV.QUEUE.1",
-                new HashMap<String, Long>(
+                new HashMap<>(
                     ImmutableMap.of(
                         "ibm.mq.oldest.msg.age", -1L,
                         "ibm.mq.uncommitted.messages", 10L,