public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pyroscope: Fix incorrect rate calculation from flamegraph totals (#110470)

Browse Source 
* fix(pyroscope): remove incorrect rate calculation from flamegraph totals

* update CHANGELOG.md
This commit is contained in:
Marc Sanmiquel
2025-09-03 08:15:06 +01:00
committed by GitHub
parent cb3fc369fe
commit cb77e97996
3 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/grafana-pyroscope-datasource/query_test.go
+10 -14
View File
@@ -229,15 +229,13 @@ func Test_treeToNestedDataFrame(t *testing.T) {
require.Equal(t, 0, frame.Fields[0].Len())
})
t.Run("rateCalculated metadata for cumulative profile", func(t *testing.T) {
t.Run("no rateCalculated metadata for flamegraph", func(t *testing.T) {
tree := &ProfileTree{
Value: 100, Level: 0, Self: 1, Name: "root",
}
frame := treeToNestedSetDataFrame(tree, "short", 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
require.NotNil(t, frame.Meta)
require.NotNil(t, frame.Meta.Custom)
custom := frame.Meta.Custom.(map[string]interface{})
require.Equal(t, true, custom["rateCalculated"])
require.Nil(t, frame.Meta.Custom)
})
t.Run("no rateCalculated metadata for instant profile", func(t *testing.T) {
@@ -249,26 +247,24 @@ func Test_treeToNestedDataFrame(t *testing.T) {
require.Nil(t, frame.Meta.Custom)
})
t.Run("CPU time keeps original units for tree data", func(t *testing.T) {
t.Run("CPU time keeps original values and units for flamegraph", func(t *testing.T) {
tree := &ProfileTree{
Value: 3000000000, Level: 0, Self: 1500000000, Name: "root", // 3s total, 1.5s self in nanoseconds
}
// Test CPU profile (should keep nanoseconds for flamegraph, no unit conversion)
// Test CPU profile flamegraph - should keep original cumulative values and units
frame := treeToNestedSetDataFrame(tree, "ns", 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
// Check unit remains as nanoseconds (no conversion for flamegraphs)
// Check unit remains as nanoseconds
require.Equal(t, "ns", frame.Fields[1].Config.Unit)
require.Equal(t, "ns", frame.Fields[2].Config.Unit)
// Check values were rate calculated but not unit converted: 3000000000/15 = 200000000, 1500000000/15 = 100000000
require.Equal(t, int64(200000000), frame.Fields[1].At(0))
require.Equal(t, int64(100000000), frame.Fields[2].At(0))
// Check values are NOT rate calculated - flamegraphs show cumulative totals
require.Equal(t, int64(3000000000), frame.Fields[1].At(0))
require.Equal(t, int64(1500000000), frame.Fields[2].At(0))
// Check metadata shows rate was calculated
// Check metadata shows rate was NOT calculated for flamegraphs
require.NotNil(t, frame.Meta)
require.NotNil(t, frame.Meta.Custom)
custom := frame.Meta.Custom.(map[string]interface{})
require.Equal(t, true, custom["rateCalculated"])
require.Nil(t, frame.Meta.Custom)
})
}