wip: convert to vtproto #6407

MichaHoffmann · 2023-06-01T14:03:36Z

WIP: get rid of gogoproto and introduce vtproto

state:

converting to golang proto v2 api
pkg/store tests are passing
pkg/receive tests are passing
pkg/targets tests are passing
pkg/rules tests are passing
pkg/metadata tests are passing

pkg/store/prometheus.go

scripts/installprotoc.sh

sonatype-lift · 2023-06-01T14:10:07Z

pkg/store/labelpb/label_test.go

@@ -306,51 +296,10 @@ func testInjectExtLabels(tb testutil.TB) {
 }

 var (
-	zdest ZLabel
+	zdest *Label


U1000: var zdest is unused

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

sonatype-lift · 2023-06-01T14:10:10Z

pkg/store/labelpb/label_test.go

@@ -306,51 +296,10 @@ func testInjectExtLabels(tb testutil.TB) {
 }

 var (
-	zdest ZLabel
+	zdest *Label
 	dest  Label


U1000: var dest is unused

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

sonatype-lift · 2023-06-01T14:10:12Z

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go

+	if len(m.BlockMatchers) > 0 {
+		for iNdEx := len(m.BlockMatchers) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.BlockMatchers[iNdEx].MarshalToSizedBuffer(dAtA[:i])


typecheck: m.BlockMatchers[iNdEx].MarshalToSizedBuffer undefined (type *storepb.LabelMatcher has no field or method MarshalToSizedBuffer)

❗❗ 8 similar findings have been found in this PR

🔎 Expand here to view all instances of this finding

File Path Line Number

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 544

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 626

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 700

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 752

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 788

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 881

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 1134

pkg/github.com/thanos-io/thanos/pkg/store/hintspb/hints.pb.go 1304

Visit the Lift Web Console to find more details in your report.

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

sonatype-lift · 2023-06-01T14:10:14Z

pkg/store/labelpb/label_test.go

@@ -306,51 +296,10 @@ func testInjectExtLabels(tb testutil.TB) {
 }

 var (
-	zdest ZLabel
+	zdest *Label


unused: var zdest is unused

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

sonatype-lift · 2023-06-01T14:10:16Z

pkg/store/labelpb/label_test.go

@@ -306,51 +296,10 @@ func testInjectExtLabels(tb testutil.TB) {
 }

 var (
-	zdest ZLabel
+	zdest *Label
 	dest  Label


unused: var dest is unused

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

pkg/store/prometheus.go

pkg/store/proxy_test.go

fpetkovski · 2023-06-02T10:39:19Z

pkg/store/labelpb/label.go

-func ZLabelsFromPromLabels(lset labels.Labels) []ZLabel {
-	return *(*[]ZLabel)(unsafe.Pointer(&lset))
+// ProtobufLabelsFromPromLabels converts Prometheus labels to a slice pointers to labelpb.Label.
+func ProtobufLabelsFromPromLabels(lset labels.Labels) []*Label {


This kinda defeats the purpose of ZLabels. Can we use the protobuf definitions from Prometheus directly?

I don't think we can since Prometheus protobuf is generated with gogoprotobuf and that interferes with our code. Worth testing out but I think we might get a similar panic to this one.

Isnt ZLabel going away with prometheus stringlabels anyway?

sonatype-lift · 2023-06-15T15:39:21Z

pkg/rules/manager.go

@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"

-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"


SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

sonatype-lift · 2023-06-15T15:39:23Z

pkg/rules/rules_test.go

@@ -10,14 +10,15 @@ import (
 	"testing"
 	"time"

-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"


SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

sonatype-lift · 2023-06-15T15:39:26Z

pkg/rules/manager.go

@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"

-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"


staticcheck: SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

sonatype-lift · 2023-06-15T15:39:28Z

pkg/rules/rules_test.go

@@ -10,14 +10,15 @@ import (
 	"testing"
 	"time"

-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"


staticcheck: SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

*: remove and ban github.com/golang/protobuf/proto Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>

pull-request-size bot added the size/XXL label Jun 1, 2023

sonatype-lift bot reviewed Jun 1, 2023

View reviewed changes

pkg/store/prometheus.go Outdated Show resolved Hide resolved

sonatype-lift bot reviewed Jun 1, 2023

View reviewed changes

scripts/installprotoc.sh Show resolved Hide resolved

sonatype-lift bot reviewed Jun 1, 2023

View reviewed changes

pkg/store/prometheus.go Outdated Show resolved Hide resolved

MichaHoffmann force-pushed the mhoffm-move-to-vt-protobuf branch from f8616b1 to a4a9126 Compare June 1, 2023 14:17

sonatype-lift bot reviewed Jun 1, 2023

View reviewed changes

pkg/store/proxy_test.go Outdated Show resolved Hide resolved

MichaHoffmann force-pushed the mhoffm-move-to-vt-protobuf branch from a4a9126 to 04782eb Compare June 1, 2023 15:14

fpetkovski reviewed Jun 2, 2023

View reviewed changes

MichaHoffmann force-pushed the mhoffm-move-to-vt-protobuf branch 2 times, most recently from e7683b5 to c5e0a2e Compare June 3, 2023 12:54

MichaHoffmann force-pushed the mhoffm-move-to-vt-protobuf branch 2 times, most recently from 7eafa8f to c878456 Compare June 15, 2023 15:29

sonatype-lift bot reviewed Jun 15, 2023

View reviewed changes

MichaHoffmann force-pushed the mhoffm-move-to-vt-protobuf branch from c878456 to 466730d Compare June 15, 2023 18:41

*: convert to proto v2 and get rid of gogoproto

e58eb48

*: remove and ban github.com/golang/protobuf/proto Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>

MichaHoffmann force-pushed the mhoffm-move-to-vt-protobuf branch from 466730d to e58eb48 Compare June 19, 2023 14:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wip: convert to vtproto #6407

wip: convert to vtproto #6407

MichaHoffmann commented Jun 1, 2023 •

edited

sonatype-lift bot Jun 1, 2023

sonatype-lift bot Jun 1, 2023

sonatype-lift bot Jun 1, 2023

sonatype-lift bot Jun 1, 2023

sonatype-lift bot Jun 1, 2023

fpetkovski Jun 2, 2023

GiedriusS Jun 5, 2023

MichaHoffmann Jun 5, 2023

sonatype-lift bot Jun 15, 2023

sonatype-lift bot Jun 15, 2023

sonatype-lift bot Jun 15, 2023

sonatype-lift bot Jun 15, 2023

Command	Usage
`@sonatype-lift ignore`	Leave out the above finding from this PR
`@sonatype-lift ignoreall`	Leave out all the existing findings from this PR
`@sonatype-lift exclude <file\|issue\|path\|tool>`	Exclude specified `file\|issue\|path\|tool` from Lift findings by updating your config.toml file

wip: convert to vtproto #6407

Are you sure you want to change the base?

wip: convert to vtproto #6407

Conversation

MichaHoffmann commented Jun 1, 2023 • edited

sonatype-lift bot Jun 1, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 1, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 1, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 1, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 1, 2023

Choose a reason for hiding this comment

fpetkovski Jun 2, 2023

Choose a reason for hiding this comment

GiedriusS Jun 5, 2023

Choose a reason for hiding this comment

MichaHoffmann Jun 5, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 15, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 15, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 15, 2023

Choose a reason for hiding this comment

sonatype-lift bot Jun 15, 2023

Choose a reason for hiding this comment

MichaHoffmann commented Jun 1, 2023 •

edited