perf: eliminate flamegraph merge (#3349)

grafana · Jun 11, 2024 · e178664 · e178664
1 parent 1bd65d1
commit e178664
Show file tree

Hide file tree

Showing 11 changed files with 710 additions and 353 deletions.
diff --git a/api/gen/proto/go/querier/v1/querier.pb.go b/api/gen/proto/go/querier/v1/querier.pb.go
diff --git a/api/gen/proto/go/querier/v1/querier_vtproto.pb.go b/api/gen/proto/go/querier/v1/querier_vtproto.pb.go
diff --git a/api/openapiv2/gen/phlare.swagger.json b/api/openapiv2/gen/phlare.swagger.json
@@ -1063,6 +1063,15 @@
         }
       }
     },
+    "v1ProfileFormat": {
+      "type": "string",
+      "enum": [
+        "PROFILE_FORMAT_UNSPECIFIED",
+        "PROFILE_FORMAT_FLAMEGRAPH",
+        "PROFILE_FORMAT_TREE"
+      ],
+      "default": "PROFILE_FORMAT_UNSPECIFIED"
+    },
     "v1ProfileSets": {
       "type": "object",
       "properties": {
@@ -1238,6 +1247,11 @@
       "properties": {
         "flamegraph": {
           "$ref": "#/definitions/v1FlameGraph"
+        },
+        "tree": {
+          "type": "string",
+          "format": "byte",
+          "description": "Pyroscope tree bytes."
         }
       }
     },
@@ -1264,6 +1278,10 @@
           "type": "string",
           "format": "int64",
           "title": "Limit the nodes returned to only show the node with the max_node's biggest total"
+        },
+        "format": {
+          "$ref": "#/definitions/v1ProfileFormat",
+          "description": "Profile format specifies the format of profile to be returned.\nIf not specified, the profile will be returned in flame graph format."
         }
       }
     },
@@ -1272,6 +1290,11 @@
       "properties": {
         "flamegraph": {
           "$ref": "#/definitions/v1FlameGraph"
+        },
+        "tree": {
+          "type": "string",
+          "format": "byte",
+          "description": "Pyroscope tree bytes."
         }
       }
     },

diff --git a/api/querier/v1/querier.proto b/api/querier/v1/querier.proto
@@ -68,10 +68,21 @@ message SelectMergeStacktracesRequest {
   int64 end = 4;
   // Limit the nodes returned to only show the node with the max_node's biggest total
   optional int64 max_nodes = 5;
+  // Profile format specifies the format of profile to be returned.
+  // If not specified, the profile will be returned in flame graph format.
+  ProfileFormat format = 6;
+}
+
+enum ProfileFormat {
+  PROFILE_FORMAT_UNSPECIFIED = 0;
+  PROFILE_FORMAT_FLAMEGRAPH = 1;
+  PROFILE_FORMAT_TREE = 2;
 }
 
 message SelectMergeStacktracesResponse {
   FlameGraph flamegraph = 1;
+  // Pyroscope tree bytes.
+  bytes tree = 2;
 }
 
 message SelectMergeSpanProfileRequest {
@@ -84,10 +95,15 @@ message SelectMergeSpanProfileRequest {
   int64 end = 5;
   // Limit the nodes returned to only show the node with the max_node's biggest total
   optional int64 max_nodes = 6;
+  // Profile format specifies the format of profile to be returned.
+  // If not specified, the profile will be returned in flame graph format.
+  ProfileFormat format = 7;
 }
 
 message SelectMergeSpanProfileResponse {
   FlameGraph flamegraph = 1;
+  // Pyroscope tree bytes.
+  bytes tree = 2;
 }
 
 message DiffRequest {