Address several review comments

Author: marcsanmi

go.mod

@@ -20,8 +20,6 @@ require (
 	github.com/felixge/fgprof v0.9.4-0.20221116204635-ececf7638e93
 	github.com/felixge/httpsnoop v1.0.4
 	github.com/fsnotify/fsnotify v1.8.0
-	github.com/go-delve/delve v1.23.1
-	github.com/fsnotify/fsnotify v1.7.0
 	github.com/go-kit/log v0.2.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/gogo/status v1.1.1
@@ -40,8 +38,6 @@ require (
 	github.com/grafana/pyroscope/api v0.4.0
 	github.com/grafana/pyroscope/lidia v0.0.0-20250416154336-a5c33510d5ff
 	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
-	github.com/grafana/pyroscope/lidia v0.0.0-20250416154336-a5c33510d5ff
-	github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1
 	github.com/hashicorp/go-multierror v1.1.1

go.sum

@@ -226,8 +226,6 @@ github.com/fullstorydev/emulators/storage v0.0.0-20240401123056-edc69752f474 h1:
 github.com/fullstorydev/emulators/storage v0.0.0-20240401123056-edc69752f474/go.mod h1:PQwxF4UU8wuL+srGxr3BOhIW5zXqgucwVlO/nPZLsxw=
 github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
 github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
-github.com/go-delve/delve v1.23.1 h1:MtZ13ppptttkqSuvVnwJ5CPhIAzDiOwRrYuCk3ES7fU=
-github.com/go-delve/delve v1.23.1/go.mod h1:S3SLuEE2mn7wipKilTvk1p9HdTMnXXElcEpiZ+VcuqU=
 github.com/go-fonts/dejavu v0.3.4 h1:Qqyx9IOs5CQFxyWTdvddeWzrX0VNwUAvbmAzL0fpjbc=
 github.com/go-fonts/dejavu v0.3.4/go.mod h1:D1z0DglIz+lmpeNYMYlxW4r22IhcdOYnt+R3PShU/Kg=
 github.com/go-fonts/latin-modern v0.3.3 h1:g2xNgI8yzdNzIVm+qvbMryB6yGPe0pSMss8QT3QwlJ0=
@@ -385,10 +383,6 @@ github.com/grafana/pyroscope/lidia v0.0.0-20250416154336-a5c33510d5ff h1:9dI8HuA
 github.com/grafana/pyroscope/lidia v0.0.0-20250416154336-a5c33510d5ff/go.mod h1:3f/0/CzhTk1moGlVOp2nJQKCAL+4M5GTnkfDd5hqDIk=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
-github.com/grafana/pyroscope/lidia v0.0.0-20250416154336-a5c33510d5ff h1:9dI8HuAIA5L/EsPXkk3YqA3Pp5i7ECvQkWMwUepLoCY=
-github.com/grafana/pyroscope/lidia v0.0.0-20250416154336-a5c33510d5ff/go.mod h1:3f/0/CzhTk1moGlVOp2nJQKCAL+4M5GTnkfDd5hqDIk=
-github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA=
-github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=

lidia/builder.go

@@ -2,7 +2,6 @@ package lidia
 
 import (
 	"encoding/binary"
-	"fmt"
 	"sort"
 )
 
@@ -105,10 +104,9 @@ func (s *sortByVADepth) Swap(i, j int) {
 
 // rangeCollector
 type rangeCollector struct {
-	sb  *stringBuilder
-	rb  *rangesBuilder
-	lb  *lineBuilder
-	blb *binaryLayoutBuilder
+	sb *stringBuilder
+	rb *rangesBuilder
+	lb *lineBuilder
 
 	opt options
 }
@@ -137,43 +135,3 @@ func (rc *rangeCollector) VisitRange(r *Range) {
 	}
 	rc.rb.add(r.VA, e)
 }
-
-type binaryLayoutBuilder struct {
-	buf []byte
-}
-
-func newBinaryLayoutBuilder() *binaryLayoutBuilder {
-	return &binaryLayoutBuilder{
-		buf: make([]byte, 0, 256),
-	}
-}
-
-func (blb *binaryLayoutBuilder) write(layout *BinaryLayoutInfo) error {
-	if layout == nil {
-		return fmt.Errorf("nil binary layout")
-	}
-
-	// Reset buffer
-	blb.buf = blb.buf[:0]
-
-	// Write ELF type
-	blb.buf = binary.LittleEndian.AppendUint16(blb.buf, layout.Type)
-
-	// Write number of program headers
-	count := uint32(len(layout.ProgramHeaders))
-	blb.buf = binary.LittleEndian.AppendUint32(blb.buf, count)
-
-	// Write each program header
-	for _, ph := range layout.ProgramHeaders {
-		blb.buf = binary.LittleEndian.AppendUint32(blb.buf, ph.Type)
-		blb.buf = binary.LittleEndian.AppendUint32(blb.buf, ph.Flags)
-		blb.buf = binary.LittleEndian.AppendUint64(blb.buf, ph.Offset)
-		blb.buf = binary.LittleEndian.AppendUint64(blb.buf, ph.VirtualAddr)
-		blb.buf = binary.LittleEndian.AppendUint64(blb.buf, ph.PhysAddr)
-		blb.buf = binary.LittleEndian.AppendUint64(blb.buf, ph.FileSize)
-		blb.buf = binary.LittleEndian.AppendUint64(blb.buf, ph.MemSize)
-		blb.buf = binary.LittleEndian.AppendUint64(blb.buf, ph.Align)
-	}
-
-	return nil
-}

lidia/constants.go

@@ -11,14 +11,11 @@ const (
 	version uint32 = 1
 
 	// Size of the file header in bytes
-	headerSize = 0x98
+	headerSize = 0x80
 
 	// Number of fields in a line table entry
 	lineTableFieldsCount = 2
 
-	// Size of each line table entry (2 uint16s or 2 uint32s)
-	lineTableFieldsSize = 4
-
 	// Number of fields in a range entry
 	fieldsCount = 8
 

lidia/format.go

@@ -54,13 +54,6 @@ type lineTablesHeader struct {
 	_         uint32
 }
 
-type binaryLayoutHeader struct {
-	size   uint64
-	offset uint64
-	crc    uint32
-	_      uint32
-}
-
 type header struct {
 	// 0x0
 	magic   [4]byte
@@ -74,8 +67,6 @@ type header struct {
 	// 0x60
 	lineTablesHeader lineTablesHeader
 	// 0x80
-	binaryLayoutHeader binaryLayoutHeader
-	// 0x98
 }
 
 func readHeader(file io.Reader) (header, error) {
@@ -106,10 +97,6 @@ func readHeader(file io.Reader) (header, error) {
 	hdr.lineTablesHeader.offset = binary.LittleEndian.Uint64(headerBuf[0x70:])
 	hdr.lineTablesHeader.crc = binary.LittleEndian.Uint32(headerBuf[0x78:])
 
-	hdr.binaryLayoutHeader.size = binary.LittleEndian.Uint64(headerBuf[0x80:])
-	hdr.binaryLayoutHeader.offset = binary.LittleEndian.Uint64(headerBuf[0x88:])
-	hdr.binaryLayoutHeader.crc = binary.LittleEndian.Uint32(headerBuf[0x90:])
-
 	return hdr, nil
 }
 
@@ -179,23 +166,6 @@ func (rc *rangeCollector) write(f io.WriteSeeker) error {
 		return err
 	}
 
-	// Flush buffer to ensure line tables are written
-	if err := buf.Flush(); err != nil {
-		return err
-	}
-
-	hdr.binaryLayoutHeader.offset = hdr.lineTablesHeader.offset + uint64(len(rc.lb.entries)*lineTableFieldsSize)
-	hdr.binaryLayoutHeader.size = uint64(len(rc.blb.buf))
-
-	if len(rc.blb.buf) > 0 {
-		if _, err := f.Write(rc.blb.buf); err != nil {
-			return err
-		}
-		crc := crc32.New(castagnoli)
-		_, _ = crc.Write(rc.blb.buf)
-		hdr.binaryLayoutHeader.crc = crc.Sum32()
-	}
-
 	if _, err := f.Seek(0, io.SeekStart); err != nil {
 		return err
 	}
@@ -230,10 +200,6 @@ func writeHeader(output io.Writer, hdr *header) error {
 	binary.LittleEndian.PutUint64(headerBuf[0x70:], hdr.lineTablesHeader.offset)
 	binary.LittleEndian.PutUint32(headerBuf[0x78:], hdr.lineTablesHeader.crc)
 
-	binary.LittleEndian.PutUint64(headerBuf[0x80:], hdr.binaryLayoutHeader.size)
-	binary.LittleEndian.PutUint64(headerBuf[0x88:], hdr.binaryLayoutHeader.offset)
-	binary.LittleEndian.PutUint32(headerBuf[0x90:], hdr.binaryLayoutHeader.crc)
-
 	if _, err := output.Write(headerBuf); err != nil {
 		return err
 	}

lidia/lidia.go

@@ -7,9 +7,7 @@ package lidia
 
 import (
 	"debug/elf"
-	"encoding/binary"
 	"fmt"
-	"hash/crc32"
 	"io"
 	"os"
 	"sort"
@@ -158,33 +156,7 @@ func CreateLidiaFromELF(elfFile *elf.File, output io.WriteSeeker, opts ...Option
 	sb := newStringBuilder()
 	rb := newRangesBuilder()
 	lb := newLineTableBuilder()
-	blb := newBinaryLayoutBuilder()
-	rc := &rangeCollector{sb: sb, rb: rb, lb: lb, blb: blb}
-
-	// Extract binary layout
-	layout := &BinaryLayoutInfo{
-		Type:           uint16(elfFile.Type),
-		ProgramHeaders: make([]ProgramHeaderInfo, 0),
-	}
-
-	for _, prog := range elfFile.Progs {
-		if prog.Type == elf.PT_LOAD {
-			layout.ProgramHeaders = append(layout.ProgramHeaders, ProgramHeaderInfo{
-				Type:        uint32(prog.Type),
-				Flags:       uint32(prog.Flags),
-				Offset:      prog.Off,
-				VirtualAddr: prog.Vaddr,
-				PhysAddr:    prog.Paddr,
-				FileSize:    prog.Filesz,
-				MemSize:     prog.Memsz,
-				Align:       prog.Align,
-			})
-		}
-	}
-
-	if err := blb.write(layout); err != nil {
-		return fmt.Errorf("failed to write binary layout: %w", err)
-	}
+	rc := &rangeCollector{sb: sb, rb: rb, lb: lb}
 
 	for _, o := range opts {
 		o(&rc.opt)
@@ -265,69 +237,6 @@ func (st *Table) Lookup(dst []SourceInfoFrame, addr uint64) ([]SourceInfoFrame,
 	return dst, nil
 }
 
-func (st *Table) GetBinaryLayout() (*BinaryLayoutInfo, error) {
-	if st.hdr.binaryLayoutHeader.size == 0 {
-		return nil, fmt.Errorf("binary layout information not available")
-	}
-
-	// Read binary layout data
-	data := make([]byte, st.hdr.binaryLayoutHeader.size)
-	if _, err := st.file.ReadAt(data, int64(st.hdr.binaryLayoutHeader.offset)); err != nil {
-		return nil, fmt.Errorf("failed to read binary layout: %w", err)
-	}
-
-	// Verify CRC if enabled
-	if st.opt.crc {
-		crc := crc32.Checksum(data, crc32.MakeTable(crc32.Castagnoli))
-		if crc != st.hdr.binaryLayoutHeader.crc {
-			return nil, fmt.Errorf("binary layout CRC mismatch")
-		}
-	}
-
-	// Decode binary layout
-	if len(data) < 6 {
-		return nil, fmt.Errorf("binary layout data too short")
-	}
-
-	layout := &BinaryLayoutInfo{
-		Type: binary.LittleEndian.Uint16(data[:2]),
-	}
-
-	count := binary.LittleEndian.Uint32(data[2:6])
-	if count > 1000 {
-		return nil, fmt.Errorf("invalid program header count: %d", count)
-	}
-
-	expectedSize := uint64(6 + count*56)
-	if uint64(len(data)) < expectedSize {
-		return nil, fmt.Errorf("binary layout data truncated")
-	}
-
-	layout.ProgramHeaders = make([]ProgramHeaderInfo, count)
-	offset := 6
-	for i := range layout.ProgramHeaders {
-		ph := &layout.ProgramHeaders[i]
-		ph.Type = binary.LittleEndian.Uint32(data[offset:])
-		offset += 4
-		ph.Flags = binary.LittleEndian.Uint32(data[offset:])
-		offset += 4
-		ph.Offset = binary.LittleEndian.Uint64(data[offset:])
-		offset += 8
-		ph.VirtualAddr = binary.LittleEndian.Uint64(data[offset:])
-		offset += 8
-		ph.PhysAddr = binary.LittleEndian.Uint64(data[offset:])
-		offset += 8
-		ph.FileSize = binary.LittleEndian.Uint64(data[offset:])
-		offset += 8
-		ph.MemSize = binary.LittleEndian.Uint64(data[offset:])
-		offset += 8
-		ph.Align = binary.LittleEndian.Uint64(data[offset:])
-		offset += 8
-	}
-
-	return layout, nil
-}
-
 // Close releases resources associated with the Table.
 func (st *Table) Close() {
 	if st.file != nil {
@@ -349,16 +258,5 @@ func (st *Table) CheckCRC() error {
 	if err := st.CheckCRCLineTables(); err != nil {
 		return err
 	}
-
-	// Add binary layout CRC check
-	if st.hdr.binaryLayoutHeader.size > 0 {
-		if err := checkCRC(st.file,
-			int64(st.hdr.binaryLayoutHeader.offset),
-			int64(st.hdr.binaryLayoutHeader.size),
-			st.hdr.binaryLayoutHeader.crc,
-			"binary layout"); err != nil {
-			return err
-		}
-	}
 	return nil
 }

pkg/experiment/ingester/segment_test.go

@@ -868,7 +868,7 @@ func gprofileFromProtoProfile(t *testing.T, profile *profilev1.Profile) *gprofil
 func staticTestData() []inputChunk {
 	return []inputChunk{
 		{
-			//todo check why it takes 10ms for each dataset
+			//todo check why it takes 10ms for each head
 			{shard: 1, tenant: "t1", profile: cpuProfile(42, 480, "svc1", "foo", "bar")},
 			{shard: 1, tenant: "t1", profile: cpuProfile(13, 233, "svc1", "qwe", "foo", "bar")},
 			{shard: 1, tenant: "t1", profile: cpuProfile(13, 472, "svc1", "qwe", "foo", "bar")},