Use ResourceAllocation less. NodeResources does the job

2 files changed, 16 insertions, 12 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 d47b82a231f..059986072f3 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
@@ -120,7 +120,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
                     Map<ZoneId, Double> deploymentCosts = snapshotsByInstance.getOrDefault(instanceName, List.of()).stream()
                             .collect(Collectors.toUnmodifiableMap(
                                     ResourceSnapshot::getZoneId,
-                                    snapshot -> cost(snapshot.allocation(), systemName),
+                                    snapshot -> cost(snapshot.resources(), systemName),
                                     Double::sum));
                     locked = locked.with(instanceName, i -> i.withDeploymentCosts(deploymentCosts));
                     updateCostMetrics(tenantAndApplication.instance(instanceName), deploymentCosts);
@@ -234,10 +234,14 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
     }
 
     private static double cost(ResourceAllocation allocation, SystemName systemName) {
+        var resources = new NodeResources(allocation.getCpuCores(), allocation.getMemoryGb(), allocation.getDiskGb(), 0);
+        return cost(resources, systemName);
+    }
+
+    private static double cost(NodeResources resources, SystemName systemName) {
         // Divide cost by 3 in non-public zones to show approx. AWS equivalent cost
         double costDivisor = systemName.isPublic() ? 1.0 : 3.0;
-        double cost = new NodeResources(allocation.getCpuCores(), allocation.getMemoryGb(), allocation.getDiskGb(), 0).cost();
-        return Math.round(cost * 100.0 / costDivisor) / 100.0;
+        return Math.round(resources.cost() * 100.0 / costDivisor) / 100.0;
     }
 
     private void updateMeteringMetrics(Collection<ResourceSnapshot> resourceSnapshots) {
@@ -245,14 +249,14 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
         // total metered resource usage, for alerting on drastic changes
         metric.set(METERING_TOTAL_REPORTED,
                 resourceSnapshots.stream()
-                        .mapToDouble(r -> r.getCpuCores() + r.getMemoryGb() + r.getDiskGb()).sum(),
+                        .mapToDouble(r -> r.resources().vcpu() + r.resources().memoryGb() + r.resources().diskGb()).sum(),
                 metric.createContext(Collections.emptyMap()));
 
         resourceSnapshots.forEach(snapshot -> {
             var context = getMetricContext(snapshot);
-            metric.set("metering.vcpu", snapshot.getCpuCores(), context);
-            metric.set("metering.memoryGB", snapshot.getMemoryGb(), context);
-            metric.set("metering.diskGB", snapshot.getDiskGb(), context);
+            metric.set("metering.vcpu", snapshot.resources().vcpu(), context);
+            metric.set("metering.memoryGB", snapshot.resources().memoryGb(), context);
+            metric.set("metering.diskGB", snapshot.resources().diskGb(), context);
         });
     }
 
@@ -276,7 +280,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
                 "tenant", snapshot.getApplicationId().tenant().value(),
                 "applicationId", snapshot.getApplicationId().toFullString(),
                 "zoneId", snapshot.getZoneId().value(),
-                "architecture", snapshot.getArchitecture()
+                "architecture", snapshot.resources().architecture()
         ));
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java
index 17461aafd02..7df216d6c9c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java
@@ -29,10 +29,10 @@ public class MeteringResponse extends SlimeJsonResponse {
             object.setString("applicationId", snapshot.getApplicationId().toShortString());
             object.setLong("timestamp", snapshot.getTimestamp().toEpochMilli());
             object.setString("zoneId", snapshot.getZoneId().value());
-            object.setDouble("cpu", snapshot.getCpuCores());
-            object.setDouble("memory", snapshot.getMemoryGb());
-            object.setDouble("disk", snapshot.getDiskGb());
-            object.setString("architecture", snapshot.getArchitecture().name());
+            object.setDouble("cpu", snapshot.resources().vcpu());
+            object.setDouble("memory", snapshot.resources().memoryGb());
+            object.setDouble("disk", snapshot.resources().diskGb());
+            object.setString("architecture", snapshot.resources().architecture().name());
         });
         return slime;
     }