Add uploadable health report (#436)

1 files changed, 41 insertions, 2 deletions

diff --git a/spark-common/src/main/proto/spark/spark.proto b/spark-common/src/main/proto/spark/spark.proto
index 6ffd4e9..779b3c6 100644
--- a/spark-common/src/main/proto/spark/spark.proto
+++ b/spark-common/src/main/proto/spark/spark.proto
@@ -104,13 +104,24 @@ message PlatformStatistics {
   Ping ping = 6; // optional
   int64 player_count = 7; // optional
   WorldStatistics world = 8; // optional
+  OnlineMode online_mode = 9; // optional
 
   message Memory {
-    MemoryPool heap = 1;
+    MemoryUsage heap = 1;
+    MemoryUsage non_heap = 2;
+    repeated MemoryPool pools = 3;
 
     message MemoryPool {
+      string name = 1;
+      MemoryUsage usage = 2;
+      MemoryUsage collection_usage = 3;
+    }
+
+    message MemoryUsage {
       int64 used = 1;
-      int64 total = 2;
+      int64 committed = 2; // previously called 'total'
+      int64 init = 3; // optional
+      int64 max = 4; // optional
     }
   }
 
@@ -134,6 +145,12 @@ message PlatformStatistics {
   message Ping {
     RollingAverageValues last15m = 1;
   }
+
+  enum OnlineMode {
+    UNKNOWN = 0;
+    OFFLINE = 1;
+    ONLINE = 2;
+  }
 }
 
 message WorldStatistics {
@@ -205,3 +222,25 @@ message CommandSenderMetadata {
     PLAYER = 1;
   }
 }
+
+message PluginOrModMetadata {
+  string name = 1;
+  string version = 2;
+  string author = 3;
+}
+
+message HealthData {
+  HealthMetadata metadata = 1;
+  map<int32, WindowStatistics> time_window_statistics = 2;
+}
+
+message HealthMetadata {
+  CommandSenderMetadata creator = 1;
+  PlatformMetadata platform_metadata = 2;
+  PlatformStatistics platform_statistics = 3;
+  SystemStatistics system_statistics = 4;
+  int64 generated_time = 5;
+  map<string, string> server_configurations = 6;
+  map<string, PluginOrModMetadata> sources = 7;
+  map<string, string> extra_platform_metadata = 8;
+}