From df83da21f8a44defaa6d76f0284f3eed33777341 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 8 Mar 2021 16:17:33 -0800 Subject: [PATCH] Use otel docker to build proto, update deps Signed-off-by: Bogdan Drutu --- Makefile | 33 ++----- go.mod | 4 +- go.sum | 25 +++++- model/signalfx_metrics.pb.go | 165 +++++++++++++++-------------------- 4 files changed, 98 insertions(+), 129 deletions(-) diff --git a/Makefile b/Makefile index 79dacec..44945f2 100644 --- a/Makefile +++ b/Makefile @@ -1,32 +1,9 @@ -PROTOC := protoc -PROTO_INCLUDES := \ - -I proto \ - -I $(shell go env GOPATH)/pkg/mod/github.com/gogo/protobuf@v1.3.1 +OTEL_DOCKER_PROTOBUF ?= otel/build-protobuf:0.2.1 -# Remapping of std types to gogo types (must not contain spaces) -PROTO_GOGO_MAPPINGS := $(shell echo \ - Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/types, \ - Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/types, \ - Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types, \ - Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types, \ - Mgoogle/protobuf/empty.proto=github.com/gogo/protobuf/types, \ - Mgoogle/api/annotations.proto=github.com/gogo/googleapis/google/api, \ - | sed 's/ //g') +PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD}/$(OTLP_PROTO_INTERMEDIATE_DIR) ${OTEL_DOCKER_PROTOBUF} --proto_path=${PWD}/$(OTLP_PROTO_INTERMEDIATE_DIR) +PROTO_INCLUDES := -I/usr/include/github.com/gogo/protobuf .PHONY: proto proto: - # -I declares import folders, in order of importance - # This is how proto resolves the protofile imports. - # It will check for the protofile relative to each of these - # folders and use the first one it finds. - $(PROTOC) \ - $(PROTO_INCLUDES) \ - --gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/model/ \ - proto/signalfx_metrics.proto - -.PHONY: proto-install -proto-install: - go get -u github.com/golang/glog - go install \ - github.com/golang/protobuf/protoc-gen-go \ - github.com/gogo/protobuf/protoc-gen-gogo + $(PROTOC) $(PROTO_INCLUDES) --gogo_out=plugins=grpc,:./ proto/signalfx_metrics.proto + mv proto/signalfx_metrics.pb.go model/ diff --git a/go.mod b/go.mod index 68166f3..2d49f34 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.13 require ( github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.3.5 - github.com/stretchr/testify v1.6.1 + github.com/golang/protobuf v1.4.3 + github.com/stretchr/testify v1.7.0 ) diff --git a/go.sum b/go.sum index b543bed..3a8adc5 100644 --- a/go.sum +++ b/go.sum @@ -2,15 +2,24 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -37,7 +46,15 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/model/signalfx_metrics.pb.go b/model/signalfx_metrics.pb.go index b7d1f4b..4ce9d73 100644 --- a/model/signalfx_metrics.pb.go +++ b/model/signalfx_metrics.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: signalfx_metrics.proto +// source: proto/signalfx_metrics.proto package model @@ -79,7 +79,7 @@ func (x *MetricType) UnmarshalJSON(data []byte) error { } func (MetricType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{0} + return fileDescriptor_a21bf05b1b375569, []int{0} } //* @@ -156,7 +156,7 @@ func (x *EventCategory) UnmarshalJSON(data []byte) error { } func (EventCategory) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{1} + return fileDescriptor_a21bf05b1b375569, []int{1} } type Datum struct { @@ -172,7 +172,7 @@ func (m *Datum) Reset() { *m = Datum{} } func (m *Datum) String() string { return proto.CompactTextString(m) } func (*Datum) ProtoMessage() {} func (*Datum) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{0} + return fileDescriptor_a21bf05b1b375569, []int{0} } func (m *Datum) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -234,7 +234,7 @@ func (m *Dimension) Reset() { *m = Dimension{} } func (m *Dimension) String() string { return proto.CompactTextString(m) } func (*Dimension) ProtoMessage() {} func (*Dimension) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{1} + return fileDescriptor_a21bf05b1b375569, []int{1} } func (m *Dimension) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -293,7 +293,7 @@ func (m *DataPoint) Reset() { *m = DataPoint{} } func (m *DataPoint) String() string { return proto.CompactTextString(m) } func (*DataPoint) ProtoMessage() {} func (*DataPoint) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{2} + return fileDescriptor_a21bf05b1b375569, []int{2} } func (m *DataPoint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -375,7 +375,7 @@ func (m *DataPointUploadMessage) Reset() { *m = DataPointUploadMessage{} func (m *DataPointUploadMessage) String() string { return proto.CompactTextString(m) } func (*DataPointUploadMessage) ProtoMessage() {} func (*DataPointUploadMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{3} + return fileDescriptor_a21bf05b1b375569, []int{3} } func (m *DataPointUploadMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -423,7 +423,7 @@ func (m *PointValue) Reset() { *m = PointValue{} } func (m *PointValue) String() string { return proto.CompactTextString(m) } func (*PointValue) ProtoMessage() {} func (*PointValue) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{4} + return fileDescriptor_a21bf05b1b375569, []int{4} } func (m *PointValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -478,7 +478,7 @@ func (m *Property) Reset() { *m = Property{} } func (m *Property) String() string { return proto.CompactTextString(m) } func (*Property) ProtoMessage() {} func (*Property) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{5} + return fileDescriptor_a21bf05b1b375569, []int{5} } func (m *Property) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -535,7 +535,7 @@ func (m *PropertyValue) Reset() { *m = PropertyValue{} } func (m *PropertyValue) String() string { return proto.CompactTextString(m) } func (*PropertyValue) ProtoMessage() {} func (*PropertyValue) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{6} + return fileDescriptor_a21bf05b1b375569, []int{6} } func (m *PropertyValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -607,7 +607,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{7} + return fileDescriptor_a21bf05b1b375569, []int{7} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -682,7 +682,7 @@ func (m *EventUploadMessage) Reset() { *m = EventUploadMessage{} } func (m *EventUploadMessage) String() string { return proto.CompactTextString(m) } func (*EventUploadMessage) ProtoMessage() {} func (*EventUploadMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_fe5b8173b206ead4, []int{8} + return fileDescriptor_a21bf05b1b375569, []int{8} } func (m *EventUploadMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -743,55 +743,57 @@ func init() { golang_proto.RegisterType((*EventUploadMessage)(nil), "com.signalfx.metrics.model.EventUploadMessage") } -func init() { proto.RegisterFile("signalfx_metrics.proto", fileDescriptor_fe5b8173b206ead4) } -func init() { golang_proto.RegisterFile("signalfx_metrics.proto", fileDescriptor_fe5b8173b206ead4) } +func init() { proto.RegisterFile("proto/signalfx_metrics.proto", fileDescriptor_a21bf05b1b375569) } +func init() { + golang_proto.RegisterFile("proto/signalfx_metrics.proto", fileDescriptor_a21bf05b1b375569) +} -var fileDescriptor_fe5b8173b206ead4 = []byte{ +var fileDescriptor_a21bf05b1b375569 = []byte{ // 695 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4d, 0x6b, 0xdb, 0x4a, - 0x14, 0xcd, 0xd8, 0x91, 0x9f, 0x75, 0x9d, 0xe4, 0xe9, 0x0d, 0x0f, 0xc7, 0x98, 0xe0, 0xa7, 0x88, - 0xd7, 0xe2, 0x66, 0xe1, 0x82, 0x77, 0x5d, 0x84, 0x90, 0x48, 0x93, 0xe0, 0xe2, 0x8f, 0x30, 0x91, - 0x4c, 0xdb, 0x8d, 0x51, 0xec, 0xa9, 0x11, 0xb5, 0x3d, 0x42, 0x92, 0x43, 0xdd, 0x55, 0x16, 0x85, - 0xd2, 0x45, 0xe9, 0xbe, 0xab, 0x40, 0x17, 0xfd, 0x05, 0x5d, 0x74, 0x17, 0xba, 0xca, 0xb2, 0x3f, - 0xa0, 0x94, 0x90, 0xfe, 0x91, 0x22, 0xc9, 0x92, 0xad, 0xd2, 0xb8, 0xa1, 0x90, 0x9d, 0xe6, 0xdc, - 0x7b, 0xce, 0x9d, 0x7b, 0x74, 0x06, 0xf2, 0xae, 0xd5, 0x1f, 0x99, 0x83, 0xa7, 0xcf, 0x3b, 0x43, - 0xe6, 0x39, 0x56, 0xd7, 0xad, 0xd8, 0x0e, 0xf7, 0x38, 0x2e, 0x76, 0xf9, 0xb0, 0x12, 0xd5, 0x2a, - 0x51, 0x6d, 0xc8, 0x7b, 0x6c, 0x50, 0xfc, 0xb7, 0xcf, 0xfb, 0x3c, 0x68, 0xbb, 0xef, 0x7f, 0x85, - 0x0c, 0xc5, 0x04, 0x41, 0x33, 0xbd, 0xf1, 0x10, 0x17, 0x21, 0xeb, 0x7a, 0x4e, 0xdb, 0x1c, 0x8c, - 0x59, 0x01, 0xc9, 0xa8, 0x2c, 0xd2, 0xf8, 0x8c, 0x65, 0xc8, 0xf5, 0xf8, 0xf8, 0x78, 0xc0, 0xc2, - 0x72, 0x4a, 0x46, 0x65, 0x44, 0xe7, 0x21, 0x9f, 0x6d, 0x8d, 0xbc, 0xb0, 0x9c, 0x96, 0x51, 0x39, - 0x4d, 0xe3, 0xb3, 0xb2, 0x03, 0xa2, 0x66, 0x0d, 0xd9, 0xc8, 0xb5, 0xf8, 0x08, 0xe7, 0x21, 0xfd, - 0x8c, 0x4d, 0xc2, 0x09, 0x7b, 0xcb, 0x17, 0xdf, 0xfe, 0x5b, 0xa2, 0x3e, 0x80, 0x8b, 0x20, 0x9c, - 0xc4, 0xe2, 0x51, 0x25, 0x84, 0x94, 0x4f, 0x29, 0x10, 0x35, 0xd3, 0x33, 0x0f, 0xb9, 0x35, 0xf2, - 0xf0, 0x06, 0x64, 0x5c, 0x3e, 0x76, 0xba, 0x2c, 0x21, 0x32, 0xc5, 0xfc, 0x6a, 0xb8, 0x76, 0x42, - 0x68, 0x8a, 0x61, 0x05, 0x44, 0xcf, 0x1a, 0x32, 0xd7, 0x33, 0x87, 0x76, 0x78, 0xcf, 0x69, 0xc3, - 0x0c, 0xc6, 0xdb, 0xd1, 0x4d, 0x96, 0x65, 0x54, 0xce, 0x55, 0x37, 0x2b, 0xd7, 0x7b, 0x5a, 0x09, - 0xac, 0x4b, 0x5c, 0x16, 0xef, 0x03, 0x84, 0x3d, 0xfa, 0xc4, 0x66, 0x05, 0x41, 0x46, 0xe5, 0xb5, - 0xea, 0xdd, 0x45, 0x1a, 0x8d, 0xb8, 0x9b, 0xce, 0x31, 0x31, 0x01, 0xe8, 0x45, 0xae, 0xb9, 0x85, - 0x8c, 0x9c, 0x2e, 0xe7, 0xaa, 0x77, 0x16, 0xde, 0x25, 0xea, 0xa6, 0x73, 0x44, 0xa5, 0x03, 0xf9, - 0xd8, 0x3a, 0xc3, 0x1e, 0x70, 0xb3, 0xd7, 0x60, 0xae, 0x6b, 0xf6, 0xc3, 0x01, 0xa6, 0x67, 0xda, - 0x7e, 0xc5, 0x2d, 0xa0, 0x1b, 0x0c, 0x88, 0x74, 0xe8, 0x1c, 0x51, 0xe1, 0x00, 0x01, 0x18, 0xe6, - 0xe0, 0xf6, 0x0d, 0x56, 0xba, 0x90, 0x3d, 0x74, 0xb8, 0xcd, 0x1c, 0x6f, 0x72, 0x6d, 0x9a, 0x76, - 0xe6, 0xd3, 0x94, 0xab, 0xde, 0x5b, 0x34, 0x22, 0x12, 0x0b, 0x16, 0x88, 0x86, 0xbc, 0x42, 0xb0, - 0x9a, 0x28, 0xdc, 0xde, 0xfb, 0xc0, 0x1b, 0x20, 0x1e, 0x73, 0x3e, 0x68, 0xc7, 0x9e, 0x64, 0xe9, - 0x0c, 0x50, 0xde, 0xa7, 0x40, 0x20, 0x27, 0x6c, 0xe4, 0xf9, 0xde, 0x32, 0xff, 0x23, 0x08, 0x16, - 0x92, 0x53, 0xf1, 0xca, 0x33, 0xf8, 0xa7, 0xd4, 0xa4, 0xfe, 0x30, 0x35, 0x58, 0x03, 0xb0, 0xc3, - 0xed, 0x2d, 0xe6, 0x16, 0xd2, 0x81, 0xcc, 0xff, 0x37, 0x31, 0x91, 0xce, 0xf1, 0x30, 0x81, 0x6c, - 0xd7, 0xf4, 0x58, 0x9f, 0x3b, 0x93, 0x60, 0xaf, 0xb5, 0xc5, 0x3f, 0x22, 0xd8, 0x52, 0x9d, 0x12, - 0x68, 0x4c, 0x4d, 0x66, 0x4a, 0xf8, 0x65, 0xa6, 0x94, 0x16, 0xe0, 0x80, 0x9e, 0x8c, 0xf8, 0x03, - 0xc8, 0x04, 0xd6, 0x44, 0xf1, 0xde, 0xfc, 0xed, 0x78, 0x3a, 0x25, 0x6c, 0xed, 0x03, 0xcc, 0x1e, - 0x26, 0x16, 0x41, 0x38, 0xd8, 0x35, 0x0e, 0x88, 0xb4, 0x84, 0x73, 0xf0, 0x97, 0xda, 0x32, 0x9a, - 0x3a, 0xa1, 0x12, 0xc2, 0x59, 0x58, 0x26, 0x4d, 0xa3, 0x21, 0xa5, 0x70, 0x1e, 0xb0, 0x6a, 0x34, - 0x8c, 0xfa, 0xae, 0x5e, 0x6b, 0x93, 0x4e, 0xd4, 0x91, 0xde, 0x7a, 0x8b, 0x60, 0x35, 0xb1, 0x18, - 0xc6, 0xb0, 0x62, 0x1c, 0x11, 0xda, 0xd1, 0xc8, 0x7e, 0xad, 0x49, 0x34, 0xe9, 0xfc, 0xe5, 0x36, - 0xce, 0x81, 0xb0, 0x5b, 0x27, 0x54, 0x97, 0xce, 0xde, 0x64, 0x82, 0x83, 0xa1, 0xd5, 0x74, 0xe9, - 0xfc, 0xdd, 0x0a, 0x16, 0x21, 0xfd, 0xb0, 0xb5, 0x27, 0x5d, 0x7e, 0xc0, 0x78, 0x0d, 0xb2, 0x6a, - 0xab, 0x5e, 0x27, 0xaa, 0xae, 0x49, 0xa7, 0x1f, 0x0b, 0x78, 0x1d, 0xfe, 0x39, 0x22, 0xb4, 0x5d, - 0x53, 0x49, 0x47, 0xab, 0x1d, 0xa9, 0xad, 0x36, 0xa1, 0x8f, 0xa5, 0xb3, 0xcf, 0x25, 0xfc, 0x37, - 0x88, 0xe4, 0x91, 0x4a, 0x0e, 0xf5, 0x5a, 0xab, 0x29, 0x5d, 0x7e, 0xdd, 0x0a, 0x14, 0x0f, 0x48, - 0x53, 0x97, 0x4e, 0x5f, 0xbf, 0xd8, 0x5b, 0xbf, 0xb8, 0x2a, 0xa1, 0x2f, 0x57, 0x25, 0x74, 0x79, - 0x55, 0x42, 0xe7, 0xdf, 0x4b, 0xe8, 0x89, 0x10, 0x18, 0xf0, 0x23, 0x00, 0x00, 0xff, 0xff, 0x74, - 0xbb, 0xf4, 0xff, 0x55, 0x06, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x3f, 0x6f, 0xd3, 0x5e, + 0x14, 0xed, 0x4b, 0xea, 0xfc, 0xe2, 0x9b, 0xb6, 0x3f, 0xf3, 0x84, 0xda, 0x28, 0xaa, 0x82, 0x6b, + 0x01, 0x0a, 0x1d, 0x82, 0x94, 0x8d, 0xa1, 0xaa, 0x5a, 0xfb, 0xb5, 0x0a, 0xca, 0x9f, 0xea, 0xd5, + 0x8e, 0x80, 0x25, 0x72, 0x93, 0x47, 0x64, 0x91, 0xe4, 0x59, 0xb6, 0x53, 0x11, 0xa6, 0x0e, 0x48, + 0x88, 0x01, 0xb1, 0x33, 0x55, 0x62, 0xe0, 0x13, 0x30, 0xb0, 0x55, 0x4c, 0x1d, 0xf9, 0x00, 0x08, + 0x55, 0xe5, 0x8b, 0x20, 0xdb, 0xb1, 0x13, 0x23, 0x1a, 0x2a, 0xa4, 0x6e, 0x7e, 0xe7, 0xde, 0x73, + 0xee, 0xbb, 0xc7, 0xe7, 0xc1, 0xba, 0xed, 0x70, 0x8f, 0x3f, 0x74, 0xad, 0xde, 0xd0, 0xec, 0x3f, + 0x7f, 0xd9, 0x1e, 0x30, 0xcf, 0xb1, 0x3a, 0x6e, 0x39, 0x80, 0x71, 0xa1, 0xc3, 0x07, 0xe5, 0xa8, + 0x56, 0x8e, 0x6a, 0x03, 0xde, 0x65, 0xfd, 0xc2, 0xed, 0x1e, 0xef, 0xf1, 0x90, 0xed, 0x7f, 0x85, + 0x0c, 0xc5, 0x04, 0x41, 0x33, 0xbd, 0xd1, 0x00, 0x17, 0x20, 0xeb, 0x7a, 0x4e, 0xcb, 0xec, 0x8f, + 0x58, 0x1e, 0xc9, 0xa8, 0x24, 0xd2, 0xf8, 0x8c, 0x65, 0xc8, 0x75, 0xf9, 0xe8, 0xa8, 0xcf, 0xc2, + 0x72, 0x4a, 0x46, 0x25, 0x44, 0x67, 0x21, 0x9f, 0x6d, 0x0d, 0xbd, 0xb0, 0x9c, 0x96, 0x51, 0x29, + 0x4d, 0xe3, 0xb3, 0xb2, 0x0d, 0xa2, 0x66, 0x0d, 0xd8, 0xd0, 0xb5, 0xf8, 0x10, 0xaf, 0x42, 0xfa, + 0x05, 0x1b, 0x87, 0x13, 0x76, 0x17, 0xcf, 0x7f, 0xdc, 0x59, 0xa0, 0x3e, 0x80, 0x0b, 0x20, 0x1c, + 0xc7, 0xe2, 0x51, 0x25, 0x84, 0x94, 0x2f, 0x29, 0x10, 0x35, 0xd3, 0x33, 0x0f, 0xb8, 0x35, 0xf4, + 0xf0, 0x3a, 0x64, 0x5c, 0x3e, 0x72, 0x3a, 0x2c, 0x21, 0x32, 0xc1, 0xfc, 0x6a, 0xb8, 0x76, 0x42, + 0x68, 0x82, 0x61, 0x05, 0x44, 0xcf, 0x1a, 0x30, 0xd7, 0x33, 0x07, 0x76, 0x78, 0xcf, 0x49, 0xc3, + 0x14, 0xc6, 0x5b, 0xd1, 0x4d, 0x16, 0x65, 0x54, 0xca, 0x55, 0x36, 0xca, 0x57, 0x7b, 0x5a, 0x0e, + 0xac, 0x4b, 0x5c, 0x16, 0xef, 0x01, 0x84, 0x3d, 0xfa, 0xd8, 0x66, 0x79, 0x41, 0x46, 0xa5, 0x95, + 0xca, 0xfd, 0x79, 0x1a, 0xf5, 0xb8, 0x9b, 0xce, 0x30, 0x31, 0x01, 0xe8, 0x46, 0xae, 0xb9, 0xf9, + 0x8c, 0x9c, 0x2e, 0xe5, 0x2a, 0xf7, 0xe6, 0xde, 0x25, 0xea, 0xa6, 0x33, 0x44, 0xa5, 0x0d, 0xab, + 0xb1, 0x75, 0x86, 0xdd, 0xe7, 0x66, 0xb7, 0xce, 0x5c, 0xd7, 0xec, 0x85, 0x03, 0x4c, 0xcf, 0xb4, + 0xfd, 0x8a, 0x9b, 0x47, 0xd7, 0x18, 0x10, 0xe9, 0xd0, 0x19, 0xa2, 0xc2, 0x01, 0x02, 0x30, 0xcc, + 0xc1, 0xcd, 0x1b, 0xac, 0x74, 0x20, 0x7b, 0xe0, 0x70, 0x9b, 0x39, 0xde, 0xf8, 0xca, 0x34, 0x6d, + 0xcf, 0xa6, 0x29, 0x57, 0x79, 0x30, 0x6f, 0x44, 0x24, 0x16, 0x2c, 0x10, 0x0d, 0x79, 0x83, 0x60, + 0x39, 0x51, 0xb8, 0xb9, 0xf7, 0x81, 0xd7, 0x41, 0x3c, 0xe2, 0xbc, 0xdf, 0x8a, 0x3d, 0xc9, 0xd2, + 0x29, 0xa0, 0x7c, 0x4c, 0x81, 0x40, 0x8e, 0xd9, 0xd0, 0xf3, 0xbd, 0x65, 0xfe, 0x47, 0x10, 0x2c, + 0x24, 0xa7, 0xe2, 0x95, 0xa7, 0xf0, 0x6f, 0xa9, 0x49, 0xfd, 0x63, 0x6a, 0xb0, 0x06, 0x60, 0x87, + 0xdb, 0x5b, 0xcc, 0xcd, 0xa7, 0x03, 0x99, 0xbb, 0xd7, 0x31, 0x91, 0xce, 0xf0, 0x30, 0x81, 0x6c, + 0xc7, 0xf4, 0x58, 0x8f, 0x3b, 0xe3, 0x60, 0xaf, 0x95, 0xf9, 0x3f, 0x22, 0xd8, 0x52, 0x9d, 0x10, + 0x68, 0x4c, 0x4d, 0x66, 0x4a, 0xf8, 0x63, 0xa6, 0x94, 0x26, 0xe0, 0x80, 0x9e, 0x8c, 0xf8, 0x23, + 0xc8, 0x04, 0xd6, 0x44, 0xf1, 0xde, 0xf8, 0xeb, 0x78, 0x3a, 0x21, 0x6c, 0xee, 0x01, 0x4c, 0x1f, + 0x26, 0x16, 0x41, 0xd8, 0xdf, 0x31, 0xf6, 0x89, 0xb4, 0x80, 0x73, 0xf0, 0x9f, 0xda, 0x34, 0x1a, + 0x3a, 0xa1, 0x12, 0xc2, 0x59, 0x58, 0x24, 0x0d, 0xa3, 0x2e, 0xa5, 0xf0, 0x2a, 0x60, 0xd5, 0xa8, + 0x1b, 0xb5, 0x1d, 0xbd, 0xda, 0x22, 0xed, 0xa8, 0x23, 0xbd, 0xf9, 0x1e, 0xc1, 0x72, 0x62, 0x31, + 0x8c, 0x61, 0xc9, 0x38, 0x24, 0xb4, 0xad, 0x91, 0xbd, 0x6a, 0x83, 0x68, 0xd2, 0xd9, 0xeb, 0x2d, + 0x9c, 0x03, 0x61, 0xa7, 0x46, 0xa8, 0x2e, 0x9d, 0xbe, 0xcb, 0x04, 0x07, 0x43, 0xab, 0xea, 0xd2, + 0xd9, 0x87, 0x25, 0x2c, 0x42, 0xfa, 0x71, 0x73, 0x57, 0xba, 0xf8, 0x84, 0xf1, 0x0a, 0x64, 0xd5, + 0x66, 0xad, 0x46, 0x54, 0x5d, 0x93, 0x4e, 0x3e, 0xe7, 0xf1, 0x1a, 0xdc, 0x3a, 0x24, 0xb4, 0x55, + 0x55, 0x49, 0x5b, 0xab, 0x1e, 0xaa, 0xcd, 0x16, 0xa1, 0x4f, 0xa5, 0xd3, 0xaf, 0x45, 0xfc, 0x3f, + 0x88, 0xe4, 0x89, 0x4a, 0x0e, 0xf4, 0x6a, 0xb3, 0x21, 0x5d, 0x7c, 0xdf, 0x0c, 0x14, 0xf7, 0x49, + 0x43, 0x97, 0x4e, 0xde, 0xbe, 0xda, 0x5d, 0x3b, 0xbf, 0x2c, 0xa2, 0x6f, 0x97, 0x45, 0x74, 0x71, + 0x59, 0x44, 0x67, 0x3f, 0x8b, 0xe8, 0x99, 0x10, 0x18, 0xf0, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x0a, + 0xf5, 0x8f, 0xeb, 0x5b, 0x06, 0x00, 0x00, } func (m *Datum) Marshal() (dAtA []byte, err error) { @@ -1541,10 +1543,7 @@ func (m *Datum) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -1659,10 +1658,7 @@ func (m *Dimension) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -1883,10 +1879,7 @@ func (m *DataPoint) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -1971,10 +1964,7 @@ func (m *DataPointUploadMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -2077,10 +2067,7 @@ func (m *PointValue) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -2199,10 +2186,7 @@ func (m *Property) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -2339,10 +2323,7 @@ func (m *PropertyValue) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -2534,10 +2515,7 @@ func (m *Event) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l { @@ -2625,10 +2603,7 @@ func (m *EventUploadMessage) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthSignalfxMetrics - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthSignalfxMetrics } if (iNdEx + skippy) > l {