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 /configserver | |
| parent | 8e28f461238415a4cd46bd621be5ae4976617e8b (diff) | |
| parent | f8042f43abdddf9b469356c565e07b7a26491649 (diff) | |
Merge pull request #12086 from vespa-engine/jvenstad/rename-deployment-metrics
Change deployment metric dimensions
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 9 | ||||
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 92e7bf0300b..d3f37eb320e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -893,11 +893,10 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye public void close() { metric.set(name, Duration.between(start, clock.instant()).toMillis(), - metric.createContext(Map.of("tenant", id.tenant().value(), - "application", id.application().value(), - "instance", id.instance().value(), - "environment", environment, - "region", region))); + metric.createContext(Map.of("applicationId", id.toFullString(), + "tenantName", id.tenant().value(), + "app", id.application().value() + "." + id.instance().value(), + "zone", environment + "." + region))); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index a963252d7ca..0e076d60d52 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -342,11 +342,10 @@ public class ApplicationRepositoryTest { new MockTesterClient(), actual); deployApp(testAppLogServerWithContainer); - Map<String, ?> context = Map.of("tenant", "test1", - "application", "testapp", - "instance", "default", - "environment", "prod", - "region", "default"); + Map<String, ?> context = Map.of("applicationId", "test1.testapp.default", + "tenantName", "test1", + "app", "testapp.default", + "zone", "prod.default"); MockMetric expected = new MockMetric(); expected.set("deployment.prepareMillis", 0L, expected.createContext(context)); expected.set("deployment.activateMillis", 0L, expected.createContext(context)); |