diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-25 09:43:10 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-25 09:43:10 +0200 |
commit | dc65e50c052f8bd162ff5696aa4f13bbc2ab3e34 (patch) | |
tree | 9ae73902a1966bd65837240ced74cf0fc2d52f50 /metrics-proxy | |
parent | ec609a2ed6c4b7d466f28e042f9088a1aff0c56e (diff) |
Make members private and use accessors
Diffstat (limited to 'metrics-proxy')
8 files changed, 17 insertions, 15 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java index d667e783b45..c1440bf890a 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/MetricsPacket.java @@ -27,9 +27,9 @@ import static java.util.stream.Collectors.joining; */ public class MetricsPacket { - public final int statusCode; - public final String statusMessage; - public final ServiceId service; + private final int statusCode; + private final String statusMessage; + private final ServiceId service; private final Instant timestamp; private final Map<MetricId, Number> metrics; private final Map<DimensionId, String> dimensions; @@ -51,6 +51,8 @@ public class MetricsPacket { public Set<ConsumerId> consumers() { return consumers; } public Instant timestamp() { return timestamp; } public ServiceId service() { return service; } + public int statusCode() { return statusCode; } + public String statusMessage() { return statusMessage; } @Override public String toString() { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java index 2510426d7df..cabcde7cbb4 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java @@ -50,7 +50,7 @@ public class GenericJsonUtil { public static GenericJsonModel toGenericJsonModel(List<MetricsPacket> metricsPackets, Node node) { Map<ServiceId, List<MetricsPacket>> packetsByService = metricsPackets.stream() - .collect(Collectors.groupingBy(packet -> packet.service, LinkedHashMap::new, toList())); + .collect(Collectors.groupingBy(MetricsPacket::service, LinkedHashMap::new, toList())); var jsonModel = new GenericJsonModel(); if (node != null) { @@ -67,8 +67,8 @@ public class GenericJsonUtil { var genericService = packets.stream().findFirst() .map(firstPacket -> new GenericService(serviceId.id, firstPacket.timestamp(), - StatusCode.values()[firstPacket.statusCode], - firstPacket.statusMessage, + StatusCode.values()[firstPacket.statusCode()], + firstPacket.statusMessage(), genericMetricsList)) .get(); if (VESPA_NODE_SERVICE_ID.equals(serviceId)) { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java index 2683917bbdc..dbd35bf8868 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java @@ -125,12 +125,12 @@ public class YamasJsonUtil { private static void toJson(MetricsPacket metric, JsonGenerator generator, boolean addStatus) throws IOException { generator.writeStartObject(); if (addStatus) { - generator.writeNumberField("status_code", metric.statusCode); + generator.writeNumberField("status_code", metric.statusCode()); } if ( ! Instant.EPOCH.equals(metric.timestamp())) { generator.writeNumberField("timestamp", metric.timestamp().getEpochSecond()); } - generator.writeStringField("application", metric.service.id); + generator.writeStringField("application", metric.service().id); if ( ! metric.metrics().isEmpty()) { generator.writeObjectFieldStart("metrics"); @@ -161,7 +161,7 @@ public class YamasJsonUtil { generator.writeEndObject(); } if (addStatus) { - generator.writeStringField("status_msg", metric.statusMessage); + generator.writeStringField("status_msg", metric.statusMessage()); } generator.writeEndObject(); } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java index 02078ef7e90..d909944fe4d 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java @@ -32,7 +32,7 @@ public class PrometheusUtil { } Map<ServiceId, List<MetricsPacket>> packetsByService = metricsPackets.stream() - .collect(Collectors.groupingBy(packet -> packet.service)); + .collect(Collectors.groupingBy(MetricsPacket::service)); List<MetricFamilySamples> statusMetrics = new ArrayList<>(packetsByService.size()); packetsByService.forEach(((serviceId, packets) -> { @@ -41,7 +41,7 @@ public class PrometheusUtil { var firstPacket = packets.get(0); var statusMetricName = serviceName + "_status"; // MetricsPacket status 0 means OK, but it's the opposite in Prometheus. - var statusMetricValue = (firstPacket.statusCode == 0) ? 1 : 0; + var statusMetricValue = (firstPacket.statusCode() == 0) ? 1 : 0; var sampleList = List.of(new Collector.MetricFamilySamples.Sample(statusMetricName, List.of(), List.of(), statusMetricValue, firstPacket.timestamp().toEpochMilli())); statusMetrics.add(new Collector.MetricFamilySamples(statusMetricName, Collector.Type.UNKNOWN, "status of service", sampleList)); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java index 47c699c8c2c..64c5f75dd2e 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java @@ -165,7 +165,7 @@ public class MetricsManagerTest { List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH); MetricsPacket extraPacket = null; for (MetricsPacket packet : packets) { - if (packet.service.equals(serviceId)) extraPacket = packet; + if (packet.service().equals(serviceId)) extraPacket = packet; } assertNotNull(extraPacket); } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java index bfe70ceb780..14c23bcba87 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java @@ -46,7 +46,7 @@ public class ExternalMetricsTest { List<MetricsPacket.Builder> packets = externalMetrics.getMetrics(); assertEquals(1, packets.size()); - assertEquals(SERVICE_ID, packets.get(0).build().service); + assertEquals(SERVICE_ID, packets.get(0).build().service()); } @Test diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java index 8f3a99c1c68..f55f3219896 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java @@ -65,7 +65,7 @@ public class YamasJsonModelTest { MetricsPacket metricsPacket = YamasJsonUtil.toMetricsPacketBuilder(jsonModel).build(); // Do some sanity checking - assertEquals(toServiceId("vespa.searchnode"), metricsPacket.service); + assertEquals(toServiceId("vespa.searchnode"), metricsPacket.service()); assertTrue(metricsPacket.consumers().contains(toConsumerId("Vespa"))); assertEquals(5.555555555E9, metricsPacket.metrics().get(toMetricId("memory_rss")).doubleValue(), 0.1d); //Not using custom double rendrer diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java index 8b022b8753d..32123068968 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java @@ -27,7 +27,7 @@ public class NodeMetricGathererTest { NodeMetricGatherer.addObjectToBuilders(builders, hostLifePacket); MetricsPacket packet = builders.remove(0).build(); - assertEquals("host_life", packet.service.id); + assertEquals("host_life", packet.service().id); assertEquals(123, packet.timestamp().getEpochSecond()); assertEquals(12L, packet.metrics().get(MetricId.toMetricId("uptime"))); assertEquals(1L, packet.metrics().get(MetricId.toMetricId("alive"))); |