Merge pull request #34 from Cinimex-Informatica/feature/issue5_incorrect_counters

issue5 Resolves: #5

Author: echerniak

src/main/java/ru/cinimex/exporter/ExporterLauncher.java

@@ -40,19 +40,19 @@ public static void main(String[] args) throws MQException, IOException {
             ArrayList<MQObject> objects = new ArrayList<>();
 
             if (config.sendPCFCommands()) {
-                if (config.getQueues().size() > 0) {
+                if (config.getQueues() != null && config.getQueues().size() > 0) {
                     monitoringTypes.add(MQObject.MQType.QUEUE);
                     for (String queueName : config.getQueues()) {
                         objects.add(new MQObject(queueName, MQObject.MQType.QUEUE));
                     }
                 }
-                if (config.getChannels().size() > 0) {
+                if (config.getChannels() != null && config.getChannels().size() > 0) {
                     monitoringTypes.add(MQObject.MQType.CHANNEL);
                     for (String channelName : config.getChannels()) {
                         objects.add(new MQObject(channelName, MQObject.MQType.CHANNEL));
                     }
                 }
-                if (config.getListeners().size() > 0) {
+                if (config.getListeners() != null && config.getListeners().size() > 0) {
                     monitoringTypes.add(MQObject.MQType.LISTENER);
                     for (String listenerName : config.getListeners()) {
                         objects.add(new MQObject(listenerName, MQObject.MQType.LISTENER));

src/main/java/ru/cinimex/exporter/mq/MQConnection.java

@@ -37,7 +37,7 @@ protected static Hashtable<String, Object> createMQConnectionParams(String host,
         Hashtable<String, Object> properties = new Hashtable<String, Object>();
         properties.put(MQConstants.TRANSPORT_PROPERTY, host == null ? MQConstants.TRANSPORT_MQSERIES_BINDINGS : MQConstants.TRANSPORT_MQSERIES_CLIENT);
         if (host != null) properties.put(MQConstants.HOST_NAME_PROPERTY, host);
-        if (port != 0) properties.put(MQConstants.PORT_PROPERTY, new Integer(port));
+        if (port != 0) properties.put(MQConstants.PORT_PROPERTY, port);
         if (channel != null) properties.put(MQConstants.CHANNEL_PROPERTY, channel);
         if (user != null || password != null) {
             if (useMQCSP) properties.put(MQConstants.USE_MQCSP_AUTHENTICATION_PROPERTY, true);

src/main/java/ru/cinimex/exporter/mq/MQObject.java

@@ -3,10 +3,6 @@
 import com.ibm.mq.constants.MQConstants;
 import com.ibm.mq.pcf.PCFMessage;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
 /**
  * Class represents MQObject (Queue, channel or listener). It stores object type and all PCFParameters, required for correct request.
  */

src/main/java/ru/cinimex/exporter/prometheus/metrics/GaugeManager.java

@@ -1,6 +1,5 @@
 package ru.cinimex.exporter.prometheus.metrics;
 
-import com.ibm.mq.constants.MQConstants;
 import ru.cinimex.exporter.mq.MQObject;
 import ru.cinimex.exporter.mq.pcf.PCFElement;
 import ru.cinimex.exporter.mq.pcf.PCFElementRow;
@@ -25,19 +24,25 @@ public static void initMetrics(ArrayList<PCFElement> elements, ArrayList<MQObjec
         for (PCFElement element : elements) {
             for (PCFElementRow row : element.getRows()) {
                 String metricName = MetricsReference.getMetricName(row.getRowDesc(), element.requiresMQObject(), row.getRowDatatype());
+                MetricsReference.Metric.Type metricType = MetricsReference.getMetricType(row.getRowDesc(), element.requiresMQObject());
                 ArrayList<String> labels = new ArrayList<>();
                 labels.add(Labels.QMGR_NAME.name());
                 MetricInterface metric;
                 if (element.requiresMQObject()) {
                     labels.add(Labels.MQ_OBJECT_NAME.name());
                 }
-                if (row.getRowDatatype() == MQConstants.MQIAMO_MONITOR_DELTA) {
-                    metric = new SimpleCounter(metricName, row.getRowDesc(), labels.stream().toArray(String[]::new));
-                } else {
-                    metric = new SimpleGauge(metricName, row.getRowDesc(), labels.stream().toArray(String[]::new));
+                switch (metricType) {
+                    case SimpleGauge:
+                        metric = new SimpleGauge(metricName, row.getRowDesc(), labels.stream().toArray(String[]::new));
+                        metrics.put(metricName, metric);
+                        break;
+                    case SimpleCounter:
+                        metric = new SimpleCounter(metricName, row.getRowDesc(), labels.stream().toArray(String[]::new));
+                        metrics.put(metricName, metric);
+                        break;
+                    default:
+                        System.err.println("Unknown metric type!");
                 }
-
-                metrics.put(metricName, metric);
             }
         }
         for (MQObject.MQType type : types) {