diff options
4 files changed, 16 insertions, 15 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 84b02dec20b..925f390aad2 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 @@ -236,8 +236,8 @@ public class VespaMetricSet { addMetric(metrics, ContainerMetrics.SERVER_THREAD_POOL_SIZE, EnumSet.of(max, last)); // TODO: Remove on Vespa 9. Use jdisc.thread_pool.rejected_tasks. addMetric(metrics, ContainerMetrics.SERVER_ACTIVE_THREADS, EnumSet.of(min, max, sum, count, last)); // TODO: Remove on Vespa 9. Use jdisc.thread_pool.rejected_tasks. - addMetric(metrics, ContainerMetrics.JDISC_TLS_CAPABILITIES_SUCCEEDED.rate()); - addMetric(metrics, ContainerMetrics.JDISC_TLS_CAPABILITIES_FAILED.rate()); + addMetric(metrics, ContainerMetrics.JDISC_TLS_CAPABILITY_CHECKS_SUCCEEDED.rate()); + addMetric(metrics, ContainerMetrics.JDISC_TLS_CAPABILITY_CHECKS_FAILED.rate()); return metrics; } 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 1c9b9acae52..06285ecfba8 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java +++ b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java @@ -60,8 +60,8 @@ public enum ContainerMetrics implements VespaMetrics { JDISC_HTTP_FILTERING_RESPONSE_UNHANDLED("jdisc.http.filtering.response.unhandled", Unit.REQUEST, "Number of filtering responses unhandled"), JDISC_HTTP_HANDLER_UNHANDLED_EXCEPTIONS("jdisc.http.handler.unhandled_exceptions", Unit.REQUEST, "Number of unhandled exceptions in handler"), - JDISC_TLS_CAPABILITIES_SUCCEEDED("jdisc.tls.capabilities.succeeded", Unit.OPERATION, "Number of TLS capability checks succeeded"), - JDISC_TLS_CAPABILITIES_FAILED("jdisc.tls.capabilities.failed", Unit.OPERATION, "Number of TLS capability checks failed"), + JDISC_TLS_CAPABILITY_CHECKS_SUCCEEDED("jdisc.tls.capability_checks.succeeded", Unit.OPERATION, "Number of TLS capability checks succeeded"), + JDISC_TLS_CAPABILITY_CHECKS_FAILED("jdisc.tls.capability_checks.failed", Unit.OPERATION, "Number of TLS capability checks failed"), JETTY_THREADPOOL_MAX_THREADS("jdisc.http.jetty.threadpool.thread.max", Unit.THREAD, "Configured maximum number of threads"), JETTY_THREADPOOL_MIN_THREADS("jdisc.http.jetty.threadpool.thread.min", Unit.THREAD, "Configured minimum number of threads"), diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index e4e5dcf660c..43925367c1d 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -147,8 +147,8 @@ public class MetricUpdater extends AbstractComponent { private void tlsMetrics() { var newSnapshot = TlsMetrics.instance().snapshot(); var diff = newSnapshot.changesSince(tlsMetricsSnapshot); - metric.set(ContainerMetrics.JDISC_TLS_CAPABILITIES_SUCCEEDED.baseName(), diff.capabilitiesSucceeded(), null); - metric.set(ContainerMetrics.JDISC_TLS_CAPABILITIES_FAILED.baseName(), diff.capabilitiesFailed(), null); + metric.add(ContainerMetrics.JDISC_TLS_CAPABILITY_CHECKS_SUCCEEDED.baseName(), diff.capabilityChecksSucceeded(), null); + metric.add(ContainerMetrics.JDISC_TLS_CAPABILITY_CHECKS_FAILED.baseName(), diff.capabilityChecksFailed(), null); tlsMetricsSnapshot = newSnapshot; } @@ -170,6 +170,7 @@ public class MetricUpdater extends AbstractComponent { garbageCollectionMetrics.emitMetrics(metric); jrtMetrics.emitMetrics(); jvmDetails(); + tlsMetrics(); } } diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TlsMetrics.java b/security-utils/src/main/java/com/yahoo/security/tls/TlsMetrics.java index 1e9561a5b82..1ee0ca2fe65 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/TlsMetrics.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/TlsMetrics.java @@ -10,27 +10,27 @@ import java.util.concurrent.atomic.AtomicLong; public class TlsMetrics { private static final TlsMetrics instance = new TlsMetrics(); - private final AtomicLong capabilitiesSucceeded = new AtomicLong(0); - private final AtomicLong capabilitiesFailed = new AtomicLong(0); + private final AtomicLong capabilityChecksSucceeded = new AtomicLong(0); + private final AtomicLong capabilityChecksFailed = new AtomicLong(0); private TlsMetrics() {} public static TlsMetrics instance() { return instance; } - void incrementCapabilitiesSucceeded() { capabilitiesSucceeded.incrementAndGet(); } - void incrementCapabilitiesFailed() { capabilitiesFailed.incrementAndGet(); } + void incrementCapabilitiesSucceeded() { capabilityChecksSucceeded.incrementAndGet(); } + void incrementCapabilitiesFailed() { capabilityChecksFailed.incrementAndGet(); } public Snapshot snapshot() { return new Snapshot(this); } - public record Snapshot(long capabilitiesSucceeded, long capabilitiesFailed) { + public record Snapshot(long capabilityChecksSucceeded, long capabilityChecksFailed) { public static final Snapshot EMPTY = new Snapshot(0, 0); - private Snapshot(TlsMetrics m) { this(m.capabilitiesSucceeded.get(), m.capabilitiesFailed.get()); } + private Snapshot(TlsMetrics m) { this(m.capabilityChecksSucceeded.get(), m.capabilityChecksFailed.get()); } public Diff changesSince(Snapshot previous) { return new Diff(this, previous); } } - public record Diff(long capabilitiesSucceeded, long capabilitiesFailed) { + public record Diff(long capabilityChecksSucceeded, long capabilityChecksFailed) { private Diff(Snapshot current, Snapshot previous) { - this(current.capabilitiesSucceeded - previous.capabilitiesSucceeded, - current.capabilitiesFailed - previous.capabilitiesFailed); + this(current.capabilityChecksSucceeded - previous.capabilityChecksSucceeded, + current.capabilityChecksFailed - previous.capabilityChecksFailed); } } } |