Merge remote-tracking branch 'origin/master' into ogronnesby/ignore-minor-micro

2 files changed, 12 insertions, 3 deletions

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 7df216d6c9c..28248560a6f 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
@@ -26,13 +26,16 @@ public class MeteringResponse extends SlimeJsonResponse {
         List<ResourceSnapshot> snapshots = resourceClient.getRawSnapshotHistoryForTenant(TenantName.from(tenantName), YearMonth.parse(month));
         snapshots.forEach(snapshot -> {
             Cursor object = root.addObject();
-            object.setString("applicationId", snapshot.getApplicationId().toShortString());
+            object.setString("applicationId", snapshot.getApplicationId().toFullString());
             object.setLong("timestamp", snapshot.getTimestamp().toEpochMilli());
             object.setString("zoneId", snapshot.getZoneId().value());
             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());
+            object.setString("version", snapshot.getVersion().toFullString());
+            object.setDouble("gpuMemoryGb", snapshot.resources().gpuResources().memoryGb());
+            object.setLong("gpuCount", snapshot.resources().gpuResources().count());
         });
         return slime;
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json
index cf7738efe7f..328329e2b60 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json
@@ -6,7 +6,10 @@
     "cpu": 12.0,
     "memory": 48.0,
     "disk": 1200.0,
-    "architecture": "arm64"
+    "architecture": "arm64",
+    "version": "0.0.0",
+    "gpuMemoryGb": 0.0,
+    "gpuCount": 0
   },
   {
     "applicationId": "tenant.app.instance",
@@ -15,6 +18,9 @@
     "cpu": 24.0,
     "memory": 96.0,
     "disk": 2400.0,
-    "architecture": "x86_64"
+    "architecture": "x86_64",
+    "version": "0.0.0",
+    "gpuMemoryGb": 0.0,
+    "gpuCount": 0
   }
 ]