Skip to content

Commit 81e6399

Browse files
willardgibbswillardgibbs
committed
some cosmetic changes
1 parent 913b6e0 commit 81e6399

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

‎src/main/java/ru/cinimex/exporter/prometheus/HTTPServer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.sun.net.httpserver.HttpExchange;
44
import com.sun.net.httpserver.HttpHandler;
55
import com.sun.net.httpserver.HttpServer;
6-
import io.prometheus.client.Collector;
76
import io.prometheus.client.CollectorRegistry;
87
import io.prometheus.client.exporter.common.TextFormat;
98
import org.apache.logging.log4j.LogManager;
@@ -16,11 +15,14 @@
1615
import java.net.HttpURLConnection;
1716
import java.net.InetSocketAddress;
1817
import java.net.URLDecoder;
19-
import java.util.Enumeration;
2018
import java.util.HashSet;
2119
import java.util.List;
2220
import java.util.Set;
23-
import java.util.concurrent.*;
21+
import java.util.concurrent.ExecutionException;
22+
import java.util.concurrent.ExecutorService;
23+
import java.util.concurrent.Executors;
24+
import java.util.concurrent.FutureTask;
25+
import java.util.concurrent.ThreadFactory;
2426
import java.util.concurrent.atomic.AtomicInteger;
2527
import java.util.zip.GZIPOutputStream;
2628

‎src/main/java/ru/cinimex/exporter/prometheus/metrics/MetricsManager.java

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package ru.cinimex.exporter.prometheus.metrics;
22

3-
import io.prometheus.client.CollectorRegistry;
43
import org.apache.logging.log4j.LogManager;
54
import org.apache.logging.log4j.Logger;
65
import ru.cinimex.exporter.mq.MQObject;
76
import ru.cinimex.exporter.mq.pcf.PCFElement;
87
import ru.cinimex.exporter.mq.pcf.PCFElementRow;
98

109
import java.util.ArrayList;
10+
import java.util.Arrays;
1111
import java.util.HashMap;
1212
import java.util.List;
1313
import java.util.Map;
1414
import java.util.Set;
15-
import java.util.function.Function;
1615

1716
import static ru.cinimex.exporter.prometheus.metrics.MetricsReference.getAdditionalMqObjectMetricsReference;
1817
import static ru.cinimex.exporter.prometheus.metrics.UpdateMetricUtils.*;
@@ -32,6 +31,7 @@ public class MetricsManager {
3231
*/
3332
public static void initMetrics(List<PCFElement> elements, List<MQObject.MQType> types) {
3433
logger.debug("Preparing to initialize metrics. {} metrics will be received from MQ topics and {} metrics will be received via direct PCF commands.", elements.size(), types.size());
34+
String logString = " created! Name: {}, description: {}, labels: {}.";
3535
metrics = new HashMap<>();
3636
for (PCFElement element : elements) {
3737
for (PCFElementRow row : element.getRows()) {
@@ -45,25 +45,27 @@ public static void initMetrics(List<PCFElement> elements, List<MQObject.MQType>
4545
case SIMPLE_GAUGE:
4646
metric = new SimpleGauge(metricName, row.getRowDesc(), labels.toArray(new String[0]));
4747
metrics.put(metricName, metric);
48-
logger.trace("New gauge created! Name: {}, description: {}, labels: {}.", metricName, row.getRowDesc(), labels);
48+
logger.trace("New " + "gauge" + logString, metricName, row.getRowDesc(), labels);
4949
break;
5050
case SIMPLE_COUNTER:
5151
metric = new SimpleCounter(metricName, row.getRowDesc(), labels.toArray(new String[0]));
5252
metrics.put(metricName, metric);
53-
logger.trace("New counter created! Name: {}, description: {}, labels: {}.", metricName, row.getRowDesc(), labels);
53+
logger.trace("New counter " + logString, metricName, row.getRowDesc(), labels);
5454
break;
5555
case EXTREME_GAUGE_MAX:
5656
metric = new ExtremeGauge(metricName, row.getRowDesc(), true, labels.toArray(new String[0]));
5757
metrics.put(metricName, metric);
58-
logger.trace("New extreme gauge created! Name: {}, description: {}, labels: {}.", metricName, row.getRowDesc(), labels);
58+
logger.trace("New extreme gauge" + logString, metricName, row.getRowDesc(), labels);
5959
break;
6060
case EXTREME_GAUGE_MIN:
6161
metric = new ExtremeGauge(metricName, row.getRowDesc(), false, labels.toArray(new String[0]));
6262
metrics.put(metricName, metric);
63-
logger.trace("New extreme gauge created! Name: {}, description: {}, labels: {}.", metricName, row.getRowDesc(), labels);
63+
logger.trace("New extreme gauge" + logString, metricName, row.getRowDesc(), labels);
6464
break;
6565
default:
66-
logger.error("Error during metrics initialization: Unknown metric type! Make sure it is one " + "of: {}", MetricsReference.Metric.Type.values());
66+
logger.error(
67+
"Error during metrics initialization: Unknown metric type! Make sure it is one " + "of: {}",
68+
(Object[]) MetricsReference.Metric.Type.values());
6769
}
6870
}
6971
}
@@ -72,15 +74,17 @@ public static void initMetrics(List<PCFElement> elements, List<MQObject.MQType>
7274
metrics.put(metricName, new SimpleGauge(metricName, MetricsReference.getMetricHelp(type), Labels.QMGR_NAME.name(), Labels.MQ_OBJECT_NAME.name()));
7375
logger.trace("New gauge created! Name: {}, description: {}, labels: {}.", metricName, MetricsReference.getMetricHelp(type), Labels.MQ_OBJECT_NAME.name());
7476
}
77+
initAdditionalMetrics();
78+
79+
logger.info("Successfully initialized {} metrics!", metrics.size());
80+
}
81+
82+
private static void initAdditionalMetrics() {
7583
getAdditionalMqObjectMetricsReference().forEach((metricInfo, metric) -> {
76-
ArrayList<String> labels = new ArrayList<>();
77-
labels.add(Labels.QMGR_NAME.name());
78-
labels.add(Labels.MQ_OBJECT_NAME.name());
84+
List<String> labels = Arrays.asList(Labels.QMGR_NAME.name(), Labels.MQ_OBJECT_NAME.name());
7985
metrics.put(metric.name, new SimpleGauge(metric.name, metricInfo, labels.toArray(new String[0])));
8086
logger.trace("New gauge created! Name: {}, description: {}, labels: {}.", metric.name, metricInfo, labels);
8187
});
82-
83-
logger.info("Successfully initialized {} metrics!", metrics.size());
8488
}
8589

8690
/**

‎src/main/java/ru/cinimex/exporter/prometheus/metrics/MetricsReference.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ public static Map<String, Metric> getAdditionalMqObjectMetricsReference() {
176176
metrics.put("destructive MQGET persistent and non-persistent average message byte count", new Metric("mqobject_get_average_destructive_mqget_persistent_and_non_persistent_message_size_bytes", Metric.Type.SIMPLE_GAUGE));
177177
return metrics;
178178
}
179+
179180
/**
180181
* Method is used to initialize ChannelStatuses.
181182
*

‎src/main/java/ru/cinimex/exporter/prometheus/metrics/UpdateMetricUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private static Double defaultConversion(List<Double> params) {
9696
}
9797

9898
/**
99-
* @param parsedQuery - parameter, needed for getting metric in special family metrics
99+
* @param parsedQuery - parameter, needed for getting metric in special family metrics
100100
* @param updatedMetricName - metric name, than will be updated
101101
* @return map with label list as key and double parameter list used for conversion function as value
102102
*/

0 commit comments

Comments
 (0)