diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-30 10:04:50 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-30 10:04:50 +0100 |
commit | 448231f18ba53edf5c0e7ab4b6732ef69328281c (patch) | |
tree | 289f528fd6adac2a39e636c449c633c26fdb838e /metrics-proxy | |
parent | 711362f17d4bbece0dc2d0833a22063374ae3e04 (diff) |
Reduce the simple usage of guava where java has caught up
Diffstat (limited to 'metrics-proxy')
7 files changed, 33 insertions, 55 deletions
diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index c3866d3e592..ee1439fb5f6 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -31,16 +31,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java index 4318a689ba8..5b9e1e67657 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaServices.java @@ -4,11 +4,9 @@ package ai.vespa.metricsproxy.service; import ai.vespa.metricsproxy.core.MonitoringConfig; import ai.vespa.metricsproxy.metric.model.DimensionId; import ai.vespa.metricsproxy.service.VespaServicesConfig.Service; -import com.google.common.annotations.VisibleForTesting; import com.yahoo.component.annotation.Inject; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.logging.Logger; @@ -39,7 +37,6 @@ public class VespaServices { updateServices(services); } - @VisibleForTesting public VespaServices(List<VespaService> services) { this.services = services; sentinel = null; @@ -74,7 +71,7 @@ public class VespaServices { * @return A list of VespaService objects */ public List<VespaService> getVespaServices() { - return Collections.unmodifiableList(services); + return List.copyOf(services); } /** 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 9e5a24ccd3c..70f126a8514 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 @@ -18,12 +18,10 @@ import ai.vespa.metricsproxy.service.DownService; import ai.vespa.metricsproxy.service.DummyService; import ai.vespa.metricsproxy.service.VespaService; import ai.vespa.metricsproxy.service.VespaServices; -import com.google.common.collect.ImmutableList; import org.junit.Before; import org.junit.Test; import java.time.Instant; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -48,7 +46,7 @@ public class MetricsManagerTest { private static final String SERVICE_0_ID = "dummy/id/0"; private static final String SERVICE_1_ID = "dummy/id/1"; - private static final List<VespaService> testServices = ImmutableList.of( + private static final List<VespaService> testServices = List.of( new DummyService(0, SERVICE_0_ID), new DummyService(1, SERVICE_1_ID)); @@ -64,7 +62,7 @@ public class MetricsManagerTest { public void service_that_is_down_has_a_separate_metrics_packet() { // Reset to use only the service that is down var downService = new DownService(HealthMetric.getDown("No response")); - List<VespaService> testServices = Collections.singletonList(downService); + List<VespaService> testServices = List.of(downService); MetricsManager metricsManager = TestUtil.createMetricsManager(new VespaServices(testServices), getMetricsConsumers(),getApplicationDimensions(), getNodeDimensions()); @@ -140,9 +138,9 @@ public class MetricsManagerTest { // TODO: test that non-whitelisted metrics are filtered out, but this is currently not the case, see ExternalMetrics.setExtraMetrics @Test public void extra_metrics_packets_containing_whitelisted_metrics_are_added() { - metricsManager.setExtraMetrics(ImmutableList.of( + metricsManager.setExtraMetrics(List.of( new MetricsPacket.Builder(toServiceId("foo")) - .putMetrics(ImmutableList.of(new Metric(WHITELISTED_METRIC_ID, 0))))); + .putMetrics(List.of(new Metric(WHITELISTED_METRIC_ID, 0))))); List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH); assertEquals(3, packets.size()); @@ -150,9 +148,9 @@ public class MetricsManagerTest { @Test public void extra_metrics_packets_without_whitelisted_metrics_are_not_added() { - metricsManager.setExtraMetrics(ImmutableList.of( + metricsManager.setExtraMetrics(List.of( new MetricsPacket.Builder(toServiceId("foo")) - .putMetrics(ImmutableList.of(new Metric(toMetricId("not-whitelisted"), 0))))); + .putMetrics(List.of(new Metric(toMetricId("not-whitelisted"), 0))))); List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH); assertEquals(2, packets.size()); @@ -161,9 +159,9 @@ public class MetricsManagerTest { @Test public void application_from_extra_metrics_packets_is_used_as_service_in_result_packets() { final ServiceId serviceId = toServiceId("custom-service"); - metricsManager.setExtraMetrics(ImmutableList.of( + metricsManager.setExtraMetrics(List.of( new MetricsPacket.Builder(serviceId) - .putMetrics(ImmutableList.of(new Metric(WHITELISTED_METRIC_ID, 0))))); + .putMetrics(List.of(new Metric(WHITELISTED_METRIC_ID, 0))))); List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH); MetricsPacket extraPacket = null; @@ -175,9 +173,9 @@ public class MetricsManagerTest { @Test public void extra_dimensions_are_added_to_metrics_packets_that_do_not_have_those_dimensions() { - metricsManager.setExtraMetrics(ImmutableList.of( + metricsManager.setExtraMetrics(List.of( new MetricsPacket.Builder(toServiceId("foo")) - .putMetrics(ImmutableList.of(new Metric(WHITELISTED_METRIC_ID, 0))) + .putMetrics(List.of(new Metric(WHITELISTED_METRIC_ID, 0))) .putDimension(ROLE_DIMENSION, "role from extraMetrics"))); List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH); @@ -188,9 +186,9 @@ public class MetricsManagerTest { @Test public void extra_dimensions_do_not_overwrite_existing_dimension_values() { - metricsManager.setExtraMetrics(ImmutableList.of( + metricsManager.setExtraMetrics(List.of( new MetricsPacket.Builder(toServiceId("foo")) - .putMetrics(ImmutableList.of(new Metric(WHITELISTED_METRIC_ID, 0))) + .putMetrics(List.of(new Metric(WHITELISTED_METRIC_ID, 0))) .putDimension(METRIC_TYPE_DIMENSION_ID, "from extraMetrics"))); List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java index dd19970efa7..4f9634a061a 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java @@ -17,7 +17,6 @@ import ai.vespa.metricsproxy.service.DownService; import ai.vespa.metricsproxy.service.DummyService; import ai.vespa.metricsproxy.service.VespaService; import ai.vespa.metricsproxy.service.VespaServices; -import com.google.common.collect.ImmutableList; import com.yahoo.container.jdisc.RequestHandlerTestDriver; import java.time.Instant; @@ -33,10 +32,9 @@ import static ai.vespa.metricsproxy.service.DummyService.METRIC_1; * * @author gjoranv */ -@SuppressWarnings("UnstableApiUsage") public class HttpHandlerTestBase { - protected static final List<VespaService> testServices = ImmutableList.of( + protected static final List<VespaService> testServices = List.of( new DummyService(0, ""), new DummyService(1, ""), new DownService(HealthMetric.getDown("No response"))); @@ -55,10 +53,10 @@ public class HttpHandlerTestBase { protected static MetricsManager getMetricsManager() { MetricsManager metricsManager = TestUtil.createMetricsManager(vespaServices, getMetricsConsumers(), getApplicationDimensions(), getNodeDimensions()); - metricsManager.setExtraMetrics(ImmutableList.of( + metricsManager.setExtraMetrics(List.of( new MetricsPacket.Builder(VESPA_NODE_SERVICE_ID) .timestamp(Instant.now().getEpochSecond()) - .putMetrics(ImmutableList.of(new Metric(MetricId.toMetricId(CPU_METRIC), 12.345))))); + .putMetrics(List.of(new Metric(MetricId.toMetricId(CPU_METRIC), 12.345))))); return metricsManager; } 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 581367878ca..4e79c11678c 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 @@ -6,7 +6,6 @@ import ai.vespa.metricsproxy.core.MetricsConsumers; import ai.vespa.metricsproxy.metric.model.ConsumerId; import ai.vespa.metricsproxy.metric.model.MetricsPacket; import ai.vespa.metricsproxy.metric.model.ServiceId; -import com.google.common.collect.ImmutableList; import org.junit.Test; import java.util.List; @@ -29,7 +28,7 @@ public class ExternalMetricsTest { MetricsConsumers noConsumers = new MetricsConsumers(new ConsumersConfig.Builder().build()); ExternalMetrics externalMetrics = new ExternalMetrics(noConsumers); - externalMetrics.setExtraMetrics(ImmutableList.of( + externalMetrics.setExtraMetrics(List.of( new MetricsPacket.Builder(toServiceId("foo")))); List<MetricsPacket.Builder> packets = externalMetrics.getMetrics(); @@ -42,7 +41,7 @@ public class ExternalMetricsTest { MetricsConsumers noConsumers = new MetricsConsumers(new ConsumersConfig.Builder().build()); ExternalMetrics externalMetrics = new ExternalMetrics(noConsumers); - externalMetrics.setExtraMetrics(ImmutableList.of( + externalMetrics.setExtraMetrics(List.of( new MetricsPacket.Builder(SERVICE_ID))); List<MetricsPacket.Builder> packets = externalMetrics.getMetrics(); @@ -59,7 +58,7 @@ public class ExternalMetricsTest { MetricsConsumers consumers = new MetricsConsumers(consumersConfig); ExternalMetrics externalMetrics = new ExternalMetrics(consumers); - externalMetrics.setExtraMetrics(ImmutableList.of( + externalMetrics.setExtraMetrics(List.of( new MetricsPacket.Builder(toServiceId("foo")))); List<MetricsPacket.Builder> packets = externalMetrics.getMetrics(); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java index 4dcdb45feee..57029ff4aff 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java @@ -2,18 +2,15 @@ package ai.vespa.metricsproxy.metric.model; import ai.vespa.metricsproxy.metric.Metric; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import org.junit.Test; import java.util.List; import java.util.Map; +import java.util.Set; import static ai.vespa.metricsproxy.metric.model.ConsumerId.toConsumerId; import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId; import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId; -import static java.util.Collections.singleton; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -45,8 +42,8 @@ public class MetricsPacketTest { MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo")) .statusCode(0) .statusMessage("") - .addConsumers(singleton(DUPLICATE_CONSUMER)) - .addConsumers(singleton(DUPLICATE_CONSUMER)) + .addConsumers(Set.of(DUPLICATE_CONSUMER)) + .addConsumers(Set.of(DUPLICATE_CONSUMER)) .build(); assertEquals(1, packet.consumers().size()); } @@ -57,17 +54,17 @@ public class MetricsPacketTest { var builder = new MetricsPacket.Builder(toServiceId("foo")) .statusCode(0) .statusMessage("") - .addConsumers(singleton(consumer)); + .addConsumers(Set.of(consumer)); assertTrue(builder.hasConsumer(consumer)); } @Test public void builder_can_retain_subset_of_metrics() { MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo")) - .putMetrics(ImmutableList.of( + .putMetrics(List.of( new Metric(toMetricId("remove"), 1), new Metric(toMetricId("keep"), 2))) - .retainMetrics(ImmutableSet.of(toMetricId("keep"), toMetricId("non-existent"))) + .retainMetrics(Set.of(toMetricId("keep"), toMetricId("non-existent"))) .build(); assertFalse("should not contain 'remove'", packet.metrics().containsKey(toMetricId("remove"))); @@ -86,14 +83,14 @@ public class MetricsPacketTest { MetricId THREE_ID = toMetricId(THREE); MetricId NON_EXISTENT_ID = toMetricId(NON_EXISTENT); - Map<MetricId, List<MetricId>> outputNamesById = ImmutableMap.of( - ONE_ID, ImmutableList.of(ONE_ID), - TWO_ID, ImmutableList.of(TWO_ID, toMetricId("dos")), - THREE_ID, ImmutableList.of(toMetricId("3")), - NON_EXISTENT_ID, ImmutableList.of(NON_EXISTENT_ID)); + Map<MetricId, List<MetricId>> outputNamesById = Map.of( + ONE_ID, List.of(ONE_ID), + TWO_ID, List.of(TWO_ID, toMetricId("dos")), + THREE_ID, List.of(toMetricId("3")), + NON_EXISTENT_ID, List.of(NON_EXISTENT_ID)); MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo")) - .putMetrics(ImmutableList.of( + .putMetrics(List.of( new Metric(ONE_ID, 1), new Metric(TWO_ID, 2), new Metric(THREE_ID, 3))) diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServicesTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServicesTest.java index dda8af8559b..f7bfdb0e76f 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServicesTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServicesTest.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.metricsproxy.service; -import com.google.common.collect.ImmutableList; import org.junit.Test; import java.util.List; @@ -18,7 +17,7 @@ public class VespaServicesTest { @Test public void services_can_be_retrieved_from_monitoring_name() { - List<VespaService> dummyServices = ImmutableList.of( + List<VespaService> dummyServices = List.of( new DummyService(0, "dummy/id/0"), new DummyService(1, "dummy/id/1")); VespaServices services = new VespaServices(dummyServices); @@ -28,7 +27,7 @@ public class VespaServicesTest { @Test public void all_services_can_be_retrieved_by_using_special_name() { - List<VespaService> dummyServices = ImmutableList.of( + List<VespaService> dummyServices = List.of( new DummyService(0, "dummy/id/0")); VespaServices services = new VespaServices(dummyServices); |