feat: adds support for group-by queries on the backend (#1244)

petethepig · web-flow · commit c52f0e4fdc08 · 2022-07-12T20:54:49.000-07:00
* feat: adds support for group-by queries on the backend

* fixes ci

* makes groups passthrough
diff --git a/cypress/fixtures/cart-service-dotnet-cpu.json b/cypress/fixtures/cart-service-dotnet-cpu.json
@@ -197,5 +197,6 @@
     "startTime": 1634591500,
     "samples": [361, 1613, 360, 908],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/hotrod-python-driver-cpu.json b/cypress/fixtures/hotrod-python-driver-cpu.json
@@ -112,5 +112,6 @@
     "startTime": 1634591500,
     "samples": [2405, 2168, 1761, 1829],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/hotrod-ruby-driver-cpu.json b/cypress/fixtures/hotrod-ruby-driver-cpu.json
@@ -184,5 +184,6 @@
     "startTime": 1634591500,
     "samples": [9, 13, 12, 11],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/pyroscope.server.alloc_objects.json b/cypress/fixtures/pyroscope.server.alloc_objects.json
@@ -137,5 +137,6 @@
     "startTime": 1632505880,
     "samples": [26580, 48911],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/pyroscope.server.alloc_space.json b/cypress/fixtures/pyroscope.server.alloc_space.json
@@ -146,5 +146,6 @@
     "startTime": 1632505880,
     "samples": [7116106, 5404818],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/pyroscope.server.cpu.json b/cypress/fixtures/pyroscope.server.cpu.json
@@ -113,5 +113,6 @@
     "startTime": 1632505880,
     "samples": [14, 14],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/pyroscope.server.inuse_objects.json b/cypress/fixtures/pyroscope.server.inuse_objects.json
@@ -180,5 +180,6 @@
     "startTime": 1632505880,
     "samples": [57657, 31258],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/pyroscope.server.inuse_space.json b/cypress/fixtures/pyroscope.server.inuse_space.json
@@ -187,5 +187,6 @@
     "startTime": 1632505880,
     "samples": [450187206, 448452204],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/render.json b/cypress/fixtures/render.json
@@ -37,5 +37,6 @@
     "startTime": 1631138160,
     "samples": [1, 3, 1, 2, 2, 4, 2, 3, 1, 1, 3, 4],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/render2.json b/cypress/fixtures/render2.json
@@ -28,5 +28,6 @@
     "startTime": 1631138160,
     "samples": [1, 3, 1, 2, 2, 4, 2, 3, 1, 1, 3, 4],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/shipping-service-go-cpu.json b/cypress/fixtures/shipping-service-go-cpu.json
@@ -225,5 +225,6 @@
     "startTime": 1634591500,
     "samples": [12, 16, 16, 17],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-dotnet-app-cpu.json b/cypress/fixtures/simple-dotnet-app-cpu.json
@@ -28,5 +28,6 @@
     "startTime": 1632504460,
     "samples": [0, 46],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-golang-app-cpu-diff.json b/cypress/fixtures/simple-golang-app-cpu-diff.json
@@ -63,5 +63,6 @@
     "startTime": 1633024290,
     "samples": [992, 988],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-golang-app-cpu.json b/cypress/fixtures/simple-golang-app-cpu.json
@@ -31,5 +31,6 @@
     "startTime": 1632335270,
     "samples": [989],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-golang-app-cpu2.json b/cypress/fixtures/simple-golang-app-cpu2.json
@@ -34,5 +34,6 @@
     "startTime": 1633024290,
     "samples": [992],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-java-app-cpu.json b/cypress/fixtures/simple-java-app-cpu.json
@@ -53,5 +53,10 @@
     "spyName": "javaspy",
     "units": "samples"
   },
-  "timeline": { "startTime": 1632504610, "samples": [991], "durationDelta": 10 }
+  "timeline": {
+    "startTime": 1632504610,
+    "samples": [991],
+    "durationDelta": 10
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-php-app-cpu.json b/cypress/fixtures/simple-php-app-cpu.json
@@ -22,5 +22,6 @@
     "startTime": 1632504370,
     "samples": [0, 2],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-python-app-cpu.json b/cypress/fixtures/simple-python-app-cpu.json
@@ -44,5 +44,6 @@
     "startTime": 1632504210,
     "samples": [1001],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/cypress/fixtures/simple-ruby-app-cpu.json b/cypress/fixtures/simple-ruby-app-cpu.json
@@ -33,5 +33,6 @@
     "startTime": 1632504320,
     "samples": [942, 1001],
     "durationDelta": 10
-  }
+  },
+  "groups": {}
 }
diff --git a/pkg/server/render.go b/pkg/server/render.go
@@ -172,6 +172,7 @@ func (rh *RenderHandler) renderParametersFromRequest(r *http.Request, p *renderP
 
 	k := v.Get("name")
 	q := v.Get("query")
+	p.gi.GroupBy = v.Get("groupBy")
 
 	switch {
 	case k == "" && q == "":
@@ -194,6 +195,9 @@ func (rh *RenderHandler) renderParametersFromRequest(r *http.Request, p *renderP
 	if mn, err := strconv.Atoi(v.Get("max-nodes")); err == nil && mn > 0 {
 		p.maxNodes = mn
 	}
+	if mn, err := strconv.Atoi(v.Get("maxNodes")); err == nil && mn > 0 {
+		p.maxNodes = mn
+	}
 
 	p.gi.StartTime = attime.Parse(v.Get("from"))
 	p.gi.EndTime = attime.Parse(v.Get("until"))
diff --git a/pkg/storage/storage_get.go b/pkg/storage/storage_get.go
@@ -21,11 +21,14 @@ type GetInput struct {
 	EndTime   time.Time
 	Key       *segment.Key
 	Query     *flameql.Query
+	// TODO: make this a part of the query
+	GroupBy string
 }
 
 type GetOutput struct {
 	Tree            *tree.Tree
 	Timeline        *segment.Timeline
+	Groups          map[string]*segment.Timeline
 	SpyName         string
 	SampleRate      uint32
 	Count           uint64
@@ -88,6 +91,7 @@ func (s *Storage) Get(ctx context.Context, gi *GetInput) (*GetOutput, error) {
 		aggregationType = "sum"
 		timeline        = segment.GenerateTimeline(gi.StartTime, gi.EndTime)
 	)
+	timelines := make(map[string]*segment.Timeline)
 
 	for _, k := range dimensionKeys() {
 		// TODO: refactor, store `Key`s in dimensions
@@ -108,7 +112,16 @@ func (s *Storage) Get(ctx context.Context, gi *GetInput) (*GetOutput, error) {
 			aggregationType = averageAggregationType
 		}
 
+		timelineKey := "*"
+		if v, ok := parsedKey.Labels()[gi.GroupBy]; ok {
+			timelineKey = v
+		}
+		if _, ok := timelines[timelineKey]; !ok {
+			timelines[timelineKey] = segment.GenerateTimeline(gi.StartTime, gi.EndTime)
+		}
+
 		timeline.PopulateTimeline(st)
+		timelines[timelineKey].PopulateTimeline(st)
 		lastSegment = st
 
 		trace.Logf(ctx, traceCatGetCallback, "segment_key=%s", key)
@@ -139,6 +152,7 @@ func (s *Storage) Get(ctx context.Context, gi *GetInput) (*GetOutput, error) {
 	return &GetOutput{
 		Tree:            resultTrie,
 		Timeline:        timeline,
+		Groups:          timelines,
 		SpyName:         lastSegment.SpyName(),
 		SampleRate:      lastSegment.SampleRate(),
 		Count:           writesTotal,
@@ -177,6 +191,7 @@ func (s *Storage) tryGetExemplar(ctx context.Context, gi *GetInput) (*GetOutput,
 
 	o := GetOutput{
 		Timeline: segment.GenerateTimeline(gi.StartTime, gi.EndTime),
+		Groups:   make(map[string]*segment.Timeline),
 		Tree:     t,
 		// Defaults: actual values should be loaded from the segment metadata.
 		SpyName:         "gospy",
diff --git a/pkg/structs/flamebearer/flamebearer.go b/pkg/structs/flamebearer/flamebearer.go
@@ -32,7 +32,8 @@ type FlamebearerProfileV1 struct {
 	// required: true
 	Metadata FlamebearerMetadataV1 `json:"metadata"`
 	// Timeline associated to the profile, used for continuous profiling only.
-	Timeline *FlamebearerTimelineV1 `json:"timeline"`
+	Timeline *FlamebearerTimelineV1            `json:"timeline"`
+	Groups   map[string]*FlamebearerTimelineV1 `json:"groups"`
 	// Number of samples in the left / base profile. Only used in "double" format.
 	LeftTicks uint64 `json:"leftTicks,omitempty"`
 	// Number of samples in the right / diff profile. Only used in "double" format.
@@ -108,11 +109,20 @@ func NewProfile(name string, output *storage.GetOutput, maxNodes int) Flamebeare
 			Flamebearer: newFlambearer(fb),
 			Metadata:    newMetadata(name, fb.Format, output),
 			Timeline:    NewTimeline(output.Timeline),
+			Groups:      convertGroups(output.Groups),
 		},
 		Telemetry: output.Telemetry,
 	}
 }
 
+func convertGroups(v map[string]*segment.Timeline) map[string]*FlamebearerTimelineV1 {
+	res := make(map[string]*FlamebearerTimelineV1)
+	for k, v := range v {
+		res[k] = NewTimeline(v)
+	}
+	return res
+}
+
 func NewCombinedProfile(name string, left, right *storage.GetOutput, maxNodes int) (FlamebearerProfile, error) {
 	if left.Units != right.Units {
 		// if one of them is empty, it still makes sense merging the profiles
diff --git a/webapp/javascript/services/render.ts b/webapp/javascript/services/render.ts
@@ -39,6 +39,7 @@ export async function renderSingle(
     z.object({ timeline: TimelineSchema })
   )
     .merge(z.object({ telemetry: z.object({}).passthrough().optional() }))
+    .merge(z.object({ groups: z.object({}).passthrough().optional() }))
     .safeParse(response.value);
 
   if (parsed.success) {

Original file line number	Diff line number	Diff line change
`@@ -197,5 +197,6 @@`
`197`	`197`	`"startTime": 1634591500,`
`198`	`198`	`"samples": [361, 1613, 360, 908],`
`199`	`199`	`"durationDelta": 10`
`200`		`- }`
	`200`	`+ },`
	`201`	`+ "groups": {}`
`201`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,6 @@`
`112`	`112`	`"startTime": 1634591500,`
`113`	`113`	`"samples": [2405, 2168, 1761, 1829],`
`114`	`114`	`"durationDelta": 10`
`115`		`- }`
	`115`	`+ },`
	`116`	`+ "groups": {}`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,5 +184,6 @@`
`184`	`184`	`"startTime": 1634591500,`
`185`	`185`	`"samples": [9, 13, 12, 11],`
`186`	`186`	`"durationDelta": 10`
`187`		`- }`
	`187`	`+ },`
	`188`	`+ "groups": {}`
`188`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,5 +137,6 @@`
`137`	`137`	`"startTime": 1632505880,`
`138`	`138`	`"samples": [26580, 48911],`
`139`	`139`	`"durationDelta": 10`
`140`		`- }`
	`140`	`+ },`
	`141`	`+ "groups": {}`
`141`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,5 +146,6 @@`
`146`	`146`	`"startTime": 1632505880,`
`147`	`147`	`"samples": [7116106, 5404818],`
`148`	`148`	`"durationDelta": 10`
`149`		`- }`
	`149`	`+ },`
	`150`	`+ "groups": {}`
`150`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,6 @@`
`113`	`113`	`"startTime": 1632505880,`
`114`	`114`	`"samples": [14, 14],`
`115`	`115`	`"durationDelta": 10`
`116`		`- }`
	`116`	`+ },`
	`117`	`+ "groups": {}`
`117`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,5 +180,6 @@`
`180`	`180`	`"startTime": 1632505880,`
`181`	`181`	`"samples": [57657, 31258],`
`182`	`182`	`"durationDelta": 10`
`183`		`- }`
	`183`	`+ },`
	`184`	`+ "groups": {}`
`184`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,5 +187,6 @@`
`187`	`187`	`"startTime": 1632505880,`
`188`	`188`	`"samples": [450187206, 448452204],`
`189`	`189`	`"durationDelta": 10`
`190`		`- }`
	`190`	`+ },`
	`191`	`+ "groups": {}`
`191`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,6 @@`
`37`	`37`	`"startTime": 1631138160,`
`38`	`38`	`"samples": [1, 3, 1, 2, 2, 4, 2, 3, 1, 1, 3, 4],`
`39`	`39`	`"durationDelta": 10`
`40`		`- }`
	`40`	`+ },`
	`41`	`+ "groups": {}`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@`
`28`	`28`	`"startTime": 1631138160,`
`29`	`29`	`"samples": [1, 3, 1, 2, 2, 4, 2, 3, 1, 1, 3, 4],`
`30`	`30`	`"durationDelta": 10`
`31`		`- }`
	`31`	`+ },`
	`32`	`+ "groups": {}`
`32`	`33`	`}`