Skip to content

Commit baca97d

Browse files
vvanhollvvanholl
committed
Code reformat
1 parent 1948b8b commit baca97d

File tree

5 files changed

+53
-53
lines changed

5 files changed

+53
-53
lines changed

‎src/main/assemblies/plugin.xml

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
<?xml version="1.0"?>
22
<assembly>
3-
<id>plugin</id>
4-
<formats>
5-
<format>zip</format>
6-
</formats>
7-
<includeBaseDirectory>false</includeBaseDirectory>
8-
<fileSets>
9-
<fileSet>
10-
<directory>${project.basedir}</directory>
11-
<outputDirectory>/</outputDirectory>
12-
<includes>
13-
<include>plugin-descriptor.properties</include>
14-
<include>plugin-security.policy</include>
15-
</includes>
16-
</fileSet>
17-
</fileSets>
18-
<dependencySets>
19-
<dependencySet>
20-
<outputDirectory>/</outputDirectory>
21-
<useProjectArtifact>true</useProjectArtifact>
22-
<useTransitiveFiltering>true</useTransitiveFiltering>
23-
<excludes>
24-
<exclude>org.elasticsearch:elasticsearch</exclude>
25-
</excludes>
26-
</dependencySet>
27-
<dependencySet>
28-
<outputDirectory>/</outputDirectory>
29-
<useProjectArtifact>true</useProjectArtifact>
30-
<useTransitiveFiltering>true</useTransitiveFiltering>
31-
<includes>
32-
<include>io.prometheus:simpleclient</include>
33-
</includes>
34-
</dependencySet>
35-
</dependencySets>
3+
<id>plugin</id>
4+
<formats>
5+
<format>zip</format>
6+
</formats>
7+
<includeBaseDirectory>false</includeBaseDirectory>
8+
<fileSets>
9+
<fileSet>
10+
<directory>${project.basedir}</directory>
11+
<outputDirectory>/</outputDirectory>
12+
<includes>
13+
<include>plugin-descriptor.properties</include>
14+
<include>plugin-security.policy</include>
15+
</includes>
16+
</fileSet>
17+
</fileSets>
18+
<dependencySets>
19+
<dependencySet>
20+
<outputDirectory>/</outputDirectory>
21+
<useProjectArtifact>true</useProjectArtifact>
22+
<useTransitiveFiltering>true</useTransitiveFiltering>
23+
<excludes>
24+
<exclude>org.elasticsearch:elasticsearch</exclude>
25+
</excludes>
26+
</dependencySet>
27+
<dependencySet>
28+
<outputDirectory>/</outputDirectory>
29+
<useProjectArtifact>true</useProjectArtifact>
30+
<useTransitiveFiltering>true</useTransitiveFiltering>
31+
<includes>
32+
<include>io.prometheus:simpleclient</include>
33+
</includes>
34+
</dependencySet>
35+
</dependencySets>
3636
</assembly>

‎src/main/java/org/compuscene/metrics/prometheus/PrometheusMetricsCatalog.java

+12-13
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,37 @@ public class PrometheusMetricsCatalog {
1616
private HashMap metrics;
1717
private CollectorRegistry registry;
1818

19-
public PrometheusMetricsCatalog(String cluster, String metric_prefix){
19+
public PrometheusMetricsCatalog(String cluster, String metric_prefix) {
2020
this.cluster = cluster;
2121
this.metric_prefix = metric_prefix;
2222
this.metrics = new HashMap();
2323
this.registry = new CollectorRegistry();
2424
}
2525

26-
public void registerGauge(String metric, String help, String... labels){
27-
String[] extended_labels = new String[labels.length +1];
28-
extended_labels[0]= "cluster";
26+
public void registerGauge(String metric, String help, String... labels) {
27+
String[] extended_labels = new String[labels.length + 1];
28+
extended_labels[0] = "cluster";
2929
for (int i = 0; i < labels.length; i++) extended_labels[i + 1] = labels[i];
3030

31-
Gauge gauge=Gauge.build().name(this.metric_prefix+metric).help(help).labelNames(extended_labels).register(this.registry);
32-
this.metrics.put(metric,gauge);
31+
Gauge gauge = Gauge.build().name(this.metric_prefix + metric).help(help).labelNames(extended_labels).register(this.registry);
32+
this.metrics.put(metric, gauge);
3333
}
3434

35-
public void setGauge(String metric, double value, String... label_values){
36-
String[] extended_label_values = new String[label_values.length +1];
37-
extended_label_values[0]= this.cluster;
35+
public void setGauge(String metric, double value, String... label_values) {
36+
String[] extended_label_values = new String[label_values.length + 1];
37+
extended_label_values[0] = this.cluster;
3838
for (int i = 0; i < label_values.length; i++) extended_label_values[i + 1] = label_values[i];
3939

4040
Gauge gauge = (Gauge) this.metrics.get(metric);
4141
gauge.labels(extended_label_values).set(value);
4242
}
4343

44-
public String toTextFormat() throws IOException{
45-
try{
44+
public String toTextFormat() throws IOException {
45+
try {
4646
Writer writer = new StringWriter();
4747
TextFormat.write004(writer, this.registry.metricFamilySamples());
4848
return writer.toString();
49-
}
50-
catch(IOException e){
49+
} catch (IOException e) {
5150
throw e;
5251
}
5352
}

‎src/main/java/org/compuscene/metrics/prometheus/PrometheusMetricsCollector.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
44
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
5-
import org.elasticsearch.action.admin.cluster.node.stats.*;
5+
import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
6+
import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequest;
7+
import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
68
import org.elasticsearch.client.Client;
79
import org.elasticsearch.http.HttpStats;
810
import org.elasticsearch.indices.NodeIndicesStats;
@@ -30,7 +32,7 @@ public PrometheusMetricsCollector(final Client client) {
3032

3133
String cluster = nodesStatsResponse.getClusterNameAsString();
3234

33-
this.catalog = new PrometheusMetricsCatalog(cluster,"es_");
35+
this.catalog = new PrometheusMetricsCatalog(cluster, "es_");
3436

3537
this.registerClusterMetrics();
3638
this.registerJVMMetrics();
@@ -500,7 +502,7 @@ public void updateMetrics() {
500502

501503
}
502504

503-
public PrometheusMetricsCatalog getCatalog(){
505+
public PrometheusMetricsCatalog getCatalog() {
504506
return this.catalog;
505507
}
506508
}

‎src/main/java/org/elasticsearch/plugin/prometheus/PrometheusExporterPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
public class PrometheusExporterPlugin extends Plugin {
1212

13-
private Settings settings;
1413
private final ESLogger logger = Loggers.getLogger(PrometheusExporterPlugin.class);
14+
private Settings settings;
1515

1616
@Inject
1717
public PrometheusExporterPlugin(Settings settings) {

‎src/main/java/org/elasticsearch/rest/prometheus/RestPrometheusMetricsAction.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.elasticsearch.rest.prometheus;
22

3+
import org.compuscene.metrics.prometheus.PrometheusMetricsCollector;
34
import org.elasticsearch.client.Client;
45
import org.elasticsearch.common.inject.Inject;
56
import org.elasticsearch.common.logging.ESLogger;
@@ -12,8 +13,6 @@
1213
import static org.elasticsearch.rest.RestStatus.INTERNAL_SERVER_ERROR;
1314
import static org.elasticsearch.rest.RestStatus.OK;
1415

15-
import org.compuscene.metrics.prometheus.*;
16-
1716

1817
public class RestPrometheusMetricsAction extends BaseRestHandler {
1918

@@ -36,7 +35,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel,
3635

3736
this.collector.updateMetrics();
3837

39-
try{
38+
try {
4039
channel.sendResponse(new BytesRestResponse(OK, this.collector.getCatalog().toTextFormat()));
4140
} catch (java.io.IOException e) {
4241
channel.sendResponse(new BytesRestResponse(INTERNAL_SERVER_ERROR, ""));

0 commit comments

Comments
 (0)