From 9c4bd387d646bd3a75ac6a8e1e649fcd53d8af97 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 7 Aug 2018 15:47:48 -0700 Subject: [PATCH 1/2] update gogo protobuf And rebuild protobuf definitions --- package.json | 2 +- tracer/wire/wire.pb.go | 91 +++++++++++++++++++++++++++++++++++------- 2 files changed, 77 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index d8cfa1b..9860097 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, { "author": "whyrusleeping", - "hash": "QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV", + "hash": "Qme4mBZ8DawL9xJPSzoEnFCHPzEAZ7NTNYoXSqgVBXpXeo", "name": "gogo-protobuf", "version": "0.0.0" } diff --git a/tracer/wire/wire.pb.go b/tracer/wire/wire.pb.go index dea8120..7cc7333 100644 --- a/tracer/wire/wire.pb.go +++ b/tracer/wire/wire.pb.go @@ -1,16 +1,6 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: wire.proto -// DO NOT EDIT! -/* -Package wire is a generated protocol buffer package. - -It is generated from these files: - wire.proto - -It has these top-level messages: - TracerState -*/ package wire import proto "github.com/gogo/protobuf/proto" @@ -22,16 +12,66 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + type TracerState struct { - TraceId uint64 `protobuf:"fixed64,1,opt,name=trace_id,proto3" json:"trace_id,omitempty"` - SpanId uint64 `protobuf:"fixed64,2,opt,name=span_id,proto3" json:"span_id,omitempty"` - Sampled bool `protobuf:"varint,3,opt,name=sampled,proto3" json:"sampled,omitempty"` - BaggageItems map[string]string `protobuf:"bytes,4,rep,name=baggage_items" json:"baggage_items,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TraceId uint64 `protobuf:"fixed64,1,opt,name=trace_id,json=traceId,proto3" json:"trace_id,omitempty"` + SpanId uint64 `protobuf:"fixed64,2,opt,name=span_id,json=spanId,proto3" json:"span_id,omitempty"` + Sampled bool `protobuf:"varint,3,opt,name=sampled,proto3" json:"sampled,omitempty"` + BaggageItems map[string]string `protobuf:"bytes,4,rep,name=baggage_items,json=baggageItems" json:"baggage_items,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *TracerState) Reset() { *m = TracerState{} } func (m *TracerState) String() string { return proto.CompactTextString(m) } func (*TracerState) ProtoMessage() {} +func (*TracerState) Descriptor() ([]byte, []int) { + return fileDescriptor_wire_32e98b294e316bc0, []int{0} +} +func (m *TracerState) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_TracerState.Unmarshal(m, b) +} +func (m *TracerState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_TracerState.Marshal(b, m, deterministic) +} +func (dst *TracerState) XXX_Merge(src proto.Message) { + xxx_messageInfo_TracerState.Merge(dst, src) +} +func (m *TracerState) XXX_Size() int { + return xxx_messageInfo_TracerState.Size(m) +} +func (m *TracerState) XXX_DiscardUnknown() { + xxx_messageInfo_TracerState.DiscardUnknown(m) +} + +var xxx_messageInfo_TracerState proto.InternalMessageInfo + +func (m *TracerState) GetTraceId() uint64 { + if m != nil { + return m.TraceId + } + return 0 +} + +func (m *TracerState) GetSpanId() uint64 { + if m != nil { + return m.SpanId + } + return 0 +} + +func (m *TracerState) GetSampled() bool { + if m != nil { + return m.Sampled + } + return false +} func (m *TracerState) GetBaggageItems() map[string]string { if m != nil { @@ -42,4 +82,25 @@ func (m *TracerState) GetBaggageItems() map[string]string { func init() { proto.RegisterType((*TracerState)(nil), "basictracer_go.wire.TracerState") + proto.RegisterMapType((map[string]string)(nil), "basictracer_go.wire.TracerState.BaggageItemsEntry") +} + +func init() { proto.RegisterFile("wire.proto", fileDescriptor_wire_32e98b294e316bc0) } + +var fileDescriptor_wire_32e98b294e316bc0 = []byte{ + // 224 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0xcf, 0x2c, 0x4a, + 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x4e, 0x4a, 0x2c, 0xce, 0x4c, 0x2e, 0x29, 0x4a, + 0x4c, 0x4e, 0x2d, 0x8a, 0x4f, 0xcf, 0xd7, 0x03, 0x49, 0x29, 0x7d, 0x65, 0xe4, 0xe2, 0x0e, 0x01, + 0x0b, 0x05, 0x97, 0x24, 0x96, 0xa4, 0x0a, 0x49, 0x72, 0x71, 0x80, 0x55, 0xc4, 0x67, 0xa6, 0x48, + 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x05, 0xb1, 0x83, 0xf9, 0x9e, 0x29, 0x42, 0xe2, 0x5c, 0xec, 0xc5, + 0x05, 0x89, 0x79, 0x20, 0x19, 0x26, 0xb0, 0x0c, 0x1b, 0x88, 0xeb, 0x99, 0x22, 0x24, 0xc1, 0xc5, + 0x5e, 0x9c, 0x98, 0x5b, 0x90, 0x93, 0x9a, 0x22, 0xc1, 0xac, 0xc0, 0xa8, 0xc1, 0x11, 0x04, 0xe3, + 0x0a, 0x85, 0x73, 0xf1, 0x26, 0x25, 0xa6, 0xa7, 0x27, 0xa6, 0xa7, 0xc6, 0x67, 0x96, 0xa4, 0xe6, + 0x16, 0x4b, 0xb0, 0x28, 0x30, 0x6b, 0x70, 0x1b, 0x19, 0xe9, 0x61, 0x71, 0x8a, 0x1e, 0x92, 0x33, + 0xf4, 0x9c, 0x20, 0xba, 0x3c, 0x41, 0x9a, 0x5c, 0xf3, 0x4a, 0x8a, 0x2a, 0x83, 0x78, 0x92, 0x90, + 0x84, 0xa4, 0xec, 0xb9, 0x04, 0x31, 0x94, 0x08, 0x09, 0x70, 0x31, 0x67, 0xa7, 0x56, 0x82, 0x9d, + 0xcd, 0x19, 0x04, 0x62, 0x0a, 0x89, 0x70, 0xb1, 0x96, 0x25, 0xe6, 0x94, 0xa6, 0x82, 0x1d, 0xcc, + 0x19, 0x04, 0xe1, 0x58, 0x31, 0x59, 0x30, 0x3a, 0xb1, 0x45, 0xb1, 0x80, 0x2c, 0x4d, 0x62, 0x03, + 0x87, 0x8d, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xbe, 0x84, 0xc2, 0x29, 0x01, 0x00, 0x00, } From d600ea165028af6e2147ce6855966249bf5bb738 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 7 Aug 2018 15:50:08 -0700 Subject: [PATCH 2/2] gx publish 1.5.4 --- .gx/lastpubver | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gx/lastpubver b/.gx/lastpubver index 76b6ae5..d588d31 100644 --- a/.gx/lastpubver +++ b/.gx/lastpubver @@ -1 +1 @@ -1.5.3: QmcVVHfdyv15GVPk7NrxdWjh2hLVccXnoD8j2tyQShiXJb +1.5.4: QmYHxH7ekDGoPPKN46yEWELvFm1E74fypwNYchLvMS5iRG diff --git a/package.json b/package.json index 9860097..564fc8d 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ "language": "go", "license": "", "name": "go-log", - "version": "1.5.3" + "version": "1.5.4" }