diff options
| author | Yngve Aasheim <yngveaasheim@users.noreply.github.com> | 2023-01-12 16:12:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 16:12:46 +0100 |
| commit | 4b97daa4a3cfa39701380af94b46f49b9635c4e1 (patch) | |
| tree | 830def0101762ac7931732cdd3affc8f84a39de6 | |
| parent | f540fc8c1fd397316f54e9ceef8901535920d8e2 (diff) | |
| parent | a97941068e2265908128ce966680fa008beb77b4 (diff) | |
Merge pull request #25535 from vespa-engine/yngveaasheim/use-enum-for-serverBytes-metrics
Use enum for server bytes metrics
3 files changed, 7 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index e66ebe10f52..6bbd1b7eef2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -135,10 +135,8 @@ public class VespaMetricSet { addMetric(metrics, ContainerMetrics.SERVER_NUM_OPEN_CONNECTIONS.baseName(), List.of("max", "last", "average")); addMetric(metrics, ContainerMetrics.SERVER_NUM_CONNECTIONS.baseName(), List.of("max", "last", "average")); - metrics.add(new Metric("serverBytesReceived.sum")); - metrics.add(new Metric("serverBytesReceived.count")); - metrics.add(new Metric("serverBytesSent.sum")); - metrics.add(new Metric("serverBytesSent.count")); + addMetric(metrics, ContainerMetrics.SERVER_BYTES_RECEIVED.baseName(), List.of("sum", "count")); + addMetric(metrics, ContainerMetrics.SERVER_BYTES_SENT.baseName(), List.of("sum", "count")); { List<String> suffixes = List.of("sum", "count", "last", "min", "max"); diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java index 3c1b4145a96..41b69d2376d 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java @@ -29,8 +29,8 @@ class MetricDefinitions { static final String NUM_PREMATURELY_CLOSED_CONNECTIONS = "jdisc.http.request.prematurely_closed"; static final String REQUESTS_PER_CONNECTION = "jdisc.http.request.requests_per_connection"; - static final String NUM_BYTES_RECEIVED = "serverBytesReceived"; - static final String NUM_BYTES_SENT = "serverBytesSent"; + static final String NUM_BYTES_RECEIVED = ContainerMetrics.SERVER_BYTES_RECEIVED.baseName(); + static final String NUM_BYTES_SENT = ContainerMetrics.SERVER_BYTES_SENT.baseName(); static final String NUM_CONNECTIONS = ContainerMetrics.SERVER_NUM_CONNECTIONS.baseName(); diff --git a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java index a595cf8b049..01108ff36e9 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java +++ b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java @@ -35,6 +35,9 @@ public enum ContainerMetrics { SERVER_NUM_OPEN_CONNECTIONS("serverNumOpenConnections", Unit.CONNECTION, "The number of currently open connections"), SERVER_NUM_CONNECTIONS("serverNumConnections", Unit.CONNECTION, "The total number of connections opened"), + SERVER_BYTES_RECEIVED("serverBytesReceived", Unit.BYTE, "The number of bytes received by the server"), + SERVER_BYTES_SENT("serverBytesSent", Unit.BYTE, "The number of bytes sent from the server"), + HANDLED_REQUESTS("handled.requests", Unit.OPERATION, "The number of requests handled per metrics snapshot"), HANDLED_LATENCY("handled.latency", Unit.MILLISECOND, "The time used for requests during this metrics snapshot"), |