From c2478926a75f10878121b0df4afad5e192b61e59 Mon Sep 17 00:00:00 2001
From: Chris Laprun <metacosm@gmail.com>
Date: Wed, 19 Nov 2025 18:44:21 +0100
Subject: [PATCH] refactor: unify configuration properties names

---
 .../sustainability/power/sensors/AbstractPowerSensor.java   | 6 +++---
 .../sustainability/power/sensors/SamplingMeasurer.java      | 2 +-
 .../power/sensors/cpu/PSExtractionStrategy.java             | 1 +
 .../sensors/macos/powermetrics/MacOSPowermetricsSensor.java | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/net/laprun/sustainability/power/sensors/AbstractPowerSensor.java b/backend/src/main/java/net/laprun/sustainability/power/sensors/AbstractPowerSensor.java
index 4f798a89..c83e4270 100644
--- a/backend/src/main/java/net/laprun/sustainability/power/sensors/AbstractPowerSensor.java
+++ b/backend/src/main/java/net/laprun/sustainability/power/sensors/AbstractPowerSensor.java
@@ -13,7 +13,7 @@ public abstract class AbstractPowerSensor implements PowerSensor {
     protected final Measures measures;
     private long lastUpdateEpoch;
     private boolean started;
-    @ConfigProperty(name = "net.laprun.sustainability.power.enable-cpu-share-sampling", defaultValue = "false")
+    @ConfigProperty(name = "power-server.enable-cpu-share-sampling", defaultValue = "false")
     protected boolean cpuSharesEnabled;
     private SensorMetadata metadata;
     private int externalCPUShareComponentIndex = -1;
@@ -71,11 +71,11 @@ public void unregister(RegisteredPID registeredPID) {
     }
 
     @Override
-    public void start(long samplingFrequencyInMillis) throws Exception {
+    public void start(long samplingPeriodInMillis) throws Exception {
         if (!started) {
             lastUpdateEpoch = System.currentTimeMillis();
             started = true;
-            doStart(samplingFrequencyInMillis);
+            doStart(samplingPeriodInMillis);
         }
     }
 
diff --git a/backend/src/main/java/net/laprun/sustainability/power/sensors/SamplingMeasurer.java b/backend/src/main/java/net/laprun/sustainability/power/sensors/SamplingMeasurer.java
index 4751d1ff..fc2207f0 100644
--- a/backend/src/main/java/net/laprun/sustainability/power/sensors/SamplingMeasurer.java
+++ b/backend/src/main/java/net/laprun/sustainability/power/sensors/SamplingMeasurer.java
@@ -33,7 +33,7 @@ public class SamplingMeasurer {
     @Inject
     Persistence persistence;
 
-    @ConfigProperty(name = "net.laprun.sustainability.power.sampling-period", defaultValue = DEFAULT_SAMPLING_PERIOD)
+    @ConfigProperty(name = "power-server.sampling-period", defaultValue = DEFAULT_SAMPLING_PERIOD)
     Duration samplingPeriod;
 
     private Multi<Measures> periodicSensorCheck;
diff --git a/backend/src/main/java/net/laprun/sustainability/power/sensors/cpu/PSExtractionStrategy.java b/backend/src/main/java/net/laprun/sustainability/power/sensors/cpu/PSExtractionStrategy.java
index 944edabc..713da912 100644
--- a/backend/src/main/java/net/laprun/sustainability/power/sensors/cpu/PSExtractionStrategy.java
+++ b/backend/src/main/java/net/laprun/sustainability/power/sensors/cpu/PSExtractionStrategy.java
@@ -48,6 +48,7 @@ public void onExit(int statusCode) {
     }
 
     void extractCPUSharesInto(byte[] bytes, Map<String, Double> cpuShares) {
+        // todo: avoid creating a string?
         extractCPUSharesInto(new String(bytes), cpuShares);
     }
 
diff --git a/backend/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java b/backend/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java
index 3e72f85b..9d142b5c 100644
--- a/backend/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java
+++ b/backend/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java
@@ -51,8 +51,8 @@ public abstract class MacOSPowermetricsSensor extends AbstractPowerSensor {
     public static final String CPU_SHARE = "cpuShare";
     private static final String DURATION_SUFFIX = "ms elapsed) ***";
     private static final int DURATION_SUFFIX_LENGTH = DURATION_SUFFIX.length();
-    public static final String TASKS_SECTION_MARKER = "*** Running tasks ***";
-    public static final String CPU_USAGE_SECTION_MARKER = "**** Processor usage ****";
+    private static final String TASKS_SECTION_MARKER = "*** Running tasks ***";
+    private static final String CPU_USAGE_SECTION_MARKER = "**** Processor usage ****";
 
     private CPU cpu;