feat: SensorMeasure can carry an external cpu share, fix persistence

Author: metacosm

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

@@ -7,13 +7,17 @@
  */
 public interface SensorMeasure {
 
+    double MISSING_CPU_SHARE = -1.0;
+    double MISSING_COMPONENT_VALUE = -1.0;
+    long MISSING_TIME = -1;
+
     /**
      * Array recording the power consumption reported by each component of this sensor
      *
      * @return the values for each power component, as described in the {@link SensorMetadata} associated with the sensor
      */
     default double[] components() {
-        return new double[] { -1.0 };
+        return new double[] { MISSING_COMPONENT_VALUE };
     }
 
     /**
@@ -22,7 +26,7 @@ default double[] components() {
      * @return the start timestamp in milliseconds for this measure
      */
     default long startMs() {
-        return -1;
+        return MISSING_TIME;
     }
 
     /**
@@ -31,7 +35,7 @@ default long startMs() {
      * @return the end timestamp in milliseconds for this measure
      */
     default long endMs() {
-        return -1;
+        return MISSING_TIME;
     }
 
     /**
@@ -57,6 +61,10 @@ default boolean isPartial() {
         return false;
     }
 
+    default double externalCPUShare() {
+        return MISSING_CPU_SHARE;
+    }
+
     /**
      * Represents an invalid or somehow missed measure.
      */

metadata/src/main/java/net/laprun/sustainability/power/measures/ExternalCPUShareSensorMeasure.java

@@ -0,0 +1,35 @@
+package net.laprun.sustainability.power.measures;
+
+import net.laprun.sustainability.power.SensorMeasure;
+
+public record ExternalCPUShareSensorMeasure(SensorMeasure delegate, double cpuShare) implements SensorMeasure {
+    @Override
+    public double[] components() {
+        return delegate.components();
+    }
+
+    @Override
+    public long startMs() {
+        return delegate.startMs();
+    }
+
+    @Override
+    public long endMs() {
+        return delegate.endMs();
+    }
+
+    @Override
+    public long durationMs() {
+        return delegate.durationMs();
+    }
+
+    @Override
+    public boolean isPartial() {
+        return delegate.isPartial();
+    }
+
+    @Override
+    public double externalCPUShare() {
+        return cpuShare;
+    }
+}

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

@@ -18,6 +18,7 @@ public class Measure extends PanacheEntity {
     public long endTime;
     public long duration;
     public double[] components;
+    public double externalCPUShare;
     public String session;
 
     public static List<Measure> forApplication(String appName) {
@@ -51,8 +52,10 @@ public String toString() {
                 "{appName='" + appName + '\'' +
                 ", startTime=" + startTime +
                 ", endTime=" + endTime +
+                ", duration=" + duration +
+                ", partial=" + isPartial() +
                 ", components=" + Arrays.toString(components) +
                 ", session='" + session + '\'' +
-                '}';
+                ", extCPU=" + externalCPUShare + '}';
     }
 }

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

@@ -25,6 +25,8 @@ public Measure save(SensorMeasure measure, String appName, String session) {
         persisted.session = session == null ? defaultSession(appName) : session;
         persisted.startTime = measure.startMs();
         persisted.endTime = measure.endMs();
+        persisted.duration = measure.durationMs();
+        persisted.externalCPUShare = measure.externalCPUShare();
         persisted.persist();
         Log.debugf("Persisted %s, measure duration: %sms", persisted, persisted.endTime - persisted.startTime);
         return persisted;