Merge pull request #27935 from vespa-engine/yngveaasheim/prepare-metricset-config-server

Add separate infrastructure metric set

4 files changed, 35 insertions, 30 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java
index c88eb2f1b86..aa50f9d3a87 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.athenz.impl;
 
+import ai.vespa.metrics.ControllerMetrics;
 import com.yahoo.component.annotation.Inject;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
@@ -22,7 +23,7 @@ import java.util.Map;
  */
 public class AthenzClientFactoryImpl implements AthenzClientFactory {
 
-    private static final String METRIC_NAME = "athenz.request.error";
+    private static final String METRIC_NAME = ControllerMetrics.ATHENZ_REQUEST_ERROR.baseName();
     private static final String ATHENZ_SERVICE_DIMENSION = "athenz-service";
     private static final String EXCEPTION_DIMENSION = "exception";
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobMetrics.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobMetrics.java
index b9bff5f777e..2924bb83104 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobMetrics.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobMetrics.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.deployment;
 
+import ai.vespa.metrics.ControllerMetrics;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobId;
 
@@ -13,19 +14,19 @@ import java.util.Map;
  */
 public class JobMetrics {
 
-    public static final String start = "deployment.start";
-    public static final String nodeAllocationFailure = "deployment.nodeAllocationFailure";
-    public static final String endpointCertificateTimeout = "deployment.endpointCertificateTimeout";
-    public static final String deploymentFailure = "deployment.deploymentFailure";
-    public static final String invalidApplication = "deployment.invalidApplication";
-    public static final String convergenceFailure = "deployment.convergenceFailure";
-    public static final String testFailure = "deployment.testFailure";
-    public static final String noTests = "deployment.noTests";
-    public static final String error = "deployment.error";
-    public static final String abort = "deployment.abort";
-    public static final String cancel = "deployment.cancel";
-    public static final String success = "deployment.success";
-    public static final String quotaExceeded = "deployment.quotaExceeded";
+    public static final String start = ControllerMetrics.DEPLOYMENT_START.baseName();
+    public static final String nodeAllocationFailure = ControllerMetrics.DEPLOYMENT_NODE_ALLOCATION_FAILURE.baseName();
+    public static final String endpointCertificateTimeout = ControllerMetrics.DEPLOYMENT_ENDPOINT_CERTIFICATE_TIMEOUT.baseName();
+    public static final String deploymentFailure = ControllerMetrics.DEPLOYMENT_DEPLOYMENT_FAILURE.baseName();
+    public static final String invalidApplication = ControllerMetrics.DEPLOYMENT_INVALID_APPLICATION.baseName();
+    public static final String convergenceFailure = ControllerMetrics.DEPLOYMENT_CONVERGENCE_FAILURE.baseName();
+    public static final String testFailure = ControllerMetrics.DEPLOYMENT_TEST_FAILURE.baseName();
+    public static final String noTests = ControllerMetrics.DEPLOYMENT_NO_TESTS.baseName();
+    public static final String error = ControllerMetrics.DEPLOYMENT_ERROR.baseName();
+    public static final String abort = ControllerMetrics.DEPLOYMENT_ABORT.baseName();
+    public static final String cancel = ControllerMetrics.DEPLOYMENT_CANCEL.baseName();
+    public static final String success = ControllerMetrics.DEPLOYMENT_SUCCESS.baseName();
+    public static final String quotaExceeded = ControllerMetrics.DEPLOYMENT_QUOTA_EXCEEDED.baseName();
 
     private final Metric metric;
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
index b2ed0941c8e..33a4802360e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.maintenance;
 
+import ai.vespa.metrics.ControllerMetrics;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.jdisc.Metric;
@@ -24,7 +25,7 @@ import java.util.stream.Collectors;
  */
 public class ArchiveAccessMaintainer extends ControllerMaintainer {
 
-    private static final String bucketCountMetricName = "archive.bucketCount";
+    private static final String bucketCountMetricName = ControllerMetrics.ARCHIVE_BUCKET_COUNT.baseName();
 
     private final CuratorArchiveBucketDb archiveBucketDb;
     private final ArchiveService archiveService;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java
index 71f9c37577a..6a280e71e98 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java
@@ -1,6 +1,8 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.maintenance;
 
+import ai.vespa.metrics.ConfigServerMetrics;
+import ai.vespa.metrics.ControllerMetrics;
 import com.yahoo.component.Version;
 import com.yahoo.config.application.api.DeploymentInstanceSpec;
 import com.yahoo.config.provision.ApplicationId;
@@ -48,22 +50,22 @@ import java.util.stream.Collectors;
  */
 public class MetricsReporter extends ControllerMaintainer {
 
-    public static final String TENANT_METRIC = "billing.tenants";
-    public static final String DEPLOYMENT_FAIL_METRIC = "deployment.failurePercentage";
-    public static final String DEPLOYMENT_AVERAGE_DURATION = "deployment.averageDuration";
-    public static final String DEPLOYMENT_FAILING_UPGRADES = "deployment.failingUpgrades";
-    public static final String DEPLOYMENT_BUILD_AGE_SECONDS = "deployment.buildAgeSeconds";
-    public static final String DEPLOYMENT_WARNINGS = "deployment.warnings";
-    public static final String DEPLOYMENT_OVERDUE_UPGRADE = "deployment.overdueUpgradeSeconds";
-    public static final String OS_CHANGE_DURATION = "deployment.osChangeDuration";
-    public static final String PLATFORM_CHANGE_DURATION = "deployment.platformChangeDuration";
-    public static final String OS_NODE_COUNT = "deployment.nodeCountByOsVersion";
-    public static final String PLATFORM_NODE_COUNT = "deployment.nodeCountByPlatformVersion";
-    public static final String BROKEN_SYSTEM_VERSION = "deployment.brokenSystemVersion";
-    public static final String REMAINING_ROTATIONS = "remaining_rotations";
-    public static final String NAME_SERVICE_REQUESTS_QUEUED = "dns.queuedRequests";
+    public static final String TENANT_METRIC = ControllerMetrics.BILLING_TENANTS.baseName();
+    public static final String DEPLOYMENT_FAIL_METRIC = ControllerMetrics.DEPLOYMENT_FAILURE_PERCENTAGE.baseName();
+    public static final String DEPLOYMENT_AVERAGE_DURATION = ControllerMetrics.DEPLOYMENT_AVERAGE_DURATION.baseName();
+    public static final String DEPLOYMENT_FAILING_UPGRADES = ControllerMetrics.DEPLOYMENT_FAILING_UPGRADES.baseName();
+    public static final String DEPLOYMENT_BUILD_AGE_SECONDS = ControllerMetrics.DEPLOYMENT_BUILD_AGE_SECONDS.baseName();
+    public static final String DEPLOYMENT_WARNINGS = ControllerMetrics.DEPLOYMENT_WARNINGS.baseName();
+    public static final String DEPLOYMENT_OVERDUE_UPGRADE = ControllerMetrics.DEPLOYMENT_OVERDUE_UPGRADE_SECONDS.baseName();
+    public static final String OS_CHANGE_DURATION = ControllerMetrics.DEPLOYMENT_OS_CHANGE_DURATION.baseName();
+    public static final String PLATFORM_CHANGE_DURATION = ControllerMetrics.DEPLOYMENT_PLATFORM_CHANGE_DURATION.baseName();
+    public static final String OS_NODE_COUNT = ControllerMetrics.DEPLOYMENT_NODE_COUNT_BY_OS_VERSION.baseName();
+    public static final String PLATFORM_NODE_COUNT = ControllerMetrics.DEPLOYMENT_NODE_COUNT_BY_PLATFORM_VERSION.baseName();
+    public static final String BROKEN_SYSTEM_VERSION = ControllerMetrics.DEPLOYMENT_BROKEN_SYSTEM_VERSION.baseName();
+    public static final String REMAINING_ROTATIONS = ControllerMetrics.REMAINING_ROTATIONS.baseName();
+    public static final String NAME_SERVICE_REQUESTS_QUEUED = ControllerMetrics.DNS_QUEUED_REQUESTS.baseName();
     public static final String OPERATION_PREFIX = "operation.";
-    public static final String ZMS_QUOTA_USAGE = "zms.quota.usage";
+    public static final String ZMS_QUOTA_USAGE = ControllerMetrics.ZMS_QUOTA_USAGE.baseName();
 
     private final Metric metric;
     private final Clock clock;