Merge remote-tracking branch 'lucko/master' into forge-1.7.10

1 files changed, 12 insertions, 0 deletions

diff --git a/spark-common/src/main/proto/spark/spark_sampler.proto b/spark-common/src/main/proto/spark/spark_sampler.proto
index 245da37..dbc336a 100644
--- a/spark-common/src/main/proto/spark/spark_sampler.proto
+++ b/spark-common/src/main/proto/spark/spark_sampler.proto
@@ -15,6 +15,7 @@ message SamplerData {
   map<string, string> line_sources = 5; // optional
   repeated int32 time_windows = 6;
   map<int32, WindowStatistics> time_window_statistics = 7;
+  SocketChannelInfo channel_info = 8;
 }
 
 message SamplerMetadata {
@@ -32,6 +33,7 @@ message SamplerMetadata {
   int32 number_of_ticks = 12;
   map<string, SourceMetadata> sources = 13;
   map<string, string> extra_platform_metadata = 14;
+  SamplerMode sampler_mode = 15;
 
   message ThreadDumper {
     Type type = 1;
@@ -67,6 +69,11 @@ message SamplerMetadata {
     string name = 1;
     string version = 2;
   }
+
+  enum SamplerMode {
+    EXECUTION = 0;
+    ALLOCATION = 1;
+  }
 }
 
 message ThreadNode {
@@ -94,3 +101,8 @@ message StackTraceNode {
   repeated double times = 8;
   repeated int32 children_refs = 9;
 }
+
+message SocketChannelInfo {
+  string channel_id = 1;
+  bytes public_key = 2;
+}