Skip to content

Commit b68b4f3

Browse files
committed
fix: use external cpu share from unpersisted measure
1 parent d0df53a commit b68b4f3

File tree

1 file changed

+1
-5
lines changed
  • cli/src/main/java/net/laprun/sustainability/cli

1 file changed

+1
-5
lines changed

cli/src/main/java/net/laprun/sustainability/cli/Power.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
package net.laprun.sustainability.cli;
2020

21-
import static net.laprun.sustainability.power.sensors.PowerSensor.EXTERNAL_CPU_SHARE_COMPONENT_NAME;
22-
2321
import java.time.Instant;
2422
import java.util.Optional;
2523
import java.util.concurrent.TimeUnit;
@@ -136,12 +134,10 @@ public void run() {
136134
}
137135

138136
private Measure extractPowerConsumption(String applicationName, boolean useExternalCPUShare) {
139-
int cpuShareComponent = useExternalCPUShare ? measurer.metadata().metadataFor(EXTERNAL_CPU_SHARE_COMPONENT_NAME).index()
140-
: -1;
141137
final var appPower = measurer.persistence()
142138
.synthesizeAndAggregateForSession(applicationName, session,
143139
m -> {
144-
double factor = useExternalCPUShare ? m.components[cpuShareComponent] : 1.0;
140+
double factor = useExternalCPUShare ? m.externalCPUShare : 1.0;
145141
return factor * totaler.computeTotalFrom(m.components);
146142
})
147143
.map(measure -> new Measure(measure, totaler.expectedResultUnit()))

0 commit comments

Comments
 (0)