2 files changed, 67 insertions, 4 deletions
diff --git a/spark-common/src/main/proto/spark/spark.proto b/spark-common/src/main/proto/spark/spark.proto
index ec0aa88..f61e585 100644
--- a/spark-common/src/main/proto/spark/spark.proto
+++ b/spark-common/src/main/proto/spark/spark.proto
@@ -94,7 +94,8 @@ message PlatformStatistics {
   Tps tps = 4; // optional
   Mspt mspt = 5; // optional
   Ping ping = 6; // optional
-  int64 player_count = 7;
+  int64 player_count = 7; // optional
+  WorldStatistics world = 8; // optional
 
   message Memory {
     MemoryPool heap = 1;
@@ -127,6 +128,45 @@ message PlatformStatistics {
   }
 }
 
+message WorldStatistics {
+  int32 total_entities = 1;
+  map<string, int32> entity_counts = 2;
+  repeated World worlds = 3;
+
+  message World {
+    string name = 1;
+    int32 total_entities = 2;
+    repeated Region regions = 3;
+  }
+
+  message Region {
+    int32 total_entities = 1;
+    repeated Chunk chunks = 2;
+  }
+
+  message Chunk {
+    int32 x = 1;
+    int32 z = 2;
+    int32 total_entities = 3;
+    map<string, int32> entity_counts = 4;
+  }
+}
+
+message WindowStatistics {
+  int32 ticks = 1;
+  double cpu_process = 2;
+  double cpu_system = 3;
+  double tps = 4;
+  double mspt_median = 5;
+  double mspt_max = 6;
+
+  // world
+  int32 players = 7;
+  int32 entities = 8;
+  int32 tile_entities = 9;
+  int32 chunks = 10;
+}
+
 message RollingAverageValues {
   double mean = 1;
   double max = 2;
diff --git a/spark-common/src/main/proto/spark/spark_sampler.proto b/spark-common/src/main/proto/spark/spark_sampler.proto
index 51bdd64..245da37 100644
--- a/spark-common/src/main/proto/spark/spark_sampler.proto
+++ b/spark-common/src/main/proto/spark/spark_sampler.proto
@@ -11,6 +11,10 @@ message SamplerData {
   SamplerMetadata metadata = 1;
   repeated ThreadNode threads = 2;
   map<string, string> class_sources = 3; // optional
+  map<string, string> method_sources = 4; // optional
+  map<string, string> line_sources = 5; // optional
+  repeated int32 time_windows = 6;
+  map<int32, WindowStatistics> time_window_statistics = 7;
 }
 
 message SamplerMetadata {
@@ -25,6 +29,9 @@ message SamplerMetadata {
   SystemStatistics system_statistics = 9;
   map<string, string> server_configurations = 10;
   int64 end_time = 11;
+  int32 number_of_ticks = 12;
+  map<string, SourceMetadata> sources = 13;
+  map<string, string> extra_platform_metadata = 14;
 
   message ThreadDumper {
     Type type = 1;
@@ -42,6 +49,7 @@ message SamplerMetadata {
     Type type = 1;
     ThreadGrouper thread_grouper = 2;
     int64 tick_length_threshold = 3; // optional
+    int32 number_of_included_ticks = 4; // optional
 
     enum Type {
       SIMPLE = 0;
@@ -54,20 +62,35 @@ message SamplerMetadata {
       AS_ONE = 2;
     }
   }
+
+  message SourceMetadata {
+    string name = 1;
+    string version = 2;
+  }
 }
 
 message ThreadNode {
   string name = 1;
-  double time = 2;
+
+  // replaced
+  reserved 2;
+  reserved "time";
+
   repeated StackTraceNode children = 3;
+  repeated double times = 4;
+  repeated int32 children_refs = 5;
 }
 
 message StackTraceNode {
-  double time = 1;
-  repeated StackTraceNode children = 2;
+  // replaced
+  reserved 1, 2;
+  reserved "time", "children";
+
   string class_name = 3;
   string method_name = 4;
   int32 parent_line_number = 5; // optional
   int32 line_number = 6; // optional
   string method_desc = 7; // optional
+  repeated double times = 8;
+  repeated int32 children_refs = 9;
 }