feat: inject platform-appropriate sensor in commands

README.md

@@ -32,7 +32,7 @@ running `sudo chmod +r` on these files. Note that this change will only persist
 To use the extension:
 
 1. Clone this repository locally
-2. Build the code using `mvn install`
+2. Build the code using `mvn install -DskipTests` (tests currently only work on macOS)
 3. Add the extension to the application which energy consumption you wish to measure. Since the extension is not yet
    released, you will need to add it manually as a dependency to your application:
     ```xml

deployment/src/main/java/io/quarkiverse/power/deployment/PowerProcessor.java

@@ -1,6 +1,7 @@
 package io.quarkiverse.power.deployment;
 
 import io.quarkiverse.power.deployment.devui.commands.PowerCommands;
+import io.quarkiverse.power.runtime.PowerSensorProducer;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -19,6 +20,7 @@ FeatureBuildItem feature() {
     @BuildStep(onlyIf = IsDevelopment.class)
     void addConsoleCommands(BuildProducer<ConsoleCommandBuildItem> commands) {
         // register dev console commands
-        commands.produce(new ConsoleCommandBuildItem(new PowerCommands()));
+        final var producer = new PowerSensorProducer();
+        commands.produce(new ConsoleCommandBuildItem(new PowerCommands(producer.sensor())));
     }
 }

deployment/src/main/java/io/quarkiverse/power/deployment/devui/commands/PowerCommands.java

@@ -5,16 +5,20 @@
 import org.aesh.command.*;
 import org.aesh.command.invocation.CommandInvocation;
 
+import io.quarkiverse.power.runtime.PowerSensor;
+
 @GroupCommandDefinition(name = "power", description = "Power consumption commands", generateHelp = true)
 @SuppressWarnings("rawtypes")
 public class PowerCommands implements GroupCommand {
+    private final PowerSensor<?> sensor;
 
-    public PowerCommands() {
+    public PowerCommands(PowerSensor<?> sensor) {
+        this.sensor = sensor;
     }
 
     @Override
     public List<Command> getCommands() {
-        return List.of(new StartCommand(), new StopCommand());
+        return List.of(new StartCommand(sensor), new StopCommand(sensor));
     }
 
     @Override

deployment/src/main/java/io/quarkiverse/power/deployment/devui/commands/StartCommand.java

@@ -7,22 +7,23 @@
 import org.aesh.command.option.Option;
 
 import io.quarkiverse.power.runtime.PowerSensor;
-import io.quarkiverse.power.runtime.sensors.linux.rapl.IntelRAPLSensor;
 import io.quarkus.deployment.console.QuarkusCommand;
 
 @CommandDefinition(name = "start", description = "Starts measuring power consumption of the current application")
 @SuppressWarnings("rawtypes")
 public class StartCommand extends QuarkusCommand {
-
-    //    @Inject
-    PowerSensor sensor = IntelRAPLSensor.instance;
+    private final PowerSensor<?> sensor;
 
     @Option(name = "stopAfter", shortName = 's', description = "Automatically stop the measures after the specified duration in seconds", defaultValue = "-1")
     private long duration;
 
     @Option(name = "frequency", shortName = 'f', description = "The frequency at which measurements should be taken, in milliseconds", defaultValue = "1000")
     private long frequency;
 
+    public StartCommand(PowerSensor<?> sensor) {
+        this.sensor = sensor;
+    }
+
     @Override
     public CommandResult doExecute(CommandInvocation commandInvocation) throws CommandException, InterruptedException {
         try {

deployment/src/main/java/io/quarkiverse/power/deployment/devui/commands/StopCommand.java

@@ -6,15 +6,17 @@
 import org.aesh.command.invocation.CommandInvocation;
 
 import io.quarkiverse.power.runtime.PowerSensor;
-import io.quarkiverse.power.runtime.sensors.linux.rapl.IntelRAPLSensor;
 import io.quarkus.deployment.console.QuarkusCommand;
 
 @CommandDefinition(name = "stop", description = "Stops power measurement and outputs accumulated power since measures were started")
 @SuppressWarnings("rawtypes")
 public class StopCommand extends QuarkusCommand {
 
-    //    @Inject
-    PowerSensor sensor = IntelRAPLSensor.instance;
+    private final PowerSensor sensor;
+
+    public StopCommand(PowerSensor<?> sensor) {
+        this.sensor = sensor;
+    }
 
     @Override
     public CommandResult doExecute(CommandInvocation commandInvocation) throws CommandException, InterruptedException {

runtime/src/main/java/io/quarkiverse/power/runtime/PowerSensorProducer.java

@@ -3,12 +3,23 @@
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 
+import io.quarkiverse.power.runtime.sensors.linux.rapl.IntelRAPLSensor;
 import io.quarkiverse.power.runtime.sensors.macos.powermetrics.MacOSPowermetricsSensor;
 
 @Singleton
 public class PowerSensorProducer {
     @Produces
-    public PowerSensor sensor() {
-        return new MacOSPowermetricsSensor();
+    public PowerSensor<?> sensor() {
+        final var originalOSName = System.getProperty("os.name");
+        String osName = originalOSName.toLowerCase();
+
+        if (osName.contains("mac os x")) {
+            return MacOSPowermetricsSensor.instance;
+        }
+
+        if (!osName.contains("linux")) {
+            throw new RuntimeException("Unsupported platform: " + originalOSName);
+        }
+        return IntelRAPLSensor.instance;
     }
 }