diff options
author | Leandro Alves <ldalves@gmail.com> | 2020-02-06 13:03:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-06 13:03:28 +0100 |
commit | 443768b659684622310708e4e110d381e5a9b3ff (patch) | |
tree | 53f9483ffda3fe9533ee012a3e9f2b3184c0483f /controller-server | |
parent | 8e28f461238415a4cd46bd621be5ae4976617e8b (diff) | |
parent | f8042f43abdddf9b469356c565e07b7a26491649 (diff) |
Merge pull request #12086 from vespa-engine/jvenstad/rename-deployment-metrics
Change deployment metric dimensions
Diffstat (limited to 'controller-server')
2 files changed, 10 insertions, 12 deletions
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 a6ffb56492f..5df914bad80 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 @@ -40,12 +40,11 @@ public class JobMetrics { } Map<String, String> contextOf(JobId id) { - return Map.of("tenant", id.application().tenant().value(), - "application", id.application().application().value(), - "instance", id.application().instance().value(), - "job", id.type().jobName(), - "environment", id.type().environment().value(), - "region", id.type().zone(system).region().value()); + return Map.of("applicationId", id.application().toFullString(), + "tenantName", id.application().tenant().value(), + "app", id.application().application().value() + "." + id.application().instance().value(), + "test", Boolean.toString(id.type().isTest()), + "zone", id.type().zone(system).value()); } static String valueOf(RunStatus status) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java index 9de0020ce4a..b3a6ef53d2b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java @@ -375,12 +375,11 @@ public class JobRunnerTest { jobs.finish(jobs.last(id, systemTest).get().id()); } - Map<String, String> context = Map.of("tenant", "tenant", - "application", "real", - "instance", "default", - "job", "system-test", - "environment", "test", - "region", "us-east-1"); + Map<String, String> context = Map.of("applicationId", "tenant.real.default", + "tenantName", "tenant", + "app", "real.default", + "test", "true", + "zone", "test.us-east-1"); MetricsMock metric = ((MetricsMock) tester.controller().metric()); assertEquals(RunStatus.values().length - 1, metric.getMetric(context::equals, JobMetrics.start).get().intValue()); assertEquals(1, metric.getMetric(context::equals, JobMetrics.abort).get().intValue()); |