aboutsummaryrefslogtreecommitdiffstats
path: root/metrics-proxy
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-12-04 22:42:13 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2022-12-04 22:42:13 +0100
commitfd54b4e4b136b05b67b471dca3ca6ce3dd116710 (patch)
tree88ab77cc41620eb2b8639b10b7edd1e57b901f12 /metrics-proxy
parentfae49834f53500587921196e86ee4af4c670d8c9 (diff)
Revert collect(Collectors.toList())
Diffstat (limited to 'metrics-proxy')
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java2
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java4
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java2
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java2
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java2
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java2
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java2
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java2
8 files changed, 9 insertions, 9 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
index a3b02e608c2..67c888a8d77 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
@@ -129,7 +129,7 @@ public class MetricsManager {
.map(builder -> builder.putDimensionsIfAbsent(globalDims))
.map(builder -> builder.putDimensionsIfAbsent(extraDimensions))
.map(builder -> adjustTimestamp(builder, startTime))
- .toList();
+ .collect(Collectors.toList());
}
/**
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
index db8e18c3ef5..037fca95588 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
@@ -45,7 +45,7 @@ public class ValuesFetcher {
return metricsManager.getMetrics(vespaServices.getVespaServices(), Instant.now(), consumer)
.stream()
.filter(metricsPacket -> metricsPacket.consumers().contains(consumer))
- .toList();
+ .collect(Collectors.toList());
}
public MetricsPacket.Builder[] fetchMetricsAsBuilders(String requestedConsumer) throws JsonRenderingException {
@@ -54,7 +54,7 @@ public class ValuesFetcher {
List<MetricsPacket.Builder> builders = metricsManager.getMetricsAsBuilders(vespaServices.getVespaServices(), Instant.now(), consumer)
.stream()
.filter(builder -> builder.hasConsumer(consumer))
- .toList();
+ .collect(Collectors.toList());
return builders.toArray(new MetricsPacket.Builder[builders.size()]);
}
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java
index 54150f98687..30acf6eacc8 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java
@@ -87,7 +87,7 @@ public class ApplicationMetricsHandler extends HttpHandlerBase {
.stream()
.map(builder -> builder.putDimension(DimensionId.toDimensionId("hostname"), element.hostname))
.map(MetricsPacket.Builder::build))
- .toList();
+ .collect(Collectors.toList());
return new TextResponse(200, toPrometheusModel(metricsForAllNodes).serialize());
}
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
index d4f04cdb3fc..6c27d10a62f 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
@@ -185,7 +185,7 @@ public class ApplicationMetricsRetriever extends AbstractComponent implements Ru
return nodesConfig.node().stream()
.map(Node::new)
.map(node-> new NodeMetricsClient(httpClient, node, Clock.systemUTC()))
- .toList();
+ .collect(Collectors.toList());
}
static CloseableHttpAsyncClient createHttpClient() {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java
index 21f884a27b7..d05b251207d 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java
@@ -78,6 +78,6 @@ public final class PublicDimensions {
* All public dimensions, common dimensions first, then dimensions for individual metrics
*/
public static final List<String> publicDimensions = Stream.concat(commonDimensions.stream(), metricDimensions.stream())
- .toList();
+ .collect(Collectors.toList());
}
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java
index f475c06d634..911c772c0e4 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java
@@ -84,7 +84,7 @@ public class YamasJsonModel {
return metrics.keySet().stream()
.map(name -> new Metric(MetricId.toMetricId(name), metrics.get(name)))
- .toList();
+ .collect(Collectors.toList());
}
Map<DimensionId, String> getDimensionsById() {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
index 1a7c1b4df4d..148f48136f4 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
@@ -64,7 +64,7 @@ public class NodeMetricGatherer {
metricPacketBuilder.putDimensionsIfAbsent(applicationDimensions.getDimensions())
.putDimensionsIfAbsent(nodeDimensions.getDimensions())
.putDimensionsIfAbsent(metricsManager.getExtraDimensions()).build()
- ).toList();
+ ).collect(Collectors.toList());
}
protected static void addObjectToBuilders(List<MetricsPacket.Builder> builders, JsonNode object) {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
index d09f2aff3e5..5f8cbf0784d 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
@@ -30,7 +30,7 @@ public class ServiceHealthGatherer {
.putDimension(DimensionId.toDimensionId("metrictype"), "health")
.addConsumers(Set.of(ConsumerId.toConsumerId("Vespa")));
})
- .toList();
+ .collect(Collectors.toList());
}
}