From d4913b301a374560fd4a34cd36f456e694b9b0fb Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 28 Nov 2021 11:02:51 +0000 Subject: Add spark version to platform metadata --- .../java/me/lucko/spark/common/api/SparkApi.java | 37 ++++++++++++---------- .../lucko/spark/common/platform/PlatformInfo.java | 19 +++++++++-- 2 files changed, 36 insertions(+), 20 deletions(-) (limited to 'spark-common/src/main/java') diff --git a/spark-common/src/main/java/me/lucko/spark/common/api/SparkApi.java b/spark-common/src/main/java/me/lucko/spark/common/api/SparkApi.java index d0fcb0f..5b1ec2b 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/api/SparkApi.java +++ b/spark-common/src/main/java/me/lucko/spark/common/api/SparkApi.java @@ -25,7 +25,6 @@ import com.google.common.collect.ImmutableMap; import me.lucko.spark.api.Spark; import me.lucko.spark.api.SparkProvider; import me.lucko.spark.api.gc.GarbageCollector; -import me.lucko.spark.api.statistic.StatisticWindow; import me.lucko.spark.api.statistic.misc.DoubleAverageInfo; import me.lucko.spark.api.statistic.types.DoubleStatistic; import me.lucko.spark.api.statistic.types.GenericStatistic; @@ -41,6 +40,10 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import static me.lucko.spark.api.statistic.StatisticWindow.CpuUsage; +import static me.lucko.spark.api.statistic.StatisticWindow.MillisPerTick; +import static me.lucko.spark.api.statistic.StatisticWindow.TicksPerSecond; + public class SparkApi implements Spark { private static final Method SINGLETON_SET_METHOD; @@ -60,12 +63,12 @@ public class SparkApi implements Spark { } @Override - public @NonNull DoubleStatistic cpuProcess() { - return new AbstractStatistic.Double( - "CPU Process Usage", StatisticWindow.CpuUsage.class + public @NonNull DoubleStatistic cpuProcess() { + return new AbstractStatistic.Double( + "CPU Process Usage", CpuUsage.class ) { @Override - public double poll(StatisticWindow.@NonNull CpuUsage window) { + public double poll(@NonNull CpuUsage window) { switch (window) { case SECONDS_10: return CpuMonitor.processLoad10SecAvg(); @@ -81,12 +84,12 @@ public class SparkApi implements Spark { } @Override - public @NonNull DoubleStatistic cpuSystem() { - return new AbstractStatistic.Double( - "CPU System Usage", StatisticWindow.CpuUsage.class + public @NonNull DoubleStatistic cpuSystem() { + return new AbstractStatistic.Double( + "CPU System Usage", CpuUsage.class ) { @Override - public double poll(StatisticWindow.@NonNull CpuUsage window) { + public double poll(@NonNull CpuUsage window) { switch (window) { case SECONDS_10: return CpuMonitor.systemLoad10SecAvg(); @@ -102,17 +105,17 @@ public class SparkApi implements Spark { } @Override - public @Nullable DoubleStatistic tps() { + public @Nullable DoubleStatistic tps() { TickStatistics stats = this.platform.getTickStatistics(); if (stats == null) { return null; } - return new AbstractStatistic.Double( - "Ticks Per Second", StatisticWindow.TicksPerSecond.class + return new AbstractStatistic.Double( + "Ticks Per Second", TicksPerSecond.class ) { @Override - public double poll(StatisticWindow.@NonNull TicksPerSecond window) { + public double poll(@NonNull TicksPerSecond window) { switch (window) { case SECONDS_5: return stats.tps5Sec(); @@ -132,17 +135,17 @@ public class SparkApi implements Spark { } @Override - public @Nullable GenericStatistic mspt() { + public @Nullable GenericStatistic mspt() { TickStatistics stats = this.platform.getTickStatistics(); if (stats == null || !stats.isDurationSupported()) { return null; } - return new AbstractStatistic.Generic( - "Milliseconds Per Tick", DoubleAverageInfo.class, StatisticWindow.MillisPerTick.class + return new AbstractStatistic.Generic( + "Milliseconds Per Tick", DoubleAverageInfo.class, MillisPerTick.class ) { @Override - public DoubleAverageInfo poll(StatisticWindow.@NonNull MillisPerTick window) { + public DoubleAverageInfo poll(@NonNull MillisPerTick window) { switch (window) { case SECONDS_10: return stats.duration10Sec(); diff --git a/spark-common/src/main/java/me/lucko/spark/common/platform/PlatformInfo.java b/spark-common/src/main/java/me/lucko/spark/common/platform/PlatformInfo.java index c631187..80fb85f 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/platform/PlatformInfo.java +++ b/spark-common/src/main/java/me/lucko/spark/common/platform/PlatformInfo.java @@ -39,8 +39,14 @@ public interface PlatformInfo { MemoryUsage getHeapUsage(); + default int getSparkVersion() { + // does not necessarily correspond to the plugin/mod version + // this is like a data version I suppose + return 1; + } + default Data toData() { - return new Data(getType(), getName(), getVersion(), getMinecraftVersion(), getNCpus(), getHeapUsage()); + return new Data(getType(), getName(), getVersion(), getMinecraftVersion(), getNCpus(), getHeapUsage(), getSparkVersion()); } enum Type { @@ -66,14 +72,16 @@ public interface PlatformInfo { private final String minecraftVersion; private final int nCpus; private final MemoryUsage heapUsage; + private final int sparkVersion; - public Data(Type type, String name, String version, String minecraftVersion, int nCpus, MemoryUsage heapUsage) { + public Data(Type type, String name, String version, String minecraftVersion, int nCpus, MemoryUsage heapUsage, int sparkVersion) { this.type = type; this.name = name; this.version = version; this.minecraftVersion = minecraftVersion; this.nCpus = nCpus; this.heapUsage = heapUsage; + this.sparkVersion = sparkVersion; } public Type getType() { @@ -100,6 +108,10 @@ public interface PlatformInfo { return this.heapUsage; } + public int getSparkVersion() { + return this.sparkVersion; + } + public SparkProtos.MemoryUsage getHeapUsageProto() { return SparkProtos.MemoryUsage.newBuilder() .setUsed(this.heapUsage.getUsed()) @@ -114,7 +126,8 @@ public interface PlatformInfo { .setName(this.name) .setVersion(this.version) .setNCpus(this.nCpus) - .setHeapUsage(getHeapUsageProto()); + .setHeapUsage(getHeapUsageProto()) + .setSparkVersion(this.sparkVersion); if (this.minecraftVersion != null) { proto.setMinecraftVersion(this.minecraftVersion); -- cgit