feat: record measures for an application by its name

Author: metacosm

metadata/src/main/java/net/laprun/sustainability/power/SensorMeasure.java

@@ -6,11 +6,12 @@
  * with the sensor.
  *
  * @param components an array recording the power consumption reported by each component of this sensor
- * @param tick the ordinal tick associated with this measure
+ * @param startMs the start timestamp in milliseconds for this measure
+ * @param endMs the end timestamp in milliseconds for this measure
  */
-public record SensorMeasure(double[] components, long tick, long timestamp, long duration) {
+public record SensorMeasure(double[] components, long startMs, long endMs) {
     /**
      * Represents an invalid or somehow missed measure.
      */
-    public static final SensorMeasure missing = new SensorMeasure(new double[] { -1.0 }, -1, -1, -1);
+    public static final SensorMeasure missing = new SensorMeasure(new double[] { -1.0 }, -1, -1);
 }

server/src/main/java/net/laprun/sustainability/power/PowerMeasurer.java

@@ -12,6 +12,7 @@
 import net.laprun.sustainability.power.persistence.Persistence;
 import net.laprun.sustainability.power.sensors.Measures;
 import net.laprun.sustainability.power.sensors.PowerSensor;
+import net.laprun.sustainability.power.sensors.RegisteredPID;
 
 @ApplicationScoped
 public class PowerMeasurer {
@@ -25,7 +26,16 @@ public class PowerMeasurer {
 
     private Multi<Measures> periodicSensorCheck;
 
-    public Multi<SensorMeasure> startTracking(String pid) throws Exception {
+    public Multi<SensorMeasure> stream(String pid) throws Exception {
+        final var registeredPID = track(pid);
+        return periodicSensorCheck.map(measures -> measures.getOrDefault(registeredPID));
+    }
+
+    public void startTrackingApp(String appName, String pid) throws Exception {
+        stream(pid).subscribe().with(m -> Persistence.save(m, appName));
+    }
+
+    private RegisteredPID track(String pid) throws Exception {
         // first make sure that the process with that pid exists
         final var parsedPID = validPIDOrFail(pid);
 
@@ -42,10 +52,8 @@ public Multi<SensorMeasure> startTracking(String pid) throws Exception {
         final var registeredPID = sensor.register(parsedPID);
         // todo: the timing of things could make it so that the pid has been removed before the map operation occurs so
         //  currently return -1 instead of null but this needs to be properly addressed
-        return periodicSensorCheck
-                .map(measures -> measures.getOrDefault(registeredPID))
-                .onItem().invoke(sm -> Persistence.save(sm, parsedPID))
-                .onCancellation().invoke(() -> sensor.unregister(registeredPID));
+        periodicSensorCheck = periodicSensorCheck.onCancellation().invoke(() -> sensor.unregister(registeredPID));
+        return registeredPID;
     }
 
     protected long validPIDOrFail(String pid) {

server/src/main/java/net/laprun/sustainability/power/PowerResource.java

@@ -5,7 +5,11 @@
 
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.*;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.core.MediaType;
 
 import org.jboss.resteasy.reactive.RestStreamElementType;
@@ -27,10 +31,20 @@ public void onStartup(@Observes StartupEvent event) {
 
     @GET
     @RestStreamElementType(MediaType.APPLICATION_JSON)
-    @Path("{pid}")
-    public Multi<SensorMeasure> powerFor(@PathParam("pid") String pid) throws Exception {
+    @Path("stream/{pid}")
+    public Multi<SensorMeasure> streamMeasuresFor(@PathParam("pid") String pid) throws Exception {
         try {
-            return measurer.startTracking(pid);
+            return measurer.stream(pid);
+        } catch (IllegalArgumentException e) {
+            throw new NotFoundException("Unknown process: " + pid);
+        }
+    }
+
+    @POST
+    @Path("start/{appName}/{pid}")
+    public void startMeasure(@PathParam("appName") String appName, @PathParam("pid") String pid) throws Exception {
+        try {
+            measurer.startTrackingApp(appName, pid);
         } catch (IllegalArgumentException e) {
             throw new NotFoundException("Unknown process: " + pid);
         }
@@ -49,14 +63,8 @@ public Duration samplingPeriod() {
     }
 
     @GET
-    @Path("data/{pid}")
-    public List<Measure> measures(@PathParam("pid") String pid) throws Exception {
-        return Measure.forPID(Long.parseLong(pid));
-    }
-
-    @GET
-    @Path("pids")
-    public List<String> pids() {
-        return Measure.all().stream().map(m -> "" + m.pid).toList();
+    @Path("measures/{appName}")
+    public List<SensorMeasure> measures(@PathParam("appName") String appName) throws Exception {
+        return Measure.forApplication(appName).stream().map(Measure::asSensorMeasure).toList();
     }
 }

server/src/main/java/net/laprun/sustainability/power/persistence/Measure.java

@@ -5,19 +5,24 @@
 import jakarta.persistence.Entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import net.laprun.sustainability.power.SensorMeasure;
 
 @Entity
 public class Measure extends PanacheEntity {
-    public long pid;
+    public String appName;
     public long startTime;
     public long endTime;
     public double[] components;
 
-    public static List<Measure> forPID(long pid) {
-        return find("pid", pid).list();
+    public static List<Measure> forApplication(String appName) {
+        return find("appName", appName).list();
     }
 
     public static List<Measure> all() {
         return Measure.findAll().list();
     }
+
+    public SensorMeasure asSensorMeasure() {
+        return new SensorMeasure(components, startTime, endTime);
+    }
 }

server/src/main/java/net/laprun/sustainability/power/persistence/Persistence.java

@@ -8,12 +8,12 @@ public enum Persistence {
     ;
 
     @Transactional
-    public static Measure save(SensorMeasure measure, long parsedPID) {
+    public static Measure save(SensorMeasure measure, String appName) {
         final var persisted = new Measure();
         persisted.components = measure.components();
-        persisted.pid = parsedPID;
-        persisted.startTime = measure.timestamp();
-        persisted.endTime = measure.timestamp() + measure.duration();
+        persisted.appName = appName;
+        persisted.startTime = measure.startMs();
+        persisted.endTime = measure.endMs();
         persisted.persist();
         return persisted;
     }

server/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java

@@ -141,8 +141,7 @@ public Measures update(Long tick) {
             measure[i] = newComponentValue;
             lastMeasuredSensorValues[i] = newComponentValue;
         }
-        final long timestamp = System.currentTimeMillis();
-        measures.singleMeasure(new SensorMeasure(measure, tick, timestamp, timestamp - start));
+        measures.singleMeasure(new SensorMeasure(measure, start, System.currentTimeMillis()));
         return measures;
     }
 }

server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java

@@ -197,8 +197,7 @@ Measures extractPowerMeasure(InputStream powerMeasureInput, Long tick) {
                     }
                 });
 
-                final long timestamp = System.currentTimeMillis();
-                measures.record(pid, new SensorMeasure(measure, tick, timestamp, timestamp - start));
+                measures.record(pid, new SensorMeasure(measure, start, System.currentTimeMillis()));
             });
         } catch (Exception exception) {
             throw new RuntimeException(exception);

server/src/main/java/net/laprun/sustainability/power/sensors/test/TestPowerSensor.java

@@ -48,7 +48,7 @@ public void start(long samplingFrequencyInMillis) {
     @Override
     public Measures update(Long tick) {
         measures.trackedPIDs().forEach(pid -> measures.record(pid,
-                new SensorMeasure(new double[] { Math.random() }, tick, System.currentTimeMillis(), 0)));
+                new SensorMeasure(new double[] { Math.random() }, System.currentTimeMillis(), System.currentTimeMillis())));
         return measures;
     }
 }

server/src/test/java/net/laprun/sustainability/power/CIPowerResourceTest.java

@@ -22,9 +22,9 @@ protected long getPid() {
     public void testPowerEndpoint() {
         final var pid = getPid();
         given()
-                .when().get("/power/" + pid)
+                .when().post("/power/start/cipowerresourcetest/" + pid)
                 .then()
-                .statusCode(200);
+                .statusCode(204);
     }
 
     @Test

server/src/test/java/net/laprun/sustainability/power/PowerResourceTest.java

@@ -20,9 +20,9 @@ public class PowerResourceTest {
     public void testPowerEndpoint() {
         final var pid = getPid();
         given()
-                .when().get("/power/" + pid)
+                .when().post("/power/start/powerresourcetest/" + pid)
                 .then()
-                .statusCode(200);
+                .statusCode(204);
     }
 
     @Test