diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-03-04 14:59:06 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-03-04 14:59:06 +0100 |
commit | 6f7fbd44239daf9c0ff8064cca23edd8e1660991 (patch) | |
tree | e2e1ba8745be82310c2b9777b892e2518e5a8f74 | |
parent | 399ef4d7864d9334006ce68e46c72b827f2843aa (diff) |
Non-functional changes only
12 files changed, 22 insertions, 18 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index 0f006c31959..a24ba93c80e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -105,6 +105,7 @@ public class Admin extends AbstractConfigProducer<Admin> implements Serializable return metricsProxyCluster; } + /** Use by model amenders */ public void setAdditionalDefaultMetrics(MetricSet additionalDefaultMetrics) { if (additionalDefaultMetrics == null) return; this.additionalDefaultMetrics = additionalDefaultMetrics; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java index 30797f27789..9c969d4f11e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java @@ -43,13 +43,13 @@ public class MetricSet { /** * Returns all metrics in this set, including all metrics in any contained metric sets. - * <br> + * * Joins this set's metrics with its child sets into a named flat map of metrics. * In the case of duplicate metrics, the metrics directly defined in this set * takes precedence with respect to output name, description and dimension value * (even if they are empty), while new dimensions from the children will be added. * - * @return All metrics contained in this set. + * @return all the metrics contained in this set */ public final Map<String, Metric> getMetrics() { return unmodifiableMap(flatten(metrics, children)); diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java index 0dd284e21cf..a38772ab5dd 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java @@ -74,7 +74,7 @@ public class StateHandler extends AbstractRequestHandler { } @Override - public ContentChannel handleRequest(final Request request, ResponseHandler handler) { + public ContentChannel handleRequest(Request request, ResponseHandler handler) { new ResponseDispatch() { @Override 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 33827634ebf..a829139605e 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 @@ -32,7 +32,8 @@ import static java.util.stream.Collectors.toList; * @author gjoranv */ public class MetricsManager { - private static Logger log = Logger.getLogger(MetricsManager.class.getName()); + + private static final Logger log = Logger.getLogger(MetricsManager.class.getName()); static final DimensionId VESPA_VERSION = toDimensionId("vespaVersion"); @@ -75,8 +76,8 @@ public class MetricsManager { /** * Returns the metrics for the given services. The empty list is returned if no services are given. * - * @param services The services to retrieve metrics for. - * @return Metrics for all matching services. + * @param services the services to retrieve metrics for + * @return tetrics for all matching services */ public List<MetricsPacket> getMetrics(List<VespaService> services, Instant startTime) { return getMetricsAsBuilders(services, startTime).stream() diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java index b895d6221c3..6dda8350c8e 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java @@ -256,8 +256,7 @@ public class VespaMetrics { } } if (isForwarded) { - b.append(formatter.format(s, alias, metric.getValue())) - .append(" "); + b.append(formatter.format(s, alias, metric.getValue())).append(" "); } } } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java index 337967f3075..158f626cf84 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java @@ -25,11 +25,12 @@ import static java.util.logging.Level.FINE; import static java.util.stream.Collectors.toCollection; /** - * This class is responsible for handling metrics received from external processes. + * Handling of metrics received from external processes. * * @author gjoranv */ public class ExternalMetrics { + private static final Logger log = Logger.getLogger(ExternalMetrics.class.getName()); // NOTE: node service id must be kept in sync with the same constant _value_ used in docker-api:Metrics.java @@ -52,7 +53,8 @@ public class ExternalMetrics { public void setExtraMetrics(List<MetricsPacket.Builder> externalPackets) { // TODO: Metrics filtering per consumer is not yet implemented. - // Split each packet per metric, and re-aggregate based on the metrics each consumer wants. Then filter out all packages with no consumers. + // Split each packet per metric, and re-aggregate based on the metrics each consumer wants. + // Then filter out all packages with no consumers. log.log(FINE, () -> "Setting new external metrics with " + externalPackets.size() + " metrics packets."); externalPackets.forEach(packet -> { packet.addConsumers(consumers.getAllConsumers()) @@ -95,4 +97,5 @@ public class ExternalMetrics { dimensions.keySet().retainAll(Set.of(ROLE_DIMENSION, STATE_DIMENSION, ORCHESTRATOR_STATE_DIMENSION)); return dimensions; } + } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java index a7ea70495f7..63e147bf6b4 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metric.java @@ -13,6 +13,7 @@ import java.util.Set; * @author Jo Kristian Bergum */ public class Metric { + private final long time; private final Number value; private final String description; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java index 45d76375c07..b45e7743640 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java @@ -13,6 +13,7 @@ import java.util.List; // TODO: remove timestamp, only used as temporary storage. // TODO: instances of this class can probably be replaced by a simple freezable map. public class Metrics { + private final List<Metric> metrics = new ArrayList<>(); private long timestamp; private boolean isFrozen = false; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java index 30e7d7b81f8..79af500cde7 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java @@ -37,7 +37,7 @@ public class RpcServer { private static final Logger log = Logger.getLogger(RpcServer.class.getName()); - private static int LOG_SPENT_TIME_LIMIT = 10 * 1000; // ms. same as default client RPC timeout used in rpc_invoke + private static final int LOG_SPENT_TIME_LIMIT = 10 * 1000; // ms. same as default client RPC timeout used in rpc_invoke private final VespaServices vespaServices; private final MetricsManager metricsManager; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java index a6c2220b5a2..05e65449163 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; */ public class SystemPoller { - final private static Logger log = Logger.getLogger(SystemPoller.class.getName()); + private static final Logger log = Logger.getLogger(SystemPoller.class.getName()); private final int pollingIntervalSecs; private final List<VespaService> services; @@ -55,12 +55,10 @@ public class SystemPoller { * @return array[0] = memoryResident, array[1] = memoryVirtual (kB units) */ long[] getMemoryUsage(VespaService service) { - long size[] = new long[2]; + long[] size = new long[2]; BufferedReader br; int pid = service.getPid(); - size[0] = 0; - size[1] = 0; try { br = new BufferedReader(new FileReader("/proc/" + pid + "/smaps")); } catch (FileNotFoundException ex) { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java index 69558b0c474..b069256f527 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/VespaService.java @@ -27,7 +27,6 @@ public class VespaService implements Comparable<VespaService> { private final String monitoringPrefix; private final Map<DimensionId, String> dimensions; - private volatile int pid = -1; private volatile String state = "UNKNOWN"; private volatile boolean isAlive; @@ -42,8 +41,8 @@ public class VespaService implements Comparable<VespaService> { // Used to keep track of log level when health or metrics requests fail - private AtomicInteger metricsFetchCount = new AtomicInteger(0); - private AtomicInteger healthFetchCount = new AtomicInteger(0); + private final AtomicInteger metricsFetchCount = new AtomicInteger(0); + private final AtomicInteger healthFetchCount = new AtomicInteger(0); public static VespaService create(String name, String id, int statePort) { 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 e01a68a1f7f..71f8a5f2b21 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 @@ -24,6 +24,7 @@ import static java.util.logging.Level.FINE; * @author gjoranv */ public class VespaServices { + private static final Logger log = Logger.getLogger(VespaServices.class.getName()); public static final String ALL_SERVICES = "all"; |