From 73a5a1c3fc9855c7580cfa7e1e65c351af82bf17 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 28 Jan 2025 10:17:42 +0100 Subject: [PATCH] feat: display metadata / configuration on start --- .../net/laprun/sustainability/power/PowerResource.java | 8 ++++++++ .../macos/powermetrics/MacOSPowermetricsSensor.java | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/net/laprun/sustainability/power/PowerResource.java b/server/src/main/java/net/laprun/sustainability/power/PowerResource.java index 8b3da4a..0c0d2cc 100644 --- a/server/src/main/java/net/laprun/sustainability/power/PowerResource.java +++ b/server/src/main/java/net/laprun/sustainability/power/PowerResource.java @@ -2,12 +2,15 @@ import java.time.Duration; +import jakarta.enterprise.event.Observes; import jakarta.inject.Inject; import jakarta.ws.rs.*; import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.RestStreamElementType; +import io.quarkus.logging.Log; +import io.quarkus.runtime.StartupEvent; import io.smallrye.mutiny.Multi; @Path("/power") @@ -15,6 +18,11 @@ public class PowerResource { @Inject PowerMeasurer measurer; + public void onStartup(@Observes StartupEvent event) { + Log.info("\nConfigured sampling period: " + samplingPeriod() + + "\nDetected metadata:\n" + metadata()); + } + @GET @RestStreamElementType(MediaType.APPLICATION_JSON) @Path("{pid}") diff --git a/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java index 3530c28..464cdc5 100644 --- a/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java +++ b/server/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java @@ -9,7 +9,6 @@ import java.util.HashSet; import java.util.regex.Pattern; -import io.quarkus.logging.Log; import net.laprun.sustainability.power.SensorMeasure; import net.laprun.sustainability.power.SensorMetadata; import net.laprun.sustainability.power.sensors.AbstractPowerSensor; @@ -89,7 +88,6 @@ void initMetadata(InputStream inputStream) { final var metadata = new SensorMetadata(components, "macOS powermetrics derived information, see https://firefox-source-docs.mozilla.org/performance/powermetrics.html"); cpu.setMetadata(metadata); - Log.info("Detected metadata:\n" + metadata); } catch (IOException e) { throw new RuntimeException(e); }