Profile proto serialization with slice reused (#2159)

* Experiment profile proto serialization with slice reused * make reference-help * Switch to Grafana fork * fmt
grafana · Jul 24, 2023 · ec55ea2 · ec55ea2
1 parent 3ee46b9
commit ec55ea2
Show file tree

Hide file tree

Showing 20 changed files with 210 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -249,7 +249,7 @@ $(BIN)/protoc-gen-connect-go-mux: Makefile go.mod
 
 $(BIN)/protoc-gen-go-vtproto: Makefile go.mod
 	@mkdir -p $(@D)
-	GOBIN=$(abspath $(@D)) $(GO) install github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto@v0.4.0
+	GOBIN=$(abspath $(@D)) $(GO) install github.com/grafana/vtprotobuf/cmd/protoc-gen-go-vtproto@69fa34dad3472084bcae0b557e8813e6d4678f2b
 
 $(BIN)/protoc-gen-openapiv2: Makefile go.mod
 	@mkdir -p $(@D)

diff --git a/api/buf.gen.yaml b/api/buf.gen.yaml
@@ -18,6 +18,11 @@ plugins:
       - features=marshal+unmarshal+size+pool+grpc+pool+clone
       - pool=github.com/grafana/pyroscope/api/gen/proto/go/google/v1.Profile
       - pool=github.com/grafana/pyroscope/api/gen/proto/go/google/v1.Sample
+      - pool=github.com/grafana/pyroscope/api/gen/proto/go/google/v1.Mapping
+      - pool=github.com/grafana/pyroscope/api/gen/proto/go/google/v1.Function
+      - pool=github.com/grafana/pyroscope/api/gen/proto/go/google/v1.Location
+      - pool=github.com/grafana/pyroscope/api/gen/proto/go/google/v1.Label
+      - pool=github.com/grafana/pyroscope/api/gen/proto/go/google/v1.Line
 
   - name: connect-go
     out: gen/proto/go

diff --git a/api/gen/proto/go/agent/v1/agent_vtproto.pb.go b/api/gen/proto/go/agent/v1/agent_vtproto.pb.go
diff --git a/api/gen/proto/go/google/v1/profile_vtproto.pb.go b/api/gen/proto/go/google/v1/profile_vtproto.pb.go
diff --git a/api/gen/proto/go/ingester/v1/ingester_vtproto.pb.go b/api/gen/proto/go/ingester/v1/ingester_vtproto.pb.go
diff --git a/api/gen/proto/go/push/v1/push_vtproto.pb.go b/api/gen/proto/go/push/v1/push_vtproto.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/gen/proto/go/status/v1/status_vtproto.pb.go b/api/gen/proto/go/status/v1/status_vtproto.pb.go
diff --git a/api/gen/proto/go/storegateway/v1/storegateway_vtproto.pb.go b/api/gen/proto/go/storegateway/v1/storegateway_vtproto.pb.go
diff --git a/api/gen/proto/go/types/v1/types_vtproto.pb.go b/api/gen/proto/go/types/v1/types_vtproto.pb.go
diff --git a/cmd/pyroscope/help-all.txt.tmpl b/cmd/pyroscope/help-all.txt.tmpl
@@ -1,4 +1,4 @@
-Usage of ./phlare:
+Usage of ./pyroscope:
   -api.base-url string
     	base URL for when the server is behind a reverse proxy with a different path
   -auth.multitenancy-enabled

diff --git a/cmd/pyroscope/help.txt.tmpl b/cmd/pyroscope/help.txt.tmpl
@@ -1,4 +1,4 @@
-Usage of ./phlare:
+Usage of ./pyroscope:
   -api.base-url string
     	base URL for when the server is behind a reverse proxy with a different path
   -auth.multitenancy-enabled

diff --git a/cmd/pyroscope/main_test.go b/cmd/pyroscope/main_test.go
@@ -110,7 +110,7 @@ func TestHelp(t *testing.T) {
 
 			co := test.CaptureOutput(t)
 
-			const cmd = "./phlare"
+			const cmd = "./pyroscope"
 			os.Args = []string{cmd, tc.arg}
 
 			// reset default flags

diff --git a/pkg/frontend/frontendpb/frontend_vtproto.pb.go b/pkg/frontend/frontendpb/frontend_vtproto.pb.go
diff --git a/pkg/og/convert/jfr/jfr_labels_vtproto.pb.go b/pkg/og/convert/jfr/jfr_labels_vtproto.pb.go
diff --git a/pkg/og/storage/tree/profile_vtproto.pb.go b/pkg/og/storage/tree/profile_vtproto.pb.go
diff --git a/pkg/pprof/pprof_test.go b/pkg/pprof/pprof_test.go
@@ -2,6 +2,7 @@ package pprof
 
 import (
 	"math/rand"
+	"os"
 	"testing"
 	"time"
 
@@ -183,3 +184,21 @@ func countSampleDuplicates(p *Profile) int {
 	}
 	return totalDupe
 }
+
+var prof *profilev1.Profile
+
+func BenchmarkFromRawBytes(b *testing.B) {
+	data, err := os.ReadFile("testdata/heap")
+	require.NoError(b, err)
+	b.ResetTimer()
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		err := FromBytes(data, func(p *profilev1.Profile, i int) error {
+			prof = p
+			return nil
+		})
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}
diff --git a/pkg/querier/stats/stats_vtproto.pb.go b/pkg/querier/stats/stats_vtproto.pb.go
diff --git a/pkg/scheduler/schedulerpb/scheduler_vtproto.pb.go b/pkg/scheduler/schedulerpb/scheduler_vtproto.pb.go
diff --git a/pkg/util/httpgrpc/httpgrpc_vtproto.pb.go b/pkg/util/httpgrpc/httpgrpc_vtproto.pb.go