From a406819abcc0d89a479aacca7929fc38c530d6ce Mon Sep 17 00:00:00 2001 From: Yngve Aasheim Date: Tue, 15 Aug 2023 08:18:16 +0200 Subject: Use consistent tag name --- .../vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java index 998b72665d7..00c9bd165a9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java @@ -271,7 +271,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { private Metric.Context getMetricContext(ApplicationId applicationId, ZoneId zoneId) { return metric.createContext(Map.of( - "tenant", applicationId.tenant().value(), + "tenantName", applicationId.tenant().value(), "applicationId", applicationId.toFullString(), "zoneId", zoneId.value() )); @@ -279,7 +279,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { private Metric.Context getMetricContext(ResourceSnapshot snapshot) { return metric.createContext(Map.of( - "tenant", snapshot.getApplicationId().tenant().value(), + "tenantName", snapshot.getApplicationId().tenant().value(), "applicationId", snapshot.getApplicationId().toFullString(), "zoneId", snapshot.getZoneId().value(), "architecture", snapshot.resources().architecture() -- cgit v1.2.3 From b27f4f5aa33a1a1546194ee566df39e706c0366f Mon Sep 17 00:00:00 2001 From: Yngve Aasheim Date: Tue, 15 Aug 2023 09:17:26 +0200 Subject: Use new tag name in test --- .../hosted/controller/maintenance/ResourceMeterMaintainerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java index 8196aa48197..fac05fc125f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java @@ -81,7 +81,7 @@ public class ResourceMeterMaintainerTest { assertEquals(1.72, (Double) metrics.getMetric(context -> z1.value().equals(context.get("zoneId")) && - app1.tenant().value().equals(context.get("tenant")), + app1.tenant().value().equals(context.get("tenantName")), "metering.cost.hourly").get(), Double.MIN_VALUE); } @@ -109,8 +109,8 @@ public class ResourceMeterMaintainerTest { assertEquals(tester.clock().millis() / 1000, metrics.getMetric("metering_last_reported")); assertEquals(2224.0d, (Double) metrics.getMetric("metering_total_reported"), Double.MIN_VALUE); - assertEquals(24d, (Double) metrics.getMetric(context -> "tenant1".equals(context.get("tenant")), "metering.vcpu").get(), Double.MIN_VALUE); - assertEquals(40d, (Double) metrics.getMetric(context -> "tenant2".equals(context.get("tenant")), "metering.vcpu").get(), Double.MIN_VALUE); + assertEquals(24d, (Double) metrics.getMetric(context -> "tenant1".equals(context.get("tenantName")), "metering.vcpu").get(), Double.MIN_VALUE); + assertEquals(40d, (Double) metrics.getMetric(context -> "tenant2".equals(context.get("tenantName")), "metering.vcpu").get(), Double.MIN_VALUE); // Metering is not refreshed assertFalse(resourceClient.hasRefreshedMaterializedView()); -- cgit v1.2.3