Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade protobuf #81

Merged
merged 12 commits into from
Jun 27, 2022
Merged

Upgrade protobuf #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
89ee228
Regenerate protobuf files and update generate script
ctlong Jun 23, 2022
9a1b7cd
Embed required `Unimplemented*Server` implementation
ctlong Jun 23, 2022
e60557a
Use google.golang.org/protobuf over other protobuf packages
ctlong Jun 23, 2022
bc2087c
Make examples dir its own go module
ctlong Jun 23, 2022
b092cc6
Update converstion tests
ctlong Jun 23, 2022
99686a5
Fix go vet errors in conversion
ctlong Jun 24, 2022
cec4705
Regnerate loggregator v2 rpc code
ctlong Jun 27, 2022
156fc4e
update sonde-go
Jun 27, 2022
822d8a2
don't wait for write protected files in tmp
ctlong Jun 27, 2022
d1860b7
rename golangci config file to match other repos
Jun 27, 2022
ae6adcd
Run
ctlong Jun 27, 2022
8ffe9b1
Upgrade the dropsonde library
Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 .golangci.yaml → .golangci.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion conversion/benchmark/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"

"github.com/cloudfoundry/sonde-go/events"
"github.com/gogo/protobuf/proto"
"google.golang.org/protobuf/proto"
)

func BenchmarkToV2Log(b *testing.B) {
Expand Down
52 changes: 22 additions & 30 deletions conversion/container_metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ package conversion_test
import (
"code.cloudfoundry.org/go-loggregator/v8/conversion"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"

"github.com/cloudfoundry/sonde-go/events"
"github.com/gogo/protobuf/proto"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct"
"google.golang.org/protobuf/proto"
)

var _ = Describe("ContainerMetric", func() {
Expand Down Expand Up @@ -48,18 +47,16 @@ var _ = Describe("ContainerMetric", func() {

envelopes := conversion.ToV1(envelope)
Expect(len(envelopes)).To(Equal(1))
Expect(*envelopes[0]).To(MatchFields(IgnoreExtras, Fields{
"EventType": Equal(events.Envelope_ContainerMetric.Enum()),
"ContainerMetric": Equal(&events.ContainerMetric{
ApplicationId: proto.String("some-id"),
InstanceIndex: proto.Int32(123),
CpuPercentage: proto.Float64(11),
MemoryBytes: proto.Uint64(13),
DiskBytes: proto.Uint64(15),
MemoryBytesQuota: proto.Uint64(17),
DiskBytesQuota: proto.Uint64(19),
}),
}))
Expect(envelopes[0].GetEventType()).To(Equal(events.Envelope_ContainerMetric))
Expect(proto.Equal(envelopes[0].GetContainerMetric(), &events.ContainerMetric{
ApplicationId: proto.String("some-id"),
InstanceIndex: proto.Int32(123),
CpuPercentage: proto.Float64(11),
MemoryBytes: proto.Uint64(13),
DiskBytes: proto.Uint64(15),
MemoryBytesQuota: proto.Uint64(17),
DiskBytesQuota: proto.Uint64(19),
})).To(BeTrue())
})

It("sets InstanceIndex from GaugeValue if present", func() {
Expand All @@ -84,18 +81,16 @@ var _ = Describe("ContainerMetric", func() {

envelopes := conversion.ToV1(envelope)
Expect(len(envelopes)).To(Equal(1))
Expect(*envelopes[0]).To(MatchFields(IgnoreExtras, Fields{
"EventType": Equal(events.Envelope_ContainerMetric.Enum()),
"ContainerMetric": Equal(&events.ContainerMetric{
ApplicationId: proto.String(""),
InstanceIndex: proto.Int32(19),
CpuPercentage: proto.Float64(0),
MemoryBytes: proto.Uint64(0),
DiskBytes: proto.Uint64(0),
MemoryBytesQuota: proto.Uint64(0),
DiskBytesQuota: proto.Uint64(0),
}),
}))
Expect(envelopes[0].GetEventType()).To(Equal(events.Envelope_ContainerMetric))
Expect(proto.Equal(envelopes[0].GetContainerMetric(), &events.ContainerMetric{
ApplicationId: proto.String(""),
InstanceIndex: proto.Int32(19),
CpuPercentage: proto.Float64(0),
MemoryBytes: proto.Uint64(0),
DiskBytes: proto.Uint64(0),
MemoryBytesQuota: proto.Uint64(0),
DiskBytesQuota: proto.Uint64(0),
})).To(BeTrue())
})

DescribeTable("it is resilient to malformed envelopes", func(v2e *loggregator_v2.Envelope) {
Expand Down Expand Up @@ -207,10 +202,7 @@ var _ = Describe("ContainerMetric", func() {
}

converted := conversion.ToV2(localV1Envelope, false)

Expect(*converted).To(MatchFields(IgnoreExtras, Fields{
"SourceId": Equal(expectedV2Envelope.SourceId),
}))
Expect(converted.GetSourceId()).To(Equal(expectedV2Envelope.GetSourceId()))
})
})

Expand Down
31 changes: 13 additions & 18 deletions conversion/counter_event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ package conversion_test
import (
"code.cloudfoundry.org/go-loggregator/v8/conversion"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"

"github.com/cloudfoundry/sonde-go/events"
"github.com/gogo/protobuf/proto"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct"
"google.golang.org/protobuf/proto"
)

var _ = Describe("CounterEvent", func() {
Expand All @@ -26,14 +25,12 @@ var _ = Describe("CounterEvent", func() {

envelopes := conversion.ToV1(envelope)
Expect(len(envelopes)).To(Equal(1))
Expect(*envelopes[0]).To(MatchFields(IgnoreExtras, Fields{
"EventType": Equal(events.Envelope_CounterEvent.Enum()),
"CounterEvent": Equal(&events.CounterEvent{
Name: proto.String("name"),
Total: proto.Uint64(99),
Delta: proto.Uint64(0),
}),
}))
Expect(envelopes[0].GetEventType()).To(Equal(events.Envelope_CounterEvent))
Expect(proto.Equal(envelopes[0].GetCounterEvent(), &events.CounterEvent{
Name: proto.String("name"),
Total: proto.Uint64(99),
Delta: proto.Uint64(0),
})).To(BeTrue())
})
})

Expand All @@ -50,14 +47,12 @@ var _ = Describe("CounterEvent", func() {

envelopes := conversion.ToV1(envelope)
Expect(len(envelopes)).To(Equal(1))
Expect(*envelopes[0]).To(MatchFields(IgnoreExtras, Fields{
"EventType": Equal(events.Envelope_CounterEvent.Enum()),
"CounterEvent": Equal(&events.CounterEvent{
Name: proto.String("name"),
Total: proto.Uint64(0),
Delta: proto.Uint64(99),
}),
}))
Expect(envelopes[0].GetEventType()).To(Equal(events.Envelope_CounterEvent))
Expect(proto.Equal(envelopes[0].GetCounterEvent(), &events.CounterEvent{
Name: proto.String("name"),
Total: proto.Uint64(0),
Delta: proto.Uint64(99),
})).To(BeTrue())
})
})
})
Expand Down
32 changes: 15 additions & 17 deletions conversion/end_to_end_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import (

"code.cloudfoundry.org/go-loggregator/v8/conversion"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"

"github.com/cloudfoundry/sonde-go/events"
"github.com/gogo/protobuf/proto"
goproto "github.com/golang/protobuf/proto"
"google.golang.org/protobuf/proto"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -59,7 +57,7 @@ var _ = Describe("Envelope conversion", func() {

v2e := conversion.ToV2(v1e, false)

_, err = goproto.Marshal(v2e)
_, err = proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

v1Envs := conversion.ToV1(v2e)
Expand Down Expand Up @@ -98,7 +96,7 @@ var _ = Describe("Envelope conversion", func() {

v2e := conversion.ToV2(v1e, false)

_, err = goproto.Marshal(v2e)
_, err = proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

v1Envs := conversion.ToV1(v2e)
Expand Down Expand Up @@ -134,7 +132,7 @@ var _ = Describe("Envelope conversion", func() {

v2e := conversion.ToV2(v1e, false)

_, err = goproto.Marshal(v2e)
_, err = proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

v1Envs := conversion.ToV1(v2e)
Expand Down Expand Up @@ -170,7 +168,7 @@ var _ = Describe("Envelope conversion", func() {

v2e := conversion.ToV2(v1e, false)

_, err = goproto.Marshal(v2e)
_, err = proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

v1Envs := conversion.ToV1(v2e)
Expand Down Expand Up @@ -206,7 +204,7 @@ var _ = Describe("Envelope conversion", func() {

v2e := conversion.ToV2(v1e, false)

_, err = goproto.Marshal(v2e)
_, err = proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

v1Envs := conversion.ToV1(v2e)
Expand Down Expand Up @@ -246,7 +244,7 @@ var _ = Describe("Envelope conversion", func() {

v2e := conversion.ToV2(v1e, false)

_, err = goproto.Marshal(v2e)
_, err = proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

v1Envs := conversion.ToV1(v2e)
Expand Down Expand Up @@ -289,9 +287,9 @@ var _ = Describe("Envelope conversion", func() {
"__v1_type": ValueText("HttpStartStop"),
},
}
expected := goproto.Clone(v2e)
expected := proto.Clone(v2e)

_, err := goproto.Marshal(v2e)
_, err := proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

envelopes := conversion.ToV1(v2e)
Expand Down Expand Up @@ -326,9 +324,9 @@ var _ = Describe("Envelope conversion", func() {
"__v1_type": ValueText("LogMessage"),
},
}
expected := goproto.Clone(v2e)
expected := proto.Clone(v2e)

_, err := goproto.Marshal(v2e)
_, err := proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

envelopes := conversion.ToV1(v2e)
Expand Down Expand Up @@ -362,9 +360,9 @@ var _ = Describe("Envelope conversion", func() {
"__v1_type": ValueText("CounterEvent"),
},
}
expected := goproto.Clone(v2e)
expected := proto.Clone(v2e)

_, err := goproto.Marshal(v2e)
_, err := proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

envelopes := conversion.ToV1(v2e)
Expand Down Expand Up @@ -413,9 +411,9 @@ var _ = Describe("Envelope conversion", func() {
"__v1_type": ValueText("ContainerMetric"),
},
}
expected := goproto.Clone(v2e)
expected := proto.Clone(v2e)

_, err := goproto.Marshal(v2e)
_, err := proto.Marshal(v2e)
Expect(err).ToNot(HaveOccurred())

envelopes := conversion.ToV1(v2e)
Expand Down
26 changes: 10 additions & 16 deletions conversion/envelope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ import (

"code.cloudfoundry.org/go-loggregator/v8/conversion"
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"

"github.com/cloudfoundry/sonde-go/events"
"github.com/gogo/protobuf/proto"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct"
"google.golang.org/protobuf/proto"
)

var _ = Describe("Envelope", func() {
Expand All @@ -34,15 +32,13 @@ var _ = Describe("Envelope", func() {
envelopes := conversion.ToV1(envelope)
Expect(len(envelopes)).To(Equal(1))
oldEnvelope := envelopes[0]
Expect(*oldEnvelope).To(MatchFields(IgnoreExtras, Fields{
"Origin": Equal(proto.String("origin")),
"EventType": Equal(events.Envelope_LogMessage.Enum()),
"Timestamp": Equal(proto.Int64(99)),
"Deployment": Equal(proto.String("deployment")),
"Job": Equal(proto.String("job")),
"Index": Equal(proto.String("index")),
"Ip": Equal(proto.String("ip")),
}))
Expect(oldEnvelope.GetOrigin()).To(Equal("origin"))
Expect(oldEnvelope.GetEventType()).To(Equal(events.Envelope_LogMessage))
Expect(oldEnvelope.GetTimestamp()).To(Equal(int64(99)))
Expect(oldEnvelope.GetDeployment()).To(Equal("deployment"))
Expect(oldEnvelope.GetJob()).To(Equal("job"))
Expect(oldEnvelope.GetIndex()).To(Equal("index"))
Expect(oldEnvelope.GetIp()).To(Equal("ip"))
Expect(oldEnvelope.Tags).To(HaveKeyWithValue("random_text", "random_text"))
Expect(oldEnvelope.Tags).To(HaveKeyWithValue("random_int", "123"))
Expect(oldEnvelope.Tags).To(HaveKeyWithValue("random_decimal", fmt.Sprintf("%f", 123.0)))
Expand Down Expand Up @@ -121,10 +117,8 @@ var _ = Describe("Envelope", func() {

converted := conversion.ToV2(v1Envelope, false)

Expect(*converted).To(MatchFields(IgnoreExtras, Fields{
"SourceId": Equal(expectedV2Envelope.SourceId),
"Timestamp": Equal(expectedV2Envelope.Timestamp),
}))
Expect(converted.SourceId).To(Equal(expectedV2Envelope.SourceId))
Expect(converted.Timestamp).To(Equal(expectedV2Envelope.Timestamp))
Expect(converted.DeprecatedTags["random-tag"]).To(Equal(expectedV2Envelope.DeprecatedTags["random-tag"]))
Expect(converted.DeprecatedTags["origin"]).To(Equal(expectedV2Envelope.DeprecatedTags["origin"]))
Expect(converted.DeprecatedTags["deployment"]).To(Equal(expectedV2Envelope.DeprecatedTags["deployment"]))
Expand Down
7 changes: 3 additions & 4 deletions conversion/error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import (
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"

"github.com/cloudfoundry/sonde-go/events"
"github.com/gogo/protobuf/proto"
goproto "github.com/golang/protobuf/proto"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"google.golang.org/protobuf/proto"
)

var _ = Describe("HTTP", func() {
Expand Down Expand Up @@ -49,11 +48,11 @@ var _ = Describe("HTTP", func() {

converted := conversion.ToV2(v1Envelope, false)

_, err := goproto.Marshal(converted)
_, err := proto.Marshal(converted)
Expect(err).ToNot(HaveOccurred())

for k, v := range expectedV2Envelope.DeprecatedTags {
Expect(goproto.Equal(converted.GetDeprecatedTags()[k], v)).To(BeTrue())
Expect(proto.Equal(converted.GetDeprecatedTags()[k], v)).To(BeTrue())
}

// Expect(converted.GetError().GetSource()).To(Equal(expectedV2Envelope.GetError().GetSource()))
Expand Down
Loading