Skip to content

refactor: unify configuration properties names #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
Merged

refactor: unify configuration properties names #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/src/main/java/net/laprun/sustainability/power/sensors/AbstractPowerSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/java/net/laprun/sustainability/power/sensors/SamplingMeasurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions backend/src/main/java/net/laprun/sustainability/power/sensors/cpu/PSExtractionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions ...a/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading