From b6b70ec516432bd6ccbdbd4b984d70324f8d7da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=BB=B6=E9=BE=99?= Date: Thu, 30 Apr 2020 10:07:11 +0800 Subject: [PATCH] [WIP] Fix sw7 (#221) fix bugs --- reporter/network/common/v1/common.pb.go | 232 +++++------ reporter/network/common/v2/common.pb.go | 310 +++++++-------- .../agent/v1/ApplicationRegisterService.pb.go | 47 ++- reporter/network/language/agent/v1/CLR.pb.go | 193 +++++----- .../language/agent/v1/DiscoveryService.pb.go | 133 ++++--- .../language/agent/v1/Downstream.pb.go | 20 +- reporter/network/language/agent/v1/JVM.pb.go | 333 ++++++++-------- .../language/agent/v1/JVMMetricsService.pb.go | 57 ++- .../agent/v1/TraceSegmentService.pb.go | 210 +++++----- .../language/agent/v1/trace-common.pb.go | 117 +++--- reporter/network/language/agent/v2/CLR.pb.go | 193 +++++----- .../network/language/agent/v2/CLRMetric.pb.go | 108 +++--- reporter/network/language/agent/v2/JVM.pb.go | 333 ++++++++-------- .../network/language/agent/v2/JVMMetric.pb.go | 108 +++--- .../language/agent/v2/trace-common.pb.go | 197 +++++----- .../network/language/agent/v2/trace.pb.go | 364 +++++++++--------- .../network/language/profile/v2/Profile.pb.go | 100 ++--- .../network/register/v2/InstancePing.pb.go | 51 ++- reporter/network/register/v2/Register.pb.go | 280 +++++++------- reporter/protocol/v1/README.md | 5 - reporter/protocol/v1/common/CLR.proto | 14 +- reporter/protocol/v1/common/JVM.proto | 26 +- reporter/protocol/v1/common/common.proto | 16 +- .../protocol/v1/common/trace-common.proto | 8 +- .../v1/language-agent-v2/CLRMetric.proto | 36 -- .../v1/language-agent-v2/JVMMetric.proto | 36 -- .../protocol/v1/language-agent-v2/trace.proto | 77 ---- .../ApplicationRegisterService.proto | 2 - .../v1/language-agent/DiscoveryService.proto | 4 +- .../v1/language-agent/Downstream.proto | 2 - .../v1/language-agent/JVMMetricsService.proto | 4 +- .../language-agent/TraceSegmentService.proto | 18 +- .../protocol/v1/register/InstancePing.proto | 37 -- reporter/protocol/v1/register/Register.proto | 125 ------ .../istio/skywalking.config.pb.html | 39 -- .../v1/service-mesh-probe/service-mesh.proto | 56 --- reporter/protocol/v2/README.md | 10 +- .../protocol/v2/browser/BrowserPerf.proto | 92 ----- reporter/protocol/v2/common/CLR.proto | 14 +- reporter/protocol/v2/common/JVM.proto | 26 +- reporter/protocol/v2/common/common.proto | 31 +- .../protocol/v2/common/trace-common.proto | 14 +- .../v2/language-agent-v2/CLRMetric.proto | 8 +- .../v2/language-agent-v2/JVMMetric.proto | 8 +- .../protocol/v2/language-agent-v2/trace.proto | 28 +- reporter/protocol/v2/profile/Profile.proto | 8 +- .../protocol/v2/register/InstancePing.proto | 4 +- reporter/protocol/v2/register/Register.proto | 31 +- .../istio/skywalking.config.pb.html | 39 -- .../v2/service-mesh-probe/service-mesh.proto | 58 --- reporter/service/register.go | 12 +- reporter/service/trace.go | 56 +-- 52 files changed, 1796 insertions(+), 2534 deletions(-) delete mode 100644 reporter/protocol/v1/README.md delete mode 100644 reporter/protocol/v1/language-agent-v2/CLRMetric.proto delete mode 100644 reporter/protocol/v1/language-agent-v2/JVMMetric.proto delete mode 100644 reporter/protocol/v1/language-agent-v2/trace.proto delete mode 100644 reporter/protocol/v1/register/InstancePing.proto delete mode 100644 reporter/protocol/v1/register/Register.proto delete mode 100644 reporter/protocol/v1/service-mesh-probe/istio/skywalking.config.pb.html delete mode 100644 reporter/protocol/v1/service-mesh-probe/service-mesh.proto delete mode 100644 reporter/protocol/v2/browser/BrowserPerf.proto delete mode 100644 reporter/protocol/v2/service-mesh-probe/istio/skywalking.config.pb.html delete mode 100644 reporter/protocol/v2/service-mesh-probe/service-mesh.proto diff --git a/reporter/network/common/v1/common.pb.go b/reporter/network/common/v1/common.pb.go index 1627c0e..91e8630 100644 --- a/reporter/network/common/v1/common.pb.go +++ b/reporter/network/common/v1/common.pb.go @@ -23,35 +23,35 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // In most cases, detect point should be `server` or `client`. // Even in service mesh, this means `server`/`client` side sidecar // `proxy` is reserved only. -type DetectPoint int32 +type DetectPointV1 int32 const ( - DetectPoint_client DetectPoint = 0 - DetectPoint_server DetectPoint = 1 - DetectPoint_proxy DetectPoint = 2 + DetectPointV1_client DetectPointV1 = 0 + DetectPointV1_server DetectPointV1 = 1 + DetectPointV1_proxy DetectPointV1 = 2 ) -var DetectPoint_name = map[int32]string{ +var DetectPointV1_name = map[int32]string{ 0: "client", 1: "server", 2: "proxy", } -var DetectPoint_value = map[string]int32{ +var DetectPointV1_value = map[string]int32{ "client": 0, "server": 1, "proxy": 2, } -func (x DetectPoint) String() string { - return proto.EnumName(DetectPoint_name, int32(x)) +func (x DetectPointV1) String() string { + return proto.EnumName(DetectPointV1_name, int32(x)) } -func (DetectPoint) EnumDescriptor() ([]byte, []int) { +func (DetectPointV1) EnumDescriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{0} } -type KeyStringValuePair struct { +type KeyStringValuePairV1 struct { Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -59,39 +59,39 @@ type KeyStringValuePair struct { XXX_sizecache int32 `json:"-"` } -func (m *KeyStringValuePair) Reset() { *m = KeyStringValuePair{} } -func (m *KeyStringValuePair) String() string { return proto.CompactTextString(m) } -func (*KeyStringValuePair) ProtoMessage() {} -func (*KeyStringValuePair) Descriptor() ([]byte, []int) { +func (m *KeyStringValuePairV1) Reset() { *m = KeyStringValuePairV1{} } +func (m *KeyStringValuePairV1) String() string { return proto.CompactTextString(m) } +func (*KeyStringValuePairV1) ProtoMessage() {} +func (*KeyStringValuePairV1) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{0} } -func (m *KeyStringValuePair) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_KeyStringValuePair.Unmarshal(m, b) +func (m *KeyStringValuePairV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_KeyStringValuePairV1.Unmarshal(m, b) } -func (m *KeyStringValuePair) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_KeyStringValuePair.Marshal(b, m, deterministic) +func (m *KeyStringValuePairV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_KeyStringValuePairV1.Marshal(b, m, deterministic) } -func (m *KeyStringValuePair) XXX_Merge(src proto.Message) { - xxx_messageInfo_KeyStringValuePair.Merge(m, src) +func (m *KeyStringValuePairV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_KeyStringValuePairV1.Merge(m, src) } -func (m *KeyStringValuePair) XXX_Size() int { - return xxx_messageInfo_KeyStringValuePair.Size(m) +func (m *KeyStringValuePairV1) XXX_Size() int { + return xxx_messageInfo_KeyStringValuePairV1.Size(m) } -func (m *KeyStringValuePair) XXX_DiscardUnknown() { - xxx_messageInfo_KeyStringValuePair.DiscardUnknown(m) +func (m *KeyStringValuePairV1) XXX_DiscardUnknown() { + xxx_messageInfo_KeyStringValuePairV1.DiscardUnknown(m) } -var xxx_messageInfo_KeyStringValuePair proto.InternalMessageInfo +var xxx_messageInfo_KeyStringValuePairV1 proto.InternalMessageInfo -func (m *KeyStringValuePair) GetKey() string { +func (m *KeyStringValuePairV1) GetKey() string { if m != nil { return m.Key } return "" } -func (m *KeyStringValuePair) GetValue() string { +func (m *KeyStringValuePairV1) GetValue() string { if m != nil { return m.Value } @@ -145,125 +145,125 @@ func (m *KeyIntValuePair) GetValue() int32 { return 0 } -type CPU struct { +type CPUV1 struct { UsagePercent float64 `protobuf:"fixed64,2,opt,name=usagePercent,proto3" json:"usagePercent,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *CPU) Reset() { *m = CPU{} } -func (m *CPU) String() string { return proto.CompactTextString(m) } -func (*CPU) ProtoMessage() {} -func (*CPU) Descriptor() ([]byte, []int) { +func (m *CPUV1) Reset() { *m = CPUV1{} } +func (m *CPUV1) String() string { return proto.CompactTextString(m) } +func (*CPUV1) ProtoMessage() {} +func (*CPUV1) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{2} } -func (m *CPU) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CPU.Unmarshal(m, b) +func (m *CPUV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CPUV1.Unmarshal(m, b) } -func (m *CPU) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CPU.Marshal(b, m, deterministic) +func (m *CPUV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CPUV1.Marshal(b, m, deterministic) } -func (m *CPU) XXX_Merge(src proto.Message) { - xxx_messageInfo_CPU.Merge(m, src) +func (m *CPUV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_CPUV1.Merge(m, src) } -func (m *CPU) XXX_Size() int { - return xxx_messageInfo_CPU.Size(m) +func (m *CPUV1) XXX_Size() int { + return xxx_messageInfo_CPUV1.Size(m) } -func (m *CPU) XXX_DiscardUnknown() { - xxx_messageInfo_CPU.DiscardUnknown(m) +func (m *CPUV1) XXX_DiscardUnknown() { + xxx_messageInfo_CPUV1.DiscardUnknown(m) } -var xxx_messageInfo_CPU proto.InternalMessageInfo +var xxx_messageInfo_CPUV1 proto.InternalMessageInfo -func (m *CPU) GetUsagePercent() float64 { +func (m *CPUV1) GetUsagePercent() float64 { if m != nil { return m.UsagePercent } return 0 } -type Commands struct { - Commands []*Command `protobuf:"bytes,1,rep,name=commands,proto3" json:"commands,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type CommandsV1 struct { + Commands []*CommandV1 `protobuf:"bytes,1,rep,name=commands,proto3" json:"commands,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Commands) Reset() { *m = Commands{} } -func (m *Commands) String() string { return proto.CompactTextString(m) } -func (*Commands) ProtoMessage() {} -func (*Commands) Descriptor() ([]byte, []int) { +func (m *CommandsV1) Reset() { *m = CommandsV1{} } +func (m *CommandsV1) String() string { return proto.CompactTextString(m) } +func (*CommandsV1) ProtoMessage() {} +func (*CommandsV1) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{3} } -func (m *Commands) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Commands.Unmarshal(m, b) +func (m *CommandsV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CommandsV1.Unmarshal(m, b) } -func (m *Commands) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Commands.Marshal(b, m, deterministic) +func (m *CommandsV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CommandsV1.Marshal(b, m, deterministic) } -func (m *Commands) XXX_Merge(src proto.Message) { - xxx_messageInfo_Commands.Merge(m, src) +func (m *CommandsV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommandsV1.Merge(m, src) } -func (m *Commands) XXX_Size() int { - return xxx_messageInfo_Commands.Size(m) +func (m *CommandsV1) XXX_Size() int { + return xxx_messageInfo_CommandsV1.Size(m) } -func (m *Commands) XXX_DiscardUnknown() { - xxx_messageInfo_Commands.DiscardUnknown(m) +func (m *CommandsV1) XXX_DiscardUnknown() { + xxx_messageInfo_CommandsV1.DiscardUnknown(m) } -var xxx_messageInfo_Commands proto.InternalMessageInfo +var xxx_messageInfo_CommandsV1 proto.InternalMessageInfo -func (m *Commands) GetCommands() []*Command { +func (m *CommandsV1) GetCommands() []*CommandV1 { if m != nil { return m.Commands } return nil } -type Command struct { - Command string `protobuf:"bytes,1,opt,name=command,proto3" json:"command,omitempty"` - Args []*KeyStringValuePair `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type CommandV1 struct { + Command string `protobuf:"bytes,1,opt,name=command,proto3" json:"command,omitempty"` + Args []*KeyStringValuePairV1 `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Command) Reset() { *m = Command{} } -func (m *Command) String() string { return proto.CompactTextString(m) } -func (*Command) ProtoMessage() {} -func (*Command) Descriptor() ([]byte, []int) { +func (m *CommandV1) Reset() { *m = CommandV1{} } +func (m *CommandV1) String() string { return proto.CompactTextString(m) } +func (*CommandV1) ProtoMessage() {} +func (*CommandV1) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{4} } -func (m *Command) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Command.Unmarshal(m, b) +func (m *CommandV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CommandV1.Unmarshal(m, b) } -func (m *Command) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Command.Marshal(b, m, deterministic) +func (m *CommandV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CommandV1.Marshal(b, m, deterministic) } -func (m *Command) XXX_Merge(src proto.Message) { - xxx_messageInfo_Command.Merge(m, src) +func (m *CommandV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommandV1.Merge(m, src) } -func (m *Command) XXX_Size() int { - return xxx_messageInfo_Command.Size(m) +func (m *CommandV1) XXX_Size() int { + return xxx_messageInfo_CommandV1.Size(m) } -func (m *Command) XXX_DiscardUnknown() { - xxx_messageInfo_Command.DiscardUnknown(m) +func (m *CommandV1) XXX_DiscardUnknown() { + xxx_messageInfo_CommandV1.DiscardUnknown(m) } -var xxx_messageInfo_Command proto.InternalMessageInfo +var xxx_messageInfo_CommandV1 proto.InternalMessageInfo -func (m *Command) GetCommand() string { +func (m *CommandV1) GetCommand() string { if m != nil { return m.Command } return "" } -func (m *Command) GetArgs() []*KeyStringValuePair { +func (m *CommandV1) GetArgs() []*KeyStringValuePairV1 { if m != nil { return m.Args } @@ -271,37 +271,37 @@ func (m *Command) GetArgs() []*KeyStringValuePair { } func init() { - proto.RegisterEnum("skywalking.network.protocol.common.v1.DetectPoint", DetectPoint_name, DetectPoint_value) - proto.RegisterType((*KeyStringValuePair)(nil), "skywalking.network.protocol.common.v1.KeyStringValuePair") - proto.RegisterType((*KeyIntValuePair)(nil), "skywalking.network.protocol.common.v1.KeyIntValuePair") - proto.RegisterType((*CPU)(nil), "skywalking.network.protocol.common.v1.CPU") - proto.RegisterType((*Commands)(nil), "skywalking.network.protocol.common.v1.Commands") - proto.RegisterType((*Command)(nil), "skywalking.network.protocol.common.v1.Command") + proto.RegisterEnum("DetectPointV1", DetectPointV1_name, DetectPointV1_value) + proto.RegisterType((*KeyStringValuePairV1)(nil), "KeyStringValuePairV1") + proto.RegisterType((*KeyIntValuePair)(nil), "KeyIntValuePair") + proto.RegisterType((*CPUV1)(nil), "CPUV1") + proto.RegisterType((*CommandsV1)(nil), "CommandsV1") + proto.RegisterType((*CommandV1)(nil), "CommandV1") } func init() { proto.RegisterFile("common/common.proto", fileDescriptor_8f954d82c0b891f6) } var fileDescriptor_8f954d82c0b891f6 = []byte{ - // 327 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0x4b, 0xc3, 0x40, - 0x10, 0x35, 0xa9, 0xfd, 0x9a, 0x0a, 0x86, 0xd5, 0x43, 0x10, 0x0f, 0x25, 0x20, 0x54, 0x0f, 0x5b, - 0xab, 0xa7, 0x82, 0x27, 0xeb, 0x45, 0x8b, 0x12, 0x52, 0xac, 0xe0, 0x6d, 0x5d, 0x87, 0x18, 0x92, - 0xec, 0x86, 0xcd, 0x36, 0x35, 0x7f, 0xc9, 0x5f, 0x29, 0x4d, 0xb6, 0x55, 0xf1, 0x92, 0x53, 0x66, - 0xde, 0x9b, 0x37, 0xef, 0x4d, 0x58, 0x38, 0xe2, 0x32, 0x4d, 0xa5, 0x18, 0xd7, 0x1f, 0x9a, 0x29, - 0xa9, 0x25, 0x39, 0xcb, 0xe3, 0x72, 0xcd, 0x92, 0x38, 0x12, 0x21, 0x15, 0xa8, 0xd7, 0x52, 0xc5, - 0x35, 0xc3, 0x65, 0x42, 0xcd, 0x64, 0x31, 0xf1, 0x6e, 0x80, 0xcc, 0xb1, 0x5c, 0x68, 0x15, 0x89, - 0x70, 0xc9, 0x92, 0x15, 0xfa, 0x2c, 0x52, 0xc4, 0x81, 0x56, 0x8c, 0xa5, 0x6b, 0x0d, 0xad, 0x51, - 0x3f, 0xd8, 0x94, 0xe4, 0x18, 0xda, 0xc5, 0x86, 0x76, 0xed, 0x0a, 0xab, 0x1b, 0x6f, 0x0a, 0x87, - 0x73, 0x2c, 0xef, 0x85, 0x6e, 0x2c, 0x6d, 0x6f, 0xa5, 0xe7, 0xd0, 0x9a, 0xf9, 0xcf, 0xc4, 0x83, - 0x83, 0x55, 0xce, 0x42, 0xf4, 0x51, 0x71, 0x14, 0xba, 0x9a, 0xb1, 0x82, 0x3f, 0x98, 0xb7, 0x84, - 0xde, 0x4c, 0xa6, 0x29, 0x13, 0xef, 0x39, 0x79, 0x80, 0x1e, 0x37, 0xb5, 0x6b, 0x0d, 0x5b, 0xa3, - 0xc1, 0x15, 0xa5, 0x8d, 0x2e, 0xa5, 0x66, 0x45, 0xb0, 0xd3, 0x7b, 0x0a, 0xba, 0x06, 0x24, 0x2e, - 0x74, 0x0d, 0x6c, 0x92, 0x6f, 0x5b, 0xf2, 0x08, 0xfb, 0x4c, 0x85, 0xb9, 0x6b, 0x57, 0x66, 0xd3, - 0x86, 0x66, 0xff, 0xff, 0x69, 0x50, 0xad, 0xb9, 0xb8, 0x84, 0xc1, 0x1d, 0x6a, 0xe4, 0xda, 0x97, - 0x91, 0xd0, 0x04, 0xa0, 0xc3, 0x93, 0x08, 0x85, 0x76, 0xf6, 0x36, 0x75, 0x8e, 0xaa, 0x40, 0xe5, - 0x58, 0xa4, 0x0f, 0xed, 0x4c, 0xc9, 0xcf, 0xd2, 0xb1, 0x6f, 0x43, 0x18, 0x49, 0x15, 0x52, 0x96, - 0x31, 0xfe, 0x81, 0xbf, 0xed, 0x59, 0x96, 0xee, 0x22, 0xd4, 0xce, 0xbe, 0xf5, 0x7a, 0xfa, 0x33, - 0x30, 0x36, 0xa4, 0x79, 0x17, 0xe3, 0x62, 0xf2, 0x65, 0x9f, 0x2c, 0xe2, 0xf2, 0xc5, 0xe8, 0x9f, - 0x6a, 0xda, 0x37, 0xe9, 0xdf, 0x3a, 0xd5, 0x1d, 0xd7, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, - 0x54, 0x58, 0x93, 0x4f, 0x02, 0x00, 0x00, + // 324 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x41, 0x4b, 0xeb, 0x40, + 0x14, 0x85, 0x5f, 0xd2, 0x97, 0xbe, 0xd7, 0xfb, 0x9e, 0x18, 0xc6, 0x0a, 0x41, 0x5c, 0x94, 0x2c, + 0xa4, 0x2a, 0x4c, 0x49, 0x75, 0xe3, 0xc6, 0x85, 0x75, 0x23, 0x05, 0x19, 0x52, 0x8c, 0xe0, 0x6e, + 0x1c, 0x2f, 0x31, 0x24, 0x99, 0x29, 0x93, 0x69, 0x6b, 0xfe, 0x92, 0xbf, 0x52, 0x92, 0x4c, 0x2b, + 0x82, 0xe0, 0x6a, 0xee, 0x3d, 0xdf, 0x39, 0xc3, 0x30, 0x07, 0x0e, 0x84, 0x2a, 0x4b, 0x25, 0x27, + 0xdd, 0x41, 0x97, 0x5a, 0x19, 0x15, 0x5e, 0xc3, 0x70, 0x8e, 0xf5, 0xc2, 0xe8, 0x4c, 0xa6, 0x09, + 0x2f, 0x56, 0xc8, 0x78, 0xa6, 0x93, 0x88, 0xf8, 0xd0, 0xcb, 0xb1, 0x0e, 0x9c, 0x91, 0x33, 0x1e, + 0xc4, 0xcd, 0x48, 0x86, 0xe0, 0xad, 0x1b, 0x43, 0xe0, 0xb6, 0x5a, 0xb7, 0x84, 0x57, 0xb0, 0x3f, + 0xc7, 0xfa, 0x4e, 0x9a, 0x5d, 0xf8, 0xa7, 0xa8, 0xb7, 0x8d, 0x9e, 0x83, 0x37, 0x63, 0x0f, 0x49, + 0x44, 0x42, 0xf8, 0xbf, 0xaa, 0x78, 0x8a, 0x0c, 0xb5, 0x40, 0x69, 0x5a, 0x97, 0x13, 0x7f, 0xd1, + 0xc2, 0x4b, 0x80, 0x99, 0x2a, 0x4b, 0x2e, 0x5f, 0xaa, 0x24, 0x22, 0x27, 0xf0, 0x57, 0xd8, 0x2d, + 0x70, 0x46, 0xbd, 0xf1, 0xbf, 0x29, 0x50, 0x8b, 0x93, 0x28, 0xde, 0xb1, 0x90, 0xc1, 0x60, 0x27, + 0x93, 0x00, 0xfe, 0x58, 0x60, 0xdf, 0xb6, 0x5d, 0xc9, 0x29, 0xfc, 0xe6, 0x3a, 0xad, 0x02, 0xb7, + 0xbd, 0xea, 0x90, 0x7e, 0xf7, 0x23, 0x71, 0x6b, 0x39, 0x9b, 0xc2, 0xde, 0x2d, 0x1a, 0x14, 0x86, + 0xa9, 0x4c, 0x9a, 0x24, 0x22, 0x00, 0x7d, 0x51, 0x64, 0x28, 0x8d, 0xff, 0xab, 0x99, 0x2b, 0xd4, + 0x6b, 0xd4, 0xbe, 0x43, 0x06, 0xe0, 0x2d, 0xb5, 0x7a, 0xab, 0x7d, 0xf7, 0x26, 0x85, 0xb1, 0xd2, + 0x29, 0xe5, 0x4b, 0x2e, 0x5e, 0x91, 0x56, 0x79, 0xbd, 0xe1, 0x45, 0x9e, 0xc9, 0x46, 0x29, 0xa9, + 0x44, 0xb3, 0x51, 0x3a, 0xa7, 0x5d, 0x2b, 0xcc, 0x79, 0x3a, 0xfe, 0x34, 0x4c, 0x2c, 0xb4, 0x95, + 0x4d, 0xd6, 0xd1, 0xbb, 0x7b, 0xb4, 0xc8, 0xeb, 0x47, 0x9b, 0xbf, 0xef, 0x30, 0x6b, 0x9a, 0x14, + 0xaa, 0x78, 0xee, 0xb7, 0x9d, 0x5e, 0x7c, 0x04, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xd7, 0xb0, 0x33, + 0xea, 0x01, 0x00, 0x00, } diff --git a/reporter/network/common/v2/common.pb.go b/reporter/network/common/v2/common.pb.go index 6c5831e..0fa7768 100644 --- a/reporter/network/common/v2/common.pb.go +++ b/reporter/network/common/v2/common.pb.go @@ -23,74 +23,35 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // In most cases, detect point should be `server` or `client`. // Even in service mesh, this means `server`/`client` side sidecar // `proxy` is reserved only. -type DetectPoint int32 +type DetectPointV2 int32 const ( - DetectPoint_client DetectPoint = 0 - DetectPoint_server DetectPoint = 1 - DetectPoint_proxy DetectPoint = 2 + DetectPointV2_client DetectPointV2 = 0 + DetectPointV2_server DetectPointV2 = 1 + DetectPointV2_proxy DetectPointV2 = 2 ) -var DetectPoint_name = map[int32]string{ +var DetectPointV2_name = map[int32]string{ 0: "client", 1: "server", 2: "proxy", } -var DetectPoint_value = map[string]int32{ +var DetectPointV2_value = map[string]int32{ "client": 0, "server": 1, "proxy": 2, } -func (x DetectPoint) String() string { - return proto.EnumName(DetectPoint_name, int32(x)) +func (x DetectPointV2) String() string { + return proto.EnumName(DetectPointV2_name, int32(x)) } -func (DetectPoint) EnumDescriptor() ([]byte, []int) { +func (DetectPointV2) EnumDescriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{0} } -type ServiceType int32 - -const ( - // An agent works inside the normal business application. - ServiceType_normal ServiceType = 0 - // An agent works inside the database. - ServiceType_database ServiceType = 1 - // An agent works inside the MQ. - ServiceType_mq ServiceType = 2 - // An agent works inside the cache server. - ServiceType_cache ServiceType = 3 - // An agent works inside the browser. - ServiceType_browser ServiceType = 4 -) - -var ServiceType_name = map[int32]string{ - 0: "normal", - 1: "database", - 2: "mq", - 3: "cache", - 4: "browser", -} - -var ServiceType_value = map[string]int32{ - "normal": 0, - "database": 1, - "mq": 2, - "cache": 3, - "browser": 4, -} - -func (x ServiceType) String() string { - return proto.EnumName(ServiceType_name, int32(x)) -} - -func (ServiceType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_8f954d82c0b891f6, []int{1} -} - -type KeyStringValuePair struct { +type KeyStringValuePairV2 struct { Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -98,46 +59,46 @@ type KeyStringValuePair struct { XXX_sizecache int32 `json:"-"` } -func (m *KeyStringValuePair) Reset() { *m = KeyStringValuePair{} } -func (m *KeyStringValuePair) String() string { return proto.CompactTextString(m) } -func (*KeyStringValuePair) ProtoMessage() {} -func (*KeyStringValuePair) Descriptor() ([]byte, []int) { +func (m *KeyStringValuePairV2) Reset() { *m = KeyStringValuePairV2{} } +func (m *KeyStringValuePairV2) String() string { return proto.CompactTextString(m) } +func (*KeyStringValuePairV2) ProtoMessage() {} +func (*KeyStringValuePairV2) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{0} } -func (m *KeyStringValuePair) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_KeyStringValuePair.Unmarshal(m, b) +func (m *KeyStringValuePairV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_KeyStringValuePairV2.Unmarshal(m, b) } -func (m *KeyStringValuePair) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_KeyStringValuePair.Marshal(b, m, deterministic) +func (m *KeyStringValuePairV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_KeyStringValuePairV2.Marshal(b, m, deterministic) } -func (m *KeyStringValuePair) XXX_Merge(src proto.Message) { - xxx_messageInfo_KeyStringValuePair.Merge(m, src) +func (m *KeyStringValuePairV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_KeyStringValuePairV2.Merge(m, src) } -func (m *KeyStringValuePair) XXX_Size() int { - return xxx_messageInfo_KeyStringValuePair.Size(m) +func (m *KeyStringValuePairV2) XXX_Size() int { + return xxx_messageInfo_KeyStringValuePairV2.Size(m) } -func (m *KeyStringValuePair) XXX_DiscardUnknown() { - xxx_messageInfo_KeyStringValuePair.DiscardUnknown(m) +func (m *KeyStringValuePairV2) XXX_DiscardUnknown() { + xxx_messageInfo_KeyStringValuePairV2.DiscardUnknown(m) } -var xxx_messageInfo_KeyStringValuePair proto.InternalMessageInfo +var xxx_messageInfo_KeyStringValuePairV2 proto.InternalMessageInfo -func (m *KeyStringValuePair) GetKey() string { +func (m *KeyStringValuePairV2) GetKey() string { if m != nil { return m.Key } return "" } -func (m *KeyStringValuePair) GetValue() string { +func (m *KeyStringValuePairV2) GetValue() string { if m != nil { return m.Value } return "" } -type KeyIntValuePair struct { +type KeyIntValuePairV2 struct { Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Value int32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -145,164 +106,164 @@ type KeyIntValuePair struct { XXX_sizecache int32 `json:"-"` } -func (m *KeyIntValuePair) Reset() { *m = KeyIntValuePair{} } -func (m *KeyIntValuePair) String() string { return proto.CompactTextString(m) } -func (*KeyIntValuePair) ProtoMessage() {} -func (*KeyIntValuePair) Descriptor() ([]byte, []int) { +func (m *KeyIntValuePairV2) Reset() { *m = KeyIntValuePairV2{} } +func (m *KeyIntValuePairV2) String() string { return proto.CompactTextString(m) } +func (*KeyIntValuePairV2) ProtoMessage() {} +func (*KeyIntValuePairV2) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{1} } -func (m *KeyIntValuePair) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_KeyIntValuePair.Unmarshal(m, b) +func (m *KeyIntValuePairV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_KeyIntValuePairV2.Unmarshal(m, b) } -func (m *KeyIntValuePair) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_KeyIntValuePair.Marshal(b, m, deterministic) +func (m *KeyIntValuePairV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_KeyIntValuePairV2.Marshal(b, m, deterministic) } -func (m *KeyIntValuePair) XXX_Merge(src proto.Message) { - xxx_messageInfo_KeyIntValuePair.Merge(m, src) +func (m *KeyIntValuePairV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_KeyIntValuePairV2.Merge(m, src) } -func (m *KeyIntValuePair) XXX_Size() int { - return xxx_messageInfo_KeyIntValuePair.Size(m) +func (m *KeyIntValuePairV2) XXX_Size() int { + return xxx_messageInfo_KeyIntValuePairV2.Size(m) } -func (m *KeyIntValuePair) XXX_DiscardUnknown() { - xxx_messageInfo_KeyIntValuePair.DiscardUnknown(m) +func (m *KeyIntValuePairV2) XXX_DiscardUnknown() { + xxx_messageInfo_KeyIntValuePairV2.DiscardUnknown(m) } -var xxx_messageInfo_KeyIntValuePair proto.InternalMessageInfo +var xxx_messageInfo_KeyIntValuePairV2 proto.InternalMessageInfo -func (m *KeyIntValuePair) GetKey() string { +func (m *KeyIntValuePairV2) GetKey() string { if m != nil { return m.Key } return "" } -func (m *KeyIntValuePair) GetValue() int32 { +func (m *KeyIntValuePairV2) GetValue() int32 { if m != nil { return m.Value } return 0 } -type CPU struct { +type CPUV2 struct { UsagePercent float64 `protobuf:"fixed64,2,opt,name=usagePercent,proto3" json:"usagePercent,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *CPU) Reset() { *m = CPU{} } -func (m *CPU) String() string { return proto.CompactTextString(m) } -func (*CPU) ProtoMessage() {} -func (*CPU) Descriptor() ([]byte, []int) { +func (m *CPUV2) Reset() { *m = CPUV2{} } +func (m *CPUV2) String() string { return proto.CompactTextString(m) } +func (*CPUV2) ProtoMessage() {} +func (*CPUV2) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{2} } -func (m *CPU) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CPU.Unmarshal(m, b) +func (m *CPUV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CPUV2.Unmarshal(m, b) } -func (m *CPU) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CPU.Marshal(b, m, deterministic) +func (m *CPUV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CPUV2.Marshal(b, m, deterministic) } -func (m *CPU) XXX_Merge(src proto.Message) { - xxx_messageInfo_CPU.Merge(m, src) +func (m *CPUV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_CPUV2.Merge(m, src) } -func (m *CPU) XXX_Size() int { - return xxx_messageInfo_CPU.Size(m) +func (m *CPUV2) XXX_Size() int { + return xxx_messageInfo_CPUV2.Size(m) } -func (m *CPU) XXX_DiscardUnknown() { - xxx_messageInfo_CPU.DiscardUnknown(m) +func (m *CPUV2) XXX_DiscardUnknown() { + xxx_messageInfo_CPUV2.DiscardUnknown(m) } -var xxx_messageInfo_CPU proto.InternalMessageInfo +var xxx_messageInfo_CPUV2 proto.InternalMessageInfo -func (m *CPU) GetUsagePercent() float64 { +func (m *CPUV2) GetUsagePercent() float64 { if m != nil { return m.UsagePercent } return 0 } -type Commands struct { - Commands []*Command `protobuf:"bytes,1,rep,name=commands,proto3" json:"commands,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type CommandsV2 struct { + Commands []*CommandV2 `protobuf:"bytes,1,rep,name=commands,proto3" json:"commands,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Commands) Reset() { *m = Commands{} } -func (m *Commands) String() string { return proto.CompactTextString(m) } -func (*Commands) ProtoMessage() {} -func (*Commands) Descriptor() ([]byte, []int) { +func (m *CommandsV2) Reset() { *m = CommandsV2{} } +func (m *CommandsV2) String() string { return proto.CompactTextString(m) } +func (*CommandsV2) ProtoMessage() {} +func (*CommandsV2) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{3} } -func (m *Commands) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Commands.Unmarshal(m, b) +func (m *CommandsV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CommandsV2.Unmarshal(m, b) } -func (m *Commands) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Commands.Marshal(b, m, deterministic) +func (m *CommandsV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CommandsV2.Marshal(b, m, deterministic) } -func (m *Commands) XXX_Merge(src proto.Message) { - xxx_messageInfo_Commands.Merge(m, src) +func (m *CommandsV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommandsV2.Merge(m, src) } -func (m *Commands) XXX_Size() int { - return xxx_messageInfo_Commands.Size(m) +func (m *CommandsV2) XXX_Size() int { + return xxx_messageInfo_CommandsV2.Size(m) } -func (m *Commands) XXX_DiscardUnknown() { - xxx_messageInfo_Commands.DiscardUnknown(m) +func (m *CommandsV2) XXX_DiscardUnknown() { + xxx_messageInfo_CommandsV2.DiscardUnknown(m) } -var xxx_messageInfo_Commands proto.InternalMessageInfo +var xxx_messageInfo_CommandsV2 proto.InternalMessageInfo -func (m *Commands) GetCommands() []*Command { +func (m *CommandsV2) GetCommands() []*CommandV2 { if m != nil { return m.Commands } return nil } -type Command struct { - Command string `protobuf:"bytes,1,opt,name=command,proto3" json:"command,omitempty"` - Args []*KeyStringValuePair `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type CommandV2 struct { + Command string `protobuf:"bytes,1,opt,name=command,proto3" json:"command,omitempty"` + Args []*KeyStringValuePairV2 `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Command) Reset() { *m = Command{} } -func (m *Command) String() string { return proto.CompactTextString(m) } -func (*Command) ProtoMessage() {} -func (*Command) Descriptor() ([]byte, []int) { +func (m *CommandV2) Reset() { *m = CommandV2{} } +func (m *CommandV2) String() string { return proto.CompactTextString(m) } +func (*CommandV2) ProtoMessage() {} +func (*CommandV2) Descriptor() ([]byte, []int) { return fileDescriptor_8f954d82c0b891f6, []int{4} } -func (m *Command) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Command.Unmarshal(m, b) +func (m *CommandV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CommandV2.Unmarshal(m, b) } -func (m *Command) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Command.Marshal(b, m, deterministic) +func (m *CommandV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CommandV2.Marshal(b, m, deterministic) } -func (m *Command) XXX_Merge(src proto.Message) { - xxx_messageInfo_Command.Merge(m, src) +func (m *CommandV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommandV2.Merge(m, src) } -func (m *Command) XXX_Size() int { - return xxx_messageInfo_Command.Size(m) +func (m *CommandV2) XXX_Size() int { + return xxx_messageInfo_CommandV2.Size(m) } -func (m *Command) XXX_DiscardUnknown() { - xxx_messageInfo_Command.DiscardUnknown(m) +func (m *CommandV2) XXX_DiscardUnknown() { + xxx_messageInfo_CommandV2.DiscardUnknown(m) } -var xxx_messageInfo_Command proto.InternalMessageInfo +var xxx_messageInfo_CommandV2 proto.InternalMessageInfo -func (m *Command) GetCommand() string { +func (m *CommandV2) GetCommand() string { if m != nil { return m.Command } return "" } -func (m *Command) GetArgs() []*KeyStringValuePair { +func (m *CommandV2) GetArgs() []*KeyStringValuePairV2 { if m != nil { return m.Args } @@ -310,41 +271,36 @@ func (m *Command) GetArgs() []*KeyStringValuePair { } func init() { - proto.RegisterEnum("skywalking.network.protocol.common.DetectPoint", DetectPoint_name, DetectPoint_value) - proto.RegisterEnum("skywalking.network.protocol.common.ServiceType", ServiceType_name, ServiceType_value) - proto.RegisterType((*KeyStringValuePair)(nil), "skywalking.network.protocol.common.KeyStringValuePair") - proto.RegisterType((*KeyIntValuePair)(nil), "skywalking.network.protocol.common.KeyIntValuePair") - proto.RegisterType((*CPU)(nil), "skywalking.network.protocol.common.CPU") - proto.RegisterType((*Commands)(nil), "skywalking.network.protocol.common.Commands") - proto.RegisterType((*Command)(nil), "skywalking.network.protocol.common.Command") + proto.RegisterEnum("DetectPointV2", DetectPointV2_name, DetectPointV2_value) + proto.RegisterType((*KeyStringValuePairV2)(nil), "KeyStringValuePairV2") + proto.RegisterType((*KeyIntValuePairV2)(nil), "KeyIntValuePairV2") + proto.RegisterType((*CPUV2)(nil), "CPUV2") + proto.RegisterType((*CommandsV2)(nil), "CommandsV2") + proto.RegisterType((*CommandV2)(nil), "CommandV2") } func init() { proto.RegisterFile("common/common.proto", fileDescriptor_8f954d82c0b891f6) } var fileDescriptor_8f954d82c0b891f6 = []byte{ - // 378 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0xab, 0xd3, 0x40, - 0x10, 0x6f, 0x92, 0x7e, 0x4e, 0x0a, 0x2e, 0xab, 0x87, 0x20, 0x1e, 0x4a, 0x4e, 0xb5, 0x42, 0x2a, - 0x15, 0x04, 0xc1, 0x93, 0x15, 0x8a, 0x16, 0x24, 0x24, 0x7e, 0x80, 0xb7, 0xed, 0x76, 0x88, 0x21, - 0xc9, 0x6e, 0xdc, 0x6c, 0x53, 0xf3, 0x2f, 0xf9, 0x57, 0x4a, 0x92, 0x6d, 0x7d, 0x8f, 0x77, 0x78, - 0x3d, 0x65, 0xe6, 0xf7, 0x91, 0x99, 0xf9, 0xb1, 0xf0, 0x94, 0xcb, 0xa2, 0x90, 0x62, 0xdd, 0x7f, - 0x82, 0x52, 0x49, 0x2d, 0xa9, 0x5f, 0x65, 0xcd, 0x99, 0xe5, 0x59, 0x2a, 0x92, 0x40, 0xa0, 0x3e, - 0x4b, 0x95, 0xf5, 0x0c, 0x97, 0x79, 0xd0, 0x2b, 0xfd, 0xf7, 0x40, 0xf7, 0xd8, 0xc4, 0x5a, 0xa5, - 0x22, 0xf9, 0xce, 0xf2, 0x13, 0x86, 0x2c, 0x55, 0x94, 0x80, 0x93, 0x61, 0xe3, 0x59, 0x0b, 0x6b, - 0x39, 0x8b, 0xda, 0x92, 0x3e, 0x83, 0x51, 0xdd, 0xd2, 0x9e, 0xdd, 0x61, 0x7d, 0xe3, 0xbf, 0x83, - 0x27, 0x7b, 0x6c, 0x3e, 0x09, 0x7d, 0xb3, 0x75, 0x74, 0xb1, 0xbe, 0x04, 0x67, 0x1b, 0x7e, 0xa3, - 0x3e, 0xcc, 0x4f, 0x15, 0x4b, 0x30, 0x44, 0xc5, 0x51, 0xe8, 0x4e, 0x63, 0x45, 0xf7, 0x30, 0x3f, - 0x86, 0xe9, 0x56, 0x16, 0x05, 0x13, 0xc7, 0x8a, 0xee, 0x60, 0xca, 0x4d, 0xed, 0x59, 0x0b, 0x67, - 0xe9, 0x6e, 0x5e, 0x05, 0x8f, 0x9f, 0x19, 0x18, 0x7f, 0x74, 0x35, 0xfb, 0x12, 0x26, 0x06, 0xa4, - 0x1e, 0x4c, 0x0c, 0x6c, 0xd6, 0xbe, 0xb4, 0xf4, 0x33, 0x0c, 0x99, 0x4a, 0x2a, 0xcf, 0xee, 0x26, - 0xbd, 0xbd, 0x65, 0xd2, 0xc3, 0x34, 0xa3, 0xee, 0x1f, 0xab, 0xd7, 0xe0, 0x7e, 0x44, 0x8d, 0x5c, - 0x87, 0x32, 0x15, 0x9a, 0x02, 0x8c, 0x79, 0x9e, 0xa2, 0xd0, 0x64, 0xd0, 0xd6, 0x15, 0xaa, 0x1a, - 0x15, 0xb1, 0xe8, 0x0c, 0x46, 0xa5, 0x92, 0x7f, 0x1a, 0x62, 0xaf, 0x76, 0xe0, 0xc6, 0xa8, 0xea, - 0x94, 0xe3, 0xd7, 0xa6, 0xc4, 0x56, 0x25, 0xa4, 0x2a, 0x58, 0x4e, 0x06, 0x74, 0x0e, 0xd3, 0x23, - 0xd3, 0xec, 0xc0, 0x2a, 0x24, 0x16, 0x1d, 0x83, 0x5d, 0xfc, 0x26, 0x76, 0xeb, 0xe5, 0x8c, 0xff, - 0x42, 0xe2, 0x50, 0x17, 0x26, 0x07, 0x25, 0xcf, 0x15, 0x2a, 0x32, 0xfc, 0x90, 0xc0, 0x52, 0xaa, - 0x24, 0x60, 0x65, 0x4b, 0xde, 0x3d, 0x82, 0x95, 0xc5, 0xf5, 0x90, 0x7e, 0xff, 0xd0, 0xfa, 0xf9, - 0xe2, 0xbf, 0x60, 0x6d, 0x48, 0xf3, 0xae, 0xd6, 0xf5, 0xe6, 0xaf, 0xfd, 0x3c, 0xce, 0x9a, 0x1f, - 0xc6, 0xff, 0xa5, 0xa7, 0x43, 0x93, 0xc1, 0x61, 0xdc, 0xa5, 0xf1, 0xe6, 0x5f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xe2, 0x02, 0x58, 0x1a, 0x8f, 0x02, 0x00, 0x00, + // 320 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0x41, 0x4b, 0xfb, 0x30, + 0x18, 0xc6, 0xff, 0xed, 0xfe, 0x9d, 0xee, 0x55, 0xa1, 0xc6, 0x09, 0x45, 0x3c, 0x8c, 0x1e, 0x64, + 0x2a, 0x74, 0x10, 0xbd, 0x09, 0x1e, 0x9c, 0x17, 0x19, 0x48, 0xe8, 0xb0, 0x82, 0xb7, 0x18, 0x5f, + 0x6a, 0x69, 0x9b, 0x8c, 0x34, 0xdb, 0xec, 0x57, 0xf2, 0x53, 0x4a, 0xdb, 0x6c, 0x22, 0x78, 0xf1, + 0x94, 0xf7, 0x7d, 0x7e, 0xcf, 0x13, 0x42, 0x1e, 0x38, 0x12, 0xaa, 0x2c, 0x95, 0x9c, 0x74, 0x47, + 0xb4, 0xd0, 0xca, 0xa8, 0xf0, 0x16, 0x86, 0x33, 0xac, 0xe7, 0x46, 0x67, 0x32, 0x4d, 0x78, 0xb1, + 0x44, 0xc6, 0x33, 0x9d, 0x50, 0xe2, 0x43, 0x2f, 0xc7, 0x3a, 0x70, 0x46, 0xce, 0x78, 0x10, 0x37, + 0x23, 0x19, 0x82, 0xb7, 0x6a, 0x0c, 0x81, 0xdb, 0x6a, 0xdd, 0x12, 0xde, 0xc0, 0xe1, 0x0c, 0xeb, + 0x07, 0x69, 0xfe, 0x10, 0xf6, 0x36, 0xe1, 0x4b, 0xf0, 0xa6, 0xec, 0x29, 0xa1, 0x24, 0x84, 0xfd, + 0x65, 0xc5, 0x53, 0x64, 0xa8, 0x05, 0x4a, 0xd3, 0xba, 0x9c, 0xf8, 0x87, 0x16, 0x5e, 0x03, 0x4c, + 0x55, 0x59, 0x72, 0xf9, 0x56, 0x25, 0x94, 0x9c, 0xc1, 0xae, 0xb0, 0x5b, 0xe0, 0x8c, 0x7a, 0xe3, + 0x3d, 0x0a, 0x91, 0xc5, 0x09, 0x8d, 0xb7, 0x2c, 0x64, 0x30, 0xd8, 0xca, 0x24, 0x80, 0x1d, 0x0b, + 0xec, 0xdb, 0x36, 0x2b, 0x39, 0x87, 0xff, 0x5c, 0xa7, 0x55, 0xe0, 0xb6, 0x57, 0x1d, 0x47, 0xbf, + 0xfd, 0x49, 0xdc, 0x5a, 0x2e, 0x28, 0x1c, 0xdc, 0xa3, 0x41, 0x61, 0x98, 0xca, 0xa4, 0x49, 0x28, + 0x01, 0xe8, 0x8b, 0x22, 0x43, 0x69, 0xfc, 0x7f, 0xcd, 0x5c, 0xa1, 0x5e, 0xa1, 0xf6, 0x1d, 0x32, + 0x00, 0x6f, 0xa1, 0xd5, 0x47, 0xed, 0xbb, 0x77, 0x29, 0x8c, 0x95, 0x4e, 0x23, 0xbe, 0xe0, 0xe2, + 0x1d, 0xa3, 0x2a, 0xaf, 0xd7, 0xbc, 0xc8, 0x33, 0xd9, 0x28, 0x65, 0x24, 0xd1, 0xac, 0x95, 0xce, + 0xa3, 0xae, 0x17, 0xe6, 0xbc, 0x9c, 0x7e, 0x1b, 0x26, 0x16, 0xda, 0xd2, 0x26, 0x2b, 0xfa, 0xe9, + 0x9e, 0xcc, 0xf3, 0xfa, 0xd9, 0xe6, 0x1f, 0x3b, 0xcc, 0x9a, 0x2e, 0x85, 0x2a, 0x5e, 0xfb, 0x6d, + 0xab, 0x57, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x84, 0x2a, 0x9c, 0x20, 0xec, 0x01, 0x00, 0x00, } diff --git a/reporter/network/language/agent/v1/ApplicationRegisterService.pb.go b/reporter/network/language/agent/v1/ApplicationRegisterService.pb.go index 36a5d36..7575351 100644 --- a/reporter/network/language/agent/v1/ApplicationRegisterService.pb.go +++ b/reporter/network/language/agent/v1/ApplicationRegisterService.pb.go @@ -103,8 +103,8 @@ func (m *ApplicationMapping) GetApplication() *KeyWithIntegerValue { } func init() { - proto.RegisterType((*Application)(nil), "skywalking.network.protocol.agent.v1.Application") - proto.RegisterType((*ApplicationMapping)(nil), "skywalking.network.protocol.agent.v1.ApplicationMapping") + proto.RegisterType((*Application)(nil), "Application") + proto.RegisterType((*ApplicationMapping)(nil), "ApplicationMapping") } func init() { @@ -112,25 +112,24 @@ func init() { } var fileDescriptor_e1c2b07c1f73c603 = []byte{ - // 279 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0x4f, 0x4b, 0xc4, 0x30, - 0x10, 0xc5, 0xad, 0x07, 0xc1, 0xf4, 0x20, 0x04, 0x41, 0xe9, 0x49, 0x8a, 0x87, 0x5e, 0x4c, 0xed, - 0x0a, 0xea, 0x55, 0x3d, 0x89, 0x7f, 0x58, 0xba, 0xe0, 0x82, 0xb7, 0xb1, 0x0e, 0xd9, 0xd0, 0x98, - 0x84, 0x6c, 0xb6, 0xa5, 0xdf, 0xc0, 0x6f, 0x22, 0xf8, 0x29, 0x85, 0x36, 0xbb, 0x86, 0xa2, 0xa0, - 0xc7, 0x36, 0xef, 0xfd, 0xe6, 0xcd, 0x3c, 0x92, 0x4b, 0x50, 0x7c, 0x05, 0x1c, 0x4f, 0x80, 0xa3, - 0x72, 0xf9, 0x95, 0x31, 0x52, 0x54, 0xe0, 0x84, 0x56, 0x25, 0x72, 0xb1, 0x74, 0x68, 0x67, 0x68, - 0x1b, 0x51, 0x21, 0x33, 0x56, 0x3b, 0x4d, 0x8f, 0x97, 0x75, 0xd7, 0x82, 0xac, 0x85, 0xe2, 0x4c, - 0xa1, 0x6b, 0xb5, 0xad, 0x87, 0x97, 0x4a, 0x4b, 0xd6, 0x33, 0x58, 0x53, 0x24, 0xd9, 0x08, 0x7b, - 0x87, 0xdd, 0x5c, 0xb8, 0xc5, 0xad, 0x72, 0xc8, 0xd1, 0x3e, 0x81, 0x5c, 0x79, 0x5e, 0x7a, 0x41, - 0xe2, 0x60, 0x26, 0xcd, 0xc8, 0x1e, 0x7c, 0x7f, 0xde, 0xe8, 0x57, 0x3c, 0x8c, 0x8e, 0xa2, 0x6c, - 0xb7, 0x1c, 0xff, 0x4e, 0xef, 0x09, 0x0d, 0x8c, 0x0f, 0x60, 0x8c, 0x50, 0x9c, 0x9e, 0x93, 0x38, - 0x10, 0xf6, 0xde, 0x78, 0xb2, 0xcf, 0x7e, 0x98, 0x5f, 0x86, 0xc2, 0xc9, 0x47, 0x44, 0x92, 0xdf, - 0x77, 0xa7, 0xef, 0x11, 0x39, 0x18, 0x05, 0x58, 0x4b, 0x68, 0xc1, 0xfe, 0x72, 0x12, 0x16, 0xd0, - 0x93, 0xcb, 0x7f, 0x5b, 0xfc, 0x7e, 0xe9, 0xd6, 0x75, 0x4b, 0x4e, 0xb5, 0xe5, 0x0c, 0x0c, 0x54, - 0x0b, 0x0c, 0x39, 0x60, 0xde, 0x36, 0xac, 0xf5, 0xf9, 0x07, 0xd6, 0x34, 0x7a, 0x0e, 0x6a, 0xcb, - 0xbd, 0x68, 0x53, 0x7d, 0x3e, 0x74, 0xd4, 0x14, 0x9f, 0xdb, 0xc9, 0xac, 0xee, 0xe6, 0x9e, 0xf7, - 0x38, 0xc8, 0xa6, 0x3e, 0xd6, 0xcb, 0x4e, 0x1f, 0xf0, 0xec, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xa5, - 0xe7, 0xe2, 0x75, 0x33, 0x02, 0x00, 0x00, + // 262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4b, 0xc3, 0x30, + 0x14, 0xc7, 0xad, 0x07, 0xc1, 0x54, 0x10, 0xa2, 0xa0, 0xf4, 0x24, 0xc5, 0x43, 0x2f, 0xbe, 0xea, + 0x04, 0xbd, 0x09, 0xea, 0x49, 0xfc, 0xc1, 0xe8, 0xc0, 0x81, 0x78, 0x79, 0xd6, 0x47, 0x16, 0x1a, + 0x93, 0x90, 0x65, 0x2b, 0xfd, 0x97, 0xfc, 0x2b, 0x65, 0x5d, 0xe7, 0x42, 0x75, 0xc7, 0x3c, 0x3e, + 0xdf, 0xf7, 0x4d, 0x3e, 0x61, 0xb9, 0x42, 0x2d, 0x66, 0x28, 0xe8, 0x0c, 0x05, 0x69, 0x9f, 0xdf, + 0x5a, 0xab, 0x64, 0x89, 0x5e, 0x1a, 0x5d, 0x90, 0x90, 0x53, 0x4f, 0x6e, 0x44, 0x6e, 0x2e, 0x4b, + 0x02, 0xeb, 0x8c, 0x37, 0x49, 0xd6, 0x0b, 0x3c, 0x52, 0x33, 0x96, 0x7e, 0xf2, 0xa0, 0x3d, 0x09, + 0x72, 0xaf, 0xa8, 0x66, 0x1d, 0x99, 0x5e, 0xb3, 0x38, 0xd8, 0xc6, 0x33, 0xb6, 0x8f, 0xeb, 0xe3, + 0xbd, 0xf9, 0xa4, 0xe3, 0xe8, 0x24, 0xca, 0x76, 0x8b, 0xfe, 0x38, 0x7d, 0x62, 0x3c, 0x08, 0x3e, + 0xa3, 0xb5, 0x52, 0x0b, 0x7e, 0xc5, 0xe2, 0x00, 0x6c, 0xb3, 0xf1, 0xe0, 0x10, 0xfe, 0xe9, 0x2f, + 0x42, 0x70, 0xf0, 0xce, 0x92, 0xcd, 0x8f, 0xe2, 0x37, 0xec, 0xa8, 0x57, 0xbf, 0x22, 0xf8, 0x1e, + 0x04, 0xb9, 0xe4, 0x00, 0xfe, 0xde, 0x29, 0xdd, 0xba, 0xab, 0xd9, 0xb9, 0x71, 0x02, 0xd0, 0x62, + 0x39, 0x21, 0x98, 0x56, 0x4d, 0x8d, 0xaa, 0x92, 0x7a, 0x31, 0xf9, 0x02, 0x4d, 0xbe, 0x36, 0xae, + 0x82, 0x95, 0x32, 0x68, 0x95, 0x0d, 0xa3, 0xb7, 0xd3, 0x35, 0x98, 0x77, 0xd0, 0xef, 0x47, 0xe4, + 0x4b, 0xaf, 0xf3, 0x8b, 0xef, 0xed, 0x64, 0x54, 0x35, 0xe3, 0x6e, 0xdf, 0xcb, 0x12, 0x1b, 0x2e, + 0xd4, 0x96, 0x46, 0x7d, 0xec, 0xb4, 0x92, 0x2f, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x02, 0x5e, + 0x49, 0x1c, 0xc1, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -158,7 +157,7 @@ func NewApplicationRegisterServiceClient(cc *grpc.ClientConn) ApplicationRegiste func (c *applicationRegisterServiceClient) ApplicationCodeRegister(ctx context.Context, in *Application, opts ...grpc.CallOption) (*ApplicationMapping, error) { out := new(ApplicationMapping) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.v1.ApplicationRegisterService/applicationCodeRegister", in, out, opts...) + err := c.cc.Invoke(ctx, "/ApplicationRegisterService/applicationCodeRegister", in, out, opts...) if err != nil { return nil, err } @@ -192,7 +191,7 @@ func _ApplicationRegisterService_ApplicationCodeRegister_Handler(srv interface{} } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.v1.ApplicationRegisterService/ApplicationCodeRegister", + FullMethod: "/ApplicationRegisterService/ApplicationCodeRegister", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ApplicationRegisterServiceServer).ApplicationCodeRegister(ctx, req.(*Application)) @@ -201,7 +200,7 @@ func _ApplicationRegisterService_ApplicationCodeRegister_Handler(srv interface{} } var _ApplicationRegisterService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v1.ApplicationRegisterService", + ServiceName: "ApplicationRegisterService", HandlerType: (*ApplicationRegisterServiceServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/reporter/network/language/agent/v1/CLR.pb.go b/reporter/network/language/agent/v1/CLR.pb.go index f5760e7..78021b1 100644 --- a/reporter/network/language/agent/v1/CLR.pb.go +++ b/reporter/network/language/agent/v1/CLR.pb.go @@ -5,9 +5,9 @@ package v1 import ( fmt "fmt" - v1 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v1" proto "github.com/golang/protobuf/proto" math "math" + v1 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v1" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,70 +21,70 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type CLRMetric struct { - Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` - Cpu *v1.CPU `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` - Gc *ClrGC `protobuf:"bytes,3,opt,name=gc,proto3" json:"gc,omitempty"` - Thread *ClrThread `protobuf:"bytes,4,opt,name=thread,proto3" json:"thread,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type CLRMetricV1 struct { + Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` + Cpu *v1.CPUV1 `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` + Gc *ClrGCV1 `protobuf:"bytes,3,opt,name=gc,proto3" json:"gc,omitempty"` + Thread *ClrThreadV1 `protobuf:"bytes,4,opt,name=thread,proto3" json:"thread,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *CLRMetric) Reset() { *m = CLRMetric{} } -func (m *CLRMetric) String() string { return proto.CompactTextString(m) } -func (*CLRMetric) ProtoMessage() {} -func (*CLRMetric) Descriptor() ([]byte, []int) { +func (m *CLRMetricV1) Reset() { *m = CLRMetricV1{} } +func (m *CLRMetricV1) String() string { return proto.CompactTextString(m) } +func (*CLRMetricV1) ProtoMessage() {} +func (*CLRMetricV1) Descriptor() ([]byte, []int) { return fileDescriptor_a10d56830892247a, []int{0} } -func (m *CLRMetric) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CLRMetric.Unmarshal(m, b) +func (m *CLRMetricV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CLRMetricV1.Unmarshal(m, b) } -func (m *CLRMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CLRMetric.Marshal(b, m, deterministic) +func (m *CLRMetricV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CLRMetricV1.Marshal(b, m, deterministic) } -func (m *CLRMetric) XXX_Merge(src proto.Message) { - xxx_messageInfo_CLRMetric.Merge(m, src) +func (m *CLRMetricV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_CLRMetricV1.Merge(m, src) } -func (m *CLRMetric) XXX_Size() int { - return xxx_messageInfo_CLRMetric.Size(m) +func (m *CLRMetricV1) XXX_Size() int { + return xxx_messageInfo_CLRMetricV1.Size(m) } -func (m *CLRMetric) XXX_DiscardUnknown() { - xxx_messageInfo_CLRMetric.DiscardUnknown(m) +func (m *CLRMetricV1) XXX_DiscardUnknown() { + xxx_messageInfo_CLRMetricV1.DiscardUnknown(m) } -var xxx_messageInfo_CLRMetric proto.InternalMessageInfo +var xxx_messageInfo_CLRMetricV1 proto.InternalMessageInfo -func (m *CLRMetric) GetTime() int64 { +func (m *CLRMetricV1) GetTime() int64 { if m != nil { return m.Time } return 0 } -func (m *CLRMetric) GetCpu() *v1.CPU { +func (m *CLRMetricV1) GetCpu() *v1.CPUV1 { if m != nil { return m.Cpu } return nil } -func (m *CLRMetric) GetGc() *ClrGC { +func (m *CLRMetricV1) GetGc() *ClrGCV1 { if m != nil { return m.Gc } return nil } -func (m *CLRMetric) GetThread() *ClrThread { +func (m *CLRMetricV1) GetThread() *ClrThreadV1 { if m != nil { return m.Thread } return nil } -type ClrGC struct { +type ClrGCV1 struct { Gen0CollectCount int64 `protobuf:"varint,1,opt,name=Gen0CollectCount,proto3" json:"Gen0CollectCount,omitempty"` Gen1CollectCount int64 `protobuf:"varint,2,opt,name=Gen1CollectCount,proto3" json:"Gen1CollectCount,omitempty"` Gen2CollectCount int64 `protobuf:"varint,3,opt,name=Gen2CollectCount,proto3" json:"Gen2CollectCount,omitempty"` @@ -94,60 +94,60 @@ type ClrGC struct { XXX_sizecache int32 `json:"-"` } -func (m *ClrGC) Reset() { *m = ClrGC{} } -func (m *ClrGC) String() string { return proto.CompactTextString(m) } -func (*ClrGC) ProtoMessage() {} -func (*ClrGC) Descriptor() ([]byte, []int) { +func (m *ClrGCV1) Reset() { *m = ClrGCV1{} } +func (m *ClrGCV1) String() string { return proto.CompactTextString(m) } +func (*ClrGCV1) ProtoMessage() {} +func (*ClrGCV1) Descriptor() ([]byte, []int) { return fileDescriptor_a10d56830892247a, []int{1} } -func (m *ClrGC) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ClrGC.Unmarshal(m, b) +func (m *ClrGCV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ClrGCV1.Unmarshal(m, b) } -func (m *ClrGC) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ClrGC.Marshal(b, m, deterministic) +func (m *ClrGCV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ClrGCV1.Marshal(b, m, deterministic) } -func (m *ClrGC) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClrGC.Merge(m, src) +func (m *ClrGCV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClrGCV1.Merge(m, src) } -func (m *ClrGC) XXX_Size() int { - return xxx_messageInfo_ClrGC.Size(m) +func (m *ClrGCV1) XXX_Size() int { + return xxx_messageInfo_ClrGCV1.Size(m) } -func (m *ClrGC) XXX_DiscardUnknown() { - xxx_messageInfo_ClrGC.DiscardUnknown(m) +func (m *ClrGCV1) XXX_DiscardUnknown() { + xxx_messageInfo_ClrGCV1.DiscardUnknown(m) } -var xxx_messageInfo_ClrGC proto.InternalMessageInfo +var xxx_messageInfo_ClrGCV1 proto.InternalMessageInfo -func (m *ClrGC) GetGen0CollectCount() int64 { +func (m *ClrGCV1) GetGen0CollectCount() int64 { if m != nil { return m.Gen0CollectCount } return 0 } -func (m *ClrGC) GetGen1CollectCount() int64 { +func (m *ClrGCV1) GetGen1CollectCount() int64 { if m != nil { return m.Gen1CollectCount } return 0 } -func (m *ClrGC) GetGen2CollectCount() int64 { +func (m *ClrGCV1) GetGen2CollectCount() int64 { if m != nil { return m.Gen2CollectCount } return 0 } -func (m *ClrGC) GetHeapMemory() int64 { +func (m *ClrGCV1) GetHeapMemory() int64 { if m != nil { return m.HeapMemory } return 0 } -type ClrThread struct { +type ClrThreadV1 struct { AvailableCompletionPortThreads int32 `protobuf:"varint,1,opt,name=AvailableCompletionPortThreads,proto3" json:"AvailableCompletionPortThreads,omitempty"` AvailableWorkerThreads int32 `protobuf:"varint,2,opt,name=AvailableWorkerThreads,proto3" json:"AvailableWorkerThreads,omitempty"` MaxCompletionPortThreads int32 `protobuf:"varint,3,opt,name=MaxCompletionPortThreads,proto3" json:"MaxCompletionPortThreads,omitempty"` @@ -157,53 +157,53 @@ type ClrThread struct { XXX_sizecache int32 `json:"-"` } -func (m *ClrThread) Reset() { *m = ClrThread{} } -func (m *ClrThread) String() string { return proto.CompactTextString(m) } -func (*ClrThread) ProtoMessage() {} -func (*ClrThread) Descriptor() ([]byte, []int) { +func (m *ClrThreadV1) Reset() { *m = ClrThreadV1{} } +func (m *ClrThreadV1) String() string { return proto.CompactTextString(m) } +func (*ClrThreadV1) ProtoMessage() {} +func (*ClrThreadV1) Descriptor() ([]byte, []int) { return fileDescriptor_a10d56830892247a, []int{2} } -func (m *ClrThread) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ClrThread.Unmarshal(m, b) +func (m *ClrThreadV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ClrThreadV1.Unmarshal(m, b) } -func (m *ClrThread) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ClrThread.Marshal(b, m, deterministic) +func (m *ClrThreadV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ClrThreadV1.Marshal(b, m, deterministic) } -func (m *ClrThread) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClrThread.Merge(m, src) +func (m *ClrThreadV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClrThreadV1.Merge(m, src) } -func (m *ClrThread) XXX_Size() int { - return xxx_messageInfo_ClrThread.Size(m) +func (m *ClrThreadV1) XXX_Size() int { + return xxx_messageInfo_ClrThreadV1.Size(m) } -func (m *ClrThread) XXX_DiscardUnknown() { - xxx_messageInfo_ClrThread.DiscardUnknown(m) +func (m *ClrThreadV1) XXX_DiscardUnknown() { + xxx_messageInfo_ClrThreadV1.DiscardUnknown(m) } -var xxx_messageInfo_ClrThread proto.InternalMessageInfo +var xxx_messageInfo_ClrThreadV1 proto.InternalMessageInfo -func (m *ClrThread) GetAvailableCompletionPortThreads() int32 { +func (m *ClrThreadV1) GetAvailableCompletionPortThreads() int32 { if m != nil { return m.AvailableCompletionPortThreads } return 0 } -func (m *ClrThread) GetAvailableWorkerThreads() int32 { +func (m *ClrThreadV1) GetAvailableWorkerThreads() int32 { if m != nil { return m.AvailableWorkerThreads } return 0 } -func (m *ClrThread) GetMaxCompletionPortThreads() int32 { +func (m *ClrThreadV1) GetMaxCompletionPortThreads() int32 { if m != nil { return m.MaxCompletionPortThreads } return 0 } -func (m *ClrThread) GetMaxWorkerThreads() int32 { +func (m *ClrThreadV1) GetMaxWorkerThreads() int32 { if m != nil { return m.MaxWorkerThreads } @@ -211,38 +211,37 @@ func (m *ClrThread) GetMaxWorkerThreads() int32 { } func init() { - proto.RegisterType((*CLRMetric)(nil), "skywalking.network.protocol.common.v1.CLRMetric") - proto.RegisterType((*ClrGC)(nil), "skywalking.network.protocol.common.v1.ClrGC") - proto.RegisterType((*ClrThread)(nil), "skywalking.network.protocol.common.v1.ClrThread") + proto.RegisterType((*CLRMetricV1)(nil), "CLRMetricV1") + proto.RegisterType((*ClrGCV1)(nil), "ClrGCV1") + proto.RegisterType((*ClrThreadV1)(nil), "ClrThreadV1") } func init() { proto.RegisterFile("common/CLR.proto", fileDescriptor_a10d56830892247a) } var fileDescriptor_a10d56830892247a = []byte{ - // 395 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xdf, 0xea, 0xda, 0x30, - 0x14, 0xc7, 0x69, 0xeb, 0x4f, 0x58, 0x76, 0x23, 0x19, 0x8c, 0xe2, 0x85, 0x88, 0x6c, 0x20, 0x32, - 0x52, 0xeb, 0x60, 0x17, 0xc3, 0x9b, 0xad, 0x30, 0xbd, 0xb0, 0xa3, 0x64, 0x1b, 0xc2, 0xee, 0x62, - 0x16, 0x6a, 0x69, 0x9a, 0x94, 0x18, 0xff, 0xbd, 0xd2, 0xf6, 0x5c, 0x7b, 0x82, 0xbd, 0xc0, 0x30, - 0x8d, 0x9d, 0x45, 0x65, 0xde, 0xc9, 0xf7, 0x7c, 0x3e, 0xe7, 0x78, 0x7a, 0x02, 0x3a, 0x54, 0x16, - 0x85, 0x14, 0x41, 0xb4, 0xc0, 0xa8, 0x54, 0x52, 0x4b, 0xf8, 0x7a, 0x93, 0x1f, 0xf7, 0x84, 0xe7, - 0x99, 0x48, 0x91, 0x60, 0x7a, 0x2f, 0x55, 0x5e, 0x55, 0xa8, 0xe4, 0xa8, 0xa2, 0xd1, 0x2e, 0xec, - 0xbe, 0xb0, 0xa2, 0x4d, 0x0c, 0x31, 0xf8, 0xed, 0x80, 0x67, 0xd1, 0x02, 0xc7, 0x4c, 0xab, 0x8c, - 0x42, 0x08, 0x5a, 0x3a, 0x2b, 0x98, 0xef, 0xf4, 0x9d, 0xa1, 0x87, 0xcd, 0x6f, 0x38, 0x05, 0x1e, - 0x2d, 0xb7, 0xbe, 0xdb, 0x77, 0x86, 0xcf, 0x27, 0x23, 0xf4, 0xd0, 0x2c, 0x14, 0x25, 0xdf, 0xf0, - 0x49, 0x83, 0x53, 0xe0, 0xa6, 0xd4, 0xf7, 0x8c, 0xfc, 0xe6, 0x51, 0x99, 0xab, 0x59, 0x84, 0xdd, - 0x94, 0xc2, 0x39, 0x68, 0xeb, 0xb5, 0x62, 0xe4, 0x87, 0xdf, 0x32, 0x1d, 0xc6, 0x8f, 0x77, 0xf8, - 0x6a, 0x3c, 0x6c, 0xfd, 0xc1, 0x2f, 0x07, 0x3c, 0x99, 0xbe, 0x70, 0x04, 0x3a, 0x33, 0x26, 0xc6, - 0x91, 0xe4, 0x9c, 0x51, 0x1d, 0xc9, 0xad, 0xd0, 0x76, 0xdf, 0xab, 0xdc, 0xb2, 0x61, 0x83, 0x75, - 0x6b, 0x36, 0xbc, 0xc1, 0x4e, 0x1a, 0xac, 0x57, 0xb3, 0x8d, 0x1c, 0xf6, 0x00, 0x98, 0x33, 0x52, - 0xc6, 0xac, 0x90, 0xea, 0x68, 0x76, 0xf3, 0xf0, 0x45, 0x32, 0xf8, 0x73, 0xba, 0xca, 0x79, 0x07, - 0xf8, 0x09, 0xf4, 0x3e, 0xec, 0x48, 0xc6, 0xc9, 0x8a, 0xb3, 0x48, 0x16, 0x25, 0x67, 0x3a, 0x93, - 0x22, 0x91, 0x4a, 0x57, 0xc0, 0xc6, 0xfc, 0xff, 0x27, 0xfc, 0x1f, 0x0a, 0xbe, 0x03, 0x2f, 0x6b, - 0x62, 0x29, 0x55, 0xce, 0xd4, 0xd9, 0x77, 0x8d, 0x7f, 0xa7, 0x0a, 0xdf, 0x03, 0x3f, 0x26, 0x87, - 0xdb, 0x93, 0x3d, 0x63, 0xde, 0xad, 0x9f, 0xbe, 0x4a, 0x4c, 0x0e, 0xcd, 0x69, 0x2d, 0xe3, 0x5c, - 0xe5, 0x1f, 0xf7, 0x60, 0x2c, 0x55, 0x8a, 0x48, 0x49, 0xe8, 0x9a, 0x5d, 0x5e, 0x9a, 0x94, 0x45, - 0x7d, 0x6d, 0x4e, 0x44, 0xba, 0x25, 0x29, 0x43, 0x24, 0x65, 0x42, 0x27, 0xce, 0xf7, 0x57, 0xff, - 0xc0, 0xc0, 0x42, 0xc1, 0x19, 0x0a, 0x0c, 0x14, 0xec, 0xc2, 0x9f, 0x6e, 0xf7, 0x4b, 0x7e, 0x5c, - 0xda, 0x7e, 0x9f, 0x2b, 0x2c, 0xb1, 0x0f, 0x67, 0xd5, 0x36, 0x4f, 0xe8, 0xed, 0xdf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xdb, 0x30, 0x45, 0x65, 0x5b, 0x03, 0x00, 0x00, + // 381 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0xeb, 0xd3, 0x30, + 0x18, 0xc7, 0x69, 0x3b, 0xa7, 0x64, 0x1e, 0x46, 0x04, 0x29, 0x3b, 0x8c, 0x31, 0x76, 0x18, 0x1e, + 0xd2, 0x75, 0x82, 0x07, 0x6f, 0x1a, 0x70, 0x1e, 0x56, 0x29, 0x51, 0x3b, 0xf0, 0x96, 0xc5, 0xd0, + 0x95, 0xa6, 0x49, 0xc9, 0xb2, 0x7f, 0xf8, 0x8e, 0x04, 0x5f, 0x9e, 0x77, 0x69, 0xda, 0xcd, 0x95, + 0x6d, 0xfc, 0x4e, 0x2d, 0x9f, 0xef, 0xe7, 0xdb, 0xe4, 0x29, 0x0f, 0xe8, 0x33, 0x55, 0x14, 0x4a, + 0x06, 0x78, 0x49, 0x50, 0xa9, 0x95, 0x51, 0x83, 0x57, 0x0d, 0xa9, 0x1f, 0x35, 0x1c, 0xff, 0x02, + 0x3d, 0xbc, 0x24, 0x11, 0x37, 0x3a, 0x63, 0x49, 0x08, 0x21, 0xe8, 0x98, 0xac, 0xe0, 0xbe, 0x33, + 0x72, 0xa6, 0x1e, 0xb1, 0xef, 0xd0, 0x07, 0x1e, 0x2b, 0x77, 0xbe, 0x3b, 0x72, 0xa6, 0xbd, 0x79, + 0x17, 0xe1, 0xf8, 0x7b, 0x12, 0x92, 0x0a, 0x41, 0x1f, 0xb8, 0x29, 0xf3, 0x3d, 0x1b, 0xbc, 0x40, + 0x58, 0xe8, 0x05, 0x4e, 0x42, 0xe2, 0xa6, 0x0c, 0x4e, 0x40, 0xd7, 0x6c, 0x34, 0xa7, 0x3f, 0xfd, + 0x8e, 0x4d, 0x5f, 0x56, 0xe9, 0x37, 0x4b, 0x92, 0x90, 0x34, 0xd9, 0xf8, 0x8f, 0x03, 0x9e, 0x37, + 0x2d, 0xf8, 0x06, 0xf4, 0x17, 0x5c, 0xce, 0xb0, 0x12, 0x82, 0x33, 0x83, 0xd5, 0x4e, 0x9a, 0xe6, + 0x16, 0x37, 0xbc, 0x71, 0xc3, 0x96, 0xeb, 0x5e, 0xdc, 0xf0, 0x8e, 0x3b, 0x6f, 0xb9, 0xde, 0xc5, + 0x6d, 0x71, 0x38, 0x04, 0xe0, 0x33, 0xa7, 0x65, 0xc4, 0x0b, 0xa5, 0x4f, 0xf6, 0xe6, 0x1e, 0xb9, + 0x22, 0xe3, 0xbf, 0x0e, 0xe8, 0x5d, 0xcd, 0x01, 0x3f, 0x81, 0xe1, 0x87, 0x3d, 0xcd, 0x04, 0x5d, + 0x0b, 0x8e, 0x55, 0x51, 0x0a, 0x6e, 0x32, 0x25, 0x63, 0xa5, 0x4d, 0xad, 0x6c, 0xed, 0x04, 0xcf, + 0xc8, 0x13, 0x16, 0x7c, 0x07, 0x5e, 0x5f, 0x8c, 0x95, 0xd2, 0x39, 0xd7, 0xe7, 0xbe, 0x6b, 0xfb, + 0x0f, 0x52, 0xf8, 0x1e, 0xf8, 0x11, 0x3d, 0xde, 0x3f, 0xd9, 0xb3, 0xcd, 0x87, 0x79, 0xf5, 0x5f, + 0x22, 0x7a, 0x6c, 0x9f, 0xd6, 0xb1, 0x9d, 0x1b, 0xfe, 0xf1, 0x00, 0x66, 0x4a, 0xa7, 0x88, 0x96, + 0x94, 0x6d, 0x38, 0xda, 0xe6, 0xa7, 0x03, 0x15, 0x79, 0x26, 0x2b, 0x52, 0x20, 0xc9, 0xcd, 0x41, + 0xe9, 0x1c, 0x09, 0x2a, 0xd3, 0x1d, 0x4d, 0x39, 0xa2, 0x29, 0x97, 0x26, 0x76, 0x7e, 0x4c, 0xfe, + 0x8b, 0x41, 0x23, 0x05, 0x67, 0x29, 0xb0, 0x52, 0xb0, 0x0f, 0x7f, 0xbb, 0x83, 0xaf, 0xf9, 0x69, + 0xd5, 0x7c, 0xef, 0x4b, 0xad, 0xc5, 0xd5, 0x6a, 0x32, 0x25, 0xd6, 0x5d, 0xbb, 0xa4, 0x6f, 0xff, + 0x05, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xfb, 0xea, 0x01, 0xcd, 0x02, 0x00, 0x00, } diff --git a/reporter/network/language/agent/v1/DiscoveryService.pb.go b/reporter/network/language/agent/v1/DiscoveryService.pb.go index e50c73b..20cbd1f 100644 --- a/reporter/network/language/agent/v1/DiscoveryService.pb.go +++ b/reporter/network/language/agent/v1/DiscoveryService.pb.go @@ -433,12 +433,12 @@ func (m *ServiceNameMappingElement) GetElement() *ServiceNameElement { } type ServiceNameElement struct { - ServiceName string `protobuf:"bytes,1,opt,name=serviceName,proto3" json:"serviceName,omitempty"` - ApplicationId int32 `protobuf:"varint,2,opt,name=applicationId,proto3" json:"applicationId,omitempty"` - SrcSpanType SpanType `protobuf:"varint,3,opt,name=srcSpanType,proto3,enum=skywalking.network.protocol.common.v1.SpanType" json:"srcSpanType,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServiceName string `protobuf:"bytes,1,opt,name=serviceName,proto3" json:"serviceName,omitempty"` + ApplicationId int32 `protobuf:"varint,2,opt,name=applicationId,proto3" json:"applicationId,omitempty"` + SrcSpanType SpanTypeV1 `protobuf:"varint,3,opt,name=srcSpanType,proto3,enum=SpanTypeV1" json:"srcSpanType,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ServiceNameElement) Reset() { *m = ServiceNameElement{} } @@ -480,23 +480,23 @@ func (m *ServiceNameElement) GetApplicationId() int32 { return 0 } -func (m *ServiceNameElement) GetSrcSpanType() SpanType { +func (m *ServiceNameElement) GetSrcSpanType() SpanTypeV1 { if m != nil { return m.SrcSpanType } - return SpanType_Entry + return SpanTypeV1_Entry } func init() { - proto.RegisterType((*ApplicationInstance)(nil), "skywalking.network.protocol.agent.v1.ApplicationInstance") - proto.RegisterType((*ApplicationInstanceMapping)(nil), "skywalking.network.protocol.agent.v1.ApplicationInstanceMapping") - proto.RegisterType((*ApplicationInstanceRecover)(nil), "skywalking.network.protocol.agent.v1.ApplicationInstanceRecover") - proto.RegisterType((*ApplicationInstanceHeartbeat)(nil), "skywalking.network.protocol.agent.v1.ApplicationInstanceHeartbeat") - proto.RegisterType((*OSInfo)(nil), "skywalking.network.protocol.agent.v1.OSInfo") - proto.RegisterType((*ServiceNameCollection)(nil), "skywalking.network.protocol.agent.v1.ServiceNameCollection") - proto.RegisterType((*ServiceNameMappingCollection)(nil), "skywalking.network.protocol.agent.v1.ServiceNameMappingCollection") - proto.RegisterType((*ServiceNameMappingElement)(nil), "skywalking.network.protocol.agent.v1.ServiceNameMappingElement") - proto.RegisterType((*ServiceNameElement)(nil), "skywalking.network.protocol.agent.v1.ServiceNameElement") + proto.RegisterType((*ApplicationInstance)(nil), "ApplicationInstance") + proto.RegisterType((*ApplicationInstanceMapping)(nil), "ApplicationInstanceMapping") + proto.RegisterType((*ApplicationInstanceRecover)(nil), "ApplicationInstanceRecover") + proto.RegisterType((*ApplicationInstanceHeartbeat)(nil), "ApplicationInstanceHeartbeat") + proto.RegisterType((*OSInfo)(nil), "OSInfo") + proto.RegisterType((*ServiceNameCollection)(nil), "ServiceNameCollection") + proto.RegisterType((*ServiceNameMappingCollection)(nil), "ServiceNameMappingCollection") + proto.RegisterType((*ServiceNameMappingElement)(nil), "ServiceNameMappingElement") + proto.RegisterType((*ServiceNameElement)(nil), "ServiceNameElement") } func init() { @@ -504,49 +504,46 @@ func init() { } var fileDescriptor_59659d1d84d9b7a2 = []byte{ - // 666 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0x4f, 0x6f, 0xd3, 0x3e, - 0x18, 0xc7, 0xe7, 0x76, 0xdd, 0x6f, 0x79, 0xfa, 0x1b, 0x42, 0x86, 0xa1, 0x2c, 0x4c, 0x22, 0x8a, - 0x86, 0xd4, 0x03, 0x4b, 0xb7, 0xb2, 0x03, 0x88, 0x03, 0x30, 0x86, 0x44, 0x0f, 0x8c, 0xe1, 0x6e, - 0x42, 0x82, 0x93, 0x97, 0x79, 0x59, 0xd4, 0xc4, 0x8e, 0xe2, 0xd0, 0x52, 0x38, 0x72, 0x06, 0x89, - 0xb7, 0xc1, 0x01, 0x2e, 0xbc, 0x03, 0xde, 0x09, 0xaf, 0x04, 0x35, 0x71, 0xfe, 0x6c, 0xcd, 0xa6, - 0xae, 0x08, 0x8e, 0x7e, 0x1e, 0xfb, 0xf3, 0xfc, 0xf3, 0xd7, 0x86, 0xdb, 0x3e, 0xe5, 0xee, 0x5b, - 0xea, 0xb2, 0x75, 0xea, 0x32, 0x1e, 0xb7, 0x77, 0x3c, 0xe9, 0x88, 0x01, 0x8b, 0x46, 0x3d, 0x16, - 0x0d, 0x3c, 0x87, 0xd9, 0x61, 0x24, 0x62, 0x81, 0xd7, 0x64, 0x7f, 0x34, 0xa4, 0x7e, 0xdf, 0xe3, - 0xae, 0xcd, 0x59, 0x3c, 0x14, 0x51, 0x3f, 0xf5, 0x38, 0xc2, 0xb7, 0x93, 0x93, 0xf6, 0x60, 0xd3, - 0xb8, 0x75, 0x16, 0x26, 0x86, 0x5c, 0xc6, 0x11, 0xa3, 0x41, 0xba, 0xd9, 0x58, 0x71, 0x44, 0x10, - 0x08, 0xde, 0x8e, 0x23, 0xea, 0xb0, 0xf5, 0x74, 0x91, 0xba, 0xac, 0x9f, 0x08, 0xae, 0x3d, 0x0e, - 0x43, 0xdf, 0x73, 0x68, 0xec, 0x09, 0xde, 0xe5, 0x32, 0xa6, 0xdc, 0x61, 0x78, 0x0d, 0x96, 0x68, - 0xc9, 0x7c, 0xa4, 0x23, 0x13, 0xb5, 0x1a, 0xe4, 0xb4, 0x11, 0xaf, 0x82, 0x96, 0x84, 0x3c, 0x38, - 0xe8, 0xee, 0xe8, 0x35, 0x13, 0xb5, 0x34, 0x52, 0x18, 0xb0, 0x05, 0xff, 0x47, 0xcc, 0xf5, 0x64, - 0xcc, 0xa2, 0x7d, 0x2f, 0x60, 0x7a, 0xdd, 0x44, 0xad, 0x3a, 0x39, 0x65, 0xc3, 0x3b, 0xb0, 0x20, - 0xa4, 0xc7, 0x8f, 0x85, 0x3e, 0x6f, 0xa2, 0x56, 0xb3, 0x73, 0xc7, 0x9e, 0xa6, 0x64, 0xfb, 0x45, - 0xaf, 0xcb, 0x8f, 0x05, 0x51, 0x67, 0xad, 0x77, 0x60, 0x54, 0x14, 0xf1, 0x9c, 0x86, 0xa1, 0xc7, - 0xdd, 0x29, 0x6b, 0xd9, 0x82, 0x65, 0x3a, 0xc9, 0xe8, 0x1e, 0x25, 0x75, 0x35, 0x48, 0xb5, 0xd3, - 0xfa, 0x85, 0x2a, 0x43, 0x13, 0x96, 0x8c, 0xf3, 0x6f, 0x86, 0xfe, 0x87, 0xed, 0x7d, 0x0f, 0xab, - 0x15, 0x35, 0x3e, 0x63, 0x34, 0x8a, 0x0f, 0x19, 0x8d, 0xcf, 0xcf, 0x1f, 0x5d, 0x94, 0xff, 0x1a, - 0x2c, 0x9d, 0x64, 0x88, 0xa4, 0x80, 0x5a, 0x52, 0xc0, 0x69, 0xa3, 0x15, 0xc2, 0x42, 0x9a, 0x0d, - 0xbe, 0x31, 0xae, 0x65, 0x97, 0x06, 0x2c, 0xc1, 0x6a, 0x44, 0xad, 0xb0, 0x01, 0x8b, 0x27, 0x42, - 0xc6, 0x9c, 0x2a, 0x84, 0x46, 0xf2, 0xf5, 0xf8, 0x82, 0x86, 0x91, 0x70, 0x98, 0x94, 0xbb, 0x22, - 0x69, 0x50, 0x83, 0x14, 0x06, 0x7c, 0x1d, 0x1a, 0x5e, 0x38, 0xd8, 0x92, 0xfa, 0xbc, 0x59, 0x6f, - 0x69, 0x24, 0x5d, 0x58, 0x01, 0x2c, 0x2b, 0x15, 0x8e, 0xf1, 0x4f, 0x84, 0xef, 0x33, 0x67, 0x9c, - 0x3a, 0xde, 0x87, 0x45, 0xe6, 0xb3, 0x80, 0xf1, 0x58, 0xea, 0xc8, 0xac, 0xb7, 0x9a, 0x9d, 0x7b, - 0xd3, 0xb5, 0xb3, 0x84, 0x7b, 0x9a, 0x02, 0x48, 0x4e, 0xb2, 0x3e, 0xc0, 0x6a, 0xc9, 0xaf, 0xee, - 0x6c, 0x29, 0xea, 0x9b, 0x89, 0xa8, 0x0f, 0x2f, 0x1d, 0x55, 0x51, 0x27, 0x83, 0x7f, 0x42, 0xb0, - 0x72, 0xee, 0xbe, 0x71, 0xf7, 0x64, 0xea, 0xcc, 0x67, 0x59, 0x18, 0x30, 0x81, 0xff, 0x14, 0x27, - 0x69, 0xfb, 0x9f, 0x74, 0x23, 0x03, 0x59, 0xdf, 0x11, 0xe0, 0x49, 0x3f, 0x36, 0xa1, 0x29, 0x0b, - 0xab, 0x9a, 0x7f, 0xd9, 0x34, 0x29, 0xb4, 0x5a, 0x95, 0xd0, 0x5e, 0x42, 0x53, 0x46, 0x4e, 0x2f, - 0xa4, 0x7c, 0x7f, 0x14, 0xa6, 0x8a, 0xb9, 0xd2, 0x69, 0x5f, 0x98, 0xb6, 0x7a, 0x2d, 0xc7, 0x79, - 0xab, 0x63, 0xa4, 0xcc, 0xe8, 0xfc, 0xa8, 0x81, 0x9e, 0x5d, 0xea, 0xb3, 0xaf, 0x38, 0xfe, 0x82, - 0xe0, 0x6a, 0xa6, 0xc7, 0xfc, 0x69, 0xbd, 0x3f, 0x5d, 0x9b, 0x2a, 0x14, 0x67, 0x3c, 0x9a, 0xf9, - 0xa8, 0x9a, 0xac, 0x35, 0x87, 0x3f, 0x22, 0xd0, 0x72, 0x89, 0xe1, 0xed, 0x99, 0x89, 0xb9, 0xfc, - 0x8d, 0x8d, 0xe9, 0x18, 0xc5, 0xb7, 0x64, 0xcd, 0x75, 0xbe, 0x21, 0xb8, 0x59, 0x1a, 0xf4, 0x44, - 0xe7, 0x3e, 0x23, 0xd0, 0x8e, 0x32, 0x23, 0x7e, 0x70, 0xe9, 0x9b, 0x55, 0x08, 0xc8, 0xd8, 0x9e, - 0x55, 0x2e, 0x05, 0xc3, 0x9a, 0xdb, 0x1e, 0xc2, 0x86, 0x88, 0x5c, 0x9b, 0x86, 0xd4, 0x39, 0x61, - 0x65, 0x22, 0x0d, 0x83, 0x9c, 0x9a, 0x7d, 0xc4, 0x29, 0x75, 0x0f, 0xbd, 0x2e, 0x7d, 0xe0, 0x6d, - 0xb5, 0xa9, 0x9d, 0x6d, 0x6a, 0xa7, 0xbf, 0xf5, 0x60, 0xf3, 0x6b, 0xcd, 0xe8, 0xf5, 0x47, 0xaf, - 0x14, 0x6f, 0x37, 0xdd, 0xb6, 0xa7, 0x12, 0x3c, 0x5c, 0x48, 0x52, 0xbd, 0xfb, 0x3b, 0x00, 0x00, - 0xff, 0xff, 0x1d, 0xf0, 0xe5, 0x6a, 0x33, 0x08, 0x00, 0x00, + // 617 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xdd, 0x4e, 0xdb, 0x3e, + 0x1c, 0x25, 0x2d, 0x05, 0xf2, 0xeb, 0x9f, 0xbf, 0x26, 0xf3, 0xa1, 0x10, 0x40, 0x44, 0x11, 0x93, + 0x7a, 0x53, 0x77, 0x74, 0x68, 0xd2, 0x2e, 0xb7, 0x31, 0x8d, 0x5e, 0x8c, 0xa1, 0x14, 0x98, 0xb4, + 0x3b, 0x63, 0x4c, 0x1b, 0x35, 0xb1, 0x23, 0xdb, 0x6b, 0xd7, 0xbd, 0xc2, 0xde, 0x81, 0x07, 0xd8, + 0x3b, 0xec, 0xdd, 0xa6, 0x7c, 0xb5, 0x81, 0xa4, 0xd5, 0x2e, 0xb6, 0x4b, 0x9f, 0xdf, 0xc9, 0xf1, + 0xb1, 0x7d, 0x72, 0xe0, 0x79, 0x40, 0xf8, 0xe0, 0x2b, 0x19, 0xb0, 0x36, 0x19, 0x30, 0xae, 0x3b, + 0x67, 0xbe, 0xa2, 0x62, 0xcc, 0xe4, 0xb4, 0xcf, 0xe4, 0xd8, 0xa7, 0x0c, 0x47, 0x52, 0x68, 0x61, + 0x1f, 0x3d, 0xa5, 0x89, 0x09, 0x57, 0x5a, 0x32, 0x12, 0x66, 0x84, 0x3d, 0x2a, 0xc2, 0x50, 0xf0, + 0x8e, 0x96, 0x84, 0xb2, 0x76, 0xba, 0x48, 0x47, 0xee, 0x83, 0x01, 0x5b, 0x6f, 0xa2, 0x28, 0xf0, + 0x29, 0xd1, 0xbe, 0xe0, 0x3d, 0xae, 0x34, 0xe1, 0x94, 0xa1, 0x63, 0xd8, 0x24, 0x05, 0xf8, 0xce, + 0x32, 0x1c, 0xa3, 0xd5, 0xf0, 0x1e, 0x83, 0xe8, 0x00, 0xcc, 0x64, 0xcb, 0xeb, 0xeb, 0xde, 0x99, + 0x55, 0x73, 0x8c, 0x96, 0xe9, 0xcd, 0x01, 0xe4, 0xc2, 0x7f, 0x92, 0x0d, 0x7c, 0xa5, 0x99, 0xbc, + 0xf2, 0x43, 0x66, 0xd5, 0x1d, 0xa3, 0x55, 0xf7, 0x1e, 0x61, 0xe8, 0x08, 0xd6, 0x84, 0xf2, 0xf9, + 0xbd, 0xb0, 0x56, 0x1d, 0xa3, 0xd5, 0xec, 0xae, 0xe3, 0x4f, 0xfd, 0x1e, 0xbf, 0x17, 0x5e, 0x06, + 0xbb, 0xdf, 0xc0, 0xae, 0xf0, 0xf7, 0x91, 0x44, 0x91, 0xcf, 0x07, 0x7f, 0x68, 0xf3, 0x14, 0x76, + 0x48, 0x59, 0xa3, 0x77, 0x97, 0x58, 0x6e, 0x78, 0xd5, 0x43, 0xf7, 0x97, 0x51, 0xb9, 0xb5, 0xc7, + 0x92, 0x37, 0xf8, 0x97, 0x5b, 0xff, 0x9d, 0x9b, 0xfb, 0x0e, 0x07, 0x15, 0xf6, 0xcf, 0x19, 0x91, + 0xfa, 0x96, 0x11, 0xbd, 0xd8, 0x9a, 0xb1, 0xcc, 0xda, 0x31, 0x6c, 0x0e, 0x73, 0x89, 0xc4, 0x5b, + 0x2d, 0xf1, 0xf6, 0x18, 0x74, 0x23, 0x58, 0x4b, 0xdd, 0xa0, 0xdd, 0xd8, 0xe6, 0x05, 0x09, 0x59, + 0x22, 0x6b, 0x7a, 0xd9, 0x0a, 0xd9, 0xb0, 0x31, 0x14, 0x4a, 0x73, 0x92, 0x49, 0x98, 0xde, 0x6c, + 0x1d, 0xc7, 0x2a, 0x92, 0x82, 0x32, 0xa5, 0x2e, 0x44, 0x72, 0xf6, 0x86, 0x37, 0x07, 0xd0, 0x36, + 0x34, 0xfc, 0x68, 0x7c, 0xaa, 0xac, 0x55, 0xa7, 0xde, 0x32, 0xbd, 0x74, 0xe1, 0x9e, 0xc3, 0x4e, + 0xf6, 0x57, 0xc4, 0xf2, 0xef, 0x44, 0x10, 0x30, 0x1a, 0x5b, 0x47, 0x1d, 0xd8, 0x60, 0x01, 0x0b, + 0x19, 0xd7, 0xca, 0x32, 0x9c, 0x7a, 0xab, 0xd9, 0xdd, 0xc2, 0x05, 0xe6, 0xfb, 0x74, 0xe6, 0xcd, + 0x48, 0xee, 0x0d, 0x1c, 0x14, 0xe6, 0x59, 0xd2, 0x0a, 0x82, 0xaf, 0x4a, 0x82, 0x36, 0x2e, 0x7f, + 0x50, 0xd6, 0x1d, 0xc2, 0xde, 0x42, 0x5a, 0x7c, 0x64, 0x95, 0x0e, 0x67, 0x0f, 0x30, 0x07, 0x50, + 0x1b, 0xd6, 0x33, 0x99, 0xe4, 0xae, 0x16, 0x1c, 0x21, 0xe7, 0xb8, 0x3f, 0x0c, 0x40, 0xe5, 0x39, + 0x72, 0xa0, 0xa9, 0xe6, 0x68, 0xf6, 0x1e, 0x45, 0xa8, 0x9c, 0xe9, 0x5a, 0x55, 0xa6, 0xdb, 0xd0, + 0x54, 0x92, 0xf6, 0x23, 0xc2, 0xaf, 0xa6, 0x51, 0x1a, 0xce, 0xff, 0xbb, 0x4d, 0x9c, 0x03, 0x37, + 0x27, 0x5e, 0x71, 0xde, 0x7d, 0x30, 0xc0, 0xca, 0x03, 0xf4, 0xb4, 0xc1, 0xd0, 0x07, 0x78, 0x96, + 0xa7, 0x7a, 0xd6, 0x3d, 0xdb, 0xb8, 0x22, 0xb7, 0xf6, 0x3e, 0x5e, 0xdc, 0x03, 0xee, 0x0a, 0x7a, + 0x0d, 0xe6, 0x2c, 0x82, 0xe8, 0x10, 0x2f, 0x4b, 0xbe, 0xdd, 0xc4, 0xf3, 0x8a, 0x74, 0x57, 0xba, + 0x14, 0xf6, 0x0b, 0xb7, 0x55, 0xb2, 0x78, 0x06, 0xe6, 0x5d, 0x8e, 0xa1, 0x5d, 0x5c, 0x99, 0x32, + 0xfb, 0x10, 0x2f, 0xcb, 0x8c, 0xbb, 0xf2, 0x76, 0x02, 0x2f, 0x84, 0x1c, 0x60, 0x12, 0x11, 0x3a, + 0x64, 0x58, 0x8d, 0xa6, 0x13, 0x12, 0x8c, 0x7c, 0x1e, 0x23, 0x21, 0xe6, 0x4c, 0x4f, 0x84, 0x1c, + 0xe1, 0xbc, 0xc8, 0x71, 0x52, 0xa2, 0x97, 0xc6, 0x97, 0xe3, 0x39, 0xb1, 0x93, 0x91, 0x3a, 0x39, + 0xa9, 0x93, 0xb6, 0xfd, 0xf8, 0xe4, 0x67, 0xcd, 0xee, 0x8f, 0xa6, 0x9f, 0x33, 0xbd, 0x8b, 0x94, + 0x76, 0x19, 0xd7, 0x3b, 0x15, 0xc1, 0xed, 0x5a, 0x52, 0xf4, 0x2f, 0x7f, 0x07, 0x00, 0x00, 0xff, + 0xff, 0xc1, 0x68, 0x7e, 0x01, 0x4d, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -575,7 +572,7 @@ func NewInstanceDiscoveryServiceClient(cc *grpc.ClientConn) InstanceDiscoverySer func (c *instanceDiscoveryServiceClient) RegisterInstance(ctx context.Context, in *ApplicationInstance, opts ...grpc.CallOption) (*ApplicationInstanceMapping, error) { out := new(ApplicationInstanceMapping) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.v1.InstanceDiscoveryService/registerInstance", in, out, opts...) + err := c.cc.Invoke(ctx, "/InstanceDiscoveryService/registerInstance", in, out, opts...) if err != nil { return nil, err } @@ -584,7 +581,7 @@ func (c *instanceDiscoveryServiceClient) RegisterInstance(ctx context.Context, i func (c *instanceDiscoveryServiceClient) Heartbeat(ctx context.Context, in *ApplicationInstanceHeartbeat, opts ...grpc.CallOption) (*Downstream, error) { out := new(Downstream) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.v1.InstanceDiscoveryService/heartbeat", in, out, opts...) + err := c.cc.Invoke(ctx, "/InstanceDiscoveryService/heartbeat", in, out, opts...) if err != nil { return nil, err } @@ -622,7 +619,7 @@ func _InstanceDiscoveryService_RegisterInstance_Handler(srv interface{}, ctx con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.v1.InstanceDiscoveryService/RegisterInstance", + FullMethod: "/InstanceDiscoveryService/RegisterInstance", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(InstanceDiscoveryServiceServer).RegisterInstance(ctx, req.(*ApplicationInstance)) @@ -640,7 +637,7 @@ func _InstanceDiscoveryService_Heartbeat_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.v1.InstanceDiscoveryService/Heartbeat", + FullMethod: "/InstanceDiscoveryService/Heartbeat", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(InstanceDiscoveryServiceServer).Heartbeat(ctx, req.(*ApplicationInstanceHeartbeat)) @@ -649,7 +646,7 @@ func _InstanceDiscoveryService_Heartbeat_Handler(srv interface{}, ctx context.Co } var _InstanceDiscoveryService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v1.InstanceDiscoveryService", + ServiceName: "InstanceDiscoveryService", HandlerType: (*InstanceDiscoveryServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -682,7 +679,7 @@ func NewServiceNameDiscoveryServiceClient(cc *grpc.ClientConn) ServiceNameDiscov func (c *serviceNameDiscoveryServiceClient) Discovery(ctx context.Context, in *ServiceNameCollection, opts ...grpc.CallOption) (*ServiceNameMappingCollection, error) { out := new(ServiceNameMappingCollection) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.v1.ServiceNameDiscoveryService/discovery", in, out, opts...) + err := c.cc.Invoke(ctx, "/ServiceNameDiscoveryService/discovery", in, out, opts...) if err != nil { return nil, err } @@ -716,7 +713,7 @@ func _ServiceNameDiscoveryService_Discovery_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.v1.ServiceNameDiscoveryService/Discovery", + FullMethod: "/ServiceNameDiscoveryService/Discovery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceNameDiscoveryServiceServer).Discovery(ctx, req.(*ServiceNameCollection)) @@ -725,7 +722,7 @@ func _ServiceNameDiscoveryService_Discovery_Handler(srv interface{}, ctx context } var _ServiceNameDiscoveryService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v1.ServiceNameDiscoveryService", + ServiceName: "ServiceNameDiscoveryService", HandlerType: (*ServiceNameDiscoveryServiceServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/reporter/network/language/agent/v1/Downstream.pb.go b/reporter/network/language/agent/v1/Downstream.pb.go index 0ded84f..f49157c 100644 --- a/reporter/network/language/agent/v1/Downstream.pb.go +++ b/reporter/network/language/agent/v1/Downstream.pb.go @@ -53,21 +53,21 @@ func (m *Downstream) XXX_DiscardUnknown() { var xxx_messageInfo_Downstream proto.InternalMessageInfo func init() { - proto.RegisterType((*Downstream)(nil), "skywalking.network.protocol.agent.v1.Downstream") + proto.RegisterType((*Downstream)(nil), "Downstream") } func init() { proto.RegisterFile("language-agent/Downstream.proto", fileDescriptor_625677b377236e86) } var fileDescriptor_625677b377236e86 = []byte{ - // 158 bytes of a gzipped FileDescriptorProto + // 145 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x49, 0xcc, 0x4b, 0x2f, 0x4d, 0x4c, 0x4f, 0xd5, 0x4d, 0x4c, 0x4f, 0xcd, 0x2b, 0xd1, 0x77, 0xc9, 0x2f, 0xcf, 0x2b, - 0x2e, 0x29, 0x4a, 0x4d, 0xcc, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0x29, 0xce, 0xae, - 0x2c, 0x4f, 0xcc, 0xc9, 0xce, 0xcc, 0x4b, 0xd7, 0xcb, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0x86, - 0xc8, 0x24, 0xe7, 0xe7, 0xe8, 0x81, 0xf5, 0xe8, 0x95, 0x19, 0x2a, 0xf1, 0x70, 0x71, 0x21, 0x74, - 0x3a, 0x95, 0x73, 0x19, 0xe4, 0x17, 0xa5, 0xeb, 0x25, 0x16, 0x24, 0x26, 0x67, 0xa4, 0xea, 0x21, - 0x19, 0x90, 0x58, 0x90, 0x0b, 0x37, 0x04, 0x66, 0x31, 0xc4, 0x90, 0x00, 0xc6, 0x28, 0x24, 0x9b, - 0xf4, 0xa1, 0x8a, 0xf4, 0x61, 0x8a, 0xf4, 0x21, 0xae, 0x2b, 0x33, 0x5c, 0xc5, 0x24, 0x15, 0x9c, - 0x5d, 0x19, 0x0e, 0x35, 0xcf, 0x0f, 0xa2, 0x2c, 0x00, 0xea, 0x9e, 0x24, 0x36, 0xb0, 0xcb, 0x8c, - 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xd1, 0x62, 0xe3, 0xd6, 0x00, 0x00, 0x00, + 0x2e, 0x29, 0x4a, 0x4d, 0xcc, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x57, 0xe2, 0xe1, 0xe2, 0x42, + 0x88, 0x39, 0x95, 0x73, 0x19, 0xe4, 0x17, 0xa5, 0xeb, 0x25, 0x16, 0x24, 0x26, 0x67, 0xa4, 0xea, + 0x15, 0x67, 0x57, 0x96, 0x27, 0xe6, 0x64, 0x67, 0xe6, 0x81, 0x44, 0x72, 0xf5, 0xf2, 0x52, 0x4b, + 0xca, 0xf3, 0x8b, 0xb2, 0xf5, 0x60, 0x46, 0xea, 0x81, 0x8d, 0x0c, 0x60, 0x8c, 0x52, 0x41, 0x28, + 0xd4, 0x87, 0x2a, 0xd2, 0x87, 0x29, 0xd2, 0x87, 0xd8, 0x5b, 0x66, 0xb8, 0x8a, 0x49, 0x2a, 0x38, + 0xbb, 0x32, 0x1c, 0x6a, 0x9e, 0x1f, 0x44, 0x59, 0x00, 0xc8, 0x0d, 0xc9, 0xf9, 0x39, 0x49, 0x6c, + 0x60, 0xd7, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x88, 0x81, 0x76, 0xd1, 0xb0, 0x00, 0x00, + 0x00, } diff --git a/reporter/network/language/agent/v1/JVM.pb.go b/reporter/network/language/agent/v1/JVM.pb.go index 48c2fd7..7e518c2 100644 --- a/reporter/network/language/agent/v1/JVM.pb.go +++ b/reporter/network/language/agent/v1/JVM.pb.go @@ -5,9 +5,9 @@ package v1 import ( fmt "fmt" - v1 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v1" proto "github.com/golang/protobuf/proto" math "math" + v1 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v1" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,18 +21,18 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type PoolType int32 +type PoolTypeV1 int32 const ( - PoolType_CODE_CACHE_USAGE PoolType = 0 - PoolType_NEWGEN_USAGE PoolType = 1 - PoolType_OLDGEN_USAGE PoolType = 2 - PoolType_SURVIVOR_USAGE PoolType = 3 - PoolType_PERMGEN_USAGE PoolType = 4 - PoolType_METASPACE_USAGE PoolType = 5 + PoolTypeV1_CODE_CACHE_USAGE PoolTypeV1 = 0 + PoolTypeV1_NEWGEN_USAGE PoolTypeV1 = 1 + PoolTypeV1_OLDGEN_USAGE PoolTypeV1 = 2 + PoolTypeV1_SURVIVOR_USAGE PoolTypeV1 = 3 + PoolTypeV1_PERMGEN_USAGE PoolTypeV1 = 4 + PoolTypeV1_METASPACE_USAGE PoolTypeV1 = 5 ) -var PoolType_name = map[int32]string{ +var PoolTypeV1_name = map[int32]string{ 0: "CODE_CACHE_USAGE", 1: "NEWGEN_USAGE", 2: "OLDGEN_USAGE", @@ -41,7 +41,7 @@ var PoolType_name = map[int32]string{ 5: "METASPACE_USAGE", } -var PoolType_value = map[string]int32{ +var PoolTypeV1_value = map[string]int32{ "CODE_CACHE_USAGE": 0, "NEWGEN_USAGE": 1, "OLDGEN_USAGE": 2, @@ -50,111 +50,111 @@ var PoolType_value = map[string]int32{ "METASPACE_USAGE": 5, } -func (x PoolType) String() string { - return proto.EnumName(PoolType_name, int32(x)) +func (x PoolTypeV1) String() string { + return proto.EnumName(PoolTypeV1_name, int32(x)) } -func (PoolType) EnumDescriptor() ([]byte, []int) { +func (PoolTypeV1) EnumDescriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{0} } -type GCPhrase int32 +type GCPhraseV1 int32 const ( - GCPhrase_NEW GCPhrase = 0 - GCPhrase_OLD GCPhrase = 1 + GCPhraseV1_NEW GCPhraseV1 = 0 + GCPhraseV1_OLD GCPhraseV1 = 1 ) -var GCPhrase_name = map[int32]string{ +var GCPhraseV1_name = map[int32]string{ 0: "NEW", 1: "OLD", } -var GCPhrase_value = map[string]int32{ +var GCPhraseV1_value = map[string]int32{ "NEW": 0, "OLD": 1, } -func (x GCPhrase) String() string { - return proto.EnumName(GCPhrase_name, int32(x)) +func (x GCPhraseV1) String() string { + return proto.EnumName(GCPhraseV1_name, int32(x)) } -func (GCPhrase) EnumDescriptor() ([]byte, []int) { +func (GCPhraseV1) EnumDescriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{1} } -type JVMMetric struct { - Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` - Cpu *v1.CPU `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` - Memory []*Memory `protobuf:"bytes,3,rep,name=memory,proto3" json:"memory,omitempty"` - MemoryPool []*MemoryPool `protobuf:"bytes,4,rep,name=memoryPool,proto3" json:"memoryPool,omitempty"` - Gc []*GC `protobuf:"bytes,5,rep,name=gc,proto3" json:"gc,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type JVMMetricV1 struct { + Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` + Cpu *v1.CPUV1 `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` + Memory []*MemoryV1 `protobuf:"bytes,3,rep,name=memory,proto3" json:"memory,omitempty"` + MemoryPool []*MemoryPoolV1 `protobuf:"bytes,4,rep,name=memoryPool,proto3" json:"memoryPool,omitempty"` + Gc []*GCV1 `protobuf:"bytes,5,rep,name=gc,proto3" json:"gc,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *JVMMetric) Reset() { *m = JVMMetric{} } -func (m *JVMMetric) String() string { return proto.CompactTextString(m) } -func (*JVMMetric) ProtoMessage() {} -func (*JVMMetric) Descriptor() ([]byte, []int) { +func (m *JVMMetricV1) Reset() { *m = JVMMetricV1{} } +func (m *JVMMetricV1) String() string { return proto.CompactTextString(m) } +func (*JVMMetricV1) ProtoMessage() {} +func (*JVMMetricV1) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{0} } -func (m *JVMMetric) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_JVMMetric.Unmarshal(m, b) +func (m *JVMMetricV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_JVMMetricV1.Unmarshal(m, b) } -func (m *JVMMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_JVMMetric.Marshal(b, m, deterministic) +func (m *JVMMetricV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_JVMMetricV1.Marshal(b, m, deterministic) } -func (m *JVMMetric) XXX_Merge(src proto.Message) { - xxx_messageInfo_JVMMetric.Merge(m, src) +func (m *JVMMetricV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_JVMMetricV1.Merge(m, src) } -func (m *JVMMetric) XXX_Size() int { - return xxx_messageInfo_JVMMetric.Size(m) +func (m *JVMMetricV1) XXX_Size() int { + return xxx_messageInfo_JVMMetricV1.Size(m) } -func (m *JVMMetric) XXX_DiscardUnknown() { - xxx_messageInfo_JVMMetric.DiscardUnknown(m) +func (m *JVMMetricV1) XXX_DiscardUnknown() { + xxx_messageInfo_JVMMetricV1.DiscardUnknown(m) } -var xxx_messageInfo_JVMMetric proto.InternalMessageInfo +var xxx_messageInfo_JVMMetricV1 proto.InternalMessageInfo -func (m *JVMMetric) GetTime() int64 { +func (m *JVMMetricV1) GetTime() int64 { if m != nil { return m.Time } return 0 } -func (m *JVMMetric) GetCpu() *v1.CPU { +func (m *JVMMetricV1) GetCpu() *v1.CPUV1 { if m != nil { return m.Cpu } return nil } -func (m *JVMMetric) GetMemory() []*Memory { +func (m *JVMMetricV1) GetMemory() []*MemoryV1 { if m != nil { return m.Memory } return nil } -func (m *JVMMetric) GetMemoryPool() []*MemoryPool { +func (m *JVMMetricV1) GetMemoryPool() []*MemoryPoolV1 { if m != nil { return m.MemoryPool } return nil } -func (m *JVMMetric) GetGc() []*GC { +func (m *JVMMetricV1) GetGc() []*GCV1 { if m != nil { return m.Gc } return nil } -type Memory struct { +type MemoryV1 struct { IsHeap bool `protobuf:"varint,1,opt,name=isHeap,proto3" json:"isHeap,omitempty"` Init int64 `protobuf:"varint,2,opt,name=init,proto3" json:"init,omitempty"` Max int64 `protobuf:"varint,3,opt,name=max,proto3" json:"max,omitempty"` @@ -165,186 +165,186 @@ type Memory struct { XXX_sizecache int32 `json:"-"` } -func (m *Memory) Reset() { *m = Memory{} } -func (m *Memory) String() string { return proto.CompactTextString(m) } -func (*Memory) ProtoMessage() {} -func (*Memory) Descriptor() ([]byte, []int) { +func (m *MemoryV1) Reset() { *m = MemoryV1{} } +func (m *MemoryV1) String() string { return proto.CompactTextString(m) } +func (*MemoryV1) ProtoMessage() {} +func (*MemoryV1) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{1} } -func (m *Memory) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Memory.Unmarshal(m, b) +func (m *MemoryV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MemoryV1.Unmarshal(m, b) } -func (m *Memory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Memory.Marshal(b, m, deterministic) +func (m *MemoryV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MemoryV1.Marshal(b, m, deterministic) } -func (m *Memory) XXX_Merge(src proto.Message) { - xxx_messageInfo_Memory.Merge(m, src) +func (m *MemoryV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoryV1.Merge(m, src) } -func (m *Memory) XXX_Size() int { - return xxx_messageInfo_Memory.Size(m) +func (m *MemoryV1) XXX_Size() int { + return xxx_messageInfo_MemoryV1.Size(m) } -func (m *Memory) XXX_DiscardUnknown() { - xxx_messageInfo_Memory.DiscardUnknown(m) +func (m *MemoryV1) XXX_DiscardUnknown() { + xxx_messageInfo_MemoryV1.DiscardUnknown(m) } -var xxx_messageInfo_Memory proto.InternalMessageInfo +var xxx_messageInfo_MemoryV1 proto.InternalMessageInfo -func (m *Memory) GetIsHeap() bool { +func (m *MemoryV1) GetIsHeap() bool { if m != nil { return m.IsHeap } return false } -func (m *Memory) GetInit() int64 { +func (m *MemoryV1) GetInit() int64 { if m != nil { return m.Init } return 0 } -func (m *Memory) GetMax() int64 { +func (m *MemoryV1) GetMax() int64 { if m != nil { return m.Max } return 0 } -func (m *Memory) GetUsed() int64 { +func (m *MemoryV1) GetUsed() int64 { if m != nil { return m.Used } return 0 } -func (m *Memory) GetCommitted() int64 { +func (m *MemoryV1) GetCommitted() int64 { if m != nil { return m.Committed } return 0 } -type MemoryPool struct { - Type PoolType `protobuf:"varint,1,opt,name=type,proto3,enum=skywalking.network.protocol.common.v1.PoolType" json:"type,omitempty"` - Init int64 `protobuf:"varint,2,opt,name=init,proto3" json:"init,omitempty"` - Max int64 `protobuf:"varint,3,opt,name=max,proto3" json:"max,omitempty"` - Used int64 `protobuf:"varint,4,opt,name=used,proto3" json:"used,omitempty"` - Commited int64 `protobuf:"varint,5,opt,name=commited,proto3" json:"commited,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type MemoryPoolV1 struct { + Type PoolTypeV1 `protobuf:"varint,1,opt,name=type,proto3,enum=PoolTypeV1" json:"type,omitempty"` + Init int64 `protobuf:"varint,2,opt,name=init,proto3" json:"init,omitempty"` + Max int64 `protobuf:"varint,3,opt,name=max,proto3" json:"max,omitempty"` + Used int64 `protobuf:"varint,4,opt,name=used,proto3" json:"used,omitempty"` + Commited int64 `protobuf:"varint,5,opt,name=commited,proto3" json:"commited,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *MemoryPool) Reset() { *m = MemoryPool{} } -func (m *MemoryPool) String() string { return proto.CompactTextString(m) } -func (*MemoryPool) ProtoMessage() {} -func (*MemoryPool) Descriptor() ([]byte, []int) { +func (m *MemoryPoolV1) Reset() { *m = MemoryPoolV1{} } +func (m *MemoryPoolV1) String() string { return proto.CompactTextString(m) } +func (*MemoryPoolV1) ProtoMessage() {} +func (*MemoryPoolV1) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{2} } -func (m *MemoryPool) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_MemoryPool.Unmarshal(m, b) +func (m *MemoryPoolV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MemoryPoolV1.Unmarshal(m, b) } -func (m *MemoryPool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_MemoryPool.Marshal(b, m, deterministic) +func (m *MemoryPoolV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MemoryPoolV1.Marshal(b, m, deterministic) } -func (m *MemoryPool) XXX_Merge(src proto.Message) { - xxx_messageInfo_MemoryPool.Merge(m, src) +func (m *MemoryPoolV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoryPoolV1.Merge(m, src) } -func (m *MemoryPool) XXX_Size() int { - return xxx_messageInfo_MemoryPool.Size(m) +func (m *MemoryPoolV1) XXX_Size() int { + return xxx_messageInfo_MemoryPoolV1.Size(m) } -func (m *MemoryPool) XXX_DiscardUnknown() { - xxx_messageInfo_MemoryPool.DiscardUnknown(m) +func (m *MemoryPoolV1) XXX_DiscardUnknown() { + xxx_messageInfo_MemoryPoolV1.DiscardUnknown(m) } -var xxx_messageInfo_MemoryPool proto.InternalMessageInfo +var xxx_messageInfo_MemoryPoolV1 proto.InternalMessageInfo -func (m *MemoryPool) GetType() PoolType { +func (m *MemoryPoolV1) GetType() PoolTypeV1 { if m != nil { return m.Type } - return PoolType_CODE_CACHE_USAGE + return PoolTypeV1_CODE_CACHE_USAGE } -func (m *MemoryPool) GetInit() int64 { +func (m *MemoryPoolV1) GetInit() int64 { if m != nil { return m.Init } return 0 } -func (m *MemoryPool) GetMax() int64 { +func (m *MemoryPoolV1) GetMax() int64 { if m != nil { return m.Max } return 0 } -func (m *MemoryPool) GetUsed() int64 { +func (m *MemoryPoolV1) GetUsed() int64 { if m != nil { return m.Used } return 0 } -func (m *MemoryPool) GetCommited() int64 { +func (m *MemoryPoolV1) GetCommited() int64 { if m != nil { return m.Commited } return 0 } -type GC struct { - Phrase GCPhrase `protobuf:"varint,1,opt,name=phrase,proto3,enum=skywalking.network.protocol.common.v1.GCPhrase" json:"phrase,omitempty"` - Count int64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` - Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type GCV1 struct { + Phrase GCPhraseV1 `protobuf:"varint,1,opt,name=phrase,proto3,enum=GCPhraseV1" json:"phrase,omitempty"` + Count int64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` + Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *GC) Reset() { *m = GC{} } -func (m *GC) String() string { return proto.CompactTextString(m) } -func (*GC) ProtoMessage() {} -func (*GC) Descriptor() ([]byte, []int) { +func (m *GCV1) Reset() { *m = GCV1{} } +func (m *GCV1) String() string { return proto.CompactTextString(m) } +func (*GCV1) ProtoMessage() {} +func (*GCV1) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{3} } -func (m *GC) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GC.Unmarshal(m, b) +func (m *GCV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GCV1.Unmarshal(m, b) } -func (m *GC) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GC.Marshal(b, m, deterministic) +func (m *GCV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GCV1.Marshal(b, m, deterministic) } -func (m *GC) XXX_Merge(src proto.Message) { - xxx_messageInfo_GC.Merge(m, src) +func (m *GCV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_GCV1.Merge(m, src) } -func (m *GC) XXX_Size() int { - return xxx_messageInfo_GC.Size(m) +func (m *GCV1) XXX_Size() int { + return xxx_messageInfo_GCV1.Size(m) } -func (m *GC) XXX_DiscardUnknown() { - xxx_messageInfo_GC.DiscardUnknown(m) +func (m *GCV1) XXX_DiscardUnknown() { + xxx_messageInfo_GCV1.DiscardUnknown(m) } -var xxx_messageInfo_GC proto.InternalMessageInfo +var xxx_messageInfo_GCV1 proto.InternalMessageInfo -func (m *GC) GetPhrase() GCPhrase { +func (m *GCV1) GetPhrase() GCPhraseV1 { if m != nil { return m.Phrase } - return GCPhrase_NEW + return GCPhraseV1_NEW } -func (m *GC) GetCount() int64 { +func (m *GCV1) GetCount() int64 { if m != nil { return m.Count } return 0 } -func (m *GC) GetTime() int64 { +func (m *GCV1) GetTime() int64 { if m != nil { return m.Time } @@ -352,49 +352,48 @@ func (m *GC) GetTime() int64 { } func init() { - proto.RegisterEnum("skywalking.network.protocol.common.v1.PoolType", PoolType_name, PoolType_value) - proto.RegisterEnum("skywalking.network.protocol.common.v1.GCPhrase", GCPhrase_name, GCPhrase_value) - proto.RegisterType((*JVMMetric)(nil), "skywalking.network.protocol.common.v1.JVMMetric") - proto.RegisterType((*Memory)(nil), "skywalking.network.protocol.common.v1.Memory") - proto.RegisterType((*MemoryPool)(nil), "skywalking.network.protocol.common.v1.MemoryPool") - proto.RegisterType((*GC)(nil), "skywalking.network.protocol.common.v1.GC") + proto.RegisterEnum("PoolTypeV1", PoolTypeV1_name, PoolTypeV1_value) + proto.RegisterEnum("GCPhraseV1", GCPhraseV1_name, GCPhraseV1_value) + proto.RegisterType((*JVMMetricV1)(nil), "JVMMetricV1") + proto.RegisterType((*MemoryV1)(nil), "MemoryV1") + proto.RegisterType((*MemoryPoolV1)(nil), "MemoryPoolV1") + proto.RegisterType((*GCV1)(nil), "GCV1") } func init() { proto.RegisterFile("common/JVM.proto", fileDescriptor_42f5f61b58cf3158) } var fileDescriptor_42f5f61b58cf3158 = []byte{ - // 519 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x41, 0x6f, 0xda, 0x4c, - 0x14, 0x8c, 0x6d, 0xe0, 0x23, 0x2f, 0x5f, 0x53, 0xf7, 0x25, 0xaa, 0x2c, 0x94, 0x03, 0x42, 0xad, - 0x44, 0x91, 0x6a, 0x17, 0x7a, 0xaa, 0xd4, 0x0b, 0x35, 0x96, 0xd3, 0x28, 0x06, 0x77, 0x09, 0x20, - 0xf5, 0x12, 0xb9, 0xce, 0xca, 0xb1, 0xc0, 0x5e, 0xcb, 0x98, 0x10, 0x6e, 0xfd, 0x37, 0x95, 0x7a, - 0xec, 0x2f, 0xac, 0xbc, 0x5e, 0xe3, 0x1c, 0x89, 0x7a, 0x9b, 0x1d, 0xcf, 0xcc, 0xbe, 0x37, 0x5e, - 0x50, 0x7d, 0x16, 0x45, 0x2c, 0x36, 0xae, 0xe6, 0x8e, 0x9e, 0xa4, 0x2c, 0x63, 0xf8, 0x76, 0xbd, - 0xdc, 0x6d, 0xbd, 0xd5, 0x32, 0x8c, 0x03, 0x3d, 0xa6, 0xd9, 0x96, 0xa5, 0xcb, 0xe2, 0x8b, 0xcf, - 0x56, 0x7a, 0xa1, 0xd6, 0x1f, 0xfa, 0xad, 0x33, 0x61, 0x14, 0x0c, 0x57, 0x74, 0xfe, 0xc8, 0x70, - 0x7c, 0x35, 0x77, 0x1c, 0x9a, 0xa5, 0xa1, 0x8f, 0x08, 0xb5, 0x2c, 0x8c, 0xa8, 0x26, 0xb5, 0xa5, - 0xae, 0x42, 0x38, 0xc6, 0xcf, 0xa0, 0xf8, 0xc9, 0x46, 0x93, 0xdb, 0x52, 0xf7, 0x64, 0xd0, 0xd3, - 0x0f, 0xba, 0x4b, 0x37, 0xdd, 0x19, 0xc9, 0x6d, 0x68, 0x41, 0x23, 0xa2, 0x11, 0x4b, 0x77, 0x9a, - 0xd2, 0x56, 0xba, 0x27, 0x83, 0xf7, 0x07, 0x06, 0x38, 0xdc, 0x44, 0x84, 0x19, 0xbf, 0x01, 0x14, - 0xc8, 0x65, 0x6c, 0xa5, 0xd5, 0x78, 0x54, 0xff, 0x59, 0x51, 0xb9, 0x91, 0x3c, 0x09, 0xc1, 0x4f, - 0x20, 0x07, 0xbe, 0x56, 0xe7, 0x51, 0xef, 0x0e, 0x8c, 0xb2, 0x4d, 0x22, 0x07, 0x7e, 0xe7, 0x11, - 0x1a, 0x45, 0x28, 0xbe, 0x86, 0x46, 0xb8, 0xbe, 0xa4, 0x5e, 0xc2, 0x2b, 0x6b, 0x12, 0x71, 0xca, - 0x8b, 0x0c, 0xe3, 0x30, 0xe3, 0xad, 0x29, 0x84, 0x63, 0x54, 0x41, 0x89, 0xbc, 0x47, 0x4d, 0xe1, - 0x54, 0x0e, 0x73, 0xd5, 0x66, 0x4d, 0xef, 0xb4, 0x5a, 0xa1, 0xca, 0x31, 0x5e, 0xc0, 0x71, 0x7e, - 0x5f, 0x98, 0x65, 0xf4, 0x4e, 0xab, 0xf3, 0x0f, 0x15, 0xd1, 0xf9, 0x25, 0x01, 0x54, 0xfb, 0xa0, - 0x09, 0xb5, 0x6c, 0x97, 0x14, 0xff, 0xeb, 0x74, 0x60, 0x1c, 0xb8, 0x45, 0x6e, 0xbd, 0xd9, 0x25, - 0x94, 0x70, 0xf3, 0x3f, 0xcc, 0xda, 0x82, 0x66, 0x31, 0xda, 0x7e, 0xd4, 0xfd, 0xb9, 0xb3, 0x05, - 0xd9, 0x36, 0xd1, 0x86, 0x46, 0x72, 0x9f, 0x7a, 0xeb, 0xe7, 0x8e, 0x68, 0x9b, 0x2e, 0xb7, 0x11, - 0x61, 0xc7, 0x73, 0xa8, 0xfb, 0x6c, 0x13, 0x97, 0x53, 0x16, 0x87, 0xfd, 0x7b, 0x55, 0xaa, 0xf7, - 0xda, 0xfb, 0x29, 0x41, 0xb3, 0xdc, 0x10, 0xcf, 0x41, 0x35, 0x27, 0x23, 0xeb, 0xd6, 0x1c, 0x9a, - 0x97, 0xd6, 0xed, 0x6c, 0x3a, 0xb4, 0x2d, 0xf5, 0x08, 0x55, 0xf8, 0x7f, 0x6c, 0x2d, 0x6c, 0x6b, - 0x2c, 0x18, 0x29, 0x67, 0x26, 0xd7, 0xa3, 0x8a, 0x91, 0x11, 0xe1, 0x74, 0x3a, 0x23, 0xf3, 0xaf, - 0xf3, 0x09, 0x11, 0x9c, 0x82, 0xaf, 0xe0, 0x85, 0x6b, 0x11, 0xa7, 0x92, 0xd5, 0xf0, 0x0c, 0x5e, - 0x3a, 0xd6, 0xcd, 0x70, 0xea, 0x0e, 0xcd, 0x32, 0xbf, 0xde, 0xbb, 0x80, 0x66, 0xb9, 0x00, 0xfe, - 0x07, 0xca, 0xd8, 0x5a, 0xa8, 0x47, 0x39, 0x98, 0x5c, 0x8f, 0x54, 0xe9, 0xcb, 0x16, 0x3e, 0xb0, - 0x34, 0xd0, 0xbd, 0xc4, 0xf3, 0xef, 0xe9, 0xd3, 0x3e, 0xbc, 0x24, 0xda, 0x77, 0xb2, 0xf2, 0xe2, - 0x60, 0xe3, 0x05, 0x54, 0xf7, 0x02, 0x1a, 0x67, 0xae, 0xf4, 0xfd, 0x4d, 0x25, 0x34, 0x84, 0xc8, - 0x28, 0x45, 0x06, 0x17, 0x19, 0x0f, 0xfd, 0xdf, 0x72, 0x6b, 0xba, 0xdc, 0x2d, 0x44, 0xde, 0xb8, - 0x90, 0xb9, 0xa2, 0xde, 0x1f, 0x0d, 0x5e, 0xf4, 0xc7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, - 0x8d, 0xc4, 0x55, 0x42, 0x04, 0x00, 0x00, + // 504 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xd1, 0x6e, 0xda, 0x30, + 0x14, 0x86, 0x1b, 0x1c, 0x18, 0x3d, 0xb4, 0x5d, 0xe6, 0x76, 0x53, 0x84, 0xa6, 0x8d, 0xb1, 0x5d, + 0xa0, 0x4a, 0x33, 0x0b, 0x7b, 0x02, 0x16, 0x22, 0xba, 0xaa, 0x81, 0xc8, 0x14, 0x23, 0xed, 0xa6, + 0xca, 0x52, 0x2b, 0x8d, 0x20, 0x71, 0x14, 0xc2, 0x18, 0xbb, 0x9c, 0xb4, 0x37, 0xd9, 0xd5, 0x9e, + 0x72, 0xb2, 0x13, 0x48, 0xef, 0x7b, 0x95, 0xff, 0x7c, 0xe7, 0xd7, 0xc9, 0xef, 0x63, 0x19, 0x8c, + 0x40, 0xc4, 0xb1, 0x48, 0xfa, 0xd7, 0xcc, 0x25, 0x69, 0x26, 0x72, 0xd1, 0x3e, 0x2f, 0x49, 0xf1, + 0x29, 0x60, 0xf7, 0xaf, 0x06, 0xad, 0x6b, 0xe6, 0xba, 0x3c, 0xcf, 0xa2, 0x80, 0x59, 0x18, 0x83, + 0x9e, 0x47, 0x31, 0x37, 0xb5, 0x8e, 0xd6, 0x43, 0x54, 0x69, 0x6c, 0x02, 0x0a, 0xd2, 0x8d, 0x59, + 0xeb, 0x68, 0xbd, 0xd6, 0xa0, 0x41, 0x6c, 0x6f, 0xce, 0x2c, 0x2a, 0x11, 0x7e, 0x07, 0x8d, 0x98, + 0xc7, 0x22, 0xdb, 0x99, 0xa8, 0x83, 0x7a, 0xad, 0xc1, 0x31, 0x71, 0x55, 0xc9, 0x2c, 0x5a, 0x36, + 0xf0, 0x47, 0x80, 0x42, 0x79, 0x42, 0xac, 0x4c, 0x5d, 0xd9, 0x4e, 0x4b, 0x9b, 0x44, 0xcc, 0xa2, + 0x8f, 0x0c, 0xf8, 0x25, 0xd4, 0xc2, 0xc0, 0xac, 0x2b, 0x5b, 0x9d, 0x8c, 0x6d, 0x66, 0xd1, 0x5a, + 0x18, 0x74, 0x7f, 0x41, 0x73, 0x3f, 0x19, 0xbf, 0x82, 0x46, 0xb4, 0xbe, 0xe2, 0x7e, 0xaa, 0x42, + 0x36, 0x69, 0x59, 0xc9, 0xe8, 0x51, 0x12, 0xe5, 0x2a, 0x27, 0xa2, 0x4a, 0x63, 0x03, 0x50, 0xec, + 0xff, 0x34, 0x91, 0x42, 0x52, 0x4a, 0xd7, 0x66, 0xcd, 0xef, 0x4d, 0xbd, 0x70, 0x49, 0x8d, 0x5f, + 0xc3, 0xb1, 0x5c, 0x4a, 0x94, 0xe7, 0xfc, 0xde, 0xac, 0xab, 0x46, 0x05, 0xba, 0x7f, 0x34, 0x38, + 0x79, 0x9c, 0x17, 0xbf, 0x05, 0x3d, 0xdf, 0xa5, 0xc5, 0x8e, 0xce, 0x06, 0x2d, 0x22, 0xf1, 0xed, + 0x2e, 0xe5, 0xcc, 0xa2, 0xaa, 0xf1, 0x84, 0x24, 0x6d, 0x68, 0x16, 0x3f, 0x3e, 0x04, 0x39, 0xd4, + 0xdd, 0x39, 0xe8, 0x72, 0x1f, 0xf8, 0x3d, 0x34, 0xd2, 0x87, 0xcc, 0x5f, 0x57, 0x01, 0xc6, 0xb6, + 0xa7, 0x80, 0x5c, 0x7b, 0xd1, 0xc2, 0x17, 0x50, 0x0f, 0xc4, 0x26, 0xd9, 0x67, 0x28, 0x8a, 0xc3, + 0xed, 0xa2, 0xea, 0x76, 0x2f, 0x7f, 0x6b, 0x00, 0xd5, 0x09, 0xf0, 0x05, 0x18, 0xf6, 0x74, 0xe4, + 0xdc, 0xd9, 0x43, 0xfb, 0xca, 0xb9, 0x9b, 0xcf, 0x86, 0x63, 0xc7, 0x38, 0xc2, 0x06, 0x9c, 0x4c, + 0x9c, 0xc5, 0xd8, 0x99, 0x94, 0x44, 0x93, 0x64, 0x7a, 0x33, 0xaa, 0x48, 0x0d, 0x63, 0x38, 0x9b, + 0xcd, 0x29, 0xfb, 0xca, 0xa6, 0xb4, 0x64, 0x08, 0xbf, 0x80, 0x53, 0xcf, 0xa1, 0x6e, 0x65, 0xd3, + 0xf1, 0x39, 0x3c, 0x77, 0x9d, 0xdb, 0xe1, 0xcc, 0x1b, 0xda, 0xfb, 0xf9, 0xf5, 0xcb, 0x37, 0x00, + 0xd5, 0x21, 0xf0, 0x33, 0x40, 0x13, 0x67, 0x61, 0x1c, 0x49, 0x31, 0xbd, 0x19, 0x19, 0xda, 0x97, + 0x2d, 0x7c, 0x12, 0x59, 0x48, 0xfc, 0xd4, 0x0f, 0x1e, 0x38, 0x59, 0x2f, 0x77, 0x5b, 0x7f, 0xb5, + 0x8c, 0x12, 0x49, 0x62, 0x92, 0xf0, 0x7c, 0x2b, 0xb2, 0x25, 0x59, 0xf9, 0x49, 0xb8, 0xf1, 0x43, + 0x4e, 0xfc, 0x90, 0x27, 0xb9, 0xa7, 0x7d, 0xfb, 0x50, 0x19, 0xfb, 0xa5, 0xa9, 0xbf, 0x37, 0xf5, + 0x95, 0xa9, 0xff, 0xc3, 0xfa, 0x57, 0x6b, 0xcf, 0x96, 0xbb, 0x45, 0x39, 0x6f, 0x52, 0xd8, 0x3c, + 0xf9, 0x38, 0x02, 0xb1, 0xfa, 0xde, 0x50, 0xcf, 0xe4, 0xf3, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x86, 0x7a, 0x7e, 0x0b, 0x4f, 0x03, 0x00, 0x00, } diff --git a/reporter/network/language/agent/v1/JVMMetricsService.pb.go b/reporter/network/language/agent/v1/JVMMetricsService.pb.go index 2271675..c0519df 100644 --- a/reporter/network/language/agent/v1/JVMMetricsService.pb.go +++ b/reporter/network/language/agent/v1/JVMMetricsService.pb.go @@ -25,11 +25,11 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type JVMMetrics struct { - Metrics []*JVMMetric `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"` - ApplicationInstanceId int32 `protobuf:"varint,2,opt,name=applicationInstanceId,proto3" json:"applicationInstanceId,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Metrics []*JVMMetricV1 `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"` + ApplicationInstanceId int32 `protobuf:"varint,2,opt,name=applicationInstanceId,proto3" json:"applicationInstanceId,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *JVMMetrics) Reset() { *m = JVMMetrics{} } @@ -57,7 +57,7 @@ func (m *JVMMetrics) XXX_DiscardUnknown() { var xxx_messageInfo_JVMMetrics proto.InternalMessageInfo -func (m *JVMMetrics) GetMetrics() []*JVMMetric { +func (m *JVMMetrics) GetMetrics() []*JVMMetricV1 { if m != nil { return m.Metrics } @@ -72,7 +72,7 @@ func (m *JVMMetrics) GetApplicationInstanceId() int32 { } func init() { - proto.RegisterType((*JVMMetrics)(nil), "skywalking.network.protocol.agent.v1.JVMMetrics") + proto.RegisterType((*JVMMetrics)(nil), "JVMMetrics") } func init() { @@ -80,25 +80,24 @@ func init() { } var fileDescriptor_84f947edc73ca4ba = []byte{ - // 287 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x41, 0x4b, 0xc3, 0x40, - 0x10, 0x85, 0x4d, 0x45, 0x0b, 0xeb, 0x45, 0x03, 0x42, 0xc9, 0xc5, 0x52, 0x44, 0x7a, 0x71, 0xd3, - 0x54, 0x7f, 0x81, 0x78, 0x69, 0xa1, 0x52, 0x5a, 0x50, 0xf0, 0x36, 0xae, 0x43, 0x0c, 0xd9, 0xec, - 0x2c, 0xbb, 0x6b, 0x42, 0xef, 0x9e, 0xfd, 0x21, 0xfe, 0x4a, 0xb1, 0x9b, 0x34, 0x45, 0xa5, 0xf4, - 0xb6, 0xec, 0xbc, 0xf9, 0xde, 0xe3, 0x0d, 0xbb, 0x92, 0xa0, 0xd2, 0x77, 0x48, 0xf1, 0x1a, 0x52, - 0x54, 0x2e, 0x9e, 0x3e, 0xce, 0x66, 0xe8, 0x4c, 0x26, 0xec, 0x12, 0x4d, 0x99, 0x09, 0xe4, 0xda, - 0x90, 0xa3, 0xf0, 0xd2, 0xe6, 0xab, 0x0a, 0x64, 0x9e, 0xa9, 0x94, 0x2b, 0x74, 0x15, 0x99, 0xdc, - 0x4f, 0x04, 0x49, 0xbe, 0x5e, 0xe5, 0x65, 0x12, 0x5d, 0xfc, 0xa2, 0xdd, 0x53, 0xa5, 0xac, 0x33, - 0x08, 0x85, 0x17, 0x47, 0xa7, 0x82, 0x8a, 0x82, 0xd4, 0x8f, 0x8d, 0xff, 0x19, 0x7c, 0x06, 0x8c, - 0xb5, 0xa6, 0xe1, 0x94, 0x75, 0x0b, 0xff, 0xec, 0x05, 0xfd, 0xc3, 0xe1, 0xc9, 0x78, 0xc4, 0x77, - 0x39, 0x7b, 0x1c, 0x2f, 0x13, 0xbe, 0x61, 0x2c, 0x1a, 0x40, 0x78, 0xcb, 0xce, 0x41, 0x6b, 0x99, - 0x09, 0x70, 0x19, 0xa9, 0x89, 0xb2, 0x0e, 0x94, 0xc0, 0xc9, 0x6b, 0xaf, 0xd3, 0x0f, 0x86, 0x47, - 0x8b, 0xff, 0x87, 0xe3, 0x8f, 0x80, 0x9d, 0xfd, 0x69, 0x21, 0x24, 0xd6, 0x15, 0x24, 0x25, 0x0a, - 0x17, 0xee, 0x4e, 0xd4, 0x74, 0xd1, 0x06, 0xb2, 0xd1, 0x9e, 0x1b, 0x6d, 0x5b, 0x83, 0x83, 0xbb, - 0x8a, 0x8d, 0xc8, 0xa4, 0x1c, 0x34, 0x88, 0x37, 0xdc, 0xde, 0x07, 0x5d, 0x6c, 0x18, 0x4d, 0xdd, - 0x9e, 0x31, 0x0f, 0x9e, 0xb7, 0xce, 0x14, 0xd7, 0xa2, 0xb8, 0x11, 0xc5, 0xfe, 0x26, 0x65, 0xf2, - 0xd5, 0x89, 0x96, 0xf9, 0xea, 0xa9, 0xe6, 0x3d, 0x78, 0xd9, 0xbc, 0x8e, 0xf3, 0x72, 0xbc, 0x0e, - 0x76, 0xf3, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x57, 0xa7, 0x28, 0xbd, 0x1a, 0x02, 0x00, 0x00, + // 262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x4b, 0x03, 0x31, + 0x14, 0xc4, 0xdd, 0x8a, 0x16, 0xb2, 0x1e, 0x74, 0x41, 0x28, 0x7b, 0xb1, 0x14, 0x2d, 0xbd, 0x98, + 0xb5, 0xd5, 0x93, 0x47, 0xf1, 0x52, 0xa1, 0x52, 0x5a, 0xa8, 0xe0, 0xed, 0x19, 0x1f, 0x6b, 0xdc, + 0x24, 0x6f, 0x49, 0x62, 0x97, 0x7e, 0x25, 0x3f, 0xa5, 0xec, 0x3f, 0x17, 0xb4, 0xb7, 0xf0, 0xe6, + 0xc7, 0x64, 0x66, 0xd8, 0x58, 0x81, 0x49, 0xbf, 0x20, 0xc5, 0x6b, 0x48, 0xd1, 0xf8, 0xe4, 0x69, + 0xb3, 0x58, 0xa0, 0xb7, 0x52, 0xb8, 0x35, 0xda, 0xad, 0x14, 0xc8, 0x73, 0x4b, 0x9e, 0xe2, 0x8b, + 0x3f, 0xdc, 0x23, 0x15, 0xc6, 0x79, 0x8b, 0xa0, 0x1b, 0xe0, 0x54, 0x90, 0xd6, 0x64, 0x4a, 0x83, + 0xfa, 0x32, 0xfa, 0x64, 0xac, 0x73, 0x8b, 0xc6, 0xac, 0xaf, 0xeb, 0xe7, 0x20, 0x18, 0x1e, 0x4e, + 0xc2, 0xd9, 0x09, 0xff, 0x55, 0x37, 0xd3, 0x55, 0x2b, 0x46, 0x77, 0xec, 0x1c, 0xf2, 0x5c, 0x49, + 0x01, 0x5e, 0x92, 0x99, 0x1b, 0xe7, 0xc1, 0x08, 0x9c, 0xbf, 0x0f, 0x7a, 0xc3, 0x60, 0x72, 0xb4, + 0xda, 0x2f, 0xce, 0xee, 0xd9, 0xd9, 0xbf, 0xe4, 0xd1, 0x15, 0xeb, 0x0b, 0x52, 0x0a, 0x85, 0x8f, + 0xc2, 0xee, 0x33, 0x17, 0x87, 0xbc, 0x4b, 0x3f, 0x3a, 0x78, 0x28, 0xd8, 0x0d, 0xd9, 0x94, 0x43, + 0x0e, 0xe2, 0x03, 0xb9, 0xcb, 0x76, 0x05, 0xa8, 0x4c, 0x9a, 0xf2, 0xa2, 0xb9, 0x41, 0x5f, 0x90, + 0xcd, 0x78, 0x5b, 0x9f, 0x57, 0xf5, 0x97, 0xc1, 0xeb, 0x65, 0x07, 0x26, 0x0d, 0x94, 0xb4, 0x50, + 0x52, 0x6f, 0xb4, 0x9d, 0x7e, 0xf7, 0xe2, 0x75, 0xb6, 0x7b, 0x69, 0xfc, 0x9e, 0x6b, 0x6c, 0x59, + 0xae, 0x23, 0x48, 0xbd, 0x1d, 0x57, 0x3b, 0xdd, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x12, 0x4c, + 0xb9, 0xde, 0x84, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -126,7 +125,7 @@ func NewJVMMetricsServiceClient(cc *grpc.ClientConn) JVMMetricsServiceClient { func (c *jVMMetricsServiceClient) Collect(ctx context.Context, in *JVMMetrics, opts ...grpc.CallOption) (*Downstream, error) { out := new(Downstream) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.v1.JVMMetricsService/collect", in, out, opts...) + err := c.cc.Invoke(ctx, "/JVMMetricsService/collect", in, out, opts...) if err != nil { return nil, err } @@ -160,7 +159,7 @@ func _JVMMetricsService_Collect_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.v1.JVMMetricsService/Collect", + FullMethod: "/JVMMetricsService/Collect", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(JVMMetricsServiceServer).Collect(ctx, req.(*JVMMetrics)) @@ -169,7 +168,7 @@ func _JVMMetricsService_Collect_Handler(srv interface{}, ctx context.Context, de } var _JVMMetricsService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v1.JVMMetricsService", + ServiceName: "JVMMetricsService", HandlerType: (*JVMMetricsServiceServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/reporter/network/language/agent/v1/TraceSegmentService.pb.go b/reporter/network/language/agent/v1/TraceSegmentService.pb.go index c9d2ff4..f428d6b 100644 --- a/reporter/network/language/agent/v1/TraceSegmentService.pb.go +++ b/reporter/network/language/agent/v1/TraceSegmentService.pb.go @@ -25,14 +25,14 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type TraceSegmentObject struct { - TraceSegmentId *UniqueId `protobuf:"bytes,1,opt,name=traceSegmentId,proto3" json:"traceSegmentId,omitempty"` - Spans []*SpanObject `protobuf:"bytes,2,rep,name=spans,proto3" json:"spans,omitempty"` - ApplicationId int32 `protobuf:"varint,3,opt,name=applicationId,proto3" json:"applicationId,omitempty"` - ApplicationInstanceId int32 `protobuf:"varint,4,opt,name=applicationInstanceId,proto3" json:"applicationInstanceId,omitempty"` - IsSizeLimited bool `protobuf:"varint,5,opt,name=isSizeLimited,proto3" json:"isSizeLimited,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + TraceSegmentId *UniqueId `protobuf:"bytes,1,opt,name=traceSegmentId,proto3" json:"traceSegmentId,omitempty"` + Spans []*SpanObjectV1 `protobuf:"bytes,2,rep,name=spans,proto3" json:"spans,omitempty"` + ApplicationId int32 `protobuf:"varint,3,opt,name=applicationId,proto3" json:"applicationId,omitempty"` + ApplicationInstanceId int32 `protobuf:"varint,4,opt,name=applicationInstanceId,proto3" json:"applicationInstanceId,omitempty"` + IsSizeLimited bool `protobuf:"varint,5,opt,name=isSizeLimited,proto3" json:"isSizeLimited,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *TraceSegmentObject) Reset() { *m = TraceSegmentObject{} } @@ -67,7 +67,7 @@ func (m *TraceSegmentObject) GetTraceSegmentId() *UniqueId { return nil } -func (m *TraceSegmentObject) GetSpans() []*SpanObject { +func (m *TraceSegmentObject) GetSpans() []*SpanObjectV1 { if m != nil { return m.Spans } @@ -96,7 +96,7 @@ func (m *TraceSegmentObject) GetIsSizeLimited() bool { } type TraceSegmentReference struct { - RefType RefType `protobuf:"varint,1,opt,name=refType,proto3,enum=skywalking.network.protocol.common.v1.RefType" json:"refType,omitempty"` + RefType RefTypeV1 `protobuf:"varint,1,opt,name=refType,proto3,enum=RefTypeV1" json:"refType,omitempty"` ParentTraceSegmentId *UniqueId `protobuf:"bytes,2,opt,name=parentTraceSegmentId,proto3" json:"parentTraceSegmentId,omitempty"` ParentSpanId int32 `protobuf:"varint,3,opt,name=parentSpanId,proto3" json:"parentSpanId,omitempty"` ParentApplicationInstanceId int32 `protobuf:"varint,4,opt,name=parentApplicationInstanceId,proto3" json:"parentApplicationInstanceId,omitempty"` @@ -137,11 +137,11 @@ func (m *TraceSegmentReference) XXX_DiscardUnknown() { var xxx_messageInfo_TraceSegmentReference proto.InternalMessageInfo -func (m *TraceSegmentReference) GetRefType() RefType { +func (m *TraceSegmentReference) GetRefType() RefTypeV1 { if m != nil { return m.RefType } - return RefType_CrossProcess + return RefTypeV1_CrossProcess } func (m *TraceSegmentReference) GetParentTraceSegmentId() *UniqueId { @@ -214,7 +214,7 @@ func (m *TraceSegmentReference) GetParentServiceId() int32 { return 0 } -type SpanObject struct { +type SpanObjectV1 struct { SpanId int32 `protobuf:"varint,1,opt,name=spanId,proto3" json:"spanId,omitempty"` ParentSpanId int32 `protobuf:"varint,2,opt,name=parentSpanId,proto3" json:"parentSpanId,omitempty"` StartTime int64 `protobuf:"varint,3,opt,name=startTime,proto3" json:"startTime,omitempty"` @@ -224,8 +224,8 @@ type SpanObject struct { OperationName string `protobuf:"bytes,7,opt,name=operationName,proto3" json:"operationName,omitempty"` PeerId int32 `protobuf:"varint,8,opt,name=peerId,proto3" json:"peerId,omitempty"` Peer string `protobuf:"bytes,9,opt,name=peer,proto3" json:"peer,omitempty"` - SpanType SpanType `protobuf:"varint,10,opt,name=spanType,proto3,enum=skywalking.network.protocol.common.v1.SpanType" json:"spanType,omitempty"` - SpanLayer SpanLayer `protobuf:"varint,11,opt,name=spanLayer,proto3,enum=skywalking.network.protocol.common.v1.SpanLayer" json:"spanLayer,omitempty"` + SpanType SpanTypeV1 `protobuf:"varint,10,opt,name=spanType,proto3,enum=SpanTypeV1" json:"spanType,omitempty"` + SpanLayer SpanLayerV1 `protobuf:"varint,11,opt,name=spanLayer,proto3,enum=SpanLayerV1" json:"spanLayer,omitempty"` ComponentId int32 `protobuf:"varint,12,opt,name=componentId,proto3" json:"componentId,omitempty"` Component string `protobuf:"bytes,13,opt,name=component,proto3" json:"component,omitempty"` IsError bool `protobuf:"varint,14,opt,name=isError,proto3" json:"isError,omitempty"` @@ -236,137 +236,137 @@ type SpanObject struct { XXX_sizecache int32 `json:"-"` } -func (m *SpanObject) Reset() { *m = SpanObject{} } -func (m *SpanObject) String() string { return proto.CompactTextString(m) } -func (*SpanObject) ProtoMessage() {} -func (*SpanObject) Descriptor() ([]byte, []int) { +func (m *SpanObjectV1) Reset() { *m = SpanObjectV1{} } +func (m *SpanObjectV1) String() string { return proto.CompactTextString(m) } +func (*SpanObjectV1) ProtoMessage() {} +func (*SpanObjectV1) Descriptor() ([]byte, []int) { return fileDescriptor_b4a2a0c689c6ad4b, []int{2} } -func (m *SpanObject) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SpanObject.Unmarshal(m, b) +func (m *SpanObjectV1) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SpanObjectV1.Unmarshal(m, b) } -func (m *SpanObject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SpanObject.Marshal(b, m, deterministic) +func (m *SpanObjectV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SpanObjectV1.Marshal(b, m, deterministic) } -func (m *SpanObject) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpanObject.Merge(m, src) +func (m *SpanObjectV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanObjectV1.Merge(m, src) } -func (m *SpanObject) XXX_Size() int { - return xxx_messageInfo_SpanObject.Size(m) +func (m *SpanObjectV1) XXX_Size() int { + return xxx_messageInfo_SpanObjectV1.Size(m) } -func (m *SpanObject) XXX_DiscardUnknown() { - xxx_messageInfo_SpanObject.DiscardUnknown(m) +func (m *SpanObjectV1) XXX_DiscardUnknown() { + xxx_messageInfo_SpanObjectV1.DiscardUnknown(m) } -var xxx_messageInfo_SpanObject proto.InternalMessageInfo +var xxx_messageInfo_SpanObjectV1 proto.InternalMessageInfo -func (m *SpanObject) GetSpanId() int32 { +func (m *SpanObjectV1) GetSpanId() int32 { if m != nil { return m.SpanId } return 0 } -func (m *SpanObject) GetParentSpanId() int32 { +func (m *SpanObjectV1) GetParentSpanId() int32 { if m != nil { return m.ParentSpanId } return 0 } -func (m *SpanObject) GetStartTime() int64 { +func (m *SpanObjectV1) GetStartTime() int64 { if m != nil { return m.StartTime } return 0 } -func (m *SpanObject) GetEndTime() int64 { +func (m *SpanObjectV1) GetEndTime() int64 { if m != nil { return m.EndTime } return 0 } -func (m *SpanObject) GetRefs() []*TraceSegmentReference { +func (m *SpanObjectV1) GetRefs() []*TraceSegmentReference { if m != nil { return m.Refs } return nil } -func (m *SpanObject) GetOperationNameId() int32 { +func (m *SpanObjectV1) GetOperationNameId() int32 { if m != nil { return m.OperationNameId } return 0 } -func (m *SpanObject) GetOperationName() string { +func (m *SpanObjectV1) GetOperationName() string { if m != nil { return m.OperationName } return "" } -func (m *SpanObject) GetPeerId() int32 { +func (m *SpanObjectV1) GetPeerId() int32 { if m != nil { return m.PeerId } return 0 } -func (m *SpanObject) GetPeer() string { +func (m *SpanObjectV1) GetPeer() string { if m != nil { return m.Peer } return "" } -func (m *SpanObject) GetSpanType() SpanType { +func (m *SpanObjectV1) GetSpanType() SpanTypeV1 { if m != nil { return m.SpanType } - return SpanType_Entry + return SpanTypeV1_Entry } -func (m *SpanObject) GetSpanLayer() SpanLayer { +func (m *SpanObjectV1) GetSpanLayer() SpanLayerV1 { if m != nil { return m.SpanLayer } - return SpanLayer_Unknown + return SpanLayerV1_Unknown } -func (m *SpanObject) GetComponentId() int32 { +func (m *SpanObjectV1) GetComponentId() int32 { if m != nil { return m.ComponentId } return 0 } -func (m *SpanObject) GetComponent() string { +func (m *SpanObjectV1) GetComponent() string { if m != nil { return m.Component } return "" } -func (m *SpanObject) GetIsError() bool { +func (m *SpanObjectV1) GetIsError() bool { if m != nil { return m.IsError } return false } -func (m *SpanObject) GetTags() []*KeyWithStringValue { +func (m *SpanObjectV1) GetTags() []*KeyWithStringValue { if m != nil { return m.Tags } return nil } -func (m *SpanObject) GetLogs() []*LogMessage { +func (m *SpanObjectV1) GetLogs() []*LogMessage { if m != nil { return m.Logs } @@ -421,10 +421,10 @@ func (m *LogMessage) GetData() []*KeyWithStringValue { } func init() { - proto.RegisterType((*TraceSegmentObject)(nil), "skywalking.network.protocol.agent.v1.TraceSegmentObject") - proto.RegisterType((*TraceSegmentReference)(nil), "skywalking.network.protocol.agent.v1.TraceSegmentReference") - proto.RegisterType((*SpanObject)(nil), "skywalking.network.protocol.agent.v1.SpanObject") - proto.RegisterType((*LogMessage)(nil), "skywalking.network.protocol.agent.v1.LogMessage") + proto.RegisterType((*TraceSegmentObject)(nil), "TraceSegmentObject") + proto.RegisterType((*TraceSegmentReference)(nil), "TraceSegmentReference") + proto.RegisterType((*SpanObjectV1)(nil), "SpanObjectV1") + proto.RegisterType((*LogMessage)(nil), "LogMessage") } func init() { @@ -432,58 +432,56 @@ func init() { } var fileDescriptor_b4a2a0c689c6ad4b = []byte{ - // 809 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x51, 0x8f, 0xdb, 0x44, - 0x10, 0xc6, 0xb9, 0xe4, 0xee, 0x32, 0x69, 0xd3, 0xb2, 0xa5, 0xc8, 0x04, 0x24, 0xa2, 0xa8, 0xa2, - 0x11, 0xa2, 0x4e, 0x2f, 0x20, 0x5e, 0x90, 0x10, 0x45, 0x05, 0x61, 0xf5, 0xb8, 0x56, 0x9b, 0xc0, - 0x49, 0xbc, 0x6d, 0xed, 0x39, 0xd7, 0xc4, 0xde, 0x35, 0xeb, 0xbd, 0x44, 0xe1, 0x47, 0xf0, 0x43, - 0x78, 0xe5, 0x81, 0x3f, 0xc5, 0x8f, 0x40, 0x3b, 0x76, 0x12, 0x3b, 0x89, 0x42, 0xe8, 0xdb, 0xce, - 0x37, 0x33, 0x9f, 0x67, 0xe7, 0xf3, 0xec, 0xc0, 0x30, 0x11, 0x32, 0xba, 0x15, 0x11, 0x3e, 0x11, - 0x11, 0x4a, 0x33, 0x9a, 0x6a, 0x11, 0xe0, 0x04, 0xa3, 0x14, 0xa5, 0x99, 0xa0, 0x9e, 0xc7, 0x01, - 0x7a, 0x99, 0x56, 0x46, 0xb1, 0x47, 0xf9, 0x6c, 0xb9, 0x10, 0xc9, 0x2c, 0x96, 0x91, 0x27, 0xd1, - 0x2c, 0x94, 0x9e, 0x15, 0x9e, 0x40, 0x25, 0x1e, 0x25, 0x7b, 0xf3, 0x8b, 0xde, 0xc7, 0x5b, 0x7c, - 0xcf, 0xd5, 0x42, 0xe6, 0x46, 0xa3, 0x48, 0x8b, 0xe0, 0xde, 0xe3, 0xad, 0x80, 0x17, 0xb8, 0xbc, - 0x8e, 0xcd, 0x9b, 0x89, 0xd1, 0xb1, 0x8c, 0x7e, 0x16, 0xc9, 0x6d, 0xf9, 0xbd, 0xde, 0x07, 0x81, - 0x4a, 0x53, 0x25, 0x47, 0xc6, 0x56, 0xf4, 0xa4, 0x30, 0x0a, 0xd7, 0xe0, 0xef, 0x06, 0xb0, 0x6a, - 0xa1, 0x2f, 0x5f, 0xff, 0x8a, 0x81, 0x61, 0xd7, 0xd0, 0x35, 0x15, 0xd4, 0x0f, 0x5d, 0xa7, 0xef, - 0x0c, 0x3b, 0xe3, 0x91, 0x77, 0xa8, 0xf4, 0x92, 0x79, 0x7e, 0xe1, 0xfd, 0x24, 0xe3, 0xdf, 0x6e, - 0xd1, 0x0f, 0xf9, 0x16, 0x0d, 0xfb, 0x1e, 0x5a, 0x79, 0x26, 0x64, 0xee, 0x36, 0xfa, 0x27, 0xc3, - 0xce, 0xf8, 0xa9, 0x77, 0x4c, 0x2b, 0xbc, 0x49, 0x26, 0x64, 0x51, 0x19, 0x2f, 0xd2, 0xd9, 0x23, - 0xb8, 0x2b, 0xb2, 0x2c, 0x89, 0x03, 0x61, 0x62, 0x25, 0xfd, 0xd0, 0x3d, 0xe9, 0x3b, 0xc3, 0x16, - 0xaf, 0x83, 0xec, 0x0b, 0x78, 0x58, 0x05, 0x64, 0x6e, 0x84, 0x0c, 0xd0, 0x0f, 0xdd, 0x26, 0x45, - 0xef, 0x77, 0x5a, 0xee, 0x38, 0x9f, 0xc4, 0xbf, 0xe3, 0x65, 0x9c, 0xc6, 0x06, 0x43, 0xb7, 0xd5, - 0x77, 0x86, 0xe7, 0xbc, 0x0e, 0x0e, 0xfe, 0x69, 0xc2, 0xc3, 0x6a, 0xe7, 0x38, 0xde, 0xa0, 0x46, - 0x19, 0x20, 0xfb, 0x01, 0xce, 0x34, 0xde, 0x4c, 0x97, 0x19, 0x52, 0xd7, 0xba, 0x63, 0xef, 0xc8, - 0xae, 0xf1, 0x22, 0x8b, 0xaf, 0xd2, 0x59, 0x00, 0xef, 0x65, 0x42, 0xa3, 0x34, 0xd3, 0xba, 0x18, - 0x8d, 0xb7, 0x13, 0x63, 0x2f, 0x19, 0x1b, 0xc0, 0x9d, 0x02, 0xb7, 0x5d, 0x5e, 0x77, 0xb2, 0x86, - 0xb1, 0x6f, 0xe0, 0xc3, 0xc2, 0x7e, 0x76, 0xa0, 0x9d, 0x87, 0x42, 0xd8, 0x27, 0xd0, 0x2d, 0x4b, - 0x7c, 0x16, 0x86, 0x1a, 0xf3, 0x9c, 0xba, 0xda, 0xe6, 0x5b, 0x28, 0xfb, 0x14, 0xee, 0xd7, 0x11, - 0x3f, 0x74, 0x4f, 0x89, 0x7e, 0x07, 0x67, 0x5f, 0x43, 0x0f, 0xa5, 0xd1, 0xcb, 0xfd, 0x45, 0x9d, - 0x51, 0xd6, 0x81, 0x08, 0xfb, 0x2d, 0xf2, 0x96, 0xd3, 0x79, 0x25, 0x52, 0x74, 0xcf, 0xa9, 0xaa, - 0x1d, 0xdc, 0xd6, 0x5f, 0xc5, 0xfc, 0xd0, 0x6d, 0x13, 0xff, 0x16, 0xca, 0x3e, 0x83, 0x77, 0xcb, - 0xce, 0x55, 0x48, 0x81, 0x48, 0x77, 0x1d, 0x6c, 0x08, 0xf7, 0x6a, 0xa0, 0x1f, 0xba, 0x1d, 0xa2, - 0xdd, 0x86, 0x07, 0x7f, 0xb5, 0x00, 0x36, 0x63, 0xc0, 0xde, 0x87, 0xd3, 0xbc, 0x90, 0xcb, 0xa1, - 0xf8, 0xd2, 0xda, 0x11, 0xb3, 0xb1, 0x47, 0xcc, 0x8f, 0xa0, 0x9d, 0x1b, 0xa1, 0xcd, 0x34, 0x4e, - 0x91, 0xd4, 0x3e, 0xe1, 0x1b, 0x80, 0xb9, 0x70, 0x86, 0x32, 0x24, 0x5f, 0x93, 0x7c, 0x2b, 0x93, - 0xbd, 0x84, 0xa6, 0xc6, 0x1b, 0x2b, 0x9c, 0x1d, 0xdd, 0xaf, 0x8e, 0x1b, 0xdd, 0xbd, 0x23, 0xc2, - 0x89, 0xc8, 0xde, 0x5e, 0x65, 0xa8, 0x49, 0x16, 0xdb, 0x8e, 0xb5, 0xd4, 0xdb, 0xb0, 0x1d, 0xc9, - 0x1a, 0x44, 0xe2, 0xb6, 0x79, 0x1d, 0xb4, 0x4d, 0xc9, 0x10, 0xb5, 0x1f, 0x92, 0x8a, 0x2d, 0x5e, - 0x5a, 0x8c, 0x41, 0xd3, 0x9e, 0x48, 0xb1, 0x36, 0xa7, 0x33, 0x7b, 0x01, 0xe7, 0xb6, 0x65, 0x34, - 0xa5, 0x40, 0x53, 0x7a, 0xec, 0x38, 0x4d, 0xca, 0x34, 0xbe, 0x26, 0x60, 0x57, 0xd0, 0xb6, 0xe7, - 0x4b, 0xb1, 0x44, 0x4d, 0x02, 0x76, 0xff, 0xe3, 0x65, 0xab, 0xb3, 0x51, 0x1e, 0xdf, 0x50, 0xb0, - 0x3e, 0x74, 0x02, 0x95, 0x66, 0x4a, 0x16, 0xe3, 0x7e, 0x87, 0x6e, 0x53, 0x85, 0xac, 0x86, 0x6b, - 0xd3, 0xbd, 0x4b, 0xf7, 0xda, 0x00, 0x56, 0xc3, 0x38, 0xff, 0x4e, 0x6b, 0xa5, 0xdd, 0x2e, 0xbd, - 0x5d, 0x2b, 0x93, 0x3d, 0x86, 0xa6, 0x11, 0x51, 0xee, 0xde, 0x23, 0x0d, 0x1f, 0x78, 0xbb, 0x3b, - 0x83, 0x53, 0x00, 0x7b, 0x0e, 0xcd, 0x44, 0x45, 0xb9, 0x7b, 0xff, 0xff, 0xbc, 0xd3, 0x97, 0x2a, - 0xfa, 0x11, 0xf3, 0x5c, 0x44, 0xc8, 0x29, 0x7b, 0xe0, 0x03, 0x6c, 0x30, 0xab, 0x83, 0xb1, 0xff, - 0x95, 0x43, 0xff, 0x15, 0x9d, 0x6d, 0x41, 0xa1, 0x30, 0xa2, 0xdc, 0x07, 0xfb, 0x0b, 0xb2, 0x01, - 0xe3, 0x3f, 0x1c, 0x78, 0xb0, 0x67, 0xa5, 0xb2, 0x05, 0x9c, 0x05, 0x2a, 0x49, 0xec, 0x50, 0x7c, - 0x79, 0xec, 0x83, 0x98, 0x15, 0x7b, 0xb4, 0x64, 0xea, 0x1d, 0x79, 0xbb, 0xcd, 0x02, 0x1e, 0xbc, - 0x33, 0x74, 0xbe, 0x5d, 0xc0, 0x53, 0xa5, 0x23, 0x4f, 0x64, 0x22, 0x78, 0x83, 0x55, 0x06, 0x91, - 0xa5, 0x6b, 0x96, 0xd5, 0x8a, 0x2e, 0x58, 0x5e, 0x39, 0xbf, 0x54, 0x76, 0xff, 0xa8, 0x0c, 0x1a, - 0xad, 0x82, 0x46, 0xc5, 0x1e, 0x9f, 0x5f, 0xfc, 0xd9, 0xe8, 0x4d, 0x66, 0xcb, 0xeb, 0x92, 0xef, - 0xaa, 0x08, 0x7b, 0x55, 0x16, 0xf4, 0xfa, 0x94, 0x4a, 0xfb, 0xfc, 0xdf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xc8, 0x54, 0x2f, 0x25, 0x71, 0x08, 0x00, 0x00, + // 775 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0x5f, 0x8f, 0xdb, 0x44, + 0x10, 0xc7, 0x77, 0xbe, 0x3f, 0x99, 0xdc, 0xa5, 0xc7, 0x96, 0x56, 0xe6, 0x40, 0x6a, 0x14, 0x4e, + 0x5c, 0x74, 0x6a, 0x1d, 0x12, 0x78, 0x05, 0x51, 0xfe, 0x3c, 0x58, 0x1c, 0xa5, 0xda, 0xa4, 0xa9, + 0xc4, 0xdb, 0xd6, 0x9e, 0x73, 0x4d, 0xec, 0x5d, 0xb3, 0xde, 0x6b, 0x14, 0x3e, 0x0e, 0xbc, 0xf1, + 0xe1, 0xf8, 0x0c, 0x68, 0xc7, 0x4e, 0x62, 0x3b, 0xd1, 0xbd, 0xed, 0xfc, 0xe6, 0xe7, 0xd9, 0x99, + 0xdf, 0x78, 0x76, 0x60, 0x98, 0x0a, 0x19, 0xdf, 0x8b, 0x18, 0x5f, 0x88, 0x18, 0xa5, 0x19, 0xcd, + 0xb4, 0x08, 0x71, 0x8a, 0x71, 0x86, 0xd2, 0x4c, 0x51, 0x7f, 0x48, 0x42, 0xf4, 0x73, 0xad, 0x8c, + 0xba, 0x7c, 0xd6, 0x62, 0xfe, 0xa4, 0x96, 0xb2, 0x30, 0x1a, 0x45, 0x56, 0x11, 0xae, 0x5b, 0x84, + 0x5f, 0x70, 0xf5, 0x36, 0x31, 0xef, 0xa7, 0x46, 0x27, 0x32, 0x9e, 0x8b, 0xf4, 0x7e, 0x1d, 0xe9, + 0xd3, 0x50, 0x65, 0x99, 0x92, 0x23, 0x63, 0xef, 0x7a, 0x51, 0x1a, 0xa5, 0x6b, 0xf0, 0x9f, 0x03, + 0xac, 0x9e, 0xc2, 0x6f, 0xef, 0xfe, 0xc0, 0xd0, 0xb0, 0x31, 0xf4, 0x4c, 0x0d, 0x0d, 0x22, 0xcf, + 0xe9, 0x3b, 0xc3, 0xee, 0xa4, 0xe3, 0xbf, 0x91, 0xc9, 0x9f, 0xf7, 0x18, 0x44, 0xbc, 0x45, 0x60, + 0x5f, 0xc0, 0x51, 0x91, 0x0b, 0x59, 0x78, 0x07, 0xfd, 0xc3, 0x61, 0x77, 0x72, 0xee, 0x4f, 0x73, + 0x21, 0xcb, 0x70, 0xf3, 0x31, 0x2f, 0x7d, 0xec, 0x0a, 0xce, 0x45, 0x9e, 0xa7, 0x49, 0x28, 0x4c, + 0xa2, 0x64, 0x10, 0x79, 0x87, 0x7d, 0x67, 0x78, 0xc4, 0x9b, 0x20, 0xfb, 0x06, 0x9e, 0xd4, 0x01, + 0x59, 0x18, 0x21, 0x43, 0x0c, 0x22, 0xcf, 0x25, 0xf6, 0x7e, 0xa7, 0x8d, 0x9d, 0x14, 0xd3, 0xe4, + 0x2f, 0xbc, 0x4d, 0xb2, 0xc4, 0x60, 0xe4, 0x1d, 0xf5, 0x9d, 0xe1, 0x29, 0x6f, 0x82, 0x83, 0xbf, + 0x5d, 0x78, 0x52, 0x2f, 0x98, 0xe3, 0x1d, 0x6a, 0x94, 0x21, 0xb2, 0x2b, 0x38, 0xd1, 0x78, 0x37, + 0x5b, 0xe5, 0x48, 0xc5, 0xf6, 0x26, 0xe0, 0xf3, 0xd2, 0x9e, 0x8f, 0xf9, 0xda, 0xc5, 0xbe, 0x85, + 0x4f, 0x72, 0xa1, 0x51, 0x9a, 0x59, 0x53, 0x9f, 0x83, 0xb6, 0x3e, 0x7b, 0x69, 0x6c, 0x00, 0x67, + 0x25, 0x6e, 0xd5, 0xd9, 0xd4, 0xdf, 0xc0, 0xd8, 0xf7, 0xf0, 0x59, 0x69, 0xbf, 0x7c, 0x40, 0x84, + 0x87, 0x28, 0xec, 0x4b, 0xe8, 0x49, 0x34, 0x4b, 0xa5, 0x17, 0x2f, 0xa3, 0x48, 0x63, 0x51, 0x90, + 0x16, 0x1d, 0xde, 0x42, 0xd9, 0x0d, 0x5c, 0x34, 0x91, 0x20, 0xf2, 0x8e, 0x29, 0xfc, 0x0e, 0xce, + 0xbe, 0x83, 0x4b, 0x94, 0x46, 0xaf, 0xf6, 0x27, 0x75, 0x42, 0x5f, 0x3d, 0xc0, 0xb0, 0x77, 0x91, + 0xb7, 0xfa, 0xc9, 0x5f, 0x89, 0x0c, 0xbd, 0x53, 0xca, 0x6a, 0x07, 0xb7, 0xf9, 0xd7, 0xb1, 0x20, + 0xf2, 0x3a, 0x14, 0xbf, 0x85, 0xb2, 0xe7, 0xf0, 0x71, 0xa5, 0x5c, 0x2d, 0x28, 0x50, 0xd0, 0x5d, + 0x07, 0x1b, 0xc2, 0xa3, 0x06, 0x18, 0x44, 0x5e, 0x97, 0xc2, 0xb6, 0xe1, 0xc1, 0x3f, 0x2e, 0x9c, + 0xd5, 0x7f, 0x5f, 0xf6, 0x14, 0x8e, 0x8b, 0xb2, 0x61, 0x0e, 0x7d, 0x51, 0x59, 0x3b, 0xed, 0x3c, + 0xd8, 0xd3, 0xce, 0xcf, 0xa1, 0x53, 0x18, 0xa1, 0xcd, 0x2c, 0xc9, 0x90, 0xfa, 0x7d, 0xc8, 0xb7, + 0x00, 0xf3, 0xe0, 0x04, 0x65, 0x44, 0x3e, 0x97, 0x7c, 0x6b, 0x93, 0xdd, 0x80, 0xab, 0xf1, 0xce, + 0xb6, 0xce, 0xce, 0xd3, 0x53, 0x7f, 0xef, 0x5f, 0xcb, 0x89, 0x63, 0x4b, 0x53, 0x39, 0x6a, 0xd2, + 0xdc, 0xd6, 0xba, 0xe9, 0x63, 0x1b, 0xb6, 0x53, 0xd2, 0x80, 0xa8, 0x73, 0x1d, 0xde, 0x04, 0x6d, + 0xbd, 0x39, 0xa2, 0x0e, 0x22, 0x6a, 0xd1, 0x11, 0xaf, 0x2c, 0xc6, 0xc0, 0xb5, 0x27, 0x6a, 0x47, + 0x87, 0xd3, 0x99, 0x5d, 0xc3, 0xa9, 0x55, 0x83, 0x06, 0x07, 0x68, 0x70, 0xba, 0x34, 0xfb, 0xd5, + 0xe4, 0x6c, 0x9c, 0xec, 0x06, 0x3a, 0xf6, 0x7c, 0x2b, 0x56, 0xa8, 0x49, 0xf9, 0xde, 0xe4, 0x8c, + 0x98, 0x84, 0xcc, 0xc7, 0x7c, 0xeb, 0x66, 0x7d, 0xe8, 0x86, 0x2a, 0xcb, 0x95, 0x2c, 0xa7, 0xeb, + 0x8c, 0xb2, 0xa8, 0x43, 0x56, 0xd6, 0x8d, 0xe9, 0x9d, 0x53, 0x3e, 0x5b, 0xc0, 0xca, 0x9a, 0x14, + 0x3f, 0x6b, 0xad, 0xb4, 0xd7, 0xa3, 0x67, 0x60, 0x6d, 0xb2, 0x6b, 0x70, 0x8d, 0x88, 0x0b, 0xef, + 0x11, 0xc9, 0xfa, 0xd8, 0xdf, 0x7d, 0x35, 0x39, 0x11, 0xd8, 0x33, 0x70, 0x53, 0x15, 0x17, 0xde, + 0x05, 0x11, 0xbb, 0xfe, 0xad, 0x8a, 0x7f, 0xc5, 0xa2, 0x10, 0x31, 0x72, 0x72, 0x0c, 0x02, 0x80, + 0x2d, 0x66, 0xa5, 0x31, 0xb6, 0x8b, 0x0e, 0x75, 0x91, 0xce, 0xf6, 0xae, 0x48, 0x18, 0x51, 0x3d, + 0x89, 0xfb, 0xef, 0xb2, 0x84, 0xc9, 0x8f, 0xf0, 0x78, 0xcf, 0x22, 0x60, 0xcf, 0xe1, 0x24, 0x54, + 0x69, 0x6a, 0x5f, 0xe4, 0x0b, 0xff, 0x4d, 0x5e, 0xbe, 0xfe, 0x15, 0xe7, 0xb2, 0xeb, 0x6f, 0x37, + 0xc2, 0xe0, 0xa3, 0xa1, 0xf3, 0xc3, 0x12, 0xbe, 0x52, 0x3a, 0xf6, 0x45, 0x2e, 0xc2, 0xf7, 0xe8, + 0x17, 0x8b, 0xd5, 0x52, 0xa4, 0x8b, 0x44, 0x5a, 0x24, 0xf3, 0xab, 0x79, 0xf6, 0xd7, 0x3b, 0xc3, + 0xa7, 0x9d, 0xf1, 0xda, 0xf9, 0xfd, 0x6a, 0x4b, 0x1c, 0x55, 0xa4, 0xd1, 0x9a, 0x34, 0x2a, 0x17, + 0xcb, 0x87, 0xf1, 0xbf, 0x07, 0x97, 0xd3, 0xc5, 0xea, 0x6d, 0x15, 0xef, 0x55, 0x49, 0x7b, 0x6d, + 0x37, 0x48, 0xa8, 0xd2, 0x77, 0xc7, 0xb4, 0x4b, 0xbe, 0xfe, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x91, + 0x02, 0xfe, 0xeb, 0xdc, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -510,7 +508,7 @@ func NewTraceSegmentServiceClient(cc *grpc.ClientConn) TraceSegmentServiceClient } func (c *traceSegmentServiceClient) Collect(ctx context.Context, opts ...grpc.CallOption) (TraceSegmentService_CollectClient, error) { - stream, err := c.cc.NewStream(ctx, &_TraceSegmentService_serviceDesc.Streams[0], "/skywalking.network.protocol.agent.v1.TraceSegmentService/collect", opts...) + stream, err := c.cc.NewStream(ctx, &_TraceSegmentService_serviceDesc.Streams[0], "/TraceSegmentService/collect", opts...) if err != nil { return nil, err } @@ -587,7 +585,7 @@ func (x *traceSegmentServiceCollectServer) Recv() (*UpstreamSegment, error) { } var _TraceSegmentService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v1.TraceSegmentService", + ServiceName: "TraceSegmentService", HandlerType: (*TraceSegmentServiceServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{ diff --git a/reporter/network/language/agent/v1/trace-common.pb.go b/reporter/network/language/agent/v1/trace-common.pb.go index 981d6d9..04277b9 100644 --- a/reporter/network/language/agent/v1/trace-common.pb.go +++ b/reporter/network/language/agent/v1/trace-common.pb.go @@ -20,71 +20,71 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type SpanType int32 +type SpanTypeV1 int32 const ( - SpanType_Entry SpanType = 0 - SpanType_Exit SpanType = 1 - SpanType_Local SpanType = 2 + SpanTypeV1_Entry SpanTypeV1 = 0 + SpanTypeV1_Exit SpanTypeV1 = 1 + SpanTypeV1_Local SpanTypeV1 = 2 ) -var SpanType_name = map[int32]string{ +var SpanTypeV1_name = map[int32]string{ 0: "Entry", 1: "Exit", 2: "Local", } -var SpanType_value = map[string]int32{ +var SpanTypeV1_value = map[string]int32{ "Entry": 0, "Exit": 1, "Local": 2, } -func (x SpanType) String() string { - return proto.EnumName(SpanType_name, int32(x)) +func (x SpanTypeV1) String() string { + return proto.EnumName(SpanTypeV1_name, int32(x)) } -func (SpanType) EnumDescriptor() ([]byte, []int) { +func (SpanTypeV1) EnumDescriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{0} } -type RefType int32 +type RefTypeV1 int32 const ( - RefType_CrossProcess RefType = 0 - RefType_CrossThread RefType = 1 + RefTypeV1_CrossProcess RefTypeV1 = 0 + RefTypeV1_CrossThread RefTypeV1 = 1 ) -var RefType_name = map[int32]string{ +var RefTypeV1_name = map[int32]string{ 0: "CrossProcess", 1: "CrossThread", } -var RefType_value = map[string]int32{ +var RefTypeV1_value = map[string]int32{ "CrossProcess": 0, "CrossThread": 1, } -func (x RefType) String() string { - return proto.EnumName(RefType_name, int32(x)) +func (x RefTypeV1) String() string { + return proto.EnumName(RefTypeV1_name, int32(x)) } -func (RefType) EnumDescriptor() ([]byte, []int) { +func (RefTypeV1) EnumDescriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{1} } -type SpanLayer int32 +type SpanLayerV1 int32 const ( - SpanLayer_Unknown SpanLayer = 0 - SpanLayer_Database SpanLayer = 1 - SpanLayer_RPCFramework SpanLayer = 2 - SpanLayer_Http SpanLayer = 3 - SpanLayer_MQ SpanLayer = 4 - SpanLayer_Cache SpanLayer = 5 + SpanLayerV1_Unknown SpanLayerV1 = 0 + SpanLayerV1_Database SpanLayerV1 = 1 + SpanLayerV1_RPCFramework SpanLayerV1 = 2 + SpanLayerV1_Http SpanLayerV1 = 3 + SpanLayerV1_MQ SpanLayerV1 = 4 + SpanLayerV1_Cache SpanLayerV1 = 5 ) -var SpanLayer_name = map[int32]string{ +var SpanLayerV1_name = map[int32]string{ 0: "Unknown", 1: "Database", 2: "RPCFramework", @@ -93,7 +93,7 @@ var SpanLayer_name = map[int32]string{ 5: "Cache", } -var SpanLayer_value = map[string]int32{ +var SpanLayerV1_value = map[string]int32{ "Unknown": 0, "Database": 1, "RPCFramework": 2, @@ -102,11 +102,11 @@ var SpanLayer_value = map[string]int32{ "Cache": 5, } -func (x SpanLayer) String() string { - return proto.EnumName(SpanLayer_name, int32(x)) +func (x SpanLayerV1) String() string { + return proto.EnumName(SpanLayerV1_name, int32(x)) } -func (SpanLayer) EnumDescriptor() ([]byte, []int) { +func (SpanLayerV1) EnumDescriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{2} } @@ -197,39 +197,38 @@ func (m *UniqueId) GetIdParts() []int64 { } func init() { - proto.RegisterEnum("skywalking.network.protocol.common.v1.SpanType", SpanType_name, SpanType_value) - proto.RegisterEnum("skywalking.network.protocol.common.v1.RefType", RefType_name, RefType_value) - proto.RegisterEnum("skywalking.network.protocol.common.v1.SpanLayer", SpanLayer_name, SpanLayer_value) - proto.RegisterType((*UpstreamSegment)(nil), "skywalking.network.protocol.common.v1.UpstreamSegment") - proto.RegisterType((*UniqueId)(nil), "skywalking.network.protocol.common.v1.UniqueId") + proto.RegisterEnum("SpanTypeV1", SpanTypeV1_name, SpanTypeV1_value) + proto.RegisterEnum("RefTypeV1", RefTypeV1_name, RefTypeV1_value) + proto.RegisterEnum("SpanLayerV1", SpanLayerV1_name, SpanLayerV1_value) + proto.RegisterType((*UpstreamSegment)(nil), "UpstreamSegment") + proto.RegisterType((*UniqueId)(nil), "UniqueId") } func init() { proto.RegisterFile("common/trace-common.proto", fileDescriptor_f5d7d2e503402948) } var fileDescriptor_f5d7d2e503402948 = []byte{ - // 375 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x6e, 0xd4, 0x30, - 0x10, 0x87, 0x37, 0xd9, 0xb6, 0x9b, 0xce, 0xae, 0xa8, 0xe5, 0xd3, 0xc2, 0xa9, 0xaa, 0x8a, 0x54, - 0x45, 0x90, 0x50, 0x78, 0x03, 0x96, 0x22, 0x2a, 0x15, 0x14, 0xb2, 0x1b, 0x55, 0xe2, 0x36, 0x9b, - 0x0c, 0x69, 0x94, 0xc4, 0x0e, 0xb6, 0xbb, 0x21, 0x77, 0x9e, 0x86, 0xa7, 0x44, 0xce, 0x1f, 0x40, - 0x9c, 0x38, 0xfe, 0xc6, 0x9f, 0xbf, 0xb1, 0x67, 0xe0, 0x69, 0x2a, 0xeb, 0x5a, 0x8a, 0xd0, 0x28, - 0x4c, 0xe9, 0xe5, 0x10, 0x82, 0x46, 0x49, 0x23, 0xf9, 0x73, 0x5d, 0x76, 0x2d, 0x56, 0x65, 0x21, - 0xf2, 0x40, 0x90, 0x69, 0xa5, 0x2a, 0x87, 0x93, 0x54, 0x56, 0xc1, 0x48, 0x1e, 0xae, 0x2f, 0x7e, - 0x38, 0x70, 0x96, 0x34, 0xda, 0x28, 0xc2, 0x7a, 0x4b, 0x79, 0x4d, 0xc2, 0xf0, 0x7b, 0x78, 0x92, - 0x57, 0x72, 0x8f, 0xd5, 0xce, 0x6a, 0x6f, 0x33, 0xbd, 0x76, 0xce, 0xe7, 0x57, 0xcb, 0xd7, 0x61, - 0xf0, 0x5f, 0xce, 0x20, 0x11, 0xc5, 0xb7, 0x47, 0xba, 0xcd, 0xe2, 0x7f, 0x34, 0x7c, 0x0d, 0x0b, - 0x3d, 0xf4, 0x58, 0xbb, 0xe7, 0xce, 0xd5, 0x2a, 0x9e, 0xe2, 0xc5, 0x25, 0x78, 0xd3, 0x2d, 0x4b, - 0x15, 0x59, 0x84, 0xca, 0x0c, 0x7d, 0xe7, 0xf1, 0x14, 0x7d, 0x1f, 0xbc, 0x6d, 0x83, 0x62, 0xd7, - 0x35, 0xc4, 0x4f, 0xe1, 0xf8, 0x46, 0x18, 0xd5, 0xb1, 0x19, 0xf7, 0xe0, 0xe8, 0xe6, 0x7b, 0x61, - 0x98, 0x63, 0x8b, 0x77, 0x32, 0xc5, 0x8a, 0xb9, 0xfe, 0x0b, 0x58, 0xc4, 0xf4, 0xb5, 0x47, 0x19, - 0xac, 0x36, 0x4a, 0x6a, 0x1d, 0x29, 0x99, 0x92, 0xd6, 0x6c, 0xc6, 0xcf, 0x60, 0xd9, 0x57, 0x76, - 0x0f, 0x8a, 0x30, 0x63, 0x8e, 0x9f, 0xc0, 0xa9, 0x35, 0xdf, 0x61, 0x47, 0x8a, 0x2f, 0x61, 0x91, - 0x88, 0x52, 0xc8, 0x56, 0xb0, 0x19, 0x5f, 0x81, 0xf7, 0x0e, 0x0d, 0xee, 0x51, 0x13, 0x73, 0xac, - 0x2a, 0x8e, 0x36, 0xef, 0x15, 0xd6, 0x64, 0x7f, 0xcf, 0x5c, 0xdb, 0xfc, 0x83, 0x31, 0x0d, 0x9b, - 0xf3, 0x13, 0x70, 0x3f, 0x7e, 0x66, 0x47, 0xf6, 0x11, 0x1b, 0x4c, 0x1f, 0x88, 0x1d, 0xbf, 0x6d, - 0xe1, 0x95, 0x54, 0x79, 0x80, 0x8d, 0xcd, 0x7f, 0x4f, 0x0f, 0x9b, 0xfa, 0xf7, 0x04, 0x2b, 0x14, - 0xf9, 0x23, 0xe6, 0x14, 0x60, 0x4e, 0xc2, 0x44, 0xce, 0x97, 0xcb, 0x3f, 0x60, 0x38, 0x42, 0xe1, - 0x04, 0x85, 0x3d, 0x14, 0x1e, 0xae, 0x7f, 0xba, 0xcf, 0xb6, 0x65, 0x77, 0x3f, 0xfa, 0x3e, 0x0d, - 0x58, 0x34, 0x2e, 0x63, 0x7f, 0xd2, 0xaf, 0xe5, 0xcd, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x22, - 0x0b, 0x4d, 0x09, 0x21, 0x02, 0x00, 0x00, + // 359 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xdf, 0x8a, 0xd3, 0x40, + 0x14, 0xc6, 0x9b, 0x74, 0xff, 0xb4, 0x27, 0xc5, 0x1d, 0xe6, 0xaa, 0x7a, 0xb5, 0x2c, 0x7b, 0xb1, + 0x14, 0x9d, 0x18, 0x7d, 0x03, 0xeb, 0x8a, 0x0b, 0xab, 0xc4, 0xb4, 0xdd, 0x82, 0x17, 0xc2, 0x69, + 0x72, 0x4c, 0x43, 0x92, 0x99, 0x38, 0x33, 0x35, 0xe6, 0x95, 0x7c, 0x4a, 0x99, 0xa6, 0x41, 0xd8, + 0xcb, 0xef, 0xe3, 0x77, 0x7e, 0x1c, 0xf8, 0xe0, 0x65, 0xaa, 0xea, 0x5a, 0xc9, 0xd0, 0x6a, 0x4c, + 0xe9, 0x4d, 0x1f, 0x44, 0xa3, 0x95, 0x55, 0x37, 0x3f, 0xe0, 0x6a, 0xd3, 0x18, 0xab, 0x09, 0xeb, + 0x15, 0xe5, 0x35, 0x49, 0xcb, 0x23, 0x78, 0x91, 0x57, 0x6a, 0x87, 0xd5, 0xda, 0xe1, 0x0f, 0x99, + 0x99, 0x7b, 0xd7, 0xe3, 0xbb, 0xe0, 0xdd, 0x54, 0x6c, 0x64, 0xf1, 0xeb, 0x40, 0x0f, 0x59, 0xf2, + 0x0c, 0xe0, 0x73, 0xb8, 0x34, 0xfd, 0xf5, 0xdc, 0xbf, 0xf6, 0xee, 0x66, 0xc9, 0x10, 0x6f, 0x6e, + 0x61, 0x32, 0x5c, 0x39, 0xaa, 0xc8, 0x62, 0xd4, 0xb6, 0x37, 0x8e, 0x93, 0x21, 0x2e, 0x5e, 0x03, + 0xac, 0x1a, 0x94, 0xeb, 0xae, 0xa1, 0xa7, 0x88, 0x4f, 0xe1, 0xfc, 0x5e, 0x5a, 0xdd, 0xb1, 0x11, + 0x9f, 0xc0, 0xd9, 0xfd, 0x9f, 0xc2, 0x32, 0xcf, 0x95, 0x8f, 0x2a, 0xc5, 0x8a, 0xf9, 0x0b, 0x01, + 0xd3, 0x84, 0x7e, 0x9e, 0x60, 0x06, 0xb3, 0xa5, 0x56, 0xc6, 0xc4, 0x5a, 0xa5, 0x64, 0x0c, 0x1b, + 0xf1, 0x2b, 0x08, 0x8e, 0xcd, 0x7a, 0xaf, 0x09, 0x33, 0xe6, 0x2d, 0xb6, 0x10, 0x38, 0xfb, 0x23, + 0x76, 0xa4, 0x9f, 0x22, 0x1e, 0xc0, 0xe5, 0x46, 0x96, 0x52, 0xb5, 0x92, 0x8d, 0xf8, 0x0c, 0x26, + 0x1f, 0xd1, 0xe2, 0x0e, 0x0d, 0x31, 0xcf, 0xc9, 0x92, 0x78, 0xf9, 0x49, 0x63, 0x4d, 0xad, 0xd2, + 0x25, 0xf3, 0xdd, 0x03, 0x9f, 0xad, 0x6d, 0xd8, 0x98, 0x5f, 0x80, 0xff, 0xe5, 0x1b, 0x3b, 0x73, + 0x8f, 0x2c, 0x31, 0xdd, 0x13, 0x3b, 0xff, 0xd0, 0xc2, 0x5b, 0xa5, 0x73, 0x81, 0x8d, 0xcb, 0xc2, + 0x94, 0x5d, 0x8b, 0x55, 0x59, 0x48, 0xd7, 0xd4, 0x42, 0x92, 0x75, 0x0e, 0x51, 0xa1, 0xcc, 0x0f, + 0x98, 0x93, 0xc0, 0x9c, 0xa4, 0x8d, 0xbd, 0xef, 0xb7, 0xff, 0xc1, 0xf0, 0x04, 0x85, 0x03, 0x14, + 0x1e, 0xa1, 0xf0, 0x77, 0xf4, 0xd7, 0x7f, 0xb5, 0x2a, 0xbb, 0xed, 0xc9, 0xf7, 0xb5, 0xc7, 0x62, + 0x37, 0x59, 0xaa, 0xaa, 0xdd, 0xc5, 0x71, 0xbc, 0xf7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, + 0xd4, 0x7a, 0xc7, 0xd9, 0x01, 0x00, 0x00, } diff --git a/reporter/network/language/agent/v2/CLR.pb.go b/reporter/network/language/agent/v2/CLR.pb.go index 70257f0..f328261 100644 --- a/reporter/network/language/agent/v2/CLR.pb.go +++ b/reporter/network/language/agent/v2/CLR.pb.go @@ -5,9 +5,9 @@ package v2 import ( fmt "fmt" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" proto "github.com/golang/protobuf/proto" math "math" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,70 +21,70 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type CLRMetric struct { - Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` - Cpu *v2.CPU `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` - Gc *ClrGC `protobuf:"bytes,3,opt,name=gc,proto3" json:"gc,omitempty"` - Thread *ClrThread `protobuf:"bytes,4,opt,name=thread,proto3" json:"thread,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type CLRMetricV2 struct { + Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` + Cpu *v2.CPUV2 `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` + Gc *ClrGCV2 `protobuf:"bytes,3,opt,name=gc,proto3" json:"gc,omitempty"` + Thread *ClrThreadV2 `protobuf:"bytes,4,opt,name=thread,proto3" json:"thread,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *CLRMetric) Reset() { *m = CLRMetric{} } -func (m *CLRMetric) String() string { return proto.CompactTextString(m) } -func (*CLRMetric) ProtoMessage() {} -func (*CLRMetric) Descriptor() ([]byte, []int) { +func (m *CLRMetricV2) Reset() { *m = CLRMetricV2{} } +func (m *CLRMetricV2) String() string { return proto.CompactTextString(m) } +func (*CLRMetricV2) ProtoMessage() {} +func (*CLRMetricV2) Descriptor() ([]byte, []int) { return fileDescriptor_a10d56830892247a, []int{0} } -func (m *CLRMetric) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CLRMetric.Unmarshal(m, b) +func (m *CLRMetricV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CLRMetricV2.Unmarshal(m, b) } -func (m *CLRMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CLRMetric.Marshal(b, m, deterministic) +func (m *CLRMetricV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CLRMetricV2.Marshal(b, m, deterministic) } -func (m *CLRMetric) XXX_Merge(src proto.Message) { - xxx_messageInfo_CLRMetric.Merge(m, src) +func (m *CLRMetricV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_CLRMetricV2.Merge(m, src) } -func (m *CLRMetric) XXX_Size() int { - return xxx_messageInfo_CLRMetric.Size(m) +func (m *CLRMetricV2) XXX_Size() int { + return xxx_messageInfo_CLRMetricV2.Size(m) } -func (m *CLRMetric) XXX_DiscardUnknown() { - xxx_messageInfo_CLRMetric.DiscardUnknown(m) +func (m *CLRMetricV2) XXX_DiscardUnknown() { + xxx_messageInfo_CLRMetricV2.DiscardUnknown(m) } -var xxx_messageInfo_CLRMetric proto.InternalMessageInfo +var xxx_messageInfo_CLRMetricV2 proto.InternalMessageInfo -func (m *CLRMetric) GetTime() int64 { +func (m *CLRMetricV2) GetTime() int64 { if m != nil { return m.Time } return 0 } -func (m *CLRMetric) GetCpu() *v2.CPU { +func (m *CLRMetricV2) GetCpu() *v2.CPUV2 { if m != nil { return m.Cpu } return nil } -func (m *CLRMetric) GetGc() *ClrGC { +func (m *CLRMetricV2) GetGc() *ClrGCV2 { if m != nil { return m.Gc } return nil } -func (m *CLRMetric) GetThread() *ClrThread { +func (m *CLRMetricV2) GetThread() *ClrThreadV2 { if m != nil { return m.Thread } return nil } -type ClrGC struct { +type ClrGCV2 struct { Gen0CollectCount int64 `protobuf:"varint,1,opt,name=Gen0CollectCount,proto3" json:"Gen0CollectCount,omitempty"` Gen1CollectCount int64 `protobuf:"varint,2,opt,name=Gen1CollectCount,proto3" json:"Gen1CollectCount,omitempty"` Gen2CollectCount int64 `protobuf:"varint,3,opt,name=Gen2CollectCount,proto3" json:"Gen2CollectCount,omitempty"` @@ -94,60 +94,60 @@ type ClrGC struct { XXX_sizecache int32 `json:"-"` } -func (m *ClrGC) Reset() { *m = ClrGC{} } -func (m *ClrGC) String() string { return proto.CompactTextString(m) } -func (*ClrGC) ProtoMessage() {} -func (*ClrGC) Descriptor() ([]byte, []int) { +func (m *ClrGCV2) Reset() { *m = ClrGCV2{} } +func (m *ClrGCV2) String() string { return proto.CompactTextString(m) } +func (*ClrGCV2) ProtoMessage() {} +func (*ClrGCV2) Descriptor() ([]byte, []int) { return fileDescriptor_a10d56830892247a, []int{1} } -func (m *ClrGC) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ClrGC.Unmarshal(m, b) +func (m *ClrGCV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ClrGCV2.Unmarshal(m, b) } -func (m *ClrGC) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ClrGC.Marshal(b, m, deterministic) +func (m *ClrGCV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ClrGCV2.Marshal(b, m, deterministic) } -func (m *ClrGC) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClrGC.Merge(m, src) +func (m *ClrGCV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClrGCV2.Merge(m, src) } -func (m *ClrGC) XXX_Size() int { - return xxx_messageInfo_ClrGC.Size(m) +func (m *ClrGCV2) XXX_Size() int { + return xxx_messageInfo_ClrGCV2.Size(m) } -func (m *ClrGC) XXX_DiscardUnknown() { - xxx_messageInfo_ClrGC.DiscardUnknown(m) +func (m *ClrGCV2) XXX_DiscardUnknown() { + xxx_messageInfo_ClrGCV2.DiscardUnknown(m) } -var xxx_messageInfo_ClrGC proto.InternalMessageInfo +var xxx_messageInfo_ClrGCV2 proto.InternalMessageInfo -func (m *ClrGC) GetGen0CollectCount() int64 { +func (m *ClrGCV2) GetGen0CollectCount() int64 { if m != nil { return m.Gen0CollectCount } return 0 } -func (m *ClrGC) GetGen1CollectCount() int64 { +func (m *ClrGCV2) GetGen1CollectCount() int64 { if m != nil { return m.Gen1CollectCount } return 0 } -func (m *ClrGC) GetGen2CollectCount() int64 { +func (m *ClrGCV2) GetGen2CollectCount() int64 { if m != nil { return m.Gen2CollectCount } return 0 } -func (m *ClrGC) GetHeapMemory() int64 { +func (m *ClrGCV2) GetHeapMemory() int64 { if m != nil { return m.HeapMemory } return 0 } -type ClrThread struct { +type ClrThreadV2 struct { AvailableCompletionPortThreads int32 `protobuf:"varint,1,opt,name=AvailableCompletionPortThreads,proto3" json:"AvailableCompletionPortThreads,omitempty"` AvailableWorkerThreads int32 `protobuf:"varint,2,opt,name=AvailableWorkerThreads,proto3" json:"AvailableWorkerThreads,omitempty"` MaxCompletionPortThreads int32 `protobuf:"varint,3,opt,name=MaxCompletionPortThreads,proto3" json:"MaxCompletionPortThreads,omitempty"` @@ -157,53 +157,53 @@ type ClrThread struct { XXX_sizecache int32 `json:"-"` } -func (m *ClrThread) Reset() { *m = ClrThread{} } -func (m *ClrThread) String() string { return proto.CompactTextString(m) } -func (*ClrThread) ProtoMessage() {} -func (*ClrThread) Descriptor() ([]byte, []int) { +func (m *ClrThreadV2) Reset() { *m = ClrThreadV2{} } +func (m *ClrThreadV2) String() string { return proto.CompactTextString(m) } +func (*ClrThreadV2) ProtoMessage() {} +func (*ClrThreadV2) Descriptor() ([]byte, []int) { return fileDescriptor_a10d56830892247a, []int{2} } -func (m *ClrThread) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ClrThread.Unmarshal(m, b) +func (m *ClrThreadV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ClrThreadV2.Unmarshal(m, b) } -func (m *ClrThread) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ClrThread.Marshal(b, m, deterministic) +func (m *ClrThreadV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ClrThreadV2.Marshal(b, m, deterministic) } -func (m *ClrThread) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClrThread.Merge(m, src) +func (m *ClrThreadV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClrThreadV2.Merge(m, src) } -func (m *ClrThread) XXX_Size() int { - return xxx_messageInfo_ClrThread.Size(m) +func (m *ClrThreadV2) XXX_Size() int { + return xxx_messageInfo_ClrThreadV2.Size(m) } -func (m *ClrThread) XXX_DiscardUnknown() { - xxx_messageInfo_ClrThread.DiscardUnknown(m) +func (m *ClrThreadV2) XXX_DiscardUnknown() { + xxx_messageInfo_ClrThreadV2.DiscardUnknown(m) } -var xxx_messageInfo_ClrThread proto.InternalMessageInfo +var xxx_messageInfo_ClrThreadV2 proto.InternalMessageInfo -func (m *ClrThread) GetAvailableCompletionPortThreads() int32 { +func (m *ClrThreadV2) GetAvailableCompletionPortThreads() int32 { if m != nil { return m.AvailableCompletionPortThreads } return 0 } -func (m *ClrThread) GetAvailableWorkerThreads() int32 { +func (m *ClrThreadV2) GetAvailableWorkerThreads() int32 { if m != nil { return m.AvailableWorkerThreads } return 0 } -func (m *ClrThread) GetMaxCompletionPortThreads() int32 { +func (m *ClrThreadV2) GetMaxCompletionPortThreads() int32 { if m != nil { return m.MaxCompletionPortThreads } return 0 } -func (m *ClrThread) GetMaxWorkerThreads() int32 { +func (m *ClrThreadV2) GetMaxWorkerThreads() int32 { if m != nil { return m.MaxWorkerThreads } @@ -211,38 +211,37 @@ func (m *ClrThread) GetMaxWorkerThreads() int32 { } func init() { - proto.RegisterType((*CLRMetric)(nil), "skywalking.network.protocol.common.CLRMetric") - proto.RegisterType((*ClrGC)(nil), "skywalking.network.protocol.common.ClrGC") - proto.RegisterType((*ClrThread)(nil), "skywalking.network.protocol.common.ClrThread") + proto.RegisterType((*CLRMetricV2)(nil), "CLRMetricV2") + proto.RegisterType((*ClrGCV2)(nil), "ClrGCV2") + proto.RegisterType((*ClrThreadV2)(nil), "ClrThreadV2") } func init() { proto.RegisterFile("common/CLR.proto", fileDescriptor_a10d56830892247a) } var fileDescriptor_a10d56830892247a = []byte{ - // 395 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xdf, 0x6a, 0xdb, 0x30, - 0x14, 0x87, 0xb1, 0x9d, 0x04, 0xa6, 0xdd, 0x04, 0x0d, 0x86, 0xc9, 0x45, 0x08, 0x66, 0xb0, 0x6c, - 0x30, 0x3b, 0xc9, 0x60, 0x90, 0xdd, 0x6d, 0xa6, 0x4d, 0x2f, 0xe2, 0x62, 0xd4, 0x96, 0x40, 0xef, - 0x14, 0x55, 0x38, 0xc6, 0xb2, 0x64, 0x14, 0xe5, 0xdf, 0x2b, 0xb5, 0xaf, 0xd4, 0xb7, 0xe8, 0x0b, - 0x94, 0xc8, 0x8e, 0x1b, 0x93, 0x84, 0xe4, 0xca, 0xe6, 0xfc, 0xbe, 0x4f, 0xc7, 0xc7, 0x47, 0xa0, - 0x49, 0x44, 0x9a, 0x0a, 0xee, 0xf9, 0x63, 0xe4, 0x66, 0x52, 0x28, 0x01, 0x9d, 0x79, 0xb2, 0x59, - 0x61, 0x96, 0xc4, 0x3c, 0x72, 0x39, 0x55, 0x2b, 0x21, 0x93, 0x3c, 0x21, 0x82, 0xb9, 0x39, 0xdd, - 0xfa, 0x52, 0x58, 0xf9, 0x23, 0x8f, 0x9d, 0x57, 0x03, 0x7c, 0xf2, 0xc7, 0x28, 0xa0, 0x4a, 0xc6, - 0x04, 0x42, 0x50, 0x53, 0x71, 0x4a, 0x6d, 0xa3, 0x63, 0x74, 0x2d, 0xa4, 0xdf, 0xe1, 0x10, 0x58, - 0x24, 0x5b, 0xd8, 0x66, 0xc7, 0xe8, 0x7e, 0x1e, 0x7c, 0x77, 0xcf, 0x37, 0x72, 0xfd, 0xf0, 0x01, - 0x6d, 0x1d, 0x38, 0x04, 0x66, 0x44, 0x6c, 0x4b, 0x9b, 0x3f, 0x2e, 0x32, 0x99, 0x1c, 0xf9, 0xc8, - 0x8c, 0x08, 0xbc, 0x02, 0x0d, 0x35, 0x93, 0x14, 0x3f, 0xd9, 0x35, 0xad, 0xff, 0xba, 0x50, 0xbf, - 0xd7, 0x12, 0x2a, 0x64, 0xe7, 0xc5, 0x00, 0x75, 0x7d, 0x28, 0xfc, 0x09, 0x9a, 0x23, 0xca, 0x7b, - 0xbe, 0x60, 0x8c, 0x12, 0xe5, 0x8b, 0x05, 0x57, 0xc5, 0x98, 0x07, 0xf5, 0x82, 0xed, 0x57, 0x58, - 0xb3, 0x64, 0xfb, 0x47, 0xd8, 0x41, 0x85, 0xb5, 0x4a, 0xb6, 0x52, 0x87, 0x6d, 0x00, 0x6e, 0x28, - 0xce, 0x02, 0x9a, 0x0a, 0xb9, 0xd1, 0x83, 0x59, 0x68, 0xaf, 0xe2, 0xbc, 0x6d, 0x97, 0xb1, 0x9b, - 0x01, 0x5e, 0x83, 0xf6, 0xbf, 0x25, 0x8e, 0x19, 0x9e, 0x32, 0xea, 0x8b, 0x34, 0x63, 0x54, 0xc5, - 0x82, 0x87, 0x42, 0xaa, 0x1c, 0x98, 0xeb, 0xef, 0xaf, 0xa3, 0x33, 0x14, 0xfc, 0x03, 0xbe, 0x96, - 0xc4, 0x44, 0xc8, 0x84, 0xca, 0x9d, 0x6f, 0x6a, 0xff, 0x44, 0x0a, 0xff, 0x02, 0x3b, 0xc0, 0xeb, - 0xe3, 0x9d, 0x2d, 0x6d, 0x9e, 0xcc, 0xb7, 0x7f, 0x25, 0xc0, 0xeb, 0x6a, 0xb7, 0x9a, 0x76, 0x0e, - 0xea, 0xff, 0x57, 0xa0, 0x27, 0x64, 0xe4, 0xe2, 0x0c, 0x93, 0x19, 0xdd, 0x5f, 0x33, 0xce, 0xd2, - 0x72, 0xd5, 0x0c, 0xf3, 0x68, 0x81, 0x23, 0xea, 0xe2, 0x88, 0x72, 0x15, 0x1a, 0x8f, 0xdf, 0x3e, - 0x40, 0xaf, 0x80, 0xbc, 0x1d, 0xe4, 0x69, 0xc8, 0x5b, 0x0e, 0x9e, 0xcd, 0xd6, 0x5d, 0xb2, 0x99, - 0x14, 0xe7, 0xdd, 0xe6, 0x58, 0x58, 0xdc, 0x9a, 0x69, 0x43, 0xdf, 0x9f, 0xdf, 0xef, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xd2, 0xab, 0x81, 0x70, 0x4f, 0x03, 0x00, 0x00, + // 381 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0xeb, 0xd3, 0x30, + 0x18, 0xc7, 0x69, 0x3b, 0xa7, 0x64, 0x1e, 0x46, 0x04, 0x29, 0x3b, 0x8c, 0x31, 0x76, 0x18, 0x1e, + 0xd2, 0xad, 0x82, 0x07, 0x6f, 0x1a, 0x70, 0x1e, 0x56, 0x29, 0x51, 0x3b, 0xf0, 0x96, 0xc5, 0xd0, + 0x95, 0xa6, 0x49, 0xc9, 0xb2, 0x7f, 0xf8, 0x8e, 0x04, 0x5f, 0x9e, 0x77, 0x69, 0xda, 0xcd, 0x95, + 0x6d, 0xfc, 0x4e, 0x2d, 0x9f, 0xef, 0xe7, 0xdb, 0xe4, 0x29, 0x0f, 0xe8, 0x33, 0x55, 0x14, 0x4a, + 0x06, 0x78, 0x49, 0x50, 0xa9, 0x95, 0x51, 0x83, 0x57, 0x0d, 0xa9, 0x1f, 0x35, 0x1c, 0xff, 0x02, + 0x3d, 0xbc, 0x24, 0x11, 0x37, 0x3a, 0x63, 0x49, 0x08, 0x21, 0xe8, 0x98, 0xac, 0xe0, 0xbe, 0x33, + 0x72, 0xa6, 0x1e, 0xb1, 0xef, 0xd0, 0x07, 0x1e, 0x2b, 0x77, 0xbe, 0x3b, 0x72, 0xa6, 0xbd, 0xb0, + 0x8b, 0x70, 0xfc, 0x3d, 0x09, 0x49, 0x85, 0xa0, 0x0f, 0xdc, 0x94, 0xf9, 0x9e, 0x0d, 0x5e, 0x20, + 0x2c, 0xf4, 0x02, 0x27, 0x21, 0x71, 0x53, 0x06, 0x27, 0xa0, 0x6b, 0x36, 0x9a, 0xd3, 0x9f, 0x7e, + 0xc7, 0xa6, 0x2f, 0xab, 0xf4, 0x9b, 0x25, 0x49, 0x48, 0x9a, 0x6c, 0xfc, 0xc7, 0x01, 0xcf, 0x9b, + 0x16, 0x7c, 0x03, 0xfa, 0x0b, 0x2e, 0x67, 0x58, 0x09, 0xc1, 0x99, 0xc1, 0x6a, 0x27, 0x4d, 0x73, + 0x8b, 0x1b, 0xde, 0xb8, 0xf3, 0x96, 0xeb, 0x5e, 0xdc, 0xf9, 0x1d, 0x37, 0x6c, 0xb9, 0xde, 0xc5, + 0x6d, 0x71, 0x38, 0x04, 0xe0, 0x33, 0xa7, 0x65, 0xc4, 0x0b, 0xa5, 0x4f, 0xf6, 0xe6, 0x1e, 0xb9, + 0x22, 0xe3, 0xbf, 0x0e, 0xe8, 0x5d, 0xcd, 0x01, 0x3f, 0x81, 0xe1, 0x87, 0x3d, 0xcd, 0x04, 0x5d, + 0x0b, 0x8e, 0x55, 0x51, 0x0a, 0x6e, 0x32, 0x25, 0x63, 0xa5, 0x4d, 0xad, 0x6c, 0xed, 0x04, 0xcf, + 0xc8, 0x13, 0x16, 0x7c, 0x07, 0x5e, 0x5f, 0x8c, 0x95, 0xd2, 0x39, 0xd7, 0xe7, 0xbe, 0x6b, 0xfb, + 0x0f, 0x52, 0xf8, 0x1e, 0xf8, 0x11, 0x3d, 0xde, 0x3f, 0xd9, 0xb3, 0xcd, 0x87, 0x79, 0xf5, 0x5f, + 0x22, 0x7a, 0x6c, 0x9f, 0xd6, 0xb1, 0x9d, 0x1b, 0xfe, 0xf1, 0x00, 0x66, 0x4a, 0xa7, 0x88, 0x96, + 0x94, 0x6d, 0x38, 0xda, 0xe6, 0xa7, 0x03, 0x15, 0x79, 0x26, 0x2b, 0x52, 0x20, 0xc9, 0xcd, 0x41, + 0xe9, 0x1c, 0x09, 0x2a, 0xd3, 0x1d, 0x4d, 0x39, 0xa2, 0x29, 0x97, 0x26, 0x76, 0x7e, 0x4c, 0xfe, + 0x8b, 0x41, 0x23, 0x05, 0x67, 0x29, 0xb0, 0x52, 0xb0, 0x0f, 0x7f, 0xbb, 0x83, 0xaf, 0xf9, 0x69, + 0xd5, 0x7c, 0xef, 0x4b, 0xad, 0xc5, 0xd5, 0x6a, 0x32, 0x25, 0xd6, 0x5d, 0xbb, 0xa4, 0x6f, 0xff, + 0x05, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xed, 0xb1, 0x87, 0xcd, 0x02, 0x00, 0x00, } diff --git a/reporter/network/language/agent/v2/CLRMetric.pb.go b/reporter/network/language/agent/v2/CLRMetric.pb.go index bee3af8..8326cb3 100644 --- a/reporter/network/language/agent/v2/CLRMetric.pb.go +++ b/reporter/network/language/agent/v2/CLRMetric.pb.go @@ -6,12 +6,12 @@ package v2 import ( context "context" fmt "fmt" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" math "math" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -25,47 +25,47 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type CLRMetricCollection struct { - Metrics []*CLRMetric `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"` - ServiceInstanceId int32 `protobuf:"varint,2,opt,name=serviceInstanceId,proto3" json:"serviceInstanceId,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type CLRMetricCollectionV2 struct { + Metrics []*CLRMetricV2 `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"` + ServiceInstanceId int32 `protobuf:"varint,2,opt,name=serviceInstanceId,proto3" json:"serviceInstanceId,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *CLRMetricCollection) Reset() { *m = CLRMetricCollection{} } -func (m *CLRMetricCollection) String() string { return proto.CompactTextString(m) } -func (*CLRMetricCollection) ProtoMessage() {} -func (*CLRMetricCollection) Descriptor() ([]byte, []int) { +func (m *CLRMetricCollectionV2) Reset() { *m = CLRMetricCollectionV2{} } +func (m *CLRMetricCollectionV2) String() string { return proto.CompactTextString(m) } +func (*CLRMetricCollectionV2) ProtoMessage() {} +func (*CLRMetricCollectionV2) Descriptor() ([]byte, []int) { return fileDescriptor_1f032372dea03c68, []int{0} } -func (m *CLRMetricCollection) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CLRMetricCollection.Unmarshal(m, b) +func (m *CLRMetricCollectionV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CLRMetricCollectionV2.Unmarshal(m, b) } -func (m *CLRMetricCollection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CLRMetricCollection.Marshal(b, m, deterministic) +func (m *CLRMetricCollectionV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CLRMetricCollectionV2.Marshal(b, m, deterministic) } -func (m *CLRMetricCollection) XXX_Merge(src proto.Message) { - xxx_messageInfo_CLRMetricCollection.Merge(m, src) +func (m *CLRMetricCollectionV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_CLRMetricCollectionV2.Merge(m, src) } -func (m *CLRMetricCollection) XXX_Size() int { - return xxx_messageInfo_CLRMetricCollection.Size(m) +func (m *CLRMetricCollectionV2) XXX_Size() int { + return xxx_messageInfo_CLRMetricCollectionV2.Size(m) } -func (m *CLRMetricCollection) XXX_DiscardUnknown() { - xxx_messageInfo_CLRMetricCollection.DiscardUnknown(m) +func (m *CLRMetricCollectionV2) XXX_DiscardUnknown() { + xxx_messageInfo_CLRMetricCollectionV2.DiscardUnknown(m) } -var xxx_messageInfo_CLRMetricCollection proto.InternalMessageInfo +var xxx_messageInfo_CLRMetricCollectionV2 proto.InternalMessageInfo -func (m *CLRMetricCollection) GetMetrics() []*CLRMetric { +func (m *CLRMetricCollectionV2) GetMetrics() []*CLRMetricV2 { if m != nil { return m.Metrics } return nil } -func (m *CLRMetricCollection) GetServiceInstanceId() int32 { +func (m *CLRMetricCollectionV2) GetServiceInstanceId() int32 { if m != nil { return m.ServiceInstanceId } @@ -73,32 +73,30 @@ func (m *CLRMetricCollection) GetServiceInstanceId() int32 { } func init() { - proto.RegisterType((*CLRMetricCollection)(nil), "skywalking.network.protocol.agent.v2.CLRMetricCollection") + proto.RegisterType((*CLRMetricCollectionV2)(nil), "CLRMetricCollectionV2") } func init() { proto.RegisterFile("language-agent-v2/CLRMetric.proto", fileDescriptor_1f032372dea03c68) } var fileDescriptor_1f032372dea03c68 = []byte{ - // 292 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4a, 0xfb, 0x40, - 0x10, 0xc6, 0xff, 0xe9, 0x1f, 0x2d, 0xac, 0x17, 0x4d, 0x41, 0x4a, 0x4e, 0xb5, 0x78, 0xe8, 0xa1, - 0xd9, 0x85, 0xf4, 0xe4, 0xd5, 0x1c, 0xa4, 0x50, 0xa5, 0xa4, 0x07, 0xc1, 0xdb, 0xba, 0x1d, 0x62, - 0x48, 0x76, 0x27, 0xec, 0xae, 0x29, 0xf5, 0x19, 0xc4, 0x07, 0xf1, 0x29, 0x85, 0xec, 0x26, 0x16, - 0x14, 0xe9, 0x69, 0x61, 0xe6, 0xf7, 0xcd, 0xf7, 0xcd, 0x0e, 0xb9, 0xaa, 0xb8, 0xca, 0x5f, 0x79, - 0x0e, 0x31, 0xcf, 0x41, 0xd9, 0xb8, 0x49, 0x58, 0xba, 0xca, 0xee, 0xc1, 0xea, 0x42, 0xd0, 0x5a, - 0xa3, 0xc5, 0xf0, 0xda, 0x94, 0xfb, 0x1d, 0xaf, 0xca, 0x42, 0xe5, 0x54, 0x81, 0xdd, 0xa1, 0x2e, - 0x5d, 0x47, 0x60, 0x45, 0x5b, 0x15, 0x6d, 0x92, 0x68, 0x24, 0x50, 0x4a, 0x54, 0xcc, 0x3d, 0x0e, - 0x88, 0xce, 0x7d, 0x31, 0x5d, 0x65, 0xae, 0x32, 0x7d, 0x0f, 0xc8, 0xa8, 0x37, 0x48, 0xb1, 0xaa, - 0x40, 0xd8, 0x02, 0x55, 0x78, 0x47, 0x86, 0xb2, 0xad, 0x99, 0x71, 0x30, 0xf9, 0x3f, 0x3b, 0x4b, - 0x62, 0xfa, 0x97, 0xad, 0x77, 0xe9, 0x27, 0x65, 0x9d, 0x3a, 0x9c, 0x93, 0x0b, 0x03, 0xba, 0x29, - 0x04, 0x2c, 0x95, 0xb1, 0x5c, 0x09, 0x58, 0x6e, 0xc7, 0x83, 0x49, 0x30, 0x3b, 0xc9, 0x7e, 0x36, - 0x92, 0x8f, 0x80, 0x5c, 0x7e, 0x0f, 0x81, 0x1a, 0xb5, 0xdd, 0x38, 0x28, 0xb4, 0x64, 0x28, 0x5c, - 0xbe, 0xf0, 0x86, 0x1e, 0xf3, 0x05, 0xf4, 0x97, 0xbd, 0xa2, 0xf9, 0x51, 0x6b, 0xa0, 0x94, 0x5c, - 0x6d, 0xcd, 0xf4, 0xdf, 0xed, 0x1b, 0x59, 0xa0, 0xce, 0x29, 0xaf, 0xb9, 0x78, 0x81, 0x43, 0x2d, - 0xaf, 0x65, 0xaf, 0xef, 0x6e, 0xd6, 0x5b, 0xaf, 0x83, 0xa7, 0x83, 0x2b, 0x31, 0xcf, 0xb1, 0x8e, - 0x63, 0x2d, 0xc7, 0x9a, 0xe4, 0x73, 0x10, 0x6d, 0xca, 0xfd, 0xa3, 0x1f, 0xf9, 0xe0, 0xb0, 0xb5, - 0x4f, 0xf3, 0x7c, 0xda, 0xe6, 0x5a, 0x7c, 0x05, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x05, 0x2d, 0xc2, - 0x14, 0x02, 0x00, 0x00, + // 272 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xdf, 0x4a, 0xfb, 0x30, + 0x14, 0x80, 0x7f, 0xdd, 0x0f, 0x1d, 0x64, 0x5e, 0x68, 0xc5, 0x31, 0x7a, 0x35, 0x87, 0xc8, 0x2e, + 0xdc, 0x89, 0x64, 0x6f, 0x60, 0xaf, 0x26, 0x53, 0x46, 0x07, 0x15, 0xbc, 0x8b, 0xd9, 0xa1, 0x96, + 0x36, 0x39, 0x25, 0x8d, 0x1d, 0xf3, 0x91, 0x7c, 0x4a, 0x59, 0xff, 0x79, 0xa1, 0x57, 0x81, 0xef, + 0x7c, 0x39, 0x09, 0x1f, 0xbb, 0xce, 0xa5, 0x49, 0x3e, 0x64, 0x82, 0x0b, 0x99, 0xa0, 0x71, 0x8b, + 0x4a, 0xf0, 0x70, 0x1d, 0x3d, 0xa1, 0xb3, 0xa9, 0x82, 0xc2, 0x92, 0xa3, 0xe0, 0x52, 0x91, 0xd6, + 0x64, 0x78, 0x73, 0xb4, 0xf0, 0xbc, 0x85, 0xe1, 0x3a, 0x6a, 0xc8, 0x4c, 0xb3, 0xab, 0xfe, 0x66, + 0x48, 0x79, 0x8e, 0xca, 0xa5, 0x64, 0x62, 0xe1, 0xdf, 0xb2, 0xa1, 0xae, 0x69, 0x39, 0xf1, 0xa6, + 0xff, 0xe7, 0x23, 0x71, 0x06, 0xbd, 0x18, 0x8b, 0xa8, 0x1b, 0xfa, 0x77, 0xec, 0xa2, 0x44, 0x5b, + 0xa5, 0x0a, 0x57, 0xa6, 0x74, 0xd2, 0x28, 0x5c, 0xed, 0x26, 0x83, 0xa9, 0x37, 0x3f, 0x89, 0x7e, + 0x0f, 0xc4, 0x23, 0x1b, 0xf7, 0x5b, 0x22, 0x2c, 0xc8, 0xba, 0x6d, 0xe3, 0xf8, 0xf7, 0x6c, 0xa8, + 0x9a, 0xf7, 0xfd, 0x31, 0xfc, 0xf9, 0xa5, 0x60, 0x04, 0x21, 0x69, 0x2d, 0xcd, 0xae, 0x8c, 0xc5, + 0xec, 0xdf, 0xc3, 0x27, 0x5b, 0x92, 0x4d, 0x40, 0x16, 0x52, 0xbd, 0x23, 0x94, 0xd9, 0x61, 0x2f, + 0xf3, 0x2c, 0x35, 0x47, 0xa2, 0xc1, 0xa0, 0xdb, 0x93, 0xcd, 0xa0, 0x0b, 0x05, 0x75, 0x28, 0xa8, + 0xc4, 0xc6, 0x7b, 0xbd, 0xf9, 0x71, 0x79, 0xeb, 0xf1, 0xce, 0xe3, 0xb5, 0xc7, 0x2b, 0xf1, 0x35, + 0x08, 0xb6, 0xd9, 0xe1, 0xa5, 0x5d, 0xf9, 0xdc, 0x68, 0x9b, 0x63, 0x33, 0x45, 0xf9, 0xdb, 0x69, + 0x5d, 0x6f, 0xf9, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xcd, 0xc8, 0x68, 0x00, 0x89, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -113,7 +111,7 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type CLRMetricReportServiceClient interface { - Collect(ctx context.Context, in *CLRMetricCollection, opts ...grpc.CallOption) (*v2.Commands, error) + Collect(ctx context.Context, in *CLRMetricCollectionV2, opts ...grpc.CallOption) (*v2.CommandsV2, error) } type cLRMetricReportServiceClient struct { @@ -124,9 +122,9 @@ func NewCLRMetricReportServiceClient(cc *grpc.ClientConn) CLRMetricReportService return &cLRMetricReportServiceClient{cc} } -func (c *cLRMetricReportServiceClient) Collect(ctx context.Context, in *CLRMetricCollection, opts ...grpc.CallOption) (*v2.Commands, error) { - out := new(v2.Commands) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.v2.CLRMetricReportService/collect", in, out, opts...) +func (c *cLRMetricReportServiceClient) Collect(ctx context.Context, in *CLRMetricCollectionV2, opts ...grpc.CallOption) (*v2.CommandsV2, error) { + out := new(v2.CommandsV2) + err := c.cc.Invoke(ctx, "/CLRMetricReportService/collect", in, out, opts...) if err != nil { return nil, err } @@ -135,14 +133,14 @@ func (c *cLRMetricReportServiceClient) Collect(ctx context.Context, in *CLRMetri // CLRMetricReportServiceServer is the server API for CLRMetricReportService service. type CLRMetricReportServiceServer interface { - Collect(context.Context, *CLRMetricCollection) (*v2.Commands, error) + Collect(context.Context, *CLRMetricCollectionV2) (*v2.CommandsV2, error) } // UnimplementedCLRMetricReportServiceServer can be embedded to have forward compatible implementations. type UnimplementedCLRMetricReportServiceServer struct { } -func (*UnimplementedCLRMetricReportServiceServer) Collect(ctx context.Context, req *CLRMetricCollection) (*v2.Commands, error) { +func (*UnimplementedCLRMetricReportServiceServer) Collect(ctx context.Context, req *CLRMetricCollectionV2) (*v2.CommandsV2, error) { return nil, status.Errorf(codes.Unimplemented, "method Collect not implemented") } @@ -151,7 +149,7 @@ func RegisterCLRMetricReportServiceServer(s *grpc.Server, srv CLRMetricReportSer } func _CLRMetricReportService_Collect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CLRMetricCollection) + in := new(CLRMetricCollectionV2) if err := dec(in); err != nil { return nil, err } @@ -160,16 +158,16 @@ func _CLRMetricReportService_Collect_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.v2.CLRMetricReportService/Collect", + FullMethod: "/CLRMetricReportService/Collect", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CLRMetricReportServiceServer).Collect(ctx, req.(*CLRMetricCollection)) + return srv.(CLRMetricReportServiceServer).Collect(ctx, req.(*CLRMetricCollectionV2)) } return interceptor(ctx, in, info, handler) } var _CLRMetricReportService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v2.CLRMetricReportService", + ServiceName: "CLRMetricReportService", HandlerType: (*CLRMetricReportServiceServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/reporter/network/language/agent/v2/JVM.pb.go b/reporter/network/language/agent/v2/JVM.pb.go index b31c63d..6936319 100644 --- a/reporter/network/language/agent/v2/JVM.pb.go +++ b/reporter/network/language/agent/v2/JVM.pb.go @@ -5,9 +5,9 @@ package v2 import ( fmt "fmt" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" proto "github.com/golang/protobuf/proto" math "math" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,18 +21,18 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type PoolType int32 +type PoolTypeV2 int32 const ( - PoolType_CODE_CACHE_USAGE PoolType = 0 - PoolType_NEWGEN_USAGE PoolType = 1 - PoolType_OLDGEN_USAGE PoolType = 2 - PoolType_SURVIVOR_USAGE PoolType = 3 - PoolType_PERMGEN_USAGE PoolType = 4 - PoolType_METASPACE_USAGE PoolType = 5 + PoolTypeV2_CODE_CACHE_USAGE PoolTypeV2 = 0 + PoolTypeV2_NEWGEN_USAGE PoolTypeV2 = 1 + PoolTypeV2_OLDGEN_USAGE PoolTypeV2 = 2 + PoolTypeV2_SURVIVOR_USAGE PoolTypeV2 = 3 + PoolTypeV2_PERMGEN_USAGE PoolTypeV2 = 4 + PoolTypeV2_METASPACE_USAGE PoolTypeV2 = 5 ) -var PoolType_name = map[int32]string{ +var PoolTypeV2_name = map[int32]string{ 0: "CODE_CACHE_USAGE", 1: "NEWGEN_USAGE", 2: "OLDGEN_USAGE", @@ -41,7 +41,7 @@ var PoolType_name = map[int32]string{ 5: "METASPACE_USAGE", } -var PoolType_value = map[string]int32{ +var PoolTypeV2_value = map[string]int32{ "CODE_CACHE_USAGE": 0, "NEWGEN_USAGE": 1, "OLDGEN_USAGE": 2, @@ -50,111 +50,111 @@ var PoolType_value = map[string]int32{ "METASPACE_USAGE": 5, } -func (x PoolType) String() string { - return proto.EnumName(PoolType_name, int32(x)) +func (x PoolTypeV2) String() string { + return proto.EnumName(PoolTypeV2_name, int32(x)) } -func (PoolType) EnumDescriptor() ([]byte, []int) { +func (PoolTypeV2) EnumDescriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{0} } -type GCPhrase int32 +type GCPhraseV2 int32 const ( - GCPhrase_NEW GCPhrase = 0 - GCPhrase_OLD GCPhrase = 1 + GCPhraseV2_NEW GCPhraseV2 = 0 + GCPhraseV2_OLD GCPhraseV2 = 1 ) -var GCPhrase_name = map[int32]string{ +var GCPhraseV2_name = map[int32]string{ 0: "NEW", 1: "OLD", } -var GCPhrase_value = map[string]int32{ +var GCPhraseV2_value = map[string]int32{ "NEW": 0, "OLD": 1, } -func (x GCPhrase) String() string { - return proto.EnumName(GCPhrase_name, int32(x)) +func (x GCPhraseV2) String() string { + return proto.EnumName(GCPhraseV2_name, int32(x)) } -func (GCPhrase) EnumDescriptor() ([]byte, []int) { +func (GCPhraseV2) EnumDescriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{1} } -type JVMMetric struct { - Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` - Cpu *v2.CPU `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` - Memory []*Memory `protobuf:"bytes,3,rep,name=memory,proto3" json:"memory,omitempty"` - MemoryPool []*MemoryPool `protobuf:"bytes,4,rep,name=memoryPool,proto3" json:"memoryPool,omitempty"` - Gc []*GC `protobuf:"bytes,5,rep,name=gc,proto3" json:"gc,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type JVMMetricV2 struct { + Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` + Cpu *v2.CPUV2 `protobuf:"bytes,2,opt,name=cpu,proto3" json:"cpu,omitempty"` + Memory []*MemoryV2 `protobuf:"bytes,3,rep,name=memory,proto3" json:"memory,omitempty"` + MemoryPool []*MemoryPoolV2 `protobuf:"bytes,4,rep,name=memoryPool,proto3" json:"memoryPool,omitempty"` + Gc []*GCV2 `protobuf:"bytes,5,rep,name=gc,proto3" json:"gc,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *JVMMetric) Reset() { *m = JVMMetric{} } -func (m *JVMMetric) String() string { return proto.CompactTextString(m) } -func (*JVMMetric) ProtoMessage() {} -func (*JVMMetric) Descriptor() ([]byte, []int) { +func (m *JVMMetricV2) Reset() { *m = JVMMetricV2{} } +func (m *JVMMetricV2) String() string { return proto.CompactTextString(m) } +func (*JVMMetricV2) ProtoMessage() {} +func (*JVMMetricV2) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{0} } -func (m *JVMMetric) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_JVMMetric.Unmarshal(m, b) +func (m *JVMMetricV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_JVMMetricV2.Unmarshal(m, b) } -func (m *JVMMetric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_JVMMetric.Marshal(b, m, deterministic) +func (m *JVMMetricV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_JVMMetricV2.Marshal(b, m, deterministic) } -func (m *JVMMetric) XXX_Merge(src proto.Message) { - xxx_messageInfo_JVMMetric.Merge(m, src) +func (m *JVMMetricV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_JVMMetricV2.Merge(m, src) } -func (m *JVMMetric) XXX_Size() int { - return xxx_messageInfo_JVMMetric.Size(m) +func (m *JVMMetricV2) XXX_Size() int { + return xxx_messageInfo_JVMMetricV2.Size(m) } -func (m *JVMMetric) XXX_DiscardUnknown() { - xxx_messageInfo_JVMMetric.DiscardUnknown(m) +func (m *JVMMetricV2) XXX_DiscardUnknown() { + xxx_messageInfo_JVMMetricV2.DiscardUnknown(m) } -var xxx_messageInfo_JVMMetric proto.InternalMessageInfo +var xxx_messageInfo_JVMMetricV2 proto.InternalMessageInfo -func (m *JVMMetric) GetTime() int64 { +func (m *JVMMetricV2) GetTime() int64 { if m != nil { return m.Time } return 0 } -func (m *JVMMetric) GetCpu() *v2.CPU { +func (m *JVMMetricV2) GetCpu() *v2.CPUV2 { if m != nil { return m.Cpu } return nil } -func (m *JVMMetric) GetMemory() []*Memory { +func (m *JVMMetricV2) GetMemory() []*MemoryV2 { if m != nil { return m.Memory } return nil } -func (m *JVMMetric) GetMemoryPool() []*MemoryPool { +func (m *JVMMetricV2) GetMemoryPool() []*MemoryPoolV2 { if m != nil { return m.MemoryPool } return nil } -func (m *JVMMetric) GetGc() []*GC { +func (m *JVMMetricV2) GetGc() []*GCV2 { if m != nil { return m.Gc } return nil } -type Memory struct { +type MemoryV2 struct { IsHeap bool `protobuf:"varint,1,opt,name=isHeap,proto3" json:"isHeap,omitempty"` Init int64 `protobuf:"varint,2,opt,name=init,proto3" json:"init,omitempty"` Max int64 `protobuf:"varint,3,opt,name=max,proto3" json:"max,omitempty"` @@ -165,186 +165,186 @@ type Memory struct { XXX_sizecache int32 `json:"-"` } -func (m *Memory) Reset() { *m = Memory{} } -func (m *Memory) String() string { return proto.CompactTextString(m) } -func (*Memory) ProtoMessage() {} -func (*Memory) Descriptor() ([]byte, []int) { +func (m *MemoryV2) Reset() { *m = MemoryV2{} } +func (m *MemoryV2) String() string { return proto.CompactTextString(m) } +func (*MemoryV2) ProtoMessage() {} +func (*MemoryV2) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{1} } -func (m *Memory) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Memory.Unmarshal(m, b) +func (m *MemoryV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MemoryV2.Unmarshal(m, b) } -func (m *Memory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Memory.Marshal(b, m, deterministic) +func (m *MemoryV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MemoryV2.Marshal(b, m, deterministic) } -func (m *Memory) XXX_Merge(src proto.Message) { - xxx_messageInfo_Memory.Merge(m, src) +func (m *MemoryV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoryV2.Merge(m, src) } -func (m *Memory) XXX_Size() int { - return xxx_messageInfo_Memory.Size(m) +func (m *MemoryV2) XXX_Size() int { + return xxx_messageInfo_MemoryV2.Size(m) } -func (m *Memory) XXX_DiscardUnknown() { - xxx_messageInfo_Memory.DiscardUnknown(m) +func (m *MemoryV2) XXX_DiscardUnknown() { + xxx_messageInfo_MemoryV2.DiscardUnknown(m) } -var xxx_messageInfo_Memory proto.InternalMessageInfo +var xxx_messageInfo_MemoryV2 proto.InternalMessageInfo -func (m *Memory) GetIsHeap() bool { +func (m *MemoryV2) GetIsHeap() bool { if m != nil { return m.IsHeap } return false } -func (m *Memory) GetInit() int64 { +func (m *MemoryV2) GetInit() int64 { if m != nil { return m.Init } return 0 } -func (m *Memory) GetMax() int64 { +func (m *MemoryV2) GetMax() int64 { if m != nil { return m.Max } return 0 } -func (m *Memory) GetUsed() int64 { +func (m *MemoryV2) GetUsed() int64 { if m != nil { return m.Used } return 0 } -func (m *Memory) GetCommitted() int64 { +func (m *MemoryV2) GetCommitted() int64 { if m != nil { return m.Committed } return 0 } -type MemoryPool struct { - Type PoolType `protobuf:"varint,1,opt,name=type,proto3,enum=skywalking.network.protocol.common.PoolType" json:"type,omitempty"` - Init int64 `protobuf:"varint,2,opt,name=init,proto3" json:"init,omitempty"` - Max int64 `protobuf:"varint,3,opt,name=max,proto3" json:"max,omitempty"` - Used int64 `protobuf:"varint,4,opt,name=used,proto3" json:"used,omitempty"` - Commited int64 `protobuf:"varint,5,opt,name=commited,proto3" json:"commited,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type MemoryPoolV2 struct { + Type PoolTypeV2 `protobuf:"varint,1,opt,name=type,proto3,enum=PoolTypeV2" json:"type,omitempty"` + Init int64 `protobuf:"varint,2,opt,name=init,proto3" json:"init,omitempty"` + Max int64 `protobuf:"varint,3,opt,name=max,proto3" json:"max,omitempty"` + Used int64 `protobuf:"varint,4,opt,name=used,proto3" json:"used,omitempty"` + Commited int64 `protobuf:"varint,5,opt,name=commited,proto3" json:"commited,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *MemoryPool) Reset() { *m = MemoryPool{} } -func (m *MemoryPool) String() string { return proto.CompactTextString(m) } -func (*MemoryPool) ProtoMessage() {} -func (*MemoryPool) Descriptor() ([]byte, []int) { +func (m *MemoryPoolV2) Reset() { *m = MemoryPoolV2{} } +func (m *MemoryPoolV2) String() string { return proto.CompactTextString(m) } +func (*MemoryPoolV2) ProtoMessage() {} +func (*MemoryPoolV2) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{2} } -func (m *MemoryPool) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_MemoryPool.Unmarshal(m, b) +func (m *MemoryPoolV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MemoryPoolV2.Unmarshal(m, b) } -func (m *MemoryPool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_MemoryPool.Marshal(b, m, deterministic) +func (m *MemoryPoolV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MemoryPoolV2.Marshal(b, m, deterministic) } -func (m *MemoryPool) XXX_Merge(src proto.Message) { - xxx_messageInfo_MemoryPool.Merge(m, src) +func (m *MemoryPoolV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoryPoolV2.Merge(m, src) } -func (m *MemoryPool) XXX_Size() int { - return xxx_messageInfo_MemoryPool.Size(m) +func (m *MemoryPoolV2) XXX_Size() int { + return xxx_messageInfo_MemoryPoolV2.Size(m) } -func (m *MemoryPool) XXX_DiscardUnknown() { - xxx_messageInfo_MemoryPool.DiscardUnknown(m) +func (m *MemoryPoolV2) XXX_DiscardUnknown() { + xxx_messageInfo_MemoryPoolV2.DiscardUnknown(m) } -var xxx_messageInfo_MemoryPool proto.InternalMessageInfo +var xxx_messageInfo_MemoryPoolV2 proto.InternalMessageInfo -func (m *MemoryPool) GetType() PoolType { +func (m *MemoryPoolV2) GetType() PoolTypeV2 { if m != nil { return m.Type } - return PoolType_CODE_CACHE_USAGE + return PoolTypeV2_CODE_CACHE_USAGE } -func (m *MemoryPool) GetInit() int64 { +func (m *MemoryPoolV2) GetInit() int64 { if m != nil { return m.Init } return 0 } -func (m *MemoryPool) GetMax() int64 { +func (m *MemoryPoolV2) GetMax() int64 { if m != nil { return m.Max } return 0 } -func (m *MemoryPool) GetUsed() int64 { +func (m *MemoryPoolV2) GetUsed() int64 { if m != nil { return m.Used } return 0 } -func (m *MemoryPool) GetCommited() int64 { +func (m *MemoryPoolV2) GetCommited() int64 { if m != nil { return m.Commited } return 0 } -type GC struct { - Phrase GCPhrase `protobuf:"varint,1,opt,name=phrase,proto3,enum=skywalking.network.protocol.common.GCPhrase" json:"phrase,omitempty"` - Count int64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` - Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type GCV2 struct { + Phrase GCPhraseV2 `protobuf:"varint,1,opt,name=phrase,proto3,enum=GCPhraseV2" json:"phrase,omitempty"` + Count int64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` + Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *GC) Reset() { *m = GC{} } -func (m *GC) String() string { return proto.CompactTextString(m) } -func (*GC) ProtoMessage() {} -func (*GC) Descriptor() ([]byte, []int) { +func (m *GCV2) Reset() { *m = GCV2{} } +func (m *GCV2) String() string { return proto.CompactTextString(m) } +func (*GCV2) ProtoMessage() {} +func (*GCV2) Descriptor() ([]byte, []int) { return fileDescriptor_42f5f61b58cf3158, []int{3} } -func (m *GC) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GC.Unmarshal(m, b) +func (m *GCV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GCV2.Unmarshal(m, b) } -func (m *GC) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GC.Marshal(b, m, deterministic) +func (m *GCV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GCV2.Marshal(b, m, deterministic) } -func (m *GC) XXX_Merge(src proto.Message) { - xxx_messageInfo_GC.Merge(m, src) +func (m *GCV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_GCV2.Merge(m, src) } -func (m *GC) XXX_Size() int { - return xxx_messageInfo_GC.Size(m) +func (m *GCV2) XXX_Size() int { + return xxx_messageInfo_GCV2.Size(m) } -func (m *GC) XXX_DiscardUnknown() { - xxx_messageInfo_GC.DiscardUnknown(m) +func (m *GCV2) XXX_DiscardUnknown() { + xxx_messageInfo_GCV2.DiscardUnknown(m) } -var xxx_messageInfo_GC proto.InternalMessageInfo +var xxx_messageInfo_GCV2 proto.InternalMessageInfo -func (m *GC) GetPhrase() GCPhrase { +func (m *GCV2) GetPhrase() GCPhraseV2 { if m != nil { return m.Phrase } - return GCPhrase_NEW + return GCPhraseV2_NEW } -func (m *GC) GetCount() int64 { +func (m *GCV2) GetCount() int64 { if m != nil { return m.Count } return 0 } -func (m *GC) GetTime() int64 { +func (m *GCV2) GetTime() int64 { if m != nil { return m.Time } @@ -352,49 +352,48 @@ func (m *GC) GetTime() int64 { } func init() { - proto.RegisterEnum("skywalking.network.protocol.common.PoolType", PoolType_name, PoolType_value) - proto.RegisterEnum("skywalking.network.protocol.common.GCPhrase", GCPhrase_name, GCPhrase_value) - proto.RegisterType((*JVMMetric)(nil), "skywalking.network.protocol.common.JVMMetric") - proto.RegisterType((*Memory)(nil), "skywalking.network.protocol.common.Memory") - proto.RegisterType((*MemoryPool)(nil), "skywalking.network.protocol.common.MemoryPool") - proto.RegisterType((*GC)(nil), "skywalking.network.protocol.common.GC") + proto.RegisterEnum("PoolTypeV2", PoolTypeV2_name, PoolTypeV2_value) + proto.RegisterEnum("GCPhraseV2", GCPhraseV2_name, GCPhraseV2_value) + proto.RegisterType((*JVMMetricV2)(nil), "JVMMetricV2") + proto.RegisterType((*MemoryV2)(nil), "MemoryV2") + proto.RegisterType((*MemoryPoolV2)(nil), "MemoryPoolV2") + proto.RegisterType((*GCV2)(nil), "GCV2") } func init() { proto.RegisterFile("common/JVM.proto", fileDescriptor_42f5f61b58cf3158) } var fileDescriptor_42f5f61b58cf3158 = []byte{ - // 517 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x41, 0x6f, 0xda, 0x4c, - 0x10, 0x8d, 0x6d, 0xe0, 0x23, 0x93, 0xaf, 0xa9, 0x3b, 0x89, 0x2a, 0x0b, 0xe5, 0x80, 0x50, 0xd5, - 0x22, 0x54, 0x99, 0x8a, 0x4a, 0x95, 0x7a, 0x2b, 0x31, 0x16, 0x69, 0x14, 0x83, 0xb5, 0x04, 0x90, - 0x7a, 0x89, 0x5c, 0x67, 0xe5, 0x58, 0x60, 0xaf, 0x65, 0x96, 0x12, 0x6e, 0xfd, 0x31, 0x55, 0x0f, - 0xfd, 0x95, 0xd5, 0xee, 0x1a, 0x9c, 0x5b, 0xa9, 0x7a, 0xf2, 0xec, 0x9b, 0xf7, 0xde, 0xce, 0x3c, - 0x2f, 0x98, 0x21, 0x4b, 0x12, 0x96, 0x76, 0xaf, 0x67, 0x9e, 0x9d, 0xe5, 0x8c, 0x33, 0x6c, 0xad, - 0x16, 0xdb, 0x4d, 0xb0, 0x5c, 0xc4, 0x69, 0x64, 0xa7, 0x94, 0x6f, 0x58, 0xbe, 0x50, 0x9d, 0x90, - 0x2d, 0x6d, 0xc5, 0x6e, 0x9c, 0x15, 0x2a, 0xf5, 0x51, 0xed, 0xd6, 0x4f, 0x1d, 0x8e, 0xaf, 0x67, - 0x9e, 0x47, 0x79, 0x1e, 0x87, 0x88, 0x50, 0xe1, 0x71, 0x42, 0x2d, 0xad, 0xa9, 0xb5, 0x0d, 0x22, - 0x6b, 0xfc, 0x08, 0x46, 0x98, 0xad, 0x2d, 0xbd, 0xa9, 0xb5, 0x4f, 0x7a, 0x6f, 0xec, 0x3f, 0x5f, - 0x64, 0x3b, 0xfe, 0x94, 0x08, 0x0d, 0x5e, 0x42, 0x2d, 0xa1, 0x09, 0xcb, 0xb7, 0x96, 0xd1, 0x34, - 0xda, 0x27, 0xbd, 0xce, 0x21, 0x6a, 0x4f, 0x2a, 0x48, 0xa1, 0xc4, 0x11, 0x80, 0xaa, 0x7c, 0xc6, - 0x96, 0x56, 0x45, 0xfa, 0xd8, 0x87, 0xfb, 0x08, 0x15, 0x79, 0xe2, 0x80, 0x1f, 0x40, 0x8f, 0x42, - 0xab, 0x2a, 0x7d, 0x5e, 0x1f, 0xe2, 0x33, 0x74, 0x88, 0x1e, 0x85, 0xad, 0x47, 0xa8, 0x29, 0x47, - 0x7c, 0x09, 0xb5, 0x78, 0x75, 0x45, 0x83, 0x4c, 0xc6, 0x54, 0x27, 0xc5, 0x49, 0x84, 0x17, 0xa7, - 0x31, 0x97, 0x49, 0x19, 0x44, 0xd6, 0x68, 0x82, 0x91, 0x04, 0x8f, 0x96, 0x21, 0x21, 0x51, 0x0a, - 0xd6, 0x7a, 0x45, 0xef, 0xad, 0x8a, 0x62, 0x89, 0x1a, 0x2f, 0xe0, 0x58, 0x5c, 0x16, 0x73, 0x4e, - 0xef, 0xad, 0xaa, 0x6c, 0x94, 0x40, 0xeb, 0x87, 0x06, 0x50, 0x2e, 0x83, 0x9f, 0xa0, 0xc2, 0xb7, - 0x99, 0xfa, 0x47, 0xa7, 0xbd, 0xb7, 0x87, 0xac, 0x20, 0x74, 0xb7, 0xdb, 0x8c, 0x12, 0xa9, 0xfc, - 0x87, 0x41, 0x1b, 0x50, 0x57, 0x73, 0xed, 0xe7, 0xdc, 0x9f, 0x5b, 0x1c, 0xf4, 0xa1, 0x83, 0x03, - 0xa8, 0x65, 0x0f, 0x79, 0xb0, 0xfa, 0xab, 0xf9, 0x86, 0x8e, 0x2f, 0x35, 0xa4, 0xd0, 0xe2, 0x39, - 0x54, 0x43, 0xb6, 0x4e, 0x77, 0x23, 0xaa, 0xc3, 0xfe, 0x75, 0x1a, 0xe5, 0xeb, 0xec, 0x7c, 0xd7, - 0xa0, 0xbe, 0x5b, 0x0f, 0xcf, 0xc1, 0x74, 0xc6, 0x03, 0xf7, 0xce, 0xe9, 0x3b, 0x57, 0xee, 0xdd, - 0x74, 0xd2, 0x1f, 0xba, 0xe6, 0x11, 0x9a, 0xf0, 0xff, 0xc8, 0x9d, 0x0f, 0xdd, 0x51, 0x81, 0x68, - 0x02, 0x19, 0xdf, 0x0c, 0x4a, 0x44, 0x47, 0x84, 0xd3, 0xc9, 0x94, 0xcc, 0x3e, 0xcf, 0xc6, 0xa4, - 0xc0, 0x0c, 0x7c, 0x01, 0xcf, 0x7c, 0x97, 0x78, 0x25, 0xad, 0x82, 0x67, 0xf0, 0xdc, 0x73, 0x6f, - 0xfb, 0x13, 0xbf, 0xef, 0xec, 0xfc, 0xab, 0x9d, 0x0b, 0xa8, 0xef, 0x16, 0xc0, 0xff, 0xc0, 0x18, - 0xb9, 0x73, 0xf3, 0x48, 0x14, 0xe3, 0x9b, 0x81, 0xa9, 0x5d, 0x6e, 0xe0, 0x1d, 0xcb, 0x23, 0x3b, - 0xc8, 0x82, 0xf0, 0x81, 0x3e, 0x0d, 0x23, 0xc8, 0x92, 0x7d, 0x20, 0xcb, 0x20, 0x8d, 0xd6, 0x41, - 0x44, 0xed, 0x20, 0xa2, 0x29, 0xf7, 0xb5, 0x2f, 0xaf, 0x4a, 0x62, 0xb7, 0x20, 0x75, 0x77, 0xa4, - 0xae, 0x24, 0x75, 0xbf, 0xf5, 0x7e, 0xe9, 0x8d, 0xc9, 0x62, 0x3b, 0x2f, 0xfc, 0x46, 0x8a, 0xe6, - 0x17, 0xd9, 0x7e, 0xad, 0xc9, 0x94, 0xdf, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x17, 0x11, 0xa8, - 0x08, 0x2d, 0x04, 0x00, 0x00, + // 503 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xd1, 0x6e, 0xd3, 0x30, + 0x14, 0x86, 0x97, 0x26, 0x2d, 0xdd, 0xe9, 0x36, 0x82, 0x37, 0x50, 0x54, 0x21, 0x28, 0x85, 0x8b, + 0x6a, 0x12, 0x2e, 0x32, 0x4f, 0x50, 0xd2, 0xa8, 0x63, 0x5a, 0xda, 0xc8, 0x5d, 0x5d, 0x89, 0x9b, + 0x29, 0x64, 0x56, 0x16, 0xb5, 0x89, 0xa3, 0x34, 0xa5, 0x84, 0x4b, 0x24, 0xde, 0x84, 0x2b, 0x9e, + 0x12, 0xd9, 0x49, 0x9b, 0xdd, 0xef, 0x2a, 0xff, 0xf9, 0xce, 0xaf, 0x93, 0xdf, 0xc7, 0x32, 0x98, + 0x81, 0x88, 0x63, 0x91, 0x0c, 0xaf, 0x99, 0x8b, 0xd3, 0x4c, 0xe4, 0xa2, 0x7b, 0x5e, 0x91, 0xf2, + 0x53, 0xc2, 0xfe, 0x5f, 0x0d, 0x3a, 0xd7, 0xcc, 0x75, 0x79, 0x9e, 0x45, 0x01, 0x23, 0x08, 0x81, + 0x91, 0x47, 0x31, 0xb7, 0xb4, 0x9e, 0x36, 0xd0, 0xa9, 0xd2, 0xc8, 0x02, 0x3d, 0x48, 0xb7, 0x56, + 0xa3, 0xa7, 0x0d, 0x3a, 0xa4, 0x85, 0x6d, 0x6f, 0xc1, 0x08, 0x95, 0x08, 0xbd, 0x83, 0x56, 0xcc, + 0x63, 0x91, 0x15, 0x96, 0xde, 0xd3, 0x07, 0x1d, 0x72, 0x8c, 0x5d, 0x55, 0x32, 0x42, 0xab, 0x06, + 0xfa, 0x08, 0x50, 0x2a, 0x4f, 0x88, 0xb5, 0x65, 0x28, 0xdb, 0x69, 0x65, 0x93, 0x88, 0x11, 0xfa, + 0xc8, 0x80, 0x5e, 0x42, 0x23, 0x0c, 0xac, 0xa6, 0xb2, 0x35, 0xf1, 0xc4, 0x66, 0x84, 0x36, 0xc2, + 0xa0, 0xff, 0x0b, 0xda, 0xfb, 0xc9, 0xe8, 0x15, 0xb4, 0xa2, 0xcd, 0x15, 0xf7, 0x53, 0x15, 0xb2, + 0x4d, 0xab, 0x4a, 0x46, 0x8f, 0x92, 0x28, 0x57, 0x39, 0x75, 0xaa, 0x34, 0x32, 0x41, 0x8f, 0xfd, + 0x9f, 0x96, 0xae, 0x90, 0x94, 0xd2, 0xb5, 0xdd, 0xf0, 0x7b, 0xcb, 0x28, 0x5d, 0x52, 0xa3, 0xd7, + 0x70, 0x2c, 0x97, 0x12, 0xe5, 0x39, 0xbf, 0xb7, 0x9a, 0xaa, 0x51, 0x83, 0xfe, 0x1f, 0x0d, 0x4e, + 0x1e, 0xe7, 0x45, 0x6f, 0xc1, 0xc8, 0x8b, 0xb4, 0xdc, 0xd1, 0x19, 0xe9, 0x60, 0x89, 0x6f, 0x8b, + 0x94, 0x33, 0x42, 0x55, 0xe3, 0x09, 0x49, 0xba, 0xd0, 0x2e, 0x7f, 0x7c, 0x08, 0x72, 0xa8, 0xfb, + 0x0b, 0x30, 0xe4, 0x3e, 0xd0, 0x7b, 0x68, 0xa5, 0x0f, 0x99, 0xbf, 0xa9, 0x03, 0x4c, 0x6c, 0x4f, + 0x01, 0xb9, 0xf6, 0xb2, 0x85, 0x2e, 0xa0, 0x19, 0x88, 0x6d, 0xb2, 0xcf, 0x50, 0x16, 0x87, 0xdb, + 0xd5, 0xeb, 0xdb, 0xbd, 0xfc, 0xad, 0x01, 0xd4, 0x27, 0x40, 0x17, 0x60, 0xda, 0xb3, 0xb1, 0x73, + 0x67, 0x8f, 0xec, 0x2b, 0xe7, 0x6e, 0x31, 0x1f, 0x4d, 0x1c, 0xf3, 0x08, 0x99, 0x70, 0x32, 0x75, + 0x96, 0x13, 0x67, 0x5a, 0x11, 0x4d, 0x92, 0xd9, 0xcd, 0xb8, 0x26, 0x0d, 0x84, 0xe0, 0x6c, 0xbe, + 0xa0, 0xec, 0x2b, 0x9b, 0xd1, 0x8a, 0xe9, 0xe8, 0x05, 0x9c, 0x7a, 0x0e, 0x75, 0x6b, 0x9b, 0x81, + 0xce, 0xe1, 0xb9, 0xeb, 0xdc, 0x8e, 0xe6, 0xde, 0xc8, 0xde, 0xcf, 0x6f, 0x5e, 0xbe, 0x01, 0xa8, + 0x0f, 0x81, 0x9e, 0x81, 0x3e, 0x75, 0x96, 0xe6, 0x91, 0x14, 0xb3, 0x9b, 0xb1, 0xa9, 0x7d, 0xd9, + 0xc1, 0x27, 0x91, 0x85, 0xd8, 0x4f, 0xfd, 0xe0, 0x81, 0xe3, 0xcd, 0xaa, 0xd8, 0xf9, 0xeb, 0x55, + 0x94, 0x48, 0x12, 0xe3, 0x84, 0xe7, 0x3b, 0x91, 0xad, 0xf0, 0xda, 0x4f, 0xc2, 0xad, 0x1f, 0x72, + 0xec, 0x87, 0x3c, 0xc9, 0x3d, 0xed, 0xdb, 0x87, 0xda, 0x38, 0xac, 0x4c, 0xc3, 0xbd, 0x69, 0xa8, + 0x4c, 0xc3, 0x1f, 0xe4, 0x5f, 0xa3, 0x3b, 0x5f, 0x15, 0xcb, 0x6a, 0xde, 0xb4, 0xb4, 0x79, 0xf2, + 0x71, 0x04, 0x62, 0xfd, 0xbd, 0xa5, 0x9e, 0xc9, 0xe7, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x86, + 0x6c, 0x8e, 0xdb, 0x4f, 0x03, 0x00, 0x00, } diff --git a/reporter/network/language/agent/v2/JVMMetric.pb.go b/reporter/network/language/agent/v2/JVMMetric.pb.go index 89fbc17..61a1542 100644 --- a/reporter/network/language/agent/v2/JVMMetric.pb.go +++ b/reporter/network/language/agent/v2/JVMMetric.pb.go @@ -6,12 +6,12 @@ package v2 import ( context "context" fmt "fmt" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" math "math" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -25,47 +25,47 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type JVMMetricCollection struct { - Metrics []*JVMMetric `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"` - ServiceInstanceId int32 `protobuf:"varint,2,opt,name=serviceInstanceId,proto3" json:"serviceInstanceId,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type JVMMetricCollectionV2 struct { + Metrics []*JVMMetricV2 `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"` + ServiceInstanceId int32 `protobuf:"varint,2,opt,name=serviceInstanceId,proto3" json:"serviceInstanceId,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *JVMMetricCollection) Reset() { *m = JVMMetricCollection{} } -func (m *JVMMetricCollection) String() string { return proto.CompactTextString(m) } -func (*JVMMetricCollection) ProtoMessage() {} -func (*JVMMetricCollection) Descriptor() ([]byte, []int) { +func (m *JVMMetricCollectionV2) Reset() { *m = JVMMetricCollectionV2{} } +func (m *JVMMetricCollectionV2) String() string { return proto.CompactTextString(m) } +func (*JVMMetricCollectionV2) ProtoMessage() {} +func (*JVMMetricCollectionV2) Descriptor() ([]byte, []int) { return fileDescriptor_a5bd38fe036677f3, []int{0} } -func (m *JVMMetricCollection) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_JVMMetricCollection.Unmarshal(m, b) +func (m *JVMMetricCollectionV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_JVMMetricCollectionV2.Unmarshal(m, b) } -func (m *JVMMetricCollection) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_JVMMetricCollection.Marshal(b, m, deterministic) +func (m *JVMMetricCollectionV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_JVMMetricCollectionV2.Marshal(b, m, deterministic) } -func (m *JVMMetricCollection) XXX_Merge(src proto.Message) { - xxx_messageInfo_JVMMetricCollection.Merge(m, src) +func (m *JVMMetricCollectionV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_JVMMetricCollectionV2.Merge(m, src) } -func (m *JVMMetricCollection) XXX_Size() int { - return xxx_messageInfo_JVMMetricCollection.Size(m) +func (m *JVMMetricCollectionV2) XXX_Size() int { + return xxx_messageInfo_JVMMetricCollectionV2.Size(m) } -func (m *JVMMetricCollection) XXX_DiscardUnknown() { - xxx_messageInfo_JVMMetricCollection.DiscardUnknown(m) +func (m *JVMMetricCollectionV2) XXX_DiscardUnknown() { + xxx_messageInfo_JVMMetricCollectionV2.DiscardUnknown(m) } -var xxx_messageInfo_JVMMetricCollection proto.InternalMessageInfo +var xxx_messageInfo_JVMMetricCollectionV2 proto.InternalMessageInfo -func (m *JVMMetricCollection) GetMetrics() []*JVMMetric { +func (m *JVMMetricCollectionV2) GetMetrics() []*JVMMetricV2 { if m != nil { return m.Metrics } return nil } -func (m *JVMMetricCollection) GetServiceInstanceId() int32 { +func (m *JVMMetricCollectionV2) GetServiceInstanceId() int32 { if m != nil { return m.ServiceInstanceId } @@ -73,32 +73,30 @@ func (m *JVMMetricCollection) GetServiceInstanceId() int32 { } func init() { - proto.RegisterType((*JVMMetricCollection)(nil), "skywalking.network.protocol.agent.v2.JVMMetricCollection") + proto.RegisterType((*JVMMetricCollectionV2)(nil), "JVMMetricCollectionV2") } func init() { proto.RegisterFile("language-agent-v2/JVMMetric.proto", fileDescriptor_a5bd38fe036677f3) } var fileDescriptor_a5bd38fe036677f3 = []byte{ - // 292 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x41, 0x4b, 0xc3, 0x30, - 0x14, 0xc7, 0xed, 0x44, 0x07, 0xf1, 0xa2, 0x1d, 0xc8, 0xe8, 0x69, 0x0e, 0x0f, 0x3b, 0x6c, 0x09, - 0x74, 0x27, 0xaf, 0xee, 0x20, 0x1b, 0x54, 0xc6, 0x06, 0x13, 0xbc, 0xc5, 0xec, 0x51, 0x4b, 0x9b, - 0xbc, 0x92, 0xc4, 0x8e, 0xf9, 0x19, 0xc4, 0x0f, 0xe2, 0xa7, 0x14, 0x9a, 0xb4, 0x0e, 0x14, 0xd9, - 0x29, 0xf0, 0xde, 0xef, 0xff, 0xfe, 0xff, 0x97, 0x47, 0x6e, 0x0a, 0xae, 0xd2, 0x37, 0x9e, 0xc2, - 0x84, 0xa7, 0xa0, 0xec, 0xa4, 0x8a, 0xd9, 0x62, 0x93, 0x24, 0x60, 0x75, 0x26, 0x68, 0xa9, 0xd1, - 0x62, 0x78, 0x6b, 0xf2, 0xfd, 0x8e, 0x17, 0x79, 0xa6, 0x52, 0xaa, 0xc0, 0xee, 0x50, 0xe7, 0xae, - 0x23, 0xb0, 0xa0, 0xb5, 0x8a, 0x56, 0x71, 0xd4, 0x13, 0x28, 0x25, 0x2a, 0xe6, 0x1e, 0x07, 0x44, - 0x97, 0xbe, 0xb8, 0xd8, 0x24, 0xae, 0x32, 0xfc, 0x08, 0x48, 0xaf, 0x35, 0x98, 0x61, 0x51, 0x80, - 0xb0, 0x19, 0xaa, 0xf0, 0x81, 0x74, 0x65, 0x5d, 0x33, 0xfd, 0x60, 0x70, 0x3a, 0xba, 0x88, 0x27, - 0xf4, 0x3f, 0x5b, 0xef, 0xd2, 0x4e, 0x5a, 0x35, 0xea, 0x70, 0x4c, 0xae, 0x0c, 0xe8, 0x2a, 0x13, - 0x30, 0x57, 0xc6, 0x72, 0x25, 0x60, 0xbe, 0xed, 0x77, 0x06, 0xc1, 0xe8, 0x6c, 0xf5, 0xbb, 0x11, - 0x7f, 0x06, 0xe4, 0xfa, 0x67, 0x08, 0x94, 0xa8, 0xed, 0xda, 0x41, 0xa1, 0x25, 0x5d, 0xe1, 0xf2, - 0x85, 0x77, 0xf4, 0x98, 0x2f, 0xa0, 0x7f, 0xec, 0x15, 0x8d, 0x8f, 0x59, 0x63, 0x86, 0x52, 0x72, - 0xb5, 0x35, 0xc3, 0x93, 0xfb, 0x77, 0x32, 0x45, 0x9d, 0x52, 0x5e, 0x72, 0xf1, 0x0a, 0x87, 0x5a, - 0x5e, 0xca, 0x56, 0xdf, 0xdc, 0xac, 0xb5, 0x5e, 0x06, 0xcf, 0x07, 0x57, 0x62, 0x9e, 0x63, 0x0d, - 0xc7, 0x6a, 0x8e, 0x55, 0xf1, 0x57, 0x27, 0x5a, 0xe7, 0xfb, 0x27, 0x3f, 0xf2, 0xd1, 0x61, 0x4b, - 0x9f, 0xe6, 0xe5, 0xbc, 0xce, 0x35, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x9c, 0x77, 0xbd, - 0x14, 0x02, 0x00, 0x00, + // 271 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x41, 0x4b, 0xc3, 0x30, + 0x14, 0x80, 0xed, 0x44, 0x07, 0x99, 0x07, 0xad, 0x38, 0x46, 0x4f, 0x73, 0x88, 0xec, 0xe0, 0x12, + 0xc9, 0xfe, 0x81, 0x3b, 0xad, 0x50, 0x19, 0x1d, 0x54, 0xf0, 0x16, 0xb3, 0x47, 0x2d, 0x6d, 0xf2, + 0x4a, 0x1a, 0x3b, 0xe6, 0x4f, 0xf2, 0x57, 0xca, 0x9a, 0xb6, 0x1e, 0xdc, 0x29, 0xf0, 0xbd, 0x2f, + 0x2f, 0xe1, 0x23, 0xf7, 0x85, 0xd0, 0xe9, 0x97, 0x48, 0x61, 0x21, 0x52, 0xd0, 0x76, 0x51, 0x73, + 0x16, 0x26, 0x51, 0x04, 0xd6, 0x64, 0x92, 0x96, 0x06, 0x2d, 0x06, 0xb7, 0x12, 0x95, 0x42, 0xcd, + 0xdc, 0xd1, 0xc2, 0xeb, 0x16, 0x86, 0x49, 0xe4, 0xc8, 0x4c, 0x91, 0xbb, 0xfe, 0xe6, 0x0a, 0x8b, + 0x02, 0xa4, 0xcd, 0x50, 0x27, 0xdc, 0x7f, 0x24, 0x43, 0xd5, 0xd0, 0x6a, 0xe2, 0x4d, 0xcf, 0xe7, + 0x23, 0x7e, 0x45, 0x7b, 0x31, 0xe1, 0x71, 0x37, 0xf4, 0x9f, 0xc8, 0x4d, 0x05, 0xa6, 0xce, 0x24, + 0xac, 0x75, 0x65, 0x85, 0x96, 0xb0, 0xde, 0x4d, 0x06, 0x53, 0x6f, 0x7e, 0x11, 0xff, 0x1f, 0xf0, + 0x90, 0x8c, 0xfb, 0x2d, 0x31, 0x94, 0x68, 0xec, 0xd6, 0x39, 0xfe, 0x33, 0x19, 0x4a, 0xf7, 0xbe, + 0x3f, 0xa6, 0x27, 0xbf, 0x14, 0x8c, 0xe8, 0x0a, 0x95, 0x12, 0x7a, 0x57, 0x25, 0x7c, 0x76, 0xf6, + 0xf2, 0x4d, 0x96, 0x68, 0x52, 0x2a, 0x4a, 0x21, 0x3f, 0x81, 0x56, 0xf9, 0x61, 0x2f, 0x8a, 0x3c, + 0xd3, 0x47, 0xa2, 0xa8, 0x06, 0xbb, 0x47, 0x93, 0xd3, 0x2e, 0x14, 0x6d, 0x42, 0xd1, 0x9a, 0x6f, + 0xbc, 0xf7, 0x87, 0x3f, 0x97, 0xb5, 0x1e, 0xeb, 0x3c, 0xd6, 0x78, 0xac, 0xe6, 0x3f, 0x83, 0x60, + 0x9b, 0x1f, 0xde, 0xda, 0x95, 0xaf, 0x4e, 0xdb, 0x1c, 0x9b, 0x49, 0x2c, 0x3e, 0x2e, 0x9b, 0x7a, + 0xcb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x3f, 0x0c, 0xc7, 0x89, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -113,7 +111,7 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type JVMMetricReportServiceClient interface { - Collect(ctx context.Context, in *JVMMetricCollection, opts ...grpc.CallOption) (*v2.Commands, error) + Collect(ctx context.Context, in *JVMMetricCollectionV2, opts ...grpc.CallOption) (*v2.CommandsV2, error) } type jVMMetricReportServiceClient struct { @@ -124,9 +122,9 @@ func NewJVMMetricReportServiceClient(cc *grpc.ClientConn) JVMMetricReportService return &jVMMetricReportServiceClient{cc} } -func (c *jVMMetricReportServiceClient) Collect(ctx context.Context, in *JVMMetricCollection, opts ...grpc.CallOption) (*v2.Commands, error) { - out := new(v2.Commands) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.v2.JVMMetricReportService/collect", in, out, opts...) +func (c *jVMMetricReportServiceClient) Collect(ctx context.Context, in *JVMMetricCollectionV2, opts ...grpc.CallOption) (*v2.CommandsV2, error) { + out := new(v2.CommandsV2) + err := c.cc.Invoke(ctx, "/JVMMetricReportService/collect", in, out, opts...) if err != nil { return nil, err } @@ -135,14 +133,14 @@ func (c *jVMMetricReportServiceClient) Collect(ctx context.Context, in *JVMMetri // JVMMetricReportServiceServer is the server API for JVMMetricReportService service. type JVMMetricReportServiceServer interface { - Collect(context.Context, *JVMMetricCollection) (*v2.Commands, error) + Collect(context.Context, *JVMMetricCollectionV2) (*v2.CommandsV2, error) } // UnimplementedJVMMetricReportServiceServer can be embedded to have forward compatible implementations. type UnimplementedJVMMetricReportServiceServer struct { } -func (*UnimplementedJVMMetricReportServiceServer) Collect(ctx context.Context, req *JVMMetricCollection) (*v2.Commands, error) { +func (*UnimplementedJVMMetricReportServiceServer) Collect(ctx context.Context, req *JVMMetricCollectionV2) (*v2.CommandsV2, error) { return nil, status.Errorf(codes.Unimplemented, "method Collect not implemented") } @@ -151,7 +149,7 @@ func RegisterJVMMetricReportServiceServer(s *grpc.Server, srv JVMMetricReportSer } func _JVMMetricReportService_Collect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(JVMMetricCollection) + in := new(JVMMetricCollectionV2) if err := dec(in); err != nil { return nil, err } @@ -160,16 +158,16 @@ func _JVMMetricReportService_Collect_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.v2.JVMMetricReportService/Collect", + FullMethod: "/JVMMetricReportService/Collect", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(JVMMetricReportServiceServer).Collect(ctx, req.(*JVMMetricCollection)) + return srv.(JVMMetricReportServiceServer).Collect(ctx, req.(*JVMMetricCollectionV2)) } return interceptor(ctx, in, info, handler) } var _JVMMetricReportService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v2.JVMMetricReportService", + ServiceName: "JVMMetricReportService", HandlerType: (*JVMMetricReportServiceServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/reporter/network/language/agent/v2/trace-common.pb.go b/reporter/network/language/agent/v2/trace-common.pb.go index d3ecfa3..6100a14 100644 --- a/reporter/network/language/agent/v2/trace-common.pb.go +++ b/reporter/network/language/agent/v2/trace-common.pb.go @@ -20,71 +20,71 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type SpanType int32 +type SpanTypeV2 int32 const ( - SpanType_Entry SpanType = 0 - SpanType_Exit SpanType = 1 - SpanType_Local SpanType = 2 + SpanTypeV2_Entry SpanTypeV2 = 0 + SpanTypeV2_Exit SpanTypeV2 = 1 + SpanTypeV2_Local SpanTypeV2 = 2 ) -var SpanType_name = map[int32]string{ +var SpanTypeV2_name = map[int32]string{ 0: "Entry", 1: "Exit", 2: "Local", } -var SpanType_value = map[string]int32{ +var SpanTypeV2_value = map[string]int32{ "Entry": 0, "Exit": 1, "Local": 2, } -func (x SpanType) String() string { - return proto.EnumName(SpanType_name, int32(x)) +func (x SpanTypeV2) String() string { + return proto.EnumName(SpanTypeV2_name, int32(x)) } -func (SpanType) EnumDescriptor() ([]byte, []int) { +func (SpanTypeV2) EnumDescriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{0} } -type RefType int32 +type RefTypeV2 int32 const ( - RefType_CrossProcess RefType = 0 - RefType_CrossThread RefType = 1 + RefTypeV2_CrossProcess RefTypeV2 = 0 + RefTypeV2_CrossThread RefTypeV2 = 1 ) -var RefType_name = map[int32]string{ +var RefTypeV2_name = map[int32]string{ 0: "CrossProcess", 1: "CrossThread", } -var RefType_value = map[string]int32{ +var RefTypeV2_value = map[string]int32{ "CrossProcess": 0, "CrossThread": 1, } -func (x RefType) String() string { - return proto.EnumName(RefType_name, int32(x)) +func (x RefTypeV2) String() string { + return proto.EnumName(RefTypeV2_name, int32(x)) } -func (RefType) EnumDescriptor() ([]byte, []int) { +func (RefTypeV2) EnumDescriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{1} } -type SpanLayer int32 +type SpanLayerV2 int32 const ( - SpanLayer_Unknown SpanLayer = 0 - SpanLayer_Database SpanLayer = 1 - SpanLayer_RPCFramework SpanLayer = 2 - SpanLayer_Http SpanLayer = 3 - SpanLayer_MQ SpanLayer = 4 - SpanLayer_Cache SpanLayer = 5 + SpanLayerV2_Unknown SpanLayerV2 = 0 + SpanLayerV2_Database SpanLayerV2 = 1 + SpanLayerV2_RPCFramework SpanLayerV2 = 2 + SpanLayerV2_Http SpanLayerV2 = 3 + SpanLayerV2_MQ SpanLayerV2 = 4 + SpanLayerV2_Cache SpanLayerV2 = 5 ) -var SpanLayer_name = map[int32]string{ +var SpanLayerV2_name = map[int32]string{ 0: "Unknown", 1: "Database", 2: "RPCFramework", @@ -93,7 +93,7 @@ var SpanLayer_name = map[int32]string{ 5: "Cache", } -var SpanLayer_value = map[string]int32{ +var SpanLayerV2_value = map[string]int32{ "Unknown": 0, "Database": 1, "RPCFramework": 2, @@ -102,94 +102,94 @@ var SpanLayer_value = map[string]int32{ "Cache": 5, } -func (x SpanLayer) String() string { - return proto.EnumName(SpanLayer_name, int32(x)) +func (x SpanLayerV2) String() string { + return proto.EnumName(SpanLayerV2_name, int32(x)) } -func (SpanLayer) EnumDescriptor() ([]byte, []int) { +func (SpanLayerV2) EnumDescriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{2} } -type UpstreamSegment struct { - GlobalTraceIds []*UniqueId `protobuf:"bytes,1,rep,name=globalTraceIds,proto3" json:"globalTraceIds,omitempty"` - Segment []byte `protobuf:"bytes,2,opt,name=segment,proto3" json:"segment,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type UpstreamSegmentV2 struct { + GlobalTraceIds []*UniqueIdV2 `protobuf:"bytes,1,rep,name=globalTraceIds,proto3" json:"globalTraceIds,omitempty"` + Segment []byte `protobuf:"bytes,2,opt,name=segment,proto3" json:"segment,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *UpstreamSegment) Reset() { *m = UpstreamSegment{} } -func (m *UpstreamSegment) String() string { return proto.CompactTextString(m) } -func (*UpstreamSegment) ProtoMessage() {} -func (*UpstreamSegment) Descriptor() ([]byte, []int) { +func (m *UpstreamSegmentV2) Reset() { *m = UpstreamSegmentV2{} } +func (m *UpstreamSegmentV2) String() string { return proto.CompactTextString(m) } +func (*UpstreamSegmentV2) ProtoMessage() {} +func (*UpstreamSegmentV2) Descriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{0} } -func (m *UpstreamSegment) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_UpstreamSegment.Unmarshal(m, b) +func (m *UpstreamSegmentV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpstreamSegmentV2.Unmarshal(m, b) } -func (m *UpstreamSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_UpstreamSegment.Marshal(b, m, deterministic) +func (m *UpstreamSegmentV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpstreamSegmentV2.Marshal(b, m, deterministic) } -func (m *UpstreamSegment) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpstreamSegment.Merge(m, src) +func (m *UpstreamSegmentV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpstreamSegmentV2.Merge(m, src) } -func (m *UpstreamSegment) XXX_Size() int { - return xxx_messageInfo_UpstreamSegment.Size(m) +func (m *UpstreamSegmentV2) XXX_Size() int { + return xxx_messageInfo_UpstreamSegmentV2.Size(m) } -func (m *UpstreamSegment) XXX_DiscardUnknown() { - xxx_messageInfo_UpstreamSegment.DiscardUnknown(m) +func (m *UpstreamSegmentV2) XXX_DiscardUnknown() { + xxx_messageInfo_UpstreamSegmentV2.DiscardUnknown(m) } -var xxx_messageInfo_UpstreamSegment proto.InternalMessageInfo +var xxx_messageInfo_UpstreamSegmentV2 proto.InternalMessageInfo -func (m *UpstreamSegment) GetGlobalTraceIds() []*UniqueId { +func (m *UpstreamSegmentV2) GetGlobalTraceIds() []*UniqueIdV2 { if m != nil { return m.GlobalTraceIds } return nil } -func (m *UpstreamSegment) GetSegment() []byte { +func (m *UpstreamSegmentV2) GetSegment() []byte { if m != nil { return m.Segment } return nil } -type UniqueId struct { +type UniqueIdV2 struct { IdParts []int64 `protobuf:"varint,1,rep,packed,name=idParts,proto3" json:"idParts,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *UniqueId) Reset() { *m = UniqueId{} } -func (m *UniqueId) String() string { return proto.CompactTextString(m) } -func (*UniqueId) ProtoMessage() {} -func (*UniqueId) Descriptor() ([]byte, []int) { +func (m *UniqueIdV2) Reset() { *m = UniqueIdV2{} } +func (m *UniqueIdV2) String() string { return proto.CompactTextString(m) } +func (*UniqueIdV2) ProtoMessage() {} +func (*UniqueIdV2) Descriptor() ([]byte, []int) { return fileDescriptor_f5d7d2e503402948, []int{1} } -func (m *UniqueId) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_UniqueId.Unmarshal(m, b) +func (m *UniqueIdV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UniqueIdV2.Unmarshal(m, b) } -func (m *UniqueId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_UniqueId.Marshal(b, m, deterministic) +func (m *UniqueIdV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UniqueIdV2.Marshal(b, m, deterministic) } -func (m *UniqueId) XXX_Merge(src proto.Message) { - xxx_messageInfo_UniqueId.Merge(m, src) +func (m *UniqueIdV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_UniqueIdV2.Merge(m, src) } -func (m *UniqueId) XXX_Size() int { - return xxx_messageInfo_UniqueId.Size(m) +func (m *UniqueIdV2) XXX_Size() int { + return xxx_messageInfo_UniqueIdV2.Size(m) } -func (m *UniqueId) XXX_DiscardUnknown() { - xxx_messageInfo_UniqueId.DiscardUnknown(m) +func (m *UniqueIdV2) XXX_DiscardUnknown() { + xxx_messageInfo_UniqueIdV2.DiscardUnknown(m) } -var xxx_messageInfo_UniqueId proto.InternalMessageInfo +var xxx_messageInfo_UniqueIdV2 proto.InternalMessageInfo -func (m *UniqueId) GetIdParts() []int64 { +func (m *UniqueIdV2) GetIdParts() []int64 { if m != nil { return m.IdParts } @@ -197,39 +197,38 @@ func (m *UniqueId) GetIdParts() []int64 { } func init() { - proto.RegisterEnum("skywalking.network.protocol.common.SpanType", SpanType_name, SpanType_value) - proto.RegisterEnum("skywalking.network.protocol.common.RefType", RefType_name, RefType_value) - proto.RegisterEnum("skywalking.network.protocol.common.SpanLayer", SpanLayer_name, SpanLayer_value) - proto.RegisterType((*UpstreamSegment)(nil), "skywalking.network.protocol.common.UpstreamSegment") - proto.RegisterType((*UniqueId)(nil), "skywalking.network.protocol.common.UniqueId") + proto.RegisterEnum("SpanTypeV2", SpanTypeV2_name, SpanTypeV2_value) + proto.RegisterEnum("RefTypeV2", RefTypeV2_name, RefTypeV2_value) + proto.RegisterEnum("SpanLayerV2", SpanLayerV2_name, SpanLayerV2_value) + proto.RegisterType((*UpstreamSegmentV2)(nil), "UpstreamSegmentV2") + proto.RegisterType((*UniqueIdV2)(nil), "UniqueIdV2") } func init() { proto.RegisterFile("common/trace-common.proto", fileDescriptor_f5d7d2e503402948) } var fileDescriptor_f5d7d2e503402948 = []byte{ - // 372 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x86, 0x63, 0xa7, 0x6d, 0xdc, 0x49, 0x44, 0x57, 0x7b, 0x0a, 0x9c, 0xaa, 0xa8, 0x87, 0xca, - 0x2a, 0x36, 0x2a, 0x6f, 0x40, 0x28, 0xa2, 0x52, 0x41, 0xc6, 0xb1, 0x85, 0xc4, 0x6d, 0x62, 0x0f, - 0xae, 0x65, 0x7b, 0xd7, 0xec, 0x6e, 0x30, 0x3e, 0xf2, 0x3a, 0x3c, 0x25, 0x5a, 0x3b, 0x06, 0xc4, - 0xa5, 0xc7, 0x7f, 0xf6, 0xdb, 0x6f, 0x76, 0x67, 0xe0, 0x79, 0x26, 0x9b, 0x46, 0x8a, 0xd0, 0x28, - 0xcc, 0xe8, 0xe5, 0x18, 0x82, 0x56, 0x49, 0x23, 0xf9, 0x46, 0x57, 0x7d, 0x87, 0x75, 0x55, 0x8a, - 0x22, 0x10, 0x64, 0x3a, 0xa9, 0xaa, 0xf1, 0x24, 0x93, 0x75, 0x30, 0x92, 0x9b, 0x9f, 0x0e, 0x5c, - 0xa4, 0xad, 0x36, 0x8a, 0xb0, 0xd9, 0x51, 0xd1, 0x90, 0x30, 0x3c, 0x81, 0x67, 0x45, 0x2d, 0xf7, - 0x58, 0x27, 0xd6, 0x79, 0x9f, 0xeb, 0xb5, 0x73, 0x39, 0xbf, 0x5e, 0xde, 0xde, 0x04, 0x4f, 0x0b, - 0x83, 0x54, 0x94, 0xdf, 0x0e, 0x74, 0x9f, 0xc7, 0xff, 0x39, 0xf8, 0x1a, 0x16, 0x7a, 0x6c, 0xb0, - 0x76, 0x2f, 0x9d, 0xeb, 0x55, 0x3c, 0xc5, 0xcd, 0x15, 0x78, 0xd3, 0x2d, 0x4b, 0x95, 0x79, 0x84, - 0xca, 0x8c, 0x4d, 0xe7, 0xf1, 0x14, 0x7d, 0x1f, 0xbc, 0x5d, 0x8b, 0x22, 0xe9, 0x5b, 0xe2, 0xe7, - 0x70, 0x7a, 0x27, 0x8c, 0xea, 0xd9, 0x8c, 0x7b, 0x70, 0x72, 0xf7, 0xa3, 0x34, 0xcc, 0xb1, 0xc5, - 0x07, 0x99, 0x61, 0xcd, 0x5c, 0xff, 0x06, 0x16, 0x31, 0x7d, 0x1d, 0x50, 0x06, 0xab, 0xad, 0x92, - 0x5a, 0x47, 0x4a, 0x66, 0xa4, 0x35, 0x9b, 0xf1, 0x0b, 0x58, 0x0e, 0x95, 0xe4, 0x51, 0x11, 0xe6, - 0xcc, 0xf1, 0x53, 0x38, 0xb7, 0xe6, 0x07, 0xec, 0x49, 0xf1, 0x25, 0x2c, 0x52, 0x51, 0x09, 0xd9, - 0x09, 0x36, 0xe3, 0x2b, 0xf0, 0xde, 0xa2, 0xc1, 0x3d, 0x6a, 0x62, 0x8e, 0x55, 0xc5, 0xd1, 0xf6, - 0x9d, 0xc2, 0x86, 0xec, 0xd7, 0x99, 0x6b, 0x9b, 0xbf, 0x37, 0xa6, 0x65, 0x73, 0x7e, 0x06, 0xee, - 0x87, 0x4f, 0xec, 0xc4, 0x3e, 0x62, 0x8b, 0xd9, 0x23, 0xb1, 0xd3, 0x37, 0x1d, 0xbc, 0x92, 0xaa, - 0x08, 0xb0, 0xb5, 0xf9, 0xdf, 0xd1, 0x61, 0xdb, 0xfc, 0x19, 0x5f, 0x8d, 0xa2, 0x38, 0x60, 0x41, - 0x01, 0x16, 0x24, 0x4c, 0xe4, 0x7c, 0xb9, 0xfa, 0x0b, 0x86, 0x47, 0x28, 0x9c, 0xa0, 0x70, 0x80, - 0xc2, 0xef, 0xb7, 0xbf, 0xdc, 0x17, 0xbb, 0xaa, 0xff, 0x7c, 0xf4, 0x7d, 0x1c, 0xb1, 0xe8, 0xb8, - 0x89, 0xfd, 0xd9, 0xb0, 0x93, 0xd7, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x8c, 0xec, 0x03, - 0x1b, 0x02, 0x00, 0x00, + // 360 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xdf, 0x8a, 0xd3, 0x40, + 0x14, 0xc6, 0x9b, 0x74, 0xff, 0x9e, 0x14, 0x1d, 0xe7, 0xaa, 0x7a, 0xb5, 0x2c, 0x22, 0x4b, 0xd1, + 0x89, 0x64, 0xdf, 0xc0, 0xba, 0xe2, 0xc2, 0x2a, 0x31, 0x6d, 0xb3, 0xe0, 0xdd, 0x49, 0x72, 0xcc, + 0x86, 0x24, 0x33, 0x71, 0x66, 0x6a, 0xcc, 0x2b, 0xf9, 0x94, 0x32, 0x4d, 0x4b, 0x61, 0x2f, 0xbf, + 0x8f, 0xdf, 0xf9, 0x71, 0xe0, 0x83, 0xd7, 0xb9, 0x6a, 0x5b, 0x25, 0x43, 0xab, 0x31, 0xa7, 0x0f, + 0x63, 0x10, 0x9d, 0x56, 0x56, 0x5d, 0x67, 0xf0, 0x6a, 0xd3, 0x19, 0xab, 0x09, 0xdb, 0x15, 0x95, + 0x2d, 0x49, 0x9b, 0x46, 0xfc, 0x16, 0x5e, 0x94, 0x8d, 0xca, 0xb0, 0x59, 0xbb, 0x83, 0xfb, 0xc2, + 0xcc, 0xbd, 0xab, 0xe9, 0x4d, 0x10, 0x05, 0x62, 0x23, 0xab, 0xdf, 0x5b, 0xba, 0x2f, 0xd2, 0x28, + 0x79, 0x86, 0xf0, 0x39, 0x9c, 0x9b, 0xd1, 0x30, 0xf7, 0xaf, 0xbc, 0x9b, 0x59, 0x72, 0x88, 0xd7, + 0xef, 0x00, 0x8e, 0x77, 0x8e, 0xab, 0x8a, 0x18, 0xb5, 0x1d, 0xad, 0xd3, 0xe4, 0x10, 0x17, 0xef, + 0x01, 0x56, 0x1d, 0xca, 0xf5, 0xd0, 0x51, 0x1a, 0xf1, 0x4b, 0x38, 0xbd, 0x93, 0x56, 0x0f, 0x6c, + 0xc2, 0x2f, 0xe0, 0xe4, 0xee, 0x6f, 0x65, 0x99, 0xe7, 0xca, 0x07, 0x95, 0x63, 0xc3, 0xfc, 0x85, + 0x80, 0xcb, 0x84, 0x7e, 0xed, 0x61, 0x06, 0xb3, 0xa5, 0x56, 0xc6, 0xc4, 0x5a, 0xe5, 0x64, 0x0c, + 0x9b, 0xf0, 0x97, 0x10, 0xec, 0x9a, 0xf5, 0x93, 0x26, 0x2c, 0x98, 0xb7, 0x78, 0x84, 0xc0, 0xd9, + 0x1f, 0x70, 0x20, 0x9d, 0x46, 0x3c, 0x80, 0xf3, 0x8d, 0xac, 0xa5, 0xea, 0x25, 0x9b, 0xf0, 0x19, + 0x5c, 0x7c, 0x46, 0x8b, 0x19, 0x1a, 0x62, 0x9e, 0x93, 0x25, 0xf1, 0xf2, 0x8b, 0xc6, 0x96, 0x7a, + 0xa5, 0x6b, 0xe6, 0xbb, 0x07, 0xbe, 0x5a, 0xdb, 0xb1, 0x29, 0x3f, 0x03, 0xff, 0xdb, 0x0f, 0x76, + 0xe2, 0x1e, 0x59, 0x62, 0xfe, 0x44, 0xec, 0xf4, 0x53, 0x0f, 0x1f, 0x95, 0x2e, 0x05, 0x76, 0x2e, + 0x0b, 0x53, 0x0f, 0x3d, 0x36, 0x75, 0x25, 0x5d, 0xd3, 0x0a, 0x49, 0xd6, 0x39, 0x44, 0x83, 0xb2, + 0xdc, 0x62, 0x49, 0x02, 0x4b, 0x92, 0x36, 0xf6, 0x7e, 0xbe, 0x3d, 0x82, 0xe1, 0x1e, 0x0a, 0x0f, + 0x50, 0xb8, 0x83, 0xc2, 0x3f, 0xd1, 0x3f, 0xff, 0xcd, 0xaa, 0x1e, 0x1e, 0xf7, 0xbe, 0xef, 0x23, + 0x16, 0xbb, 0xe1, 0x72, 0xd5, 0x64, 0x67, 0xbb, 0x09, 0x6f, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, + 0xc8, 0x1a, 0x60, 0x4e, 0xdf, 0x01, 0x00, 0x00, } diff --git a/reporter/network/language/agent/v2/trace.pb.go b/reporter/network/language/agent/v2/trace.pb.go index 3817ce9..6824f07 100644 --- a/reporter/network/language/agent/v2/trace.pb.go +++ b/reporter/network/language/agent/v2/trace.pb.go @@ -6,12 +6,12 @@ package v2 import ( context "context" fmt "fmt" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" math "math" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -25,8 +25,8 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type SegmentObject struct { - TraceSegmentId *UniqueId `protobuf:"bytes,1,opt,name=traceSegmentId,proto3" json:"traceSegmentId,omitempty"` +type SegmentObjectV2 struct { + TraceSegmentId *UniqueIdV2 `protobuf:"bytes,1,opt,name=traceSegmentId,proto3" json:"traceSegmentId,omitempty"` Spans []*SpanObjectV2 `protobuf:"bytes,2,rep,name=spans,proto3" json:"spans,omitempty"` ServiceId int32 `protobuf:"varint,3,opt,name=serviceId,proto3" json:"serviceId,omitempty"` ServiceInstanceId int32 `protobuf:"varint,4,opt,name=serviceInstanceId,proto3" json:"serviceInstanceId,omitempty"` @@ -36,179 +36,179 @@ type SegmentObject struct { XXX_sizecache int32 `json:"-"` } -func (m *SegmentObject) Reset() { *m = SegmentObject{} } -func (m *SegmentObject) String() string { return proto.CompactTextString(m) } -func (*SegmentObject) ProtoMessage() {} -func (*SegmentObject) Descriptor() ([]byte, []int) { +func (m *SegmentObjectV2) Reset() { *m = SegmentObjectV2{} } +func (m *SegmentObjectV2) String() string { return proto.CompactTextString(m) } +func (*SegmentObjectV2) ProtoMessage() {} +func (*SegmentObjectV2) Descriptor() ([]byte, []int) { return fileDescriptor_8124ab206744863a, []int{0} } -func (m *SegmentObject) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SegmentObject.Unmarshal(m, b) +func (m *SegmentObjectV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SegmentObjectV2.Unmarshal(m, b) } -func (m *SegmentObject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SegmentObject.Marshal(b, m, deterministic) +func (m *SegmentObjectV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SegmentObjectV2.Marshal(b, m, deterministic) } -func (m *SegmentObject) XXX_Merge(src proto.Message) { - xxx_messageInfo_SegmentObject.Merge(m, src) +func (m *SegmentObjectV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_SegmentObjectV2.Merge(m, src) } -func (m *SegmentObject) XXX_Size() int { - return xxx_messageInfo_SegmentObject.Size(m) +func (m *SegmentObjectV2) XXX_Size() int { + return xxx_messageInfo_SegmentObjectV2.Size(m) } -func (m *SegmentObject) XXX_DiscardUnknown() { - xxx_messageInfo_SegmentObject.DiscardUnknown(m) +func (m *SegmentObjectV2) XXX_DiscardUnknown() { + xxx_messageInfo_SegmentObjectV2.DiscardUnknown(m) } -var xxx_messageInfo_SegmentObject proto.InternalMessageInfo +var xxx_messageInfo_SegmentObjectV2 proto.InternalMessageInfo -func (m *SegmentObject) GetTraceSegmentId() *UniqueId { +func (m *SegmentObjectV2) GetTraceSegmentId() *UniqueIdV2 { if m != nil { return m.TraceSegmentId } return nil } -func (m *SegmentObject) GetSpans() []*SpanObjectV2 { +func (m *SegmentObjectV2) GetSpans() []*SpanObjectV2 { if m != nil { return m.Spans } return nil } -func (m *SegmentObject) GetServiceId() int32 { +func (m *SegmentObjectV2) GetServiceId() int32 { if m != nil { return m.ServiceId } return 0 } -func (m *SegmentObject) GetServiceInstanceId() int32 { +func (m *SegmentObjectV2) GetServiceInstanceId() int32 { if m != nil { return m.ServiceInstanceId } return 0 } -func (m *SegmentObject) GetIsSizeLimited() bool { +func (m *SegmentObjectV2) GetIsSizeLimited() bool { if m != nil { return m.IsSizeLimited } return false } -type SegmentReference struct { - RefType RefType `protobuf:"varint,1,opt,name=refType,proto3,enum=skywalking.network.protocol.common.RefType" json:"refType,omitempty"` - ParentTraceSegmentId *UniqueId `protobuf:"bytes,2,opt,name=parentTraceSegmentId,proto3" json:"parentTraceSegmentId,omitempty"` - ParentSpanId int32 `protobuf:"varint,3,opt,name=parentSpanId,proto3" json:"parentSpanId,omitempty"` - ParentServiceInstanceId int32 `protobuf:"varint,4,opt,name=parentServiceInstanceId,proto3" json:"parentServiceInstanceId,omitempty"` - NetworkAddress string `protobuf:"bytes,5,opt,name=networkAddress,proto3" json:"networkAddress,omitempty"` - NetworkAddressId int32 `protobuf:"varint,6,opt,name=networkAddressId,proto3" json:"networkAddressId,omitempty"` - EntryServiceInstanceId int32 `protobuf:"varint,7,opt,name=entryServiceInstanceId,proto3" json:"entryServiceInstanceId,omitempty"` - EntryEndpoint string `protobuf:"bytes,8,opt,name=entryEndpoint,proto3" json:"entryEndpoint,omitempty"` - EntryEndpointId int32 `protobuf:"varint,9,opt,name=entryEndpointId,proto3" json:"entryEndpointId,omitempty"` - ParentEndpoint string `protobuf:"bytes,10,opt,name=parentEndpoint,proto3" json:"parentEndpoint,omitempty"` - ParentEndpointId int32 `protobuf:"varint,11,opt,name=parentEndpointId,proto3" json:"parentEndpointId,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SegmentReference) Reset() { *m = SegmentReference{} } -func (m *SegmentReference) String() string { return proto.CompactTextString(m) } -func (*SegmentReference) ProtoMessage() {} -func (*SegmentReference) Descriptor() ([]byte, []int) { +type SegmentReferenceV2 struct { + RefType RefTypeV2 `protobuf:"varint,1,opt,name=refType,proto3,enum=RefTypeV2" json:"refType,omitempty"` + ParentTraceSegmentId *UniqueIdV2 `protobuf:"bytes,2,opt,name=parentTraceSegmentId,proto3" json:"parentTraceSegmentId,omitempty"` + ParentSpanId int32 `protobuf:"varint,3,opt,name=parentSpanId,proto3" json:"parentSpanId,omitempty"` + ParentServiceInstanceId int32 `protobuf:"varint,4,opt,name=parentServiceInstanceId,proto3" json:"parentServiceInstanceId,omitempty"` + NetworkAddress string `protobuf:"bytes,5,opt,name=networkAddress,proto3" json:"networkAddress,omitempty"` + NetworkAddressId int32 `protobuf:"varint,6,opt,name=networkAddressId,proto3" json:"networkAddressId,omitempty"` + EntryServiceInstanceId int32 `protobuf:"varint,7,opt,name=entryServiceInstanceId,proto3" json:"entryServiceInstanceId,omitempty"` + EntryEndpoint string `protobuf:"bytes,8,opt,name=entryEndpoint,proto3" json:"entryEndpoint,omitempty"` + EntryEndpointId int32 `protobuf:"varint,9,opt,name=entryEndpointId,proto3" json:"entryEndpointId,omitempty"` + ParentEndpoint string `protobuf:"bytes,10,opt,name=parentEndpoint,proto3" json:"parentEndpoint,omitempty"` + ParentEndpointId int32 `protobuf:"varint,11,opt,name=parentEndpointId,proto3" json:"parentEndpointId,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SegmentReferenceV2) Reset() { *m = SegmentReferenceV2{} } +func (m *SegmentReferenceV2) String() string { return proto.CompactTextString(m) } +func (*SegmentReferenceV2) ProtoMessage() {} +func (*SegmentReferenceV2) Descriptor() ([]byte, []int) { return fileDescriptor_8124ab206744863a, []int{1} } -func (m *SegmentReference) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SegmentReference.Unmarshal(m, b) +func (m *SegmentReferenceV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SegmentReferenceV2.Unmarshal(m, b) } -func (m *SegmentReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SegmentReference.Marshal(b, m, deterministic) +func (m *SegmentReferenceV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SegmentReferenceV2.Marshal(b, m, deterministic) } -func (m *SegmentReference) XXX_Merge(src proto.Message) { - xxx_messageInfo_SegmentReference.Merge(m, src) +func (m *SegmentReferenceV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_SegmentReferenceV2.Merge(m, src) } -func (m *SegmentReference) XXX_Size() int { - return xxx_messageInfo_SegmentReference.Size(m) +func (m *SegmentReferenceV2) XXX_Size() int { + return xxx_messageInfo_SegmentReferenceV2.Size(m) } -func (m *SegmentReference) XXX_DiscardUnknown() { - xxx_messageInfo_SegmentReference.DiscardUnknown(m) +func (m *SegmentReferenceV2) XXX_DiscardUnknown() { + xxx_messageInfo_SegmentReferenceV2.DiscardUnknown(m) } -var xxx_messageInfo_SegmentReference proto.InternalMessageInfo +var xxx_messageInfo_SegmentReferenceV2 proto.InternalMessageInfo -func (m *SegmentReference) GetRefType() RefType { +func (m *SegmentReferenceV2) GetRefType() RefTypeV2 { if m != nil { return m.RefType } - return RefType_CrossProcess + return RefTypeV2_CrossProcess } -func (m *SegmentReference) GetParentTraceSegmentId() *UniqueId { +func (m *SegmentReferenceV2) GetParentTraceSegmentId() *UniqueIdV2 { if m != nil { return m.ParentTraceSegmentId } return nil } -func (m *SegmentReference) GetParentSpanId() int32 { +func (m *SegmentReferenceV2) GetParentSpanId() int32 { if m != nil { return m.ParentSpanId } return 0 } -func (m *SegmentReference) GetParentServiceInstanceId() int32 { +func (m *SegmentReferenceV2) GetParentServiceInstanceId() int32 { if m != nil { return m.ParentServiceInstanceId } return 0 } -func (m *SegmentReference) GetNetworkAddress() string { +func (m *SegmentReferenceV2) GetNetworkAddress() string { if m != nil { return m.NetworkAddress } return "" } -func (m *SegmentReference) GetNetworkAddressId() int32 { +func (m *SegmentReferenceV2) GetNetworkAddressId() int32 { if m != nil { return m.NetworkAddressId } return 0 } -func (m *SegmentReference) GetEntryServiceInstanceId() int32 { +func (m *SegmentReferenceV2) GetEntryServiceInstanceId() int32 { if m != nil { return m.EntryServiceInstanceId } return 0 } -func (m *SegmentReference) GetEntryEndpoint() string { +func (m *SegmentReferenceV2) GetEntryEndpoint() string { if m != nil { return m.EntryEndpoint } return "" } -func (m *SegmentReference) GetEntryEndpointId() int32 { +func (m *SegmentReferenceV2) GetEntryEndpointId() int32 { if m != nil { return m.EntryEndpointId } return 0 } -func (m *SegmentReference) GetParentEndpoint() string { +func (m *SegmentReferenceV2) GetParentEndpoint() string { if m != nil { return m.ParentEndpoint } return "" } -func (m *SegmentReference) GetParentEndpointId() int32 { +func (m *SegmentReferenceV2) GetParentEndpointId() int32 { if m != nil { return m.ParentEndpointId } @@ -216,25 +216,25 @@ func (m *SegmentReference) GetParentEndpointId() int32 { } type SpanObjectV2 struct { - SpanId int32 `protobuf:"varint,1,opt,name=spanId,proto3" json:"spanId,omitempty"` - ParentSpanId int32 `protobuf:"varint,2,opt,name=parentSpanId,proto3" json:"parentSpanId,omitempty"` - StartTime int64 `protobuf:"varint,3,opt,name=startTime,proto3" json:"startTime,omitempty"` - EndTime int64 `protobuf:"varint,4,opt,name=endTime,proto3" json:"endTime,omitempty"` - Refs []*SegmentReference `protobuf:"bytes,5,rep,name=refs,proto3" json:"refs,omitempty"` - OperationNameId int32 `protobuf:"varint,6,opt,name=operationNameId,proto3" json:"operationNameId,omitempty"` - OperationName string `protobuf:"bytes,7,opt,name=operationName,proto3" json:"operationName,omitempty"` - PeerId int32 `protobuf:"varint,8,opt,name=peerId,proto3" json:"peerId,omitempty"` - Peer string `protobuf:"bytes,9,opt,name=peer,proto3" json:"peer,omitempty"` - SpanType SpanType `protobuf:"varint,10,opt,name=spanType,proto3,enum=skywalking.network.protocol.common.SpanType" json:"spanType,omitempty"` - SpanLayer SpanLayer `protobuf:"varint,11,opt,name=spanLayer,proto3,enum=skywalking.network.protocol.common.SpanLayer" json:"spanLayer,omitempty"` - ComponentId int32 `protobuf:"varint,12,opt,name=componentId,proto3" json:"componentId,omitempty"` - Component string `protobuf:"bytes,13,opt,name=component,proto3" json:"component,omitempty"` - IsError bool `protobuf:"varint,14,opt,name=isError,proto3" json:"isError,omitempty"` - Tags []*v2.KeyStringValuePair `protobuf:"bytes,15,rep,name=tags,proto3" json:"tags,omitempty"` - Logs []*Log `protobuf:"bytes,16,rep,name=logs,proto3" json:"logs,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SpanId int32 `protobuf:"varint,1,opt,name=spanId,proto3" json:"spanId,omitempty"` + ParentSpanId int32 `protobuf:"varint,2,opt,name=parentSpanId,proto3" json:"parentSpanId,omitempty"` + StartTime int64 `protobuf:"varint,3,opt,name=startTime,proto3" json:"startTime,omitempty"` + EndTime int64 `protobuf:"varint,4,opt,name=endTime,proto3" json:"endTime,omitempty"` + Refs []*SegmentReferenceV2 `protobuf:"bytes,5,rep,name=refs,proto3" json:"refs,omitempty"` + OperationNameId int32 `protobuf:"varint,6,opt,name=operationNameId,proto3" json:"operationNameId,omitempty"` + OperationName string `protobuf:"bytes,7,opt,name=operationName,proto3" json:"operationName,omitempty"` + PeerId int32 `protobuf:"varint,8,opt,name=peerId,proto3" json:"peerId,omitempty"` + Peer string `protobuf:"bytes,9,opt,name=peer,proto3" json:"peer,omitempty"` + SpanType SpanTypeV2 `protobuf:"varint,10,opt,name=spanType,proto3,enum=SpanTypeV2" json:"spanType,omitempty"` + SpanLayer SpanLayerV2 `protobuf:"varint,11,opt,name=spanLayer,proto3,enum=SpanLayerV2" json:"spanLayer,omitempty"` + ComponentId int32 `protobuf:"varint,12,opt,name=componentId,proto3" json:"componentId,omitempty"` + Component string `protobuf:"bytes,13,opt,name=component,proto3" json:"component,omitempty"` + IsError bool `protobuf:"varint,14,opt,name=isError,proto3" json:"isError,omitempty"` + Tags []*v2.KeyStringValuePairV2 `protobuf:"bytes,15,rep,name=tags,proto3" json:"tags,omitempty"` + Logs []*LogV2 `protobuf:"bytes,16,rep,name=logs,proto3" json:"logs,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SpanObjectV2) Reset() { *m = SpanObjectV2{} } @@ -290,7 +290,7 @@ func (m *SpanObjectV2) GetEndTime() int64 { return 0 } -func (m *SpanObjectV2) GetRefs() []*SegmentReference { +func (m *SpanObjectV2) GetRefs() []*SegmentReferenceV2 { if m != nil { return m.Refs } @@ -325,18 +325,18 @@ func (m *SpanObjectV2) GetPeer() string { return "" } -func (m *SpanObjectV2) GetSpanType() SpanType { +func (m *SpanObjectV2) GetSpanType() SpanTypeV2 { if m != nil { return m.SpanType } - return SpanType_Entry + return SpanTypeV2_Entry } -func (m *SpanObjectV2) GetSpanLayer() SpanLayer { +func (m *SpanObjectV2) GetSpanLayer() SpanLayerV2 { if m != nil { return m.SpanLayer } - return SpanLayer_Unknown + return SpanLayerV2_Unknown } func (m *SpanObjectV2) GetComponentId() int32 { @@ -360,61 +360,61 @@ func (m *SpanObjectV2) GetIsError() bool { return false } -func (m *SpanObjectV2) GetTags() []*v2.KeyStringValuePair { +func (m *SpanObjectV2) GetTags() []*v2.KeyStringValuePairV2 { if m != nil { return m.Tags } return nil } -func (m *SpanObjectV2) GetLogs() []*Log { +func (m *SpanObjectV2) GetLogs() []*LogV2 { if m != nil { return m.Logs } return nil } -type Log struct { - Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` - Data []*v2.KeyStringValuePair `protobuf:"bytes,2,rep,name=data,proto3" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type LogV2 struct { + Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` + Data []*v2.KeyStringValuePairV2 `protobuf:"bytes,2,rep,name=data,proto3" json:"data,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *Log) Reset() { *m = Log{} } -func (m *Log) String() string { return proto.CompactTextString(m) } -func (*Log) ProtoMessage() {} -func (*Log) Descriptor() ([]byte, []int) { +func (m *LogV2) Reset() { *m = LogV2{} } +func (m *LogV2) String() string { return proto.CompactTextString(m) } +func (*LogV2) ProtoMessage() {} +func (*LogV2) Descriptor() ([]byte, []int) { return fileDescriptor_8124ab206744863a, []int{3} } -func (m *Log) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Log.Unmarshal(m, b) +func (m *LogV2) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_LogV2.Unmarshal(m, b) } -func (m *Log) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Log.Marshal(b, m, deterministic) +func (m *LogV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_LogV2.Marshal(b, m, deterministic) } -func (m *Log) XXX_Merge(src proto.Message) { - xxx_messageInfo_Log.Merge(m, src) +func (m *LogV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_LogV2.Merge(m, src) } -func (m *Log) XXX_Size() int { - return xxx_messageInfo_Log.Size(m) +func (m *LogV2) XXX_Size() int { + return xxx_messageInfo_LogV2.Size(m) } -func (m *Log) XXX_DiscardUnknown() { - xxx_messageInfo_Log.DiscardUnknown(m) +func (m *LogV2) XXX_DiscardUnknown() { + xxx_messageInfo_LogV2.DiscardUnknown(m) } -var xxx_messageInfo_Log proto.InternalMessageInfo +var xxx_messageInfo_LogV2 proto.InternalMessageInfo -func (m *Log) GetTime() int64 { +func (m *LogV2) GetTime() int64 { if m != nil { return m.Time } return 0 } -func (m *Log) GetData() []*v2.KeyStringValuePair { +func (m *LogV2) GetData() []*v2.KeyStringValuePairV2 { if m != nil { return m.Data } @@ -422,66 +422,64 @@ func (m *Log) GetData() []*v2.KeyStringValuePair { } func init() { - proto.RegisterType((*SegmentObject)(nil), "skywalking.network.protocol.agent.v2.SegmentObject") - proto.RegisterType((*SegmentReference)(nil), "skywalking.network.protocol.agent.v2.SegmentReference") - proto.RegisterType((*SpanObjectV2)(nil), "skywalking.network.protocol.agent.v2.SpanObjectV2") - proto.RegisterType((*Log)(nil), "skywalking.network.protocol.agent.v2.Log") + proto.RegisterType((*SegmentObjectV2)(nil), "SegmentObjectV2") + proto.RegisterType((*SegmentReferenceV2)(nil), "SegmentReferenceV2") + proto.RegisterType((*SpanObjectV2)(nil), "SpanObjectV2") + proto.RegisterType((*LogV2)(nil), "LogV2") } func init() { proto.RegisterFile("language-agent-v2/trace.proto", fileDescriptor_8124ab206744863a) } var fileDescriptor_8124ab206744863a = []byte{ - // 792 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xdd, 0x6a, 0xeb, 0x46, - 0x10, 0xae, 0xfc, 0x13, 0xc7, 0xeb, 0xc4, 0x49, 0xb7, 0x25, 0x55, 0x4c, 0x0b, 0xc6, 0x84, 0xe2, - 0xb6, 0xb1, 0x0c, 0x0a, 0x84, 0xde, 0xf4, 0xa2, 0x2d, 0x81, 0xb8, 0x31, 0x69, 0x58, 0xbb, 0x29, - 0xf4, 0xaa, 0x1b, 0x69, 0xa2, 0xaa, 0xb6, 0x76, 0x75, 0x56, 0x1b, 0x07, 0xe7, 0x1d, 0xce, 0x43, - 0x9c, 0xdb, 0xf3, 0x20, 0x07, 0xce, 0x5b, 0x1d, 0x76, 0x24, 0xff, 0xc8, 0x4e, 0x0e, 0x22, 0x57, - 0xda, 0xf9, 0x66, 0xe6, 0x63, 0x66, 0xbe, 0x9d, 0x15, 0xf9, 0x6e, 0xca, 0x45, 0xf0, 0xc0, 0x03, - 0xe8, 0xf1, 0x00, 0x84, 0xee, 0xcd, 0xdc, 0xbe, 0x56, 0xdc, 0x03, 0x27, 0x56, 0x52, 0x4b, 0x7a, - 0x92, 0x4c, 0xe6, 0x8f, 0x7c, 0x3a, 0x09, 0x45, 0xe0, 0x08, 0xd0, 0x8f, 0x52, 0x4d, 0x52, 0x8f, - 0x27, 0xa7, 0x0e, 0x66, 0x38, 0x33, 0xb7, 0xf5, 0x95, 0x27, 0xa3, 0x48, 0x8a, 0x7e, 0xfa, 0x49, - 0x03, 0x5a, 0xc7, 0x19, 0x88, 0x74, 0xbd, 0x75, 0x57, 0xe7, 0x5d, 0x89, 0xec, 0x8f, 0x20, 0x88, - 0x40, 0xe8, 0x3f, 0xef, 0xfe, 0x07, 0x4f, 0xd3, 0x31, 0x69, 0x62, 0x5c, 0x86, 0x0e, 0x7c, 0xdb, - 0x6a, 0x5b, 0xdd, 0x86, 0x7b, 0xea, 0x7c, 0xae, 0x80, 0x8c, 0xf4, 0x2f, 0x11, 0xbe, 0x79, 0x80, - 0x81, 0xcf, 0x36, 0x38, 0xe8, 0x25, 0xa9, 0x26, 0x31, 0x17, 0x89, 0x5d, 0x6a, 0x97, 0xbb, 0x0d, - 0xd7, 0x75, 0x8a, 0x74, 0xe3, 0x8c, 0x62, 0x2e, 0xd2, 0xb2, 0x6e, 0x5d, 0x96, 0x12, 0xd0, 0x6f, - 0x49, 0x3d, 0x01, 0x35, 0x0b, 0x3d, 0x18, 0xf8, 0x76, 0xb9, 0x6d, 0x75, 0xab, 0x6c, 0x05, 0xd0, - 0x53, 0xf2, 0xe5, 0xc2, 0x10, 0x89, 0xe6, 0x02, 0xa3, 0x2a, 0x18, 0xb5, 0xed, 0xa0, 0x27, 0x64, - 0x3f, 0x4c, 0x46, 0xe1, 0x13, 0x0c, 0xc3, 0x28, 0xd4, 0xe0, 0xdb, 0xd5, 0xb6, 0xd5, 0xdd, 0x65, - 0x79, 0xb0, 0xf3, 0xb1, 0x42, 0x0e, 0xb3, 0x4e, 0x18, 0xdc, 0x83, 0x02, 0xe1, 0x01, 0xbd, 0x20, - 0x35, 0x05, 0xf7, 0xe3, 0x79, 0x0c, 0x38, 0x9f, 0xa6, 0xfb, 0x53, 0x91, 0xf9, 0xb0, 0x34, 0x85, - 0x2d, 0x72, 0xe9, 0xbf, 0xe4, 0xeb, 0x98, 0x2b, 0x10, 0x7a, 0x9c, 0x9f, 0x79, 0xe9, 0x15, 0x33, - 0x7f, 0x96, 0x89, 0x76, 0xc8, 0x5e, 0x8a, 0x9b, 0x61, 0x2e, 0x47, 0x96, 0xc3, 0xe8, 0xcf, 0xe4, - 0x9b, 0xcc, 0x7e, 0x61, 0x76, 0x2f, 0xb9, 0xe9, 0xf7, 0xa4, 0x99, 0xd5, 0xf5, 0xab, 0xef, 0x2b, - 0x48, 0x12, 0x1c, 0x61, 0x9d, 0x6d, 0xa0, 0xf4, 0x47, 0x72, 0x98, 0x47, 0x06, 0xbe, 0xbd, 0x83, - 0xd4, 0x5b, 0x38, 0x3d, 0x27, 0x47, 0x20, 0xb4, 0x9a, 0x6f, 0x17, 0x53, 0xc3, 0x8c, 0x17, 0xbc, - 0x46, 0x4d, 0xf4, 0x5c, 0x08, 0x3f, 0x96, 0xa1, 0xd0, 0xf6, 0x2e, 0x96, 0x92, 0x07, 0x69, 0x97, - 0x1c, 0xe4, 0x80, 0x81, 0x6f, 0xd7, 0x91, 0x76, 0x13, 0x36, 0xbd, 0xa5, 0x6d, 0x2f, 0x09, 0x49, - 0xda, 0x5b, 0x1e, 0x35, 0xbd, 0xe5, 0x91, 0x81, 0x6f, 0x37, 0xd2, 0xde, 0x36, 0xf1, 0xce, 0x87, - 0x2a, 0xd9, 0x5b, 0xbf, 0xd5, 0xf4, 0x88, 0xec, 0x24, 0xa9, 0x30, 0x16, 0xa6, 0x64, 0xd6, 0x96, - 0x6c, 0xa5, 0x67, 0x64, 0x33, 0xab, 0xa0, 0xb9, 0xd2, 0xe3, 0x30, 0x02, 0xd4, 0xb5, 0xcc, 0x56, - 0x00, 0xb5, 0x49, 0x0d, 0x84, 0x8f, 0xbe, 0x0a, 0xfa, 0x16, 0x26, 0xfd, 0x83, 0x54, 0x14, 0xdc, - 0x1b, 0xa9, 0xcc, 0x2e, 0x9e, 0x17, 0xdc, 0xc5, 0x8d, 0x0d, 0x60, 0xc8, 0x61, 0xc6, 0x29, 0x63, - 0x50, 0x5c, 0x87, 0x52, 0x5c, 0xf3, 0x08, 0x96, 0xba, 0x6e, 0xc2, 0x46, 0x9e, 0x1c, 0x84, 0x6a, - 0xd6, 0x59, 0x1e, 0x34, 0xf3, 0x88, 0x01, 0xd4, 0xc0, 0x47, 0xf5, 0xaa, 0x2c, 0xb3, 0x28, 0x25, - 0x15, 0x73, 0x42, 0xad, 0xea, 0x0c, 0xcf, 0xf4, 0x92, 0xec, 0x9a, 0x69, 0xe1, 0x12, 0x12, 0x5c, - 0xc2, 0x42, 0x0b, 0x33, 0xca, 0x72, 0xd8, 0x32, 0x9b, 0x5e, 0x91, 0xba, 0x39, 0x0f, 0xf9, 0x1c, - 0x14, 0x6a, 0xd7, 0x74, 0x7b, 0x45, 0xa9, 0x30, 0x89, 0xad, 0xf2, 0x69, 0x9b, 0x34, 0x3c, 0x19, - 0xc5, 0x52, 0xa4, 0xab, 0xbc, 0x87, 0x7d, 0xac, 0x43, 0x46, 0xb8, 0xa5, 0x69, 0xef, 0x63, 0x47, - 0x2b, 0xc0, 0x08, 0x17, 0x26, 0x17, 0x4a, 0x49, 0x65, 0x37, 0xf1, 0x3d, 0x5a, 0x98, 0x46, 0x38, - 0xcd, 0x83, 0xc4, 0x3e, 0x28, 0x20, 0x5c, 0x56, 0xe1, 0x15, 0xcc, 0x47, 0x5a, 0x85, 0x22, 0xb8, - 0xe5, 0xd3, 0x07, 0xb8, 0xe1, 0xa1, 0x62, 0xc8, 0x41, 0x7f, 0x21, 0x95, 0xa9, 0x0c, 0x12, 0xfb, - 0x10, 0xb9, 0x7e, 0x28, 0x76, 0x09, 0x86, 0x32, 0x60, 0x98, 0xd6, 0x01, 0x52, 0x1e, 0xca, 0xc0, - 0xc8, 0xa2, 0xcd, 0x0d, 0xb3, 0xf0, 0x86, 0xe1, 0xd9, 0x54, 0xe9, 0x73, 0xcd, 0xb3, 0xa7, 0xfe, - 0xd5, 0x55, 0x1a, 0x0e, 0xf7, 0xad, 0x45, 0x8e, 0xd7, 0x1f, 0x34, 0x06, 0xb1, 0x54, 0x8b, 0x77, - 0x88, 0xc6, 0xa4, 0xe6, 0xc9, 0xe9, 0xd4, 0xfc, 0xb6, 0xce, 0x0a, 0x3d, 0x95, 0x71, 0xa2, 0x15, - 0xf0, 0x28, 0x23, 0x6b, 0x15, 0xba, 0x2e, 0xbf, 0xcb, 0x28, 0xe2, 0xc2, 0x4f, 0x3a, 0x5f, 0x74, - 0xad, 0xdf, 0x9e, 0xc8, 0x99, 0x54, 0x81, 0xc3, 0x63, 0xee, 0xfd, 0x07, 0xeb, 0xd9, 0x3c, 0x8e, - 0x96, 0x0c, 0x8b, 0x1f, 0xf9, 0x72, 0x6e, 0x37, 0xd6, 0x3f, 0x6b, 0xbf, 0xef, 0x7e, 0x16, 0xd7, - 0x5f, 0xc4, 0xf5, 0x31, 0xae, 0x3f, 0x73, 0xdf, 0x97, 0x5a, 0xa3, 0xc9, 0xfc, 0xef, 0x8c, 0xf2, - 0x3a, 0x0d, 0xbb, 0xc9, 0xea, 0xb9, 0xdb, 0xc1, 0xca, 0xce, 0x3e, 0x05, 0x00, 0x00, 0xff, 0xff, - 0x47, 0xa9, 0x0e, 0x2f, 0x29, 0x08, 0x00, 0x00, + // 767 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x95, 0xe1, 0x8e, 0xdb, 0x44, + 0x10, 0xc7, 0xf1, 0x9d, 0x93, 0x5c, 0x26, 0xb9, 0x5c, 0xd9, 0x42, 0x71, 0x23, 0x90, 0xa2, 0x70, + 0xa2, 0xa1, 0xe2, 0x36, 0x92, 0x4f, 0x42, 0x7c, 0x43, 0x80, 0x8a, 0x14, 0xf5, 0x54, 0x4e, 0xce, + 0xd5, 0x48, 0x7c, 0xdb, 0xda, 0x73, 0xc6, 0x24, 0xde, 0x35, 0xeb, 0xbd, 0x54, 0xe9, 0x1b, 0xf0, + 0x10, 0xbc, 0x00, 0xef, 0xc4, 0xbb, 0x54, 0x3b, 0xb6, 0x93, 0x38, 0xb9, 0x7c, 0xca, 0xce, 0x6f, + 0xfe, 0x59, 0xef, 0xcc, 0xdf, 0xe3, 0x85, 0xaf, 0x96, 0x42, 0x26, 0x0f, 0x22, 0xc1, 0x2b, 0x91, + 0xa0, 0x34, 0x57, 0x2b, 0x7f, 0x6a, 0xb4, 0x88, 0x90, 0xe7, 0x5a, 0x19, 0x35, 0x7c, 0x1a, 0xa9, + 0x2c, 0x53, 0x72, 0x5a, 0xfe, 0x54, 0xf0, 0x79, 0x05, 0x49, 0x78, 0xb5, 0x9b, 0x1a, 0xff, 0xef, + 0xc0, 0xc5, 0x1c, 0x93, 0x0c, 0xa5, 0xf9, 0xed, 0xdd, 0x5f, 0x18, 0x99, 0xd0, 0x67, 0xd7, 0x30, + 0x20, 0x65, 0xc5, 0x67, 0xb1, 0xe7, 0x8c, 0x9c, 0x49, 0xcf, 0xef, 0xf1, 0xb7, 0x32, 0xfd, 0xfb, + 0x01, 0x67, 0x71, 0xe8, 0x07, 0x7b, 0x12, 0xf6, 0x35, 0xb4, 0x8a, 0x5c, 0xc8, 0xc2, 0x3b, 0x19, + 0x9d, 0x4e, 0x7a, 0xfe, 0x39, 0x9f, 0xe7, 0x42, 0xd6, 0x5b, 0x06, 0x65, 0x8e, 0x7d, 0x09, 0xdd, + 0x02, 0xf5, 0x2a, 0x8d, 0x70, 0x16, 0x7b, 0xa7, 0x23, 0x67, 0xd2, 0x0a, 0xb6, 0x80, 0x7d, 0x07, + 0x9f, 0xd6, 0x81, 0x2c, 0x8c, 0x90, 0xa4, 0x72, 0x49, 0x75, 0x98, 0x60, 0x97, 0x70, 0x9e, 0x16, + 0xf3, 0xf4, 0x03, 0xde, 0xa4, 0x59, 0x6a, 0x30, 0xf6, 0x5a, 0x23, 0x67, 0x72, 0x16, 0x34, 0xe1, + 0xf8, 0x1f, 0x17, 0x58, 0x75, 0xc8, 0x00, 0xef, 0x51, 0xa3, 0x8c, 0x30, 0xf4, 0xd9, 0x25, 0x74, + 0x34, 0xde, 0xdf, 0xad, 0x73, 0xa4, 0xda, 0x06, 0x3e, 0xf0, 0xa0, 0x8c, 0x43, 0x3f, 0xa8, 0x53, + 0xec, 0x47, 0xf8, 0x2c, 0x17, 0x1a, 0xa5, 0xb9, 0x6b, 0xb6, 0xe3, 0xe4, 0xb0, 0x1d, 0x8f, 0x0a, + 0xd9, 0x18, 0xfa, 0x25, 0xb7, 0xcd, 0xd8, 0x94, 0xdc, 0x60, 0xec, 0x07, 0xf8, 0xa2, 0x8a, 0x8f, + 0xd4, 0x7e, 0x2c, 0xcd, 0xbe, 0x81, 0x81, 0x44, 0xf3, 0x5e, 0xe9, 0xc5, 0x4f, 0x71, 0xac, 0xb1, + 0x28, 0xa8, 0x05, 0xdd, 0x60, 0x8f, 0xb2, 0x97, 0xf0, 0xa4, 0x49, 0x66, 0xb1, 0xd7, 0xa6, 0xad, + 0x0f, 0x38, 0xfb, 0x1e, 0x9e, 0xa1, 0x34, 0x7a, 0x7d, 0x78, 0x98, 0x0e, 0xfd, 0xe3, 0x48, 0xd6, + 0xba, 0x41, 0x99, 0x57, 0x32, 0xce, 0x55, 0x2a, 0x8d, 0x77, 0x46, 0x47, 0x69, 0x42, 0x36, 0x81, + 0x8b, 0x06, 0x98, 0xc5, 0x5e, 0x97, 0xb6, 0xdd, 0xc7, 0xb6, 0xb6, 0xb2, 0xec, 0xcd, 0x86, 0x50, + 0xd6, 0xd6, 0xa4, 0xb6, 0xb6, 0x26, 0x99, 0xc5, 0x5e, 0xaf, 0xac, 0x6d, 0x9f, 0x8f, 0xff, 0x75, + 0xa1, 0xbf, 0xfb, 0x56, 0xb2, 0x67, 0xd0, 0x2e, 0x4a, 0x63, 0x1c, 0xfa, 0x4b, 0x15, 0x1d, 0xd8, + 0x76, 0xf2, 0x88, 0x6d, 0xf6, 0x55, 0x36, 0x42, 0x9b, 0xbb, 0x34, 0x43, 0xf2, 0xf5, 0x34, 0xd8, + 0x02, 0xe6, 0x41, 0x07, 0x65, 0x4c, 0x39, 0x97, 0x72, 0x75, 0xc8, 0x5e, 0x80, 0xab, 0xf1, 0xde, + 0x5a, 0x65, 0xc7, 0xe4, 0x29, 0x3f, 0x7c, 0x39, 0x03, 0x12, 0xd8, 0x5e, 0xa9, 0x1c, 0xb5, 0x30, + 0xa9, 0x92, 0x6f, 0x44, 0x86, 0x1b, 0xd3, 0xf6, 0xb1, 0xed, 0x7d, 0x03, 0x91, 0x55, 0xdd, 0xa0, + 0x09, 0x6d, 0xb1, 0x39, 0xa2, 0x9e, 0xc5, 0x64, 0x4d, 0x2b, 0xa8, 0x22, 0xc6, 0xc0, 0xb5, 0x2b, + 0x32, 0xa2, 0x1b, 0xd0, 0x9a, 0xbd, 0x80, 0x33, 0xdb, 0x0a, 0x9a, 0x0f, 0xa0, 0xf9, 0xe8, 0xd1, + 0x3c, 0x57, 0x03, 0xb2, 0x49, 0xb2, 0x97, 0xd0, 0xb5, 0xeb, 0x1b, 0xb1, 0x46, 0x4d, 0x7d, 0x1f, + 0xf8, 0x7d, 0x52, 0x12, 0x09, 0xfd, 0x60, 0x9b, 0x66, 0x23, 0xe8, 0x45, 0x2a, 0xcb, 0x95, 0x2c, + 0x87, 0xa8, 0x4f, 0xa7, 0xd8, 0x45, 0xb6, 0xa7, 0x9b, 0xd0, 0x3b, 0xa7, 0xf3, 0x6c, 0x81, 0xed, + 0x69, 0x5a, 0xbc, 0xd2, 0x5a, 0x69, 0x6f, 0x40, 0xa3, 0x5e, 0x87, 0xec, 0x5b, 0x70, 0x8d, 0x48, + 0x0a, 0xef, 0x82, 0x7a, 0xfa, 0x39, 0x7f, 0x8d, 0xeb, 0xb9, 0xd1, 0xa9, 0x4c, 0x42, 0xb1, 0x7c, + 0xc0, 0x5b, 0x91, 0xda, 0x93, 0x90, 0x84, 0x0d, 0xc1, 0x5d, 0xaa, 0xa4, 0xf0, 0x9e, 0x90, 0xb4, + 0xcd, 0x6f, 0x54, 0x62, 0x73, 0x96, 0x8d, 0x7f, 0x85, 0x16, 0x85, 0xb6, 0x25, 0xc6, 0x5a, 0xe7, + 0x90, 0x75, 0xb4, 0xb6, 0xcf, 0x88, 0x85, 0x11, 0xd5, 0xe7, 0xed, 0xd8, 0x33, 0xac, 0xc4, 0x7f, + 0x0d, 0xcf, 0x77, 0xbf, 0x03, 0x01, 0xe6, 0x4a, 0xd7, 0xe3, 0xcb, 0x38, 0x74, 0x22, 0xb5, 0x5c, + 0x62, 0x64, 0x18, 0xe3, 0x6f, 0xf3, 0xc2, 0x68, 0x14, 0x59, 0xa5, 0x0c, 0xfd, 0x61, 0x8f, 0xff, + 0xa2, 0xb2, 0x4c, 0xc8, 0xb8, 0x08, 0xfd, 0xf1, 0x27, 0x13, 0xe7, 0xe7, 0x0f, 0x70, 0xad, 0x74, + 0xc2, 0x45, 0x2e, 0xa2, 0x3f, 0x91, 0x17, 0x8b, 0xf5, 0x7b, 0xb1, 0x5c, 0xa4, 0xd2, 0x92, 0x8c, + 0x57, 0xe3, 0xcb, 0xeb, 0x3b, 0x81, 0xd3, 0x9d, 0xc0, 0x57, 0xfe, 0xad, 0xf3, 0xc7, 0xe5, 0x56, + 0x3b, 0xad, 0x74, 0xd3, 0x5a, 0x37, 0x25, 0xdd, 0x74, 0xe5, 0xff, 0x77, 0x32, 0x9c, 0x2f, 0xd6, + 0xbf, 0x57, 0x5b, 0xbe, 0x29, 0x65, 0xb7, 0xf6, 0x66, 0x88, 0xd4, 0xf2, 0x5d, 0x9b, 0xee, 0x88, + 0xeb, 0x8f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xc8, 0x20, 0x0f, 0x74, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -508,7 +506,7 @@ func NewTraceSegmentReportServiceClient(cc *grpc.ClientConn) TraceSegmentReportS } func (c *traceSegmentReportServiceClient) Collect(ctx context.Context, opts ...grpc.CallOption) (TraceSegmentReportService_CollectClient, error) { - stream, err := c.cc.NewStream(ctx, &_TraceSegmentReportService_serviceDesc.Streams[0], "/skywalking.network.protocol.agent.v2.TraceSegmentReportService/collect", opts...) + stream, err := c.cc.NewStream(ctx, &_TraceSegmentReportService_serviceDesc.Streams[0], "/TraceSegmentReportService/collect", opts...) if err != nil { return nil, err } @@ -517,8 +515,8 @@ func (c *traceSegmentReportServiceClient) Collect(ctx context.Context, opts ...g } type TraceSegmentReportService_CollectClient interface { - Send(*UpstreamSegment) error - CloseAndRecv() (*v2.Commands, error) + Send(*UpstreamSegmentV2) error + CloseAndRecv() (*v2.CommandsV2, error) grpc.ClientStream } @@ -526,15 +524,15 @@ type traceSegmentReportServiceCollectClient struct { grpc.ClientStream } -func (x *traceSegmentReportServiceCollectClient) Send(m *UpstreamSegment) error { +func (x *traceSegmentReportServiceCollectClient) Send(m *UpstreamSegmentV2) error { return x.ClientStream.SendMsg(m) } -func (x *traceSegmentReportServiceCollectClient) CloseAndRecv() (*v2.Commands, error) { +func (x *traceSegmentReportServiceCollectClient) CloseAndRecv() (*v2.CommandsV2, error) { if err := x.ClientStream.CloseSend(); err != nil { return nil, err } - m := new(v2.Commands) + m := new(v2.CommandsV2) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } @@ -563,8 +561,8 @@ func _TraceSegmentReportService_Collect_Handler(srv interface{}, stream grpc.Ser } type TraceSegmentReportService_CollectServer interface { - SendAndClose(*v2.Commands) error - Recv() (*UpstreamSegment, error) + SendAndClose(*v2.CommandsV2) error + Recv() (*UpstreamSegmentV2, error) grpc.ServerStream } @@ -572,12 +570,12 @@ type traceSegmentReportServiceCollectServer struct { grpc.ServerStream } -func (x *traceSegmentReportServiceCollectServer) SendAndClose(m *v2.Commands) error { +func (x *traceSegmentReportServiceCollectServer) SendAndClose(m *v2.CommandsV2) error { return x.ServerStream.SendMsg(m) } -func (x *traceSegmentReportServiceCollectServer) Recv() (*UpstreamSegment, error) { - m := new(UpstreamSegment) +func (x *traceSegmentReportServiceCollectServer) Recv() (*UpstreamSegmentV2, error) { + m := new(UpstreamSegmentV2) if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err } @@ -585,7 +583,7 @@ func (x *traceSegmentReportServiceCollectServer) Recv() (*UpstreamSegment, error } var _TraceSegmentReportService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.v2.TraceSegmentReportService", + ServiceName: "TraceSegmentReportService", HandlerType: (*TraceSegmentReportServiceServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{ diff --git a/reporter/network/language/profile/v2/Profile.pb.go b/reporter/network/language/profile/v2/Profile.pb.go index 6d0388a..4068804 100644 --- a/reporter/network/language/profile/v2/Profile.pb.go +++ b/reporter/network/language/profile/v2/Profile.pb.go @@ -6,13 +6,13 @@ package v2 import ( context "context" fmt "fmt" - v21 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/language/agent/v2" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" math "math" + v21 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/language/agent/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -88,7 +88,7 @@ type ThreadSnapshot struct { // profile task id TaskId string `protobuf:"bytes,1,opt,name=taskId,proto3" json:"taskId,omitempty"` // dumped segment id - TraceSegmentId *v2.UniqueId `protobuf:"bytes,2,opt,name=traceSegmentId,proto3" json:"traceSegmentId,omitempty"` + TraceSegmentId *v2.UniqueIdV2 `protobuf:"bytes,2,opt,name=traceSegmentId,proto3" json:"traceSegmentId,omitempty"` // dump timestamp Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` // snapshot dump sequence, start with zero @@ -132,7 +132,7 @@ func (m *ThreadSnapshot) GetTaskId() string { return "" } -func (m *ThreadSnapshot) GetTraceSegmentId() *v2.UniqueId { +func (m *ThreadSnapshot) GetTraceSegmentId() *v2.UniqueIdV2 { if m != nil { return m.TraceSegmentId } @@ -268,37 +268,37 @@ func init() { func init() { proto.RegisterFile("profile/Profile.proto", fileDescriptor_ed871c17f6550fe9) } var fileDescriptor_ed871c17f6550fe9 = []byte{ - // 479 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x8b, 0xd3, 0x40, - 0x14, 0x76, 0x36, 0xdb, 0xc5, 0xbe, 0x42, 0x57, 0x46, 0x5c, 0x63, 0x10, 0x29, 0x39, 0x2c, 0x11, - 0x34, 0x81, 0x8a, 0x82, 0xd7, 0x15, 0x84, 0x05, 0x91, 0x9a, 0x56, 0x04, 0x6f, 0xe3, 0xe4, 0x99, - 0x86, 0x24, 0x33, 0xd9, 0x99, 0xc9, 0x2e, 0x45, 0x10, 0xbc, 0x78, 0xf2, 0xdf, 0xf0, 0xe2, 0xdf, - 0xe8, 0x41, 0x4c, 0xa6, 0x4d, 0xac, 0x28, 0xad, 0x9e, 0x26, 0xf3, 0xbd, 0x1f, 0xdf, 0x7b, 0xdf, - 0x37, 0x04, 0x6e, 0x55, 0x4a, 0xbe, 0xcf, 0x0a, 0x8c, 0x66, 0xed, 0x19, 0x56, 0x4a, 0x1a, 0x49, - 0xef, 0xeb, 0x7c, 0x75, 0xc5, 0x8a, 0x3c, 0x13, 0x69, 0x28, 0xd0, 0x5c, 0x49, 0x95, 0xb7, 0x11, - 0x2e, 0x8b, 0x90, 0xa5, 0x28, 0x4c, 0x68, 0x0b, 0xbd, 0x9b, 0x5c, 0x96, 0xa5, 0x14, 0x51, 0x7b, - 0xb4, 0x59, 0xde, 0x1d, 0x0b, 0x1a, 0xc5, 0x38, 0x3e, 0xec, 0x87, 0xfc, 0x4f, 0x04, 0x6e, 0x5b, - 0xb2, 0x05, 0xd3, 0xf9, 0x33, 0x59, 0x96, 0x4c, 0x24, 0xaf, 0x6a, 0x54, 0x2b, 0x7a, 0x17, 0x86, - 0x1a, 0xd5, 0x65, 0xc6, 0xf1, 0x3c, 0x71, 0xc9, 0x84, 0x04, 0x83, 0xb8, 0x03, 0xe8, 0x3d, 0x80, - 0x4c, 0x68, 0xc3, 0x44, 0x13, 0x3e, 0x68, 0xc2, 0x3d, 0x84, 0x06, 0x70, 0x5c, 0x30, 0x6d, 0x6c, - 0xc7, 0x45, 0x56, 0xa2, 0xeb, 0x4c, 0x48, 0xe0, 0xc4, 0xdb, 0xb0, 0xff, 0x9d, 0xc0, 0x78, 0xb1, - 0x54, 0xc8, 0x92, 0xb9, 0x60, 0x95, 0x5e, 0x4a, 0x43, 0x4f, 0xe0, 0xc8, 0x30, 0x9d, 0x5b, 0xde, - 0x61, 0x6c, 0x6f, 0x74, 0x01, 0xe3, 0x66, 0x89, 0x39, 0xa6, 0x25, 0x0a, 0x63, 0x89, 0x47, 0xd3, - 0x07, 0xe1, 0xdf, 0x24, 0xb2, 0x1b, 0xbf, 0x16, 0xd9, 0x45, 0x8d, 0xe7, 0x49, 0xbc, 0xd5, 0x83, - 0x52, 0x38, 0x34, 0xdd, 0x7c, 0xcd, 0x37, 0xf5, 0xe0, 0xba, 0xc6, 0x8b, 0x1a, 0x05, 0x47, 0xf7, - 0xb0, 0x59, 0x6e, 0x73, 0xa7, 0x2f, 0x60, 0xa0, 0x0d, 0xe3, 0xb9, 0x3b, 0x68, 0xc8, 0x9f, 0x84, - 0x3b, 0xfb, 0x13, 0xda, 0x3d, 0x7f, 0x56, 0xc7, 0x6d, 0x13, 0xff, 0x31, 0x8c, 0x7a, 0x28, 0x3d, - 0x85, 0x31, 0x97, 0x09, 0xce, 0xb3, 0x54, 0x30, 0x53, 0x2b, 0xd4, 0x2e, 0x99, 0x38, 0xc1, 0x30, - 0xde, 0x42, 0x7d, 0xf9, 0x8b, 0x71, 0xcf, 0x33, 0x91, 0xe9, 0x65, 0x8c, 0x95, 0x54, 0xe6, 0x3f, - 0x8d, 0xeb, 0xb4, 0x77, 0xfa, 0xda, 0x4f, 0xbf, 0x3a, 0x30, 0xea, 0x31, 0xd2, 0x2f, 0x04, 0x4e, - 0x52, 0x34, 0xbf, 0xbf, 0x1e, 0x4d, 0xcf, 0xf6, 0x50, 0xe4, 0x0f, 0xaf, 0xcf, 0xdb, 0xc9, 0xd2, - 0x35, 0xa3, 0x7f, 0x8d, 0x7e, 0x84, 0x63, 0x2e, 0x8b, 0x02, 0xb9, 0xd9, 0xbc, 0xa2, 0xa7, 0xfb, - 0x1b, 0x63, 0x4b, 0xf7, 0x65, 0x0f, 0x08, 0xfd, 0x4c, 0xe0, 0x86, 0x6a, 0xf4, 0xef, 0xfc, 0xf8, - 0x57, 0x21, 0xfa, 0x6e, 0xee, 0x3b, 0xca, 0xd9, 0x07, 0x98, 0x4a, 0x95, 0x86, 0xac, 0x62, 0x7c, - 0x89, 0xfd, 0x5a, 0x56, 0x95, 0x9b, 0xfa, 0x82, 0x89, 0xb4, 0x66, 0x29, 0xae, 0xd9, 0x67, 0xe4, - 0xed, 0x69, 0x97, 0x1a, 0xd9, 0xb4, 0x68, 0x9d, 0x16, 0xad, 0x7f, 0x4c, 0x97, 0xd3, 0x6f, 0x07, - 0xde, 0x3c, 0x5f, 0xbd, 0xb1, 0x3d, 0x5f, 0xb6, 0x89, 0x33, 0x3b, 0xce, 0xbb, 0xa3, 0x66, 0xb0, - 0x47, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xff, 0x42, 0x80, 0xd5, 0xca, 0x04, 0x00, 0x00, + // 473 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xd1, 0x8a, 0xd4, 0x30, + 0x14, 0xb5, 0x33, 0x3b, 0x8b, 0x73, 0x07, 0x66, 0x25, 0xe2, 0x5a, 0x8b, 0xc8, 0xd0, 0x87, 0xa5, + 0x3e, 0xd8, 0x42, 0x17, 0x05, 0x5f, 0x57, 0x10, 0x16, 0x44, 0xc6, 0xce, 0xb8, 0x82, 0xe0, 0x43, + 0x4c, 0xaf, 0x9d, 0xd0, 0x36, 0xe9, 0x26, 0xe9, 0x2e, 0x83, 0x4f, 0xfe, 0x8e, 0x5f, 0xe1, 0x7f, + 0xf8, 0x33, 0x62, 0x9b, 0x99, 0xd6, 0x8a, 0xe0, 0xea, 0x53, 0x9a, 0x73, 0x4f, 0xce, 0x49, 0xce, + 0xbd, 0x14, 0xee, 0x55, 0x4a, 0x7e, 0xe2, 0x05, 0x46, 0xcb, 0x76, 0x0d, 0x2b, 0x25, 0x8d, 0x24, + 0x8f, 0x75, 0xbe, 0xbd, 0xa6, 0x45, 0xce, 0x45, 0x16, 0x0a, 0x34, 0xd7, 0x52, 0xe5, 0x6d, 0x85, + 0xc9, 0x22, 0xa4, 0x19, 0x0a, 0x13, 0xda, 0x83, 0xde, 0x5d, 0x26, 0xcb, 0x52, 0x8a, 0xa8, 0x5d, + 0x5a, 0x96, 0xf7, 0xc0, 0x82, 0x46, 0x51, 0x86, 0x4f, 0xfa, 0x25, 0xff, 0x8b, 0x03, 0xf7, 0xad, + 0xd9, 0x9a, 0xea, 0xfc, 0x85, 0x2c, 0x4b, 0x2a, 0xd2, 0x37, 0x35, 0xaa, 0x2d, 0x79, 0x08, 0x53, + 0x8d, 0xea, 0x8a, 0x33, 0x3c, 0x4f, 0x5d, 0x67, 0xe1, 0x04, 0x93, 0xa4, 0x03, 0xc8, 0x23, 0x00, + 0x2e, 0xb4, 0xa1, 0xa2, 0x29, 0x8f, 0x9a, 0x72, 0x0f, 0x21, 0x01, 0x1c, 0x15, 0x54, 0x1b, 0xab, + 0xb8, 0xe6, 0x25, 0xba, 0xe3, 0x85, 0x13, 0x8c, 0x93, 0x21, 0xec, 0x7f, 0x77, 0x60, 0xbe, 0xde, + 0x28, 0xa4, 0xe9, 0x4a, 0xd0, 0x4a, 0x6f, 0xa4, 0x21, 0xc7, 0x70, 0x68, 0xa8, 0xce, 0xad, 0xef, + 0x34, 0xb1, 0x3b, 0x72, 0x0a, 0xf3, 0xe6, 0x11, 0x2b, 0xcc, 0x4a, 0x14, 0xc6, 0x1a, 0xcf, 0xe2, + 0x59, 0xf8, 0x56, 0xf0, 0xcb, 0x1a, 0xcf, 0xd3, 0x8b, 0x38, 0x19, 0x50, 0x08, 0x81, 0x03, 0xd3, + 0xd9, 0x37, 0xdf, 0xc4, 0x83, 0xdb, 0x1a, 0x2f, 0x6b, 0x14, 0x0c, 0xdd, 0x83, 0xe6, 0xee, 0xfb, + 0x3d, 0x79, 0x05, 0x13, 0x6d, 0x28, 0xcb, 0xdd, 0x49, 0xa3, 0xfd, 0x2c, 0xfc, 0xeb, 0xf8, 0x43, + 0xfb, 0x8c, 0x9f, 0xa7, 0x93, 0x56, 0xc4, 0x7f, 0x0a, 0xb3, 0x1e, 0x4a, 0x4e, 0x60, 0xce, 0x64, + 0x8a, 0x2b, 0x9e, 0x09, 0x6a, 0x6a, 0x85, 0xda, 0x75, 0x16, 0xe3, 0x60, 0x9a, 0x0c, 0x50, 0x5f, + 0xfe, 0xd2, 0x97, 0x97, 0x5c, 0x70, 0xbd, 0x49, 0xb0, 0x92, 0xca, 0xfc, 0x67, 0x5f, 0xba, 0x68, + 0xc7, 0xfd, 0x68, 0xe3, 0x6f, 0x23, 0x98, 0xf5, 0x1c, 0x49, 0x0e, 0xc7, 0x19, 0x9a, 0xdf, 0x67, + 0x43, 0x93, 0xb3, 0x1b, 0x04, 0xf2, 0x87, 0xd9, 0xf2, 0x66, 0xe1, 0x4e, 0xee, 0x22, 0xf6, 0x6f, + 0x91, 0x0f, 0x70, 0xc4, 0x64, 0x51, 0x20, 0x33, 0xfb, 0x11, 0x78, 0x7e, 0xf3, 0xd8, 0xed, 0xd1, + 0x81, 0x78, 0xe0, 0x10, 0x84, 0x3b, 0xaa, 0xc9, 0xae, 0xcb, 0xf2, 0x5f, 0x5f, 0xd1, 0xef, 0xc4, + 0xc0, 0xe8, 0xec, 0x33, 0xc4, 0x52, 0x65, 0x21, 0xad, 0x28, 0xdb, 0x60, 0x5f, 0x9e, 0x56, 0xe5, + 0xde, 0xa2, 0xa0, 0x22, 0xab, 0x69, 0x86, 0x3b, 0xf1, 0xa5, 0xf3, 0xfe, 0xa4, 0xa3, 0x46, 0x96, + 0x16, 0xed, 0x68, 0xd1, 0xee, 0x97, 0x70, 0x15, 0x7f, 0x1d, 0x79, 0xab, 0x7c, 0xfb, 0xce, 0x6a, + 0xbe, 0x6e, 0x89, 0x4b, 0x7b, 0xe3, 0x8f, 0x87, 0xcd, 0xdd, 0x4f, 0x7f, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xa6, 0x9a, 0xa1, 0x84, 0x44, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -314,11 +314,11 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type ProfileTaskClient interface { // query all sniffer need to execute profile task commands - GetProfileTaskCommands(ctx context.Context, in *ProfileTaskCommandQuery, opts ...grpc.CallOption) (*v21.Commands, error) + GetProfileTaskCommands(ctx context.Context, in *ProfileTaskCommandQuery, opts ...grpc.CallOption) (*v21.CommandsV2, error) // collect dumped thread snapshot CollectSnapshot(ctx context.Context, opts ...grpc.CallOption) (ProfileTask_CollectSnapshotClient, error) // report profiling task finished - ReportTaskFinish(ctx context.Context, in *ProfileTaskFinishReport, opts ...grpc.CallOption) (*v21.Commands, error) + ReportTaskFinish(ctx context.Context, in *ProfileTaskFinishReport, opts ...grpc.CallOption) (*v21.CommandsV2, error) } type profileTaskClient struct { @@ -329,8 +329,8 @@ func NewProfileTaskClient(cc *grpc.ClientConn) ProfileTaskClient { return &profileTaskClient{cc} } -func (c *profileTaskClient) GetProfileTaskCommands(ctx context.Context, in *ProfileTaskCommandQuery, opts ...grpc.CallOption) (*v21.Commands, error) { - out := new(v21.Commands) +func (c *profileTaskClient) GetProfileTaskCommands(ctx context.Context, in *ProfileTaskCommandQuery, opts ...grpc.CallOption) (*v21.CommandsV2, error) { + out := new(v21.CommandsV2) err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.profile.ProfileTask/getProfileTaskCommands", in, out, opts...) if err != nil { return nil, err @@ -349,7 +349,7 @@ func (c *profileTaskClient) CollectSnapshot(ctx context.Context, opts ...grpc.Ca type ProfileTask_CollectSnapshotClient interface { Send(*ThreadSnapshot) error - CloseAndRecv() (*v21.Commands, error) + CloseAndRecv() (*v21.CommandsV2, error) grpc.ClientStream } @@ -361,19 +361,19 @@ func (x *profileTaskCollectSnapshotClient) Send(m *ThreadSnapshot) error { return x.ClientStream.SendMsg(m) } -func (x *profileTaskCollectSnapshotClient) CloseAndRecv() (*v21.Commands, error) { +func (x *profileTaskCollectSnapshotClient) CloseAndRecv() (*v21.CommandsV2, error) { if err := x.ClientStream.CloseSend(); err != nil { return nil, err } - m := new(v21.Commands) + m := new(v21.CommandsV2) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } return m, nil } -func (c *profileTaskClient) ReportTaskFinish(ctx context.Context, in *ProfileTaskFinishReport, opts ...grpc.CallOption) (*v21.Commands, error) { - out := new(v21.Commands) +func (c *profileTaskClient) ReportTaskFinish(ctx context.Context, in *ProfileTaskFinishReport, opts ...grpc.CallOption) (*v21.CommandsV2, error) { + out := new(v21.CommandsV2) err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.profile.ProfileTask/reportTaskFinish", in, out, opts...) if err != nil { return nil, err @@ -384,24 +384,24 @@ func (c *profileTaskClient) ReportTaskFinish(ctx context.Context, in *ProfileTas // ProfileTaskServer is the server API for ProfileTask service. type ProfileTaskServer interface { // query all sniffer need to execute profile task commands - GetProfileTaskCommands(context.Context, *ProfileTaskCommandQuery) (*v21.Commands, error) + GetProfileTaskCommands(context.Context, *ProfileTaskCommandQuery) (*v21.CommandsV2, error) // collect dumped thread snapshot CollectSnapshot(ProfileTask_CollectSnapshotServer) error // report profiling task finished - ReportTaskFinish(context.Context, *ProfileTaskFinishReport) (*v21.Commands, error) + ReportTaskFinish(context.Context, *ProfileTaskFinishReport) (*v21.CommandsV2, error) } // UnimplementedProfileTaskServer can be embedded to have forward compatible implementations. type UnimplementedProfileTaskServer struct { } -func (*UnimplementedProfileTaskServer) GetProfileTaskCommands(ctx context.Context, req *ProfileTaskCommandQuery) (*v21.Commands, error) { +func (*UnimplementedProfileTaskServer) GetProfileTaskCommands(ctx context.Context, req *ProfileTaskCommandQuery) (*v21.CommandsV2, error) { return nil, status.Errorf(codes.Unimplemented, "method GetProfileTaskCommands not implemented") } func (*UnimplementedProfileTaskServer) CollectSnapshot(srv ProfileTask_CollectSnapshotServer) error { return status.Errorf(codes.Unimplemented, "method CollectSnapshot not implemented") } -func (*UnimplementedProfileTaskServer) ReportTaskFinish(ctx context.Context, req *ProfileTaskFinishReport) (*v21.Commands, error) { +func (*UnimplementedProfileTaskServer) ReportTaskFinish(ctx context.Context, req *ProfileTaskFinishReport) (*v21.CommandsV2, error) { return nil, status.Errorf(codes.Unimplemented, "method ReportTaskFinish not implemented") } @@ -432,7 +432,7 @@ func _ProfileTask_CollectSnapshot_Handler(srv interface{}, stream grpc.ServerStr } type ProfileTask_CollectSnapshotServer interface { - SendAndClose(*v21.Commands) error + SendAndClose(*v21.CommandsV2) error Recv() (*ThreadSnapshot, error) grpc.ServerStream } @@ -441,7 +441,7 @@ type profileTaskCollectSnapshotServer struct { grpc.ServerStream } -func (x *profileTaskCollectSnapshotServer) SendAndClose(m *v21.Commands) error { +func (x *profileTaskCollectSnapshotServer) SendAndClose(m *v21.CommandsV2) error { return x.ServerStream.SendMsg(m) } diff --git a/reporter/network/register/v2/InstancePing.pb.go b/reporter/network/register/v2/InstancePing.pb.go index 4b034f1..70f694d 100644 --- a/reporter/network/register/v2/InstancePing.pb.go +++ b/reporter/network/register/v2/InstancePing.pb.go @@ -6,12 +6,12 @@ package v2 import ( context "context" fmt "fmt" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" math "math" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -81,30 +81,29 @@ func (m *ServiceInstancePingPkg) GetServiceInstanceUUID() string { } func init() { - proto.RegisterType((*ServiceInstancePingPkg)(nil), "skywalking.network.protocol.agent.register.v2.ServiceInstancePingPkg") + proto.RegisterType((*ServiceInstancePingPkg)(nil), "ServiceInstancePingPkg") } func init() { proto.RegisterFile("register/InstancePing.proto", fileDescriptor_c10bfdff83d834ed) } var fileDescriptor_c10bfdff83d834ed = []byte{ - // 270 bytes of a gzipped FileDescriptorProto + // 251 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x4a, 0x4d, 0xcf, 0x2c, 0x2e, 0x49, 0x2d, 0xd2, 0xf7, 0xcc, 0x2b, 0x2e, 0x49, 0xcc, 0x4b, 0x4e, 0x0d, 0xc8, 0xcc, - 0x4b, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xd2, 0x2d, 0xce, 0xae, 0x2c, 0x4f, 0xcc, 0xc9, - 0x06, 0x89, 0xe4, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0x43, 0x64, 0x92, 0xf3, 0x73, 0xf4, 0x12, - 0xd3, 0x53, 0xf3, 0x4a, 0xf4, 0x60, 0xda, 0xf5, 0xca, 0x8c, 0xa4, 0x84, 0x93, 0xf3, 0x73, 0x73, - 0xf3, 0xf3, 0xf4, 0x21, 0x14, 0x44, 0xa5, 0x52, 0x0f, 0x23, 0x97, 0x58, 0x70, 0x6a, 0x51, 0x59, - 0x66, 0x72, 0x2a, 0xb2, 0x0d, 0x01, 0xd9, 0xe9, 0x42, 0x3a, 0x5c, 0x82, 0xc5, 0xa8, 0x32, 0x9e, - 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x98, 0x12, 0x42, 0x42, 0x5c, 0x2c, 0x25, 0x99, - 0xb9, 0xa9, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x60, 0xb6, 0x90, 0x01, 0x97, 0x30, 0x9a, - 0xc2, 0xd0, 0x50, 0x4f, 0x17, 0x09, 0x66, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x6c, 0x52, 0x46, 0xd3, - 0x18, 0xb9, 0x84, 0xb1, 0x38, 0x47, 0xa8, 0x9e, 0x8b, 0x2d, 0x25, 0x1f, 0xcc, 0x72, 0xd5, 0x23, - 0xc9, 0xd7, 0x7a, 0xd8, 0x3d, 0x27, 0xa5, 0x83, 0xd7, 0x18, 0x68, 0x10, 0x39, 0xe7, 0xe7, 0xe6, - 0x26, 0xe6, 0xa5, 0x14, 0x2b, 0x31, 0x38, 0xe5, 0x71, 0xe9, 0xe6, 0x17, 0xa5, 0xeb, 0x25, 0x16, - 0x24, 0x26, 0x67, 0xa4, 0x22, 0xeb, 0x4d, 0x2c, 0xc8, 0x85, 0xeb, 0x47, 0xb2, 0x37, 0x80, 0x31, - 0x4a, 0x0e, 0xa1, 0x4a, 0x1f, 0xaa, 0x42, 0x1f, 0x1e, 0x9d, 0x65, 0x46, 0xab, 0x98, 0xa4, 0x82, - 0xb3, 0x2b, 0xc3, 0xa1, 0xc6, 0xf8, 0x41, 0x14, 0x04, 0x40, 0x5d, 0x90, 0xc4, 0x06, 0x76, 0x8b, - 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xde, 0xa2, 0x69, 0x51, 0x01, 0x02, 0x00, 0x00, + 0x4b, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x97, 0x12, 0x4e, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, + 0x87, 0x50, 0x10, 0x41, 0xa5, 0x1e, 0x46, 0x2e, 0xb1, 0xe0, 0xd4, 0xa2, 0xb2, 0xcc, 0xe4, 0x54, + 0x64, 0x2d, 0x01, 0xd9, 0xe9, 0x42, 0x3a, 0x5c, 0x82, 0xc5, 0xa8, 0x32, 0x9e, 0x29, 0x12, 0x8c, + 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x98, 0x12, 0x42, 0x42, 0x5c, 0x2c, 0x25, 0x99, 0xb9, 0xa9, 0x12, + 0x4c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x60, 0xb6, 0x90, 0x01, 0x97, 0x30, 0x9a, 0xc2, 0xd0, 0x50, + 0x4f, 0x17, 0x09, 0x66, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x6c, 0x52, 0x46, 0xee, 0x5c, 0xc2, 0x58, + 0x5c, 0x23, 0x64, 0xc0, 0xc5, 0x96, 0x92, 0x0f, 0x66, 0x89, 0xeb, 0x61, 0x77, 0xad, 0x14, 0xb7, + 0x9e, 0x73, 0x7e, 0x6e, 0x6e, 0x62, 0x5e, 0x4a, 0x71, 0x98, 0x91, 0x12, 0x83, 0x53, 0x1e, 0x97, + 0x6e, 0x7e, 0x51, 0xba, 0x5e, 0x62, 0x41, 0x62, 0x72, 0x46, 0xaa, 0x5e, 0x71, 0x76, 0x65, 0x79, + 0x62, 0x4e, 0x36, 0x28, 0x2c, 0x12, 0x0b, 0x72, 0xf5, 0xf2, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, + 0xf5, 0x60, 0xa1, 0xa5, 0x57, 0x66, 0x14, 0xc0, 0x18, 0x25, 0x87, 0x50, 0xa5, 0x0f, 0x55, 0xa1, + 0x0f, 0x0f, 0xcf, 0x32, 0xa3, 0x55, 0x4c, 0x52, 0xc1, 0xd9, 0x95, 0xe1, 0x50, 0x63, 0xfc, 0x20, + 0x0a, 0x02, 0x40, 0x81, 0x98, 0x9c, 0x9f, 0x93, 0xc4, 0x06, 0x0e, 0x4e, 0x63, 0x40, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x37, 0x65, 0xd0, 0x26, 0x82, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -119,7 +118,7 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type ServiceInstancePingClient interface { - DoPing(ctx context.Context, in *ServiceInstancePingPkg, opts ...grpc.CallOption) (*v2.Commands, error) + DoPing(ctx context.Context, in *ServiceInstancePingPkg, opts ...grpc.CallOption) (*v2.CommandsV2, error) } type serviceInstancePingClient struct { @@ -130,9 +129,9 @@ func NewServiceInstancePingClient(cc *grpc.ClientConn) ServiceInstancePingClient return &serviceInstancePingClient{cc} } -func (c *serviceInstancePingClient) DoPing(ctx context.Context, in *ServiceInstancePingPkg, opts ...grpc.CallOption) (*v2.Commands, error) { - out := new(v2.Commands) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.register.v2.ServiceInstancePing/doPing", in, out, opts...) +func (c *serviceInstancePingClient) DoPing(ctx context.Context, in *ServiceInstancePingPkg, opts ...grpc.CallOption) (*v2.CommandsV2, error) { + out := new(v2.CommandsV2) + err := c.cc.Invoke(ctx, "/ServiceInstancePing/doPing", in, out, opts...) if err != nil { return nil, err } @@ -141,14 +140,14 @@ func (c *serviceInstancePingClient) DoPing(ctx context.Context, in *ServiceInsta // ServiceInstancePingServer is the server API for ServiceInstancePing service. type ServiceInstancePingServer interface { - DoPing(context.Context, *ServiceInstancePingPkg) (*v2.Commands, error) + DoPing(context.Context, *ServiceInstancePingPkg) (*v2.CommandsV2, error) } // UnimplementedServiceInstancePingServer can be embedded to have forward compatible implementations. type UnimplementedServiceInstancePingServer struct { } -func (*UnimplementedServiceInstancePingServer) DoPing(ctx context.Context, req *ServiceInstancePingPkg) (*v2.Commands, error) { +func (*UnimplementedServiceInstancePingServer) DoPing(ctx context.Context, req *ServiceInstancePingPkg) (*v2.CommandsV2, error) { return nil, status.Errorf(codes.Unimplemented, "method DoPing not implemented") } @@ -166,7 +165,7 @@ func _ServiceInstancePing_DoPing_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.register.v2.ServiceInstancePing/DoPing", + FullMethod: "/ServiceInstancePing/DoPing", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceInstancePingServer).DoPing(ctx, req.(*ServiceInstancePingPkg)) @@ -175,7 +174,7 @@ func _ServiceInstancePing_DoPing_Handler(srv interface{}, ctx context.Context, d } var _ServiceInstancePing_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.register.v2.ServiceInstancePing", + ServiceName: "ServiceInstancePing", HandlerType: (*ServiceInstancePingServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/reporter/network/register/v2/Register.pb.go b/reporter/network/register/v2/Register.pb.go index 6c2907b..1200d53 100644 --- a/reporter/network/register/v2/Register.pb.go +++ b/reporter/network/register/v2/Register.pb.go @@ -6,12 +6,12 @@ package v2 import ( context "context" fmt "fmt" - v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" math "math" + v2 "github.com/SkyAPM/SkyAPM-php-sdk/reporter/network/common/v2" ) // Reference imports to suppress errors if they are not otherwise used. @@ -66,15 +66,12 @@ func (m *Services) GetServices() []*Service { } type Service struct { - ServiceName string `protobuf:"bytes,1,opt,name=serviceName,proto3" json:"serviceName,omitempty"` - Tags []*v2.KeyStringValuePair `protobuf:"bytes,3,rep,name=tags,proto3" json:"tags,omitempty"` - Properties []*v2.KeyStringValuePair `protobuf:"bytes,4,rep,name=properties,proto3" json:"properties,omitempty"` - // Type of this register service. - // NULL means type=normal, such as all services before the 7.0.0. - Type v2.ServiceType `protobuf:"varint,5,opt,name=type,proto3,enum=skywalking.network.protocol.common.ServiceType" json:"type,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServiceName string `protobuf:"bytes,1,opt,name=serviceName,proto3" json:"serviceName,omitempty"` + Tags []*v2.KeyStringValuePairV2 `protobuf:"bytes,3,rep,name=tags,proto3" json:"tags,omitempty"` + Properties []*v2.KeyStringValuePairV2 `protobuf:"bytes,4,rep,name=properties,proto3" json:"properties,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Service) Reset() { *m = Service{} } @@ -109,32 +106,25 @@ func (m *Service) GetServiceName() string { return "" } -func (m *Service) GetTags() []*v2.KeyStringValuePair { +func (m *Service) GetTags() []*v2.KeyStringValuePairV2 { if m != nil { return m.Tags } return nil } -func (m *Service) GetProperties() []*v2.KeyStringValuePair { +func (m *Service) GetProperties() []*v2.KeyStringValuePairV2 { if m != nil { return m.Properties } return nil } -func (m *Service) GetType() v2.ServiceType { - if m != nil { - return m.Type - } - return v2.ServiceType_normal -} - type ServiceRegisterMapping struct { - Services []*v2.KeyIntValuePair `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Services []*v2.KeyIntValuePairV2 `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ServiceRegisterMapping) Reset() { *m = ServiceRegisterMapping{} } @@ -162,7 +152,7 @@ func (m *ServiceRegisterMapping) XXX_DiscardUnknown() { var xxx_messageInfo_ServiceRegisterMapping proto.InternalMessageInfo -func (m *ServiceRegisterMapping) GetServices() []*v2.KeyIntValuePair { +func (m *ServiceRegisterMapping) GetServices() []*v2.KeyIntValuePairV2 { if m != nil { return m.Services } @@ -210,14 +200,14 @@ func (m *ServiceInstances) GetInstances() []*ServiceInstance { } type ServiceInstance struct { - ServiceId int32 `protobuf:"varint,1,opt,name=serviceId,proto3" json:"serviceId,omitempty"` - InstanceUUID string `protobuf:"bytes,2,opt,name=instanceUUID,proto3" json:"instanceUUID,omitempty"` - Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` - Tags []*v2.KeyStringValuePair `protobuf:"bytes,4,rep,name=tags,proto3" json:"tags,omitempty"` - Properties []*v2.KeyStringValuePair `protobuf:"bytes,5,rep,name=properties,proto3" json:"properties,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServiceId int32 `protobuf:"varint,1,opt,name=serviceId,proto3" json:"serviceId,omitempty"` + InstanceUUID string `protobuf:"bytes,2,opt,name=instanceUUID,proto3" json:"instanceUUID,omitempty"` + Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` + Tags []*v2.KeyStringValuePairV2 `protobuf:"bytes,4,rep,name=tags,proto3" json:"tags,omitempty"` + Properties []*v2.KeyStringValuePairV2 `protobuf:"bytes,5,rep,name=properties,proto3" json:"properties,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ServiceInstance) Reset() { *m = ServiceInstance{} } @@ -266,14 +256,14 @@ func (m *ServiceInstance) GetTime() int64 { return 0 } -func (m *ServiceInstance) GetTags() []*v2.KeyStringValuePair { +func (m *ServiceInstance) GetTags() []*v2.KeyStringValuePairV2 { if m != nil { return m.Tags } return nil } -func (m *ServiceInstance) GetProperties() []*v2.KeyStringValuePair { +func (m *ServiceInstance) GetProperties() []*v2.KeyStringValuePairV2 { if m != nil { return m.Properties } @@ -281,10 +271,10 @@ func (m *ServiceInstance) GetProperties() []*v2.KeyStringValuePair { } type ServiceInstanceRegisterMapping struct { - ServiceInstances []*v2.KeyIntValuePair `protobuf:"bytes,1,rep,name=serviceInstances,proto3" json:"serviceInstances,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServiceInstances []*v2.KeyIntValuePairV2 `protobuf:"bytes,1,rep,name=serviceInstances,proto3" json:"serviceInstances,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ServiceInstanceRegisterMapping) Reset() { *m = ServiceInstanceRegisterMapping{} } @@ -312,7 +302,7 @@ func (m *ServiceInstanceRegisterMapping) XXX_DiscardUnknown() { var xxx_messageInfo_ServiceInstanceRegisterMapping proto.InternalMessageInfo -func (m *ServiceInstanceRegisterMapping) GetServiceInstances() []*v2.KeyIntValuePair { +func (m *ServiceInstanceRegisterMapping) GetServiceInstances() []*v2.KeyIntValuePairV2 { if m != nil { return m.ServiceInstances } @@ -361,10 +351,10 @@ func (m *NetAddresses) GetAddresses() []string { } type NetAddressMapping struct { - AddressIds []*v2.KeyIntValuePair `protobuf:"bytes,1,rep,name=addressIds,proto3" json:"addressIds,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + AddressIds []*v2.KeyIntValuePairV2 `protobuf:"bytes,1,rep,name=addressIds,proto3" json:"addressIds,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *NetAddressMapping) Reset() { *m = NetAddressMapping{} } @@ -392,7 +382,7 @@ func (m *NetAddressMapping) XXX_DiscardUnknown() { var xxx_messageInfo_NetAddressMapping proto.InternalMessageInfo -func (m *NetAddressMapping) GetAddressIds() []*v2.KeyIntValuePair { +func (m *NetAddressMapping) GetAddressIds() []*v2.KeyIntValuePairV2 { if m != nil { return m.AddressIds } @@ -440,16 +430,16 @@ func (m *Endpoints) GetEndpoints() []*Endpoint { } type Endpoint struct { - ServiceId int32 `protobuf:"varint,1,opt,name=serviceId,proto3" json:"serviceId,omitempty"` - EndpointName string `protobuf:"bytes,2,opt,name=endpointName,proto3" json:"endpointName,omitempty"` - Tags []*v2.KeyStringValuePair `protobuf:"bytes,3,rep,name=tags,proto3" json:"tags,omitempty"` - Properties []*v2.KeyStringValuePair `protobuf:"bytes,4,rep,name=properties,proto3" json:"properties,omitempty"` + ServiceId int32 `protobuf:"varint,1,opt,name=serviceId,proto3" json:"serviceId,omitempty"` + EndpointName string `protobuf:"bytes,2,opt,name=endpointName,proto3" json:"endpointName,omitempty"` + Tags []*v2.KeyStringValuePairV2 `protobuf:"bytes,3,rep,name=tags,proto3" json:"tags,omitempty"` + Properties []*v2.KeyStringValuePairV2 `protobuf:"bytes,4,rep,name=properties,proto3" json:"properties,omitempty"` // For endpoint - // from DetectPoint is either `client` or `server`. No chance to be `proxy`. - From v2.DetectPoint `protobuf:"varint,5,opt,name=from,proto3,enum=skywalking.network.protocol.common.DetectPoint" json:"from,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // from DetectPointV2 is either `client` or `server`. No chance to be `proxy`. + From v2.DetectPointV2 `protobuf:"varint,5,opt,name=from,proto3,enum=DetectPointV2" json:"from,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Endpoint) Reset() { *m = Endpoint{} } @@ -491,25 +481,25 @@ func (m *Endpoint) GetEndpointName() string { return "" } -func (m *Endpoint) GetTags() []*v2.KeyStringValuePair { +func (m *Endpoint) GetTags() []*v2.KeyStringValuePairV2 { if m != nil { return m.Tags } return nil } -func (m *Endpoint) GetProperties() []*v2.KeyStringValuePair { +func (m *Endpoint) GetProperties() []*v2.KeyStringValuePairV2 { if m != nil { return m.Properties } return nil } -func (m *Endpoint) GetFrom() v2.DetectPoint { +func (m *Endpoint) GetFrom() v2.DetectPointV2 { if m != nil { return m.From } - return v2.DetectPoint_client + return v2.DetectPointV2_client } type EndpointMapping struct { @@ -552,13 +542,13 @@ func (m *EndpointMapping) GetElements() []*EndpointMappingElement { } type EndpointMappingElement struct { - ServiceId int32 `protobuf:"varint,1,opt,name=serviceId,proto3" json:"serviceId,omitempty"` - EndpointName string `protobuf:"bytes,2,opt,name=endpointName,proto3" json:"endpointName,omitempty"` - EndpointId int32 `protobuf:"varint,3,opt,name=endpointId,proto3" json:"endpointId,omitempty"` - From v2.DetectPoint `protobuf:"varint,4,opt,name=from,proto3,enum=skywalking.network.protocol.common.DetectPoint" json:"from,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServiceId int32 `protobuf:"varint,1,opt,name=serviceId,proto3" json:"serviceId,omitempty"` + EndpointName string `protobuf:"bytes,2,opt,name=endpointName,proto3" json:"endpointName,omitempty"` + EndpointId int32 `protobuf:"varint,3,opt,name=endpointId,proto3" json:"endpointId,omitempty"` + From v2.DetectPointV2 `protobuf:"varint,4,opt,name=from,proto3,enum=DetectPointV2" json:"from,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *EndpointMappingElement) Reset() { *m = EndpointMappingElement{} } @@ -607,11 +597,11 @@ func (m *EndpointMappingElement) GetEndpointId() int32 { return 0 } -func (m *EndpointMappingElement) GetFrom() v2.DetectPoint { +func (m *EndpointMappingElement) GetFrom() v2.DetectPointV2 { if m != nil { return m.From } - return v2.DetectPoint_client + return v2.DetectPointV2_client } type ServiceAndNetworkAddressMappings struct { @@ -717,76 +707,72 @@ func (m *ServiceAndNetworkAddressMapping) GetNetworkAddressId() int32 { } func init() { - proto.RegisterType((*Services)(nil), "skywalking.network.protocol.agent.register.v2.Services") - proto.RegisterType((*Service)(nil), "skywalking.network.protocol.agent.register.v2.Service") - proto.RegisterType((*ServiceRegisterMapping)(nil), "skywalking.network.protocol.agent.register.v2.ServiceRegisterMapping") - proto.RegisterType((*ServiceInstances)(nil), "skywalking.network.protocol.agent.register.v2.ServiceInstances") - proto.RegisterType((*ServiceInstance)(nil), "skywalking.network.protocol.agent.register.v2.ServiceInstance") - proto.RegisterType((*ServiceInstanceRegisterMapping)(nil), "skywalking.network.protocol.agent.register.v2.ServiceInstanceRegisterMapping") - proto.RegisterType((*NetAddresses)(nil), "skywalking.network.protocol.agent.register.v2.NetAddresses") - proto.RegisterType((*NetAddressMapping)(nil), "skywalking.network.protocol.agent.register.v2.NetAddressMapping") - proto.RegisterType((*Endpoints)(nil), "skywalking.network.protocol.agent.register.v2.Endpoints") - proto.RegisterType((*Endpoint)(nil), "skywalking.network.protocol.agent.register.v2.Endpoint") - proto.RegisterType((*EndpointMapping)(nil), "skywalking.network.protocol.agent.register.v2.EndpointMapping") - proto.RegisterType((*EndpointMappingElement)(nil), "skywalking.network.protocol.agent.register.v2.EndpointMappingElement") - proto.RegisterType((*ServiceAndNetworkAddressMappings)(nil), "skywalking.network.protocol.agent.register.v2.ServiceAndNetworkAddressMappings") - proto.RegisterType((*ServiceAndNetworkAddressMapping)(nil), "skywalking.network.protocol.agent.register.v2.ServiceAndNetworkAddressMapping") + proto.RegisterType((*Services)(nil), "Services") + proto.RegisterType((*Service)(nil), "Service") + proto.RegisterType((*ServiceRegisterMapping)(nil), "ServiceRegisterMapping") + proto.RegisterType((*ServiceInstances)(nil), "ServiceInstances") + proto.RegisterType((*ServiceInstance)(nil), "ServiceInstance") + proto.RegisterType((*ServiceInstanceRegisterMapping)(nil), "ServiceInstanceRegisterMapping") + proto.RegisterType((*NetAddresses)(nil), "NetAddresses") + proto.RegisterType((*NetAddressMapping)(nil), "NetAddressMapping") + proto.RegisterType((*Endpoints)(nil), "Endpoints") + proto.RegisterType((*Endpoint)(nil), "Endpoint") + proto.RegisterType((*EndpointMapping)(nil), "EndpointMapping") + proto.RegisterType((*EndpointMappingElement)(nil), "EndpointMappingElement") + proto.RegisterType((*ServiceAndNetworkAddressMappings)(nil), "ServiceAndNetworkAddressMappings") + proto.RegisterType((*ServiceAndNetworkAddressMapping)(nil), "ServiceAndNetworkAddressMapping") } func init() { proto.RegisterFile("register/Register.proto", fileDescriptor_c38a4def3f450915) } var fileDescriptor_c38a4def3f450915 = []byte{ - // 796 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcd, 0x6b, 0xdb, 0x48, - 0x14, 0x8f, 0xfc, 0x91, 0xb5, 0x5f, 0x42, 0x3e, 0x66, 0x21, 0xab, 0x35, 0x4b, 0xd6, 0xcc, 0x61, - 0xf1, 0x2e, 0x89, 0x0c, 0x0e, 0x6c, 0x0a, 0x85, 0xb4, 0x69, 0xe2, 0x83, 0x5a, 0xe2, 0x98, 0x71, - 0x93, 0x42, 0x29, 0x2d, 0x8a, 0x35, 0x75, 0x54, 0x5b, 0x23, 0xa1, 0x99, 0x26, 0xf8, 0xd8, 0x73, - 0xa1, 0xf4, 0xd0, 0x9e, 0xfa, 0x1f, 0x94, 0xf6, 0x52, 0xe8, 0xb9, 0xf4, 0x3f, 0x2b, 0x91, 0x67, - 0x24, 0x59, 0x6e, 0x88, 0xbf, 0x2e, 0x3d, 0x79, 0xe6, 0xcd, 0x7b, 0xbf, 0xf7, 0xf3, 0xef, 0xbd, - 0x79, 0x63, 0xc3, 0x1f, 0x01, 0xed, 0x38, 0x5c, 0xd0, 0xa0, 0x4a, 0xe4, 0xc2, 0xf0, 0x03, 0x4f, - 0x78, 0x68, 0x9b, 0x77, 0xfb, 0x97, 0x56, 0xaf, 0xeb, 0xb0, 0x8e, 0xc1, 0xa8, 0xb8, 0xf4, 0x82, - 0xee, 0xe0, 0xa4, 0xed, 0xf5, 0x0c, 0xab, 0x43, 0x99, 0x30, 0x54, 0xa8, 0x71, 0x51, 0x2b, 0xfd, - 0xde, 0xf6, 0x5c, 0xd7, 0x63, 0xd5, 0xc1, 0xc7, 0xc0, 0x13, 0x3f, 0x85, 0x42, 0x8b, 0x06, 0x17, - 0x4e, 0x9b, 0x72, 0x44, 0xa0, 0xc0, 0xe5, 0x5a, 0xd7, 0xca, 0xd9, 0xca, 0x52, 0xed, 0x7f, 0x63, - 0xa2, 0x14, 0x86, 0x84, 0x22, 0x11, 0x0e, 0x7e, 0x97, 0x81, 0xdf, 0xa4, 0x15, 0x95, 0x61, 0x49, - 0xda, 0x1b, 0x96, 0x4b, 0x75, 0xad, 0xac, 0x55, 0x8a, 0x24, 0x69, 0x42, 0xf7, 0x21, 0x27, 0xac, - 0x0e, 0xd7, 0xb3, 0x63, 0x64, 0x97, 0x5f, 0xe3, 0x01, 0xed, 0xb7, 0x44, 0xe0, 0xb0, 0xce, 0xa9, - 0xd5, 0x7b, 0x49, 0x9b, 0x96, 0x13, 0x90, 0x10, 0x03, 0x9d, 0x02, 0xf8, 0x81, 0xe7, 0xd3, 0x40, - 0x38, 0x94, 0xeb, 0xb9, 0x99, 0x10, 0x13, 0x48, 0xe8, 0x00, 0x72, 0xa2, 0xef, 0x53, 0x3d, 0x5f, - 0xd6, 0x2a, 0x2b, 0xb5, 0xea, 0x38, 0x88, 0x52, 0x80, 0x87, 0x7d, 0x9f, 0x92, 0x30, 0x18, 0x3b, - 0xb0, 0xa1, 0xb4, 0x92, 0xf2, 0x1d, 0x59, 0xbe, 0xef, 0xb0, 0x0e, 0x3a, 0x1e, 0x29, 0xc2, 0xce, - 0x98, 0xa4, 0x4d, 0x26, 0x62, 0xc6, 0x71, 0x05, 0x7c, 0x58, 0x93, 0xa9, 0x4c, 0xc6, 0x85, 0xc5, - 0xae, 0x2a, 0xfd, 0x04, 0x8a, 0x8e, 0xda, 0xc8, 0x2c, 0x7b, 0xd3, 0x95, 0x5a, 0x61, 0x92, 0x18, - 0x10, 0xbf, 0xce, 0xc0, 0x6a, 0xea, 0x18, 0xfd, 0x05, 0x45, 0xc9, 0xc8, 0xb4, 0xc3, 0xca, 0xe7, - 0x49, 0x6c, 0x40, 0x18, 0x96, 0x55, 0xf8, 0xc9, 0x89, 0x79, 0xa8, 0x67, 0xc2, 0xd6, 0x18, 0xb2, - 0x21, 0x04, 0x39, 0xe1, 0xb8, 0x54, 0xcf, 0x96, 0xb5, 0x4a, 0x96, 0x84, 0xeb, 0xa8, 0x5f, 0x72, - 0x73, 0xef, 0x97, 0xfc, 0xbc, 0xfa, 0x05, 0xbf, 0xd2, 0x60, 0x33, 0x2d, 0x56, 0xaa, 0xe6, 0xcf, - 0x60, 0x8d, 0xa7, 0x4a, 0x34, 0x4b, 0xed, 0x47, 0xc0, 0xf0, 0x16, 0x2c, 0x37, 0xa8, 0xd8, 0xb7, - 0xed, 0x80, 0x72, 0x4e, 0xf9, 0x55, 0x35, 0x2c, 0xb5, 0x09, 0x33, 0x15, 0x49, 0x6c, 0xc0, 0xe7, - 0xb0, 0x1e, 0x7b, 0x2b, 0x8e, 0x2d, 0x00, 0xe9, 0x61, 0xda, 0x33, 0xb1, 0x4b, 0xc0, 0xe0, 0x33, - 0x28, 0xd6, 0x99, 0xed, 0x7b, 0x0e, 0x13, 0x1c, 0x9d, 0x40, 0x91, 0xaa, 0x8d, 0x4c, 0xb0, 0x3b, - 0x61, 0x53, 0x2a, 0x30, 0x12, 0x23, 0xe1, 0xaf, 0x19, 0x28, 0x28, 0xfb, 0xcd, 0x6d, 0xa8, 0xe2, - 0xc2, 0x09, 0x25, 0xdb, 0x30, 0x69, 0xfb, 0x55, 0x46, 0xd4, 0xf3, 0xc0, 0x73, 0x27, 0x19, 0x51, - 0x87, 0x54, 0xd0, 0xb6, 0x68, 0x86, 0xe2, 0x85, 0xc1, 0x58, 0xc0, 0xaa, 0x92, 0x4d, 0xf5, 0x80, - 0x05, 0x05, 0xda, 0xa3, 0x2e, 0x8d, 0x0b, 0x54, 0x9f, 0xb2, 0x40, 0x12, 0xb1, 0x3e, 0x40, 0x23, - 0x11, 0x2c, 0xfe, 0xa6, 0xc1, 0xc6, 0xcf, 0x9d, 0xe6, 0x50, 0xbb, 0x4d, 0x00, 0xb5, 0x37, 0xed, - 0x70, 0x90, 0xe4, 0x49, 0xc2, 0x12, 0xe9, 0x96, 0x9b, 0x45, 0xb7, 0x37, 0x1a, 0x94, 0xe5, 0x7d, - 0xdf, 0x67, 0x76, 0x63, 0x10, 0x37, 0x7c, 0x99, 0x38, 0x7a, 0x01, 0x05, 0x57, 0xae, 0xa5, 0x92, - 0x8d, 0xe9, 0xe6, 0xef, 0x75, 0x29, 0x48, 0x84, 0x8f, 0xbf, 0x6b, 0xf0, 0xf7, 0x0d, 0xde, 0x37, - 0x68, 0xbb, 0x05, 0xeb, 0xa9, 0x91, 0x62, 0xda, 0xa1, 0xc0, 0x79, 0x32, 0x7a, 0x80, 0xfe, 0x81, - 0x15, 0x36, 0x94, 0x24, 0x54, 0xba, 0x48, 0x52, 0x56, 0xf4, 0x1f, 0xac, 0x0d, 0x5b, 0x4c, 0x3b, - 0x54, 0x3e, 0x4f, 0x46, 0xec, 0xb5, 0x2f, 0x8b, 0x50, 0x50, 0x53, 0x13, 0xbd, 0xd7, 0x60, 0xdd, - 0xf6, 0x52, 0xef, 0x27, 0xda, 0x9d, 0x4e, 0x40, 0x5e, 0xaa, 0x4f, 0xf9, 0x23, 0x67, 0x78, 0x88, - 0xe3, 0x05, 0xf4, 0x59, 0x83, 0x3f, 0x23, 0x5e, 0xe9, 0x59, 0x8f, 0xee, 0xcc, 0xf6, 0xc0, 0xf2, - 0xd2, 0xd1, 0x8c, 0x2f, 0xf4, 0x08, 0xdf, 0xb7, 0x1a, 0x20, 0xdb, 0x8b, 0x66, 0xa6, 0x22, 0x7a, - 0x6b, 0xca, 0x3b, 0xcd, 0x4b, 0x7b, 0xb3, 0x4d, 0x03, 0xbc, 0x80, 0x3e, 0x68, 0xa0, 0xdb, 0xde, - 0x70, 0x8f, 0x46, 0xc4, 0x6e, 0x4f, 0x08, 0x9f, 0x7c, 0xf2, 0x4a, 0x77, 0xa7, 0x0e, 0x8e, 0xd9, - 0x7d, 0xd2, 0xe0, 0xdf, 0xa8, 0xc0, 0xd7, 0xde, 0x3c, 0x45, 0xf7, 0x78, 0xbe, 0x37, 0x9a, 0x97, - 0xb6, 0xc6, 0x19, 0x48, 0x07, 0x9e, 0xeb, 0x5a, 0xcc, 0xe6, 0x78, 0xe1, 0x1e, 0x83, 0x6d, 0x2f, - 0xe8, 0x18, 0x96, 0x6f, 0xb5, 0xcf, 0x69, 0x32, 0xd6, 0xf2, 0xdd, 0x28, 0x3e, 0xc1, 0xa0, 0xa9, - 0x3d, 0xde, 0x8c, 0xbd, 0xaa, 0xd2, 0xa3, 0x1a, 0xfd, 0xfd, 0xb8, 0xa8, 0x7d, 0xcc, 0x94, 0x5a, - 0xdd, 0xfe, 0x23, 0x09, 0x23, 0x69, 0x36, 0x25, 0x83, 0xb3, 0xc5, 0x90, 0xcb, 0xce, 0x8f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x21, 0x5d, 0x0b, 0xc0, 0xb1, 0x0c, 0x00, 0x00, + // 727 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xe1, 0x6e, 0xd3, 0x30, + 0x10, 0x6e, 0xd6, 0x16, 0x9a, 0xdb, 0xd8, 0x5a, 0x23, 0xb6, 0x50, 0xa1, 0x2d, 0x58, 0x08, 0x3a, + 0x34, 0x5c, 0x94, 0x8d, 0x1f, 0x48, 0x08, 0xb4, 0xb1, 0x01, 0x11, 0x62, 0x2a, 0x9e, 0x36, 0x24, + 0x24, 0xa4, 0x85, 0xc6, 0x94, 0xa8, 0x4d, 0x1c, 0xc5, 0x61, 0xd3, 0x1e, 0x82, 0x57, 0xe0, 0x01, + 0x78, 0x0b, 0x7e, 0xf2, 0x97, 0x07, 0xe1, 0x19, 0x50, 0x32, 0x3b, 0x49, 0xd3, 0xd1, 0x82, 0x04, + 0xbf, 0x62, 0x7f, 0xf7, 0xdd, 0xc5, 0xf7, 0xf9, 0xee, 0x0c, 0x2b, 0x11, 0x1b, 0x78, 0x22, 0x66, + 0x51, 0x97, 0xca, 0x05, 0x09, 0x23, 0x1e, 0xf3, 0xf6, 0xd5, 0x3e, 0xf7, 0x7d, 0x1e, 0x74, 0xcf, + 0x3f, 0xe7, 0x20, 0xbe, 0x0f, 0x8d, 0x03, 0x16, 0x9d, 0x78, 0x7d, 0x26, 0xd0, 0x2d, 0x68, 0x08, + 0xb9, 0x36, 0x34, 0xb3, 0xda, 0x99, 0xb7, 0x1a, 0x44, 0x1a, 0x69, 0x66, 0xc1, 0x9f, 0x35, 0xb8, + 0x2c, 0x51, 0x64, 0xc2, 0xbc, 0xc4, 0xf7, 0x1d, 0x9f, 0x19, 0x9a, 0xa9, 0x75, 0x74, 0x5a, 0x84, + 0xd0, 0x3a, 0xd4, 0x62, 0x67, 0x20, 0x8c, 0x6a, 0x1a, 0xef, 0x1a, 0x79, 0xc9, 0xce, 0x0e, 0xe2, + 0xc8, 0x0b, 0x06, 0x47, 0xce, 0xe8, 0x13, 0xeb, 0x39, 0x5e, 0x74, 0x64, 0xd1, 0x94, 0x82, 0x1e, + 0x00, 0x84, 0x11, 0x0f, 0x59, 0x14, 0x7b, 0x4c, 0x18, 0xb5, 0x69, 0x0e, 0x05, 0x22, 0x7e, 0x01, + 0xcb, 0xea, 0x90, 0x32, 0xdf, 0x57, 0x4e, 0x18, 0x7a, 0xc1, 0x00, 0x91, 0x89, 0x7c, 0x50, 0x12, + 0xce, 0x0e, 0xe2, 0x62, 0xac, 0x3c, 0xb3, 0x1d, 0x68, 0xca, 0x48, 0x76, 0x20, 0x62, 0x27, 0x48, + 0x34, 0x21, 0xa0, 0x7b, 0x6a, 0x23, 0x83, 0x34, 0x49, 0x89, 0x45, 0x73, 0x0a, 0xfe, 0xae, 0xc1, + 0x52, 0xc9, 0x8c, 0x6e, 0x80, 0x2e, 0xff, 0x61, 0xbb, 0xa9, 0x46, 0x75, 0x9a, 0x03, 0x08, 0xc3, + 0x82, 0x72, 0x3f, 0x3c, 0xb4, 0x77, 0x8d, 0xb9, 0x54, 0xc4, 0x31, 0x0c, 0x21, 0xa8, 0xc5, 0x9e, + 0xcf, 0x8c, 0xaa, 0xa9, 0x75, 0xaa, 0x34, 0x5d, 0x67, 0xca, 0xd6, 0xfe, 0x56, 0xd9, 0xfa, 0x9f, + 0x2a, 0x7b, 0x0c, 0xab, 0xe5, 0x4c, 0x4b, 0x0a, 0x3f, 0x86, 0xa6, 0x28, 0x29, 0x36, 0x45, 0xe9, + 0x09, 0x2e, 0xde, 0x80, 0x85, 0x7d, 0x16, 0x6f, 0xbb, 0x6e, 0xc4, 0x84, 0x60, 0x22, 0x51, 0xca, + 0x51, 0x9b, 0x34, 0x90, 0x4e, 0x73, 0x00, 0x3f, 0x87, 0x56, 0xce, 0x56, 0x47, 0xb0, 0x00, 0x24, + 0xc3, 0x76, 0xa7, 0xfd, 0xbc, 0xc0, 0xc2, 0x5b, 0xa0, 0xef, 0x05, 0x6e, 0xc8, 0xbd, 0x20, 0x16, + 0xe8, 0x0e, 0xe8, 0x4c, 0x6d, 0xa4, 0xbf, 0x4e, 0x94, 0x99, 0xe6, 0x36, 0xfc, 0x43, 0x83, 0x86, + 0xc2, 0x67, 0xdf, 0xa9, 0xf2, 0x4b, 0x1b, 0x43, 0xde, 0x69, 0x11, 0xfb, 0xff, 0x9d, 0x81, 0x30, + 0xd4, 0x3e, 0x44, 0xdc, 0x37, 0xea, 0xa6, 0xd6, 0x59, 0xb4, 0x16, 0xc9, 0x2e, 0x8b, 0x59, 0x3f, + 0xee, 0x25, 0x27, 0x48, 0x42, 0x27, 0x36, 0xfc, 0x0c, 0x96, 0x54, 0x4e, 0x4a, 0xd1, 0x4d, 0x68, + 0xb0, 0x11, 0xf3, 0x59, 0xae, 0xc7, 0x0a, 0x29, 0x71, 0xf6, 0xce, 0xed, 0x34, 0x23, 0xe2, 0x2f, + 0x1a, 0x2c, 0x5f, 0x4c, 0xfa, 0x07, 0x52, 0xad, 0x02, 0xa8, 0xbd, 0xed, 0xa6, 0x4d, 0x50, 0xa7, + 0x05, 0x24, 0x4b, 0xb4, 0x36, 0x25, 0xd1, 0x63, 0x30, 0x65, 0x31, 0x6f, 0x07, 0xee, 0x3e, 0x8b, + 0x4f, 0x79, 0x34, 0x1c, 0x2f, 0x25, 0x81, 0x1e, 0x41, 0xc3, 0x97, 0x6b, 0x99, 0xb9, 0x49, 0x66, + 0x38, 0xd1, 0xcc, 0x03, 0x7f, 0xd3, 0x60, 0x6d, 0x06, 0x7b, 0x86, 0x16, 0x1b, 0xd0, 0x2a, 0xb5, + 0x88, 0xed, 0xa6, 0x82, 0xd4, 0xe9, 0xa4, 0x01, 0xdd, 0x86, 0xc5, 0x60, 0xec, 0x27, 0xa9, 0x32, + 0x3a, 0x2d, 0xa1, 0xe8, 0x2e, 0x34, 0xc7, 0x11, 0xdb, 0x4d, 0x95, 0xaa, 0xd3, 0x09, 0xdc, 0xfa, + 0x39, 0x07, 0x0d, 0xd5, 0xe4, 0xe8, 0x21, 0xb4, 0x5c, 0x5e, 0x9a, 0xad, 0x48, 0x57, 0x8a, 0x88, + 0xf6, 0x0a, 0xb9, 0x78, 0xf0, 0xe2, 0x0a, 0x7a, 0x0d, 0xd7, 0x33, 0xd7, 0xf2, 0xf0, 0x40, 0xad, + 0xf2, 0x00, 0x15, 0xed, 0x35, 0x32, 0x7d, 0xd2, 0xe0, 0x0a, 0xda, 0x02, 0xe4, 0xf2, 0xac, 0x2f, + 0x55, 0x2c, 0xc8, 0x4a, 0x53, 0xb4, 0x9b, 0xe5, 0x32, 0xc5, 0x15, 0xf4, 0x04, 0x0c, 0x97, 0x8f, + 0xdf, 0x45, 0xe6, 0x7b, 0x85, 0x14, 0x87, 0x4f, 0x1b, 0x91, 0x89, 0xe9, 0x82, 0x2b, 0xe8, 0x1d, + 0xac, 0x67, 0x99, 0xfc, 0xb6, 0x08, 0x54, 0xc4, 0x9b, 0xb3, 0xca, 0x45, 0xb4, 0xe7, 0xc9, 0x53, + 0xee, 0xfb, 0x4e, 0xe0, 0x8a, 0x23, 0x0b, 0x57, 0x76, 0x02, 0xb8, 0xc7, 0xa3, 0x01, 0x71, 0x42, + 0xa7, 0xff, 0x91, 0x11, 0x31, 0x3c, 0x3b, 0x75, 0x46, 0x43, 0x2f, 0x48, 0x10, 0x9f, 0xc8, 0xeb, + 0x21, 0xea, 0x45, 0x27, 0x27, 0x56, 0x4f, 0x7b, 0xbb, 0x9a, 0xb3, 0xba, 0x92, 0xd1, 0xcd, 0xde, + 0xfc, 0x13, 0xeb, 0xeb, 0x5c, 0xfb, 0x60, 0x78, 0xf6, 0x46, 0x86, 0x91, 0xa7, 0xe8, 0x25, 0x8f, + 0x7d, 0x9f, 0x8f, 0xde, 0x5f, 0x4a, 0x9f, 0xfd, 0xcd, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x85, + 0x35, 0x1b, 0x2d, 0x26, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -805,7 +791,7 @@ type RegisterClient interface { DoServiceInstanceRegister(ctx context.Context, in *ServiceInstances, opts ...grpc.CallOption) (*ServiceInstanceRegisterMapping, error) DoEndpointRegister(ctx context.Context, in *Endpoints, opts ...grpc.CallOption) (*EndpointMapping, error) DoNetworkAddressRegister(ctx context.Context, in *NetAddresses, opts ...grpc.CallOption) (*NetAddressMapping, error) - DoServiceAndNetworkAddressMappingRegister(ctx context.Context, in *ServiceAndNetworkAddressMappings, opts ...grpc.CallOption) (*v2.Commands, error) + DoServiceAndNetworkAddressMappingRegister(ctx context.Context, in *ServiceAndNetworkAddressMappings, opts ...grpc.CallOption) (*v2.CommandsV2, error) } type registerClient struct { @@ -818,7 +804,7 @@ func NewRegisterClient(cc *grpc.ClientConn) RegisterClient { func (c *registerClient) DoServiceRegister(ctx context.Context, in *Services, opts ...grpc.CallOption) (*ServiceRegisterMapping, error) { out := new(ServiceRegisterMapping) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.register.v2.Register/doServiceRegister", in, out, opts...) + err := c.cc.Invoke(ctx, "/Register/doServiceRegister", in, out, opts...) if err != nil { return nil, err } @@ -827,7 +813,7 @@ func (c *registerClient) DoServiceRegister(ctx context.Context, in *Services, op func (c *registerClient) DoServiceInstanceRegister(ctx context.Context, in *ServiceInstances, opts ...grpc.CallOption) (*ServiceInstanceRegisterMapping, error) { out := new(ServiceInstanceRegisterMapping) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.register.v2.Register/doServiceInstanceRegister", in, out, opts...) + err := c.cc.Invoke(ctx, "/Register/doServiceInstanceRegister", in, out, opts...) if err != nil { return nil, err } @@ -836,7 +822,7 @@ func (c *registerClient) DoServiceInstanceRegister(ctx context.Context, in *Serv func (c *registerClient) DoEndpointRegister(ctx context.Context, in *Endpoints, opts ...grpc.CallOption) (*EndpointMapping, error) { out := new(EndpointMapping) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.register.v2.Register/doEndpointRegister", in, out, opts...) + err := c.cc.Invoke(ctx, "/Register/doEndpointRegister", in, out, opts...) if err != nil { return nil, err } @@ -845,16 +831,16 @@ func (c *registerClient) DoEndpointRegister(ctx context.Context, in *Endpoints, func (c *registerClient) DoNetworkAddressRegister(ctx context.Context, in *NetAddresses, opts ...grpc.CallOption) (*NetAddressMapping, error) { out := new(NetAddressMapping) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.register.v2.Register/doNetworkAddressRegister", in, out, opts...) + err := c.cc.Invoke(ctx, "/Register/doNetworkAddressRegister", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *registerClient) DoServiceAndNetworkAddressMappingRegister(ctx context.Context, in *ServiceAndNetworkAddressMappings, opts ...grpc.CallOption) (*v2.Commands, error) { - out := new(v2.Commands) - err := c.cc.Invoke(ctx, "/skywalking.network.protocol.agent.register.v2.Register/doServiceAndNetworkAddressMappingRegister", in, out, opts...) +func (c *registerClient) DoServiceAndNetworkAddressMappingRegister(ctx context.Context, in *ServiceAndNetworkAddressMappings, opts ...grpc.CallOption) (*v2.CommandsV2, error) { + out := new(v2.CommandsV2) + err := c.cc.Invoke(ctx, "/Register/doServiceAndNetworkAddressMappingRegister", in, out, opts...) if err != nil { return nil, err } @@ -867,7 +853,7 @@ type RegisterServer interface { DoServiceInstanceRegister(context.Context, *ServiceInstances) (*ServiceInstanceRegisterMapping, error) DoEndpointRegister(context.Context, *Endpoints) (*EndpointMapping, error) DoNetworkAddressRegister(context.Context, *NetAddresses) (*NetAddressMapping, error) - DoServiceAndNetworkAddressMappingRegister(context.Context, *ServiceAndNetworkAddressMappings) (*v2.Commands, error) + DoServiceAndNetworkAddressMappingRegister(context.Context, *ServiceAndNetworkAddressMappings) (*v2.CommandsV2, error) } // UnimplementedRegisterServer can be embedded to have forward compatible implementations. @@ -886,7 +872,7 @@ func (*UnimplementedRegisterServer) DoEndpointRegister(ctx context.Context, req func (*UnimplementedRegisterServer) DoNetworkAddressRegister(ctx context.Context, req *NetAddresses) (*NetAddressMapping, error) { return nil, status.Errorf(codes.Unimplemented, "method DoNetworkAddressRegister not implemented") } -func (*UnimplementedRegisterServer) DoServiceAndNetworkAddressMappingRegister(ctx context.Context, req *ServiceAndNetworkAddressMappings) (*v2.Commands, error) { +func (*UnimplementedRegisterServer) DoServiceAndNetworkAddressMappingRegister(ctx context.Context, req *ServiceAndNetworkAddressMappings) (*v2.CommandsV2, error) { return nil, status.Errorf(codes.Unimplemented, "method DoServiceAndNetworkAddressMappingRegister not implemented") } @@ -904,7 +890,7 @@ func _Register_DoServiceRegister_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.register.v2.Register/DoServiceRegister", + FullMethod: "/Register/DoServiceRegister", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegisterServer).DoServiceRegister(ctx, req.(*Services)) @@ -922,7 +908,7 @@ func _Register_DoServiceInstanceRegister_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.register.v2.Register/DoServiceInstanceRegister", + FullMethod: "/Register/DoServiceInstanceRegister", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegisterServer).DoServiceInstanceRegister(ctx, req.(*ServiceInstances)) @@ -940,7 +926,7 @@ func _Register_DoEndpointRegister_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.register.v2.Register/DoEndpointRegister", + FullMethod: "/Register/DoEndpointRegister", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegisterServer).DoEndpointRegister(ctx, req.(*Endpoints)) @@ -958,7 +944,7 @@ func _Register_DoNetworkAddressRegister_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.register.v2.Register/DoNetworkAddressRegister", + FullMethod: "/Register/DoNetworkAddressRegister", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegisterServer).DoNetworkAddressRegister(ctx, req.(*NetAddresses)) @@ -976,7 +962,7 @@ func _Register_DoServiceAndNetworkAddressMappingRegister_Handler(srv interface{} } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/skywalking.network.protocol.agent.register.v2.Register/DoServiceAndNetworkAddressMappingRegister", + FullMethod: "/Register/DoServiceAndNetworkAddressMappingRegister", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegisterServer).DoServiceAndNetworkAddressMappingRegister(ctx, req.(*ServiceAndNetworkAddressMappings)) @@ -985,7 +971,7 @@ func _Register_DoServiceAndNetworkAddressMappingRegister_Handler(srv interface{} } var _Register_serviceDesc = grpc.ServiceDesc{ - ServiceName: "skywalking.network.protocol.agent.register.v2.Register", + ServiceName: "Register", HandlerType: (*RegisterServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/reporter/protocol/v1/README.md b/reporter/protocol/v1/README.md deleted file mode 100644 index 536bc1f..0000000 --- a/reporter/protocol/v1/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Apache SkyWalking data collect protocol -Apache SkyWalking can collect data from different sources. Each kind of source should follow the protocols in this repo. - -## License -Apache 2.0 diff --git a/reporter/protocol/v1/common/CLR.proto b/reporter/protocol/v1/common/CLR.proto index f01144c..4a0c7d9 100644 --- a/reporter/protocol/v1/common/CLR.proto +++ b/reporter/protocol/v1/common/CLR.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.common.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -27,21 +25,21 @@ option go_package = "skywalking/network/language/agent/v1"; import "common/common.proto"; -message CLRMetric { +message CLRMetricV1 { int64 time = 1; - CPU cpu = 2; - ClrGC gc = 3; - ClrThread thread = 4; + CPUV1 cpu = 2; + ClrGCV1 gc = 3; + ClrThreadV1 thread = 4; } -message ClrGC { +message ClrGCV1 { int64 Gen0CollectCount = 1; int64 Gen1CollectCount = 2; int64 Gen2CollectCount = 3; int64 HeapMemory = 4; } -message ClrThread { +message ClrThreadV1 { int32 AvailableCompletionPortThreads = 1; int32 AvailableWorkerThreads = 2; int32 MaxCompletionPortThreads = 3; diff --git a/reporter/protocol/v1/common/JVM.proto b/reporter/protocol/v1/common/JVM.proto index f0ea04f..d7a0c0b 100644 --- a/reporter/protocol/v1/common/JVM.proto +++ b/reporter/protocol/v1/common/JVM.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.common.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -27,15 +25,15 @@ option go_package = "skywalking/network/language/agent/v1"; import "common/common.proto"; -message JVMMetric { +message JVMMetricV1 { int64 time = 1; - CPU cpu = 2; - repeated Memory memory = 3; - repeated MemoryPool memoryPool = 4; - repeated GC gc = 5; + CPUV1 cpu = 2; + repeated MemoryV1 memory = 3; + repeated MemoryPoolV1 memoryPool = 4; + repeated GCV1 gc = 5; } -message Memory { +message MemoryV1 { bool isHeap = 1; int64 init = 2; int64 max = 3; @@ -43,15 +41,15 @@ message Memory { int64 committed = 5; } -message MemoryPool { - PoolType type = 1; +message MemoryPoolV1 { + PoolTypeV1 type = 1; int64 init = 2; int64 max = 3; int64 used = 4; int64 commited = 5; } -enum PoolType { +enum PoolTypeV1 { CODE_CACHE_USAGE = 0; NEWGEN_USAGE = 1; OLDGEN_USAGE = 2; @@ -60,13 +58,13 @@ enum PoolType { METASPACE_USAGE = 5; } -message GC { - GCPhrase phrase = 1; +message GCV1 { + GCPhraseV1 phrase = 1; int64 count = 2; int64 time = 3; } -enum GCPhrase { +enum GCPhraseV1 { NEW = 0; OLD = 1; } diff --git a/reporter/protocol/v1/common/common.proto b/reporter/protocol/v1/common/common.proto index c3a2c21..b74a337 100644 --- a/reporter/protocol/v1/common/common.proto +++ b/reporter/protocol/v1/common/common.proto @@ -18,14 +18,12 @@ syntax = "proto3"; -package skywalking.network.protocol.common.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.common"; option csharp_namespace = "SkyWalking.NetworkProtocol"; option go_package = "skywalking/network/common/v1"; -message KeyStringValuePair { +message KeyStringValuePairV1 { string key = 1; string value = 2; } @@ -35,24 +33,24 @@ message KeyIntValuePair { int32 value = 2; } -message CPU { +message CPUV1 { double usagePercent = 2; } // In most cases, detect point should be `server` or `client`. // Even in service mesh, this means `server`/`client` side sidecar // `proxy` is reserved only. -enum DetectPoint { +enum DetectPointV1 { client = 0; server = 1; proxy = 2; } -message Commands { - repeated Command commands = 1; +message CommandsV1 { + repeated CommandV1 commands = 1; } -message Command { +message CommandV1 { string command = 1; - repeated KeyStringValuePair args = 2; + repeated KeyStringValuePairV1 args = 2; } diff --git a/reporter/protocol/v1/common/trace-common.proto b/reporter/protocol/v1/common/trace-common.proto index aae8741..b187a2f 100644 --- a/reporter/protocol/v1/common/trace-common.proto +++ b/reporter/protocol/v1/common/trace-common.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.common.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -30,7 +28,7 @@ message UpstreamSegment { bytes segment = 2; // the byte array of TraceSegmentObject } -enum SpanType { +enum SpanTypeV1 { Entry = 0; Exit = 1; Local = 2; @@ -40,12 +38,12 @@ message UniqueId { repeated int64 idParts = 1; } -enum RefType { +enum RefTypeV1 { CrossProcess = 0; CrossThread = 1; } -enum SpanLayer { +enum SpanLayerV1 { Unknown = 0; Database = 1; RPCFramework = 2; diff --git a/reporter/protocol/v1/language-agent-v2/CLRMetric.proto b/reporter/protocol/v1/language-agent-v2/CLRMetric.proto deleted file mode 100644 index da023b6..0000000 --- a/reporter/protocol/v1/language-agent-v2/CLRMetric.proto +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "common/common.proto"; -import "common/CLR.proto"; - -service CLRMetricReportService { - rpc collect (CLRMetricCollection) returns (Commands) { - } -} - -message CLRMetricCollection { - repeated CLRMetric metrics = 1; - int32 serviceInstanceId = 2; -} \ No newline at end of file diff --git a/reporter/protocol/v1/language-agent-v2/JVMMetric.proto b/reporter/protocol/v1/language-agent-v2/JVMMetric.proto deleted file mode 100644 index 845624c..0000000 --- a/reporter/protocol/v1/language-agent-v2/JVMMetric.proto +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "common/common.proto"; -import "common/JVM.proto"; - -service JVMMetricReportService { - rpc collect (JVMMetricCollection) returns (Commands) { - } -} - -message JVMMetricCollection { - repeated JVMMetric metrics = 1; - int32 serviceInstanceId = 2; -} diff --git a/reporter/protocol/v1/language-agent-v2/trace.proto b/reporter/protocol/v1/language-agent-v2/trace.proto deleted file mode 100644 index c6120c5..0000000 --- a/reporter/protocol/v1/language-agent-v2/trace.proto +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "common/common.proto"; -import "common/trace-common.proto"; - -service TraceSegmentReportService { - rpc collect (stream UpstreamSegment) returns (Commands) { - } -} - -message SegmentObject { - UniqueId traceSegmentId = 1; - repeated SpanObjectV2 spans = 2; - int32 serviceId = 3; - int32 serviceInstanceId = 4; - bool isSizeLimited = 5; -} - -message SegmentReference { - RefType refType = 1; - UniqueId parentTraceSegmentId = 2; - int32 parentSpanId = 3; - int32 parentServiceInstanceId = 4; - string networkAddress = 5; - int32 networkAddressId = 6; - int32 entryServiceInstanceId = 7; - string entryEndpoint = 8; - int32 entryEndpointId = 9; - string parentEndpoint = 10; - int32 parentEndpointId = 11; -} - -message SpanObjectV2 { - int32 spanId = 1; - int32 parentSpanId = 2; - int64 startTime = 3; - int64 endTime = 4; - repeated SegmentReference refs = 5; - int32 operationNameId = 6; - string operationName = 7; - int32 peerId = 8; - string peer = 9; - SpanType spanType = 10; - SpanLayer spanLayer = 11; - int32 componentId = 12; - string component = 13; - bool isError = 14; - repeated KeyStringValuePair tags = 15; - repeated Log logs = 16; -} - -message Log { - int64 time = 1; - repeated KeyStringValuePair data = 2; -} diff --git a/reporter/protocol/v1/language-agent/ApplicationRegisterService.proto b/reporter/protocol/v1/language-agent/ApplicationRegisterService.proto index 3056f6c..9147150 100644 --- a/reporter/protocol/v1/language-agent/ApplicationRegisterService.proto +++ b/reporter/protocol/v1/language-agent/ApplicationRegisterService.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; diff --git a/reporter/protocol/v1/language-agent/DiscoveryService.proto b/reporter/protocol/v1/language-agent/DiscoveryService.proto index f5290e0..b5f98ed 100644 --- a/reporter/protocol/v1/language-agent/DiscoveryService.proto +++ b/reporter/protocol/v1/language-agent/DiscoveryService.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -90,5 +88,5 @@ message ServiceNameMappingElement { message ServiceNameElement { string serviceName = 1; int32 applicationId = 2; - skywalking.network.protocol.common.v1.SpanType srcSpanType = 3; + SpanTypeV1 srcSpanType = 3; } diff --git a/reporter/protocol/v1/language-agent/Downstream.proto b/reporter/protocol/v1/language-agent/Downstream.proto index 946c230..2baa610 100644 --- a/reporter/protocol/v1/language-agent/Downstream.proto +++ b/reporter/protocol/v1/language-agent/Downstream.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; diff --git a/reporter/protocol/v1/language-agent/JVMMetricsService.proto b/reporter/protocol/v1/language-agent/JVMMetricsService.proto index a485e3e..d60d24d 100644 --- a/reporter/protocol/v1/language-agent/JVMMetricsService.proto +++ b/reporter/protocol/v1/language-agent/JVMMetricsService.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -34,6 +32,6 @@ service JVMMetricsService { } message JVMMetrics { - repeated skywalking.network.protocol.common.v1.JVMMetric metrics = 1; + repeated JVMMetricV1 metrics = 1; int32 applicationInstanceId = 2; } diff --git a/reporter/protocol/v1/language-agent/TraceSegmentService.proto b/reporter/protocol/v1/language-agent/TraceSegmentService.proto index 283500b..b48dc53 100644 --- a/reporter/protocol/v1/language-agent/TraceSegmentService.proto +++ b/reporter/protocol/v1/language-agent/TraceSegmentService.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v1; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -30,21 +28,21 @@ import "language-agent/KeyWithStringValue.proto"; import "common/trace-common.proto"; service TraceSegmentService { - rpc collect (stream skywalking.network.protocol.common.v1.UpstreamSegment) returns (Downstream) { + rpc collect (stream UpstreamSegment) returns (Downstream) { } } message TraceSegmentObject { - skywalking.network.protocol.common.v1.UniqueId traceSegmentId = 1; - repeated SpanObject spans = 2; + UniqueId traceSegmentId = 1; + repeated SpanObjectV1 spans = 2; int32 applicationId = 3; int32 applicationInstanceId = 4; bool isSizeLimited = 5; } message TraceSegmentReference { - skywalking.network.protocol.common.v1.RefType refType = 1; - skywalking.network.protocol.common.v1.UniqueId parentTraceSegmentId = 2; + RefTypeV1 refType = 1; + UniqueId parentTraceSegmentId = 2; int32 parentSpanId = 3; int32 parentApplicationInstanceId = 4; string networkAddress = 5; @@ -56,7 +54,7 @@ message TraceSegmentReference { int32 parentServiceId = 11; } -message SpanObject { +message SpanObjectV1 { int32 spanId = 1; int32 parentSpanId = 2; int64 startTime = 3; @@ -66,8 +64,8 @@ message SpanObject { string operationName = 7; int32 peerId = 8; string peer = 9; - skywalking.network.protocol.common.v1.SpanType spanType = 10; - skywalking.network.protocol.common.v1.SpanLayer spanLayer = 11; + SpanTypeV1 spanType = 10; + SpanLayerV1 spanLayer = 11; int32 componentId = 12; string component = 13; bool isError = 14; diff --git a/reporter/protocol/v1/register/InstancePing.proto b/reporter/protocol/v1/register/InstancePing.proto deleted file mode 100644 index a0cd112..0000000 --- a/reporter/protocol/v1/register/InstancePing.proto +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.register.v2"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "skywalking/network/language/register/v1"; - -import "common/common.proto"; - -service ServiceInstancePing { - rpc doPing (ServiceInstancePingPkg) returns (Commands) { - } -} - -message ServiceInstancePingPkg { - int32 serviceInstanceId = 1; - int64 time = 2; - string serviceInstanceUUID = 3; -} diff --git a/reporter/protocol/v1/register/Register.proto b/reporter/protocol/v1/register/Register.proto deleted file mode 100644 index 4ef4bb7..0000000 --- a/reporter/protocol/v1/register/Register.proto +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.register.v2"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; -option go_package = "skywalking/network/language/register/v1"; - -import "common/common.proto"; - -//register service for ApplicationCode, this service is called when service starts. -service Register { - rpc doServiceRegister (Services) returns (ServiceRegisterMapping) { - } - - rpc doServiceInstanceRegister (ServiceInstances) returns (ServiceInstanceRegisterMapping) { - } - - rpc doEndpointRegister (Endpoints) returns (EndpointMapping) { - } - - rpc doNetworkAddressRegister (NetAddresses) returns (NetAddressMapping) { - } - - rpc doServiceAndNetworkAddressMappingRegister (ServiceAndNetworkAddressMappings) returns(Commands) { - } -} - -// Service register -message Services { - repeated Service services = 1; -} - -message Service { - string serviceName = 1; - repeated KeyStringValuePair tags = 3; - repeated KeyStringValuePair properties = 4; -} - -message ServiceRegisterMapping { - repeated KeyIntValuePair services = 1; -} - -// Service Instance register -message ServiceInstances { - repeated ServiceInstance instances = 1; -} - -message ServiceInstance { - int32 serviceId = 1; - string instanceUUID = 2; - int64 time = 3; - repeated KeyStringValuePair tags = 4; - repeated KeyStringValuePair properties = 5; -} - -message ServiceInstanceRegisterMapping { - repeated KeyIntValuePair serviceInstances = 1; -} - -// Network address register - -// Only known use case is the language agent. -// Network address represents the ip/hostname:port, which is usually used at client side of RPC. -message NetAddresses { - repeated string addresses = 1; -} - -message NetAddressMapping { - repeated KeyIntValuePair addressIds = 1; -} - -// Endpoints register -message Endpoints { - repeated Endpoint endpoints = 1; -} - -message Endpoint { - int32 serviceId = 1; - string endpointName = 2; - repeated KeyStringValuePair tags = 3; - repeated KeyStringValuePair properties = 4; - // For endpoint - // from DetectPoint is either `client` or `server`. No chance to be `proxy`. - DetectPoint from = 5; -} - -message EndpointMapping { - repeated EndpointMappingElement elements = 1; -} - -message EndpointMappingElement { - int32 serviceId = 1; - string endpointName = 2; - int32 endpointId = 3; - DetectPoint from = 4; -} - -message ServiceAndNetworkAddressMappings { - repeated ServiceAndNetworkAddressMapping mappings = 1; -} - -message ServiceAndNetworkAddressMapping { - int32 serviceId = 1; - int32 serviceInstanceId = 2; - string networkAddress = 3; - int32 networkAddressId = 4; -} diff --git a/reporter/protocol/v1/service-mesh-probe/istio/skywalking.config.pb.html b/reporter/protocol/v1/service-mesh-probe/istio/skywalking.config.pb.html deleted file mode 100644 index a92c804..0000000 --- a/reporter/protocol/v1/service-mesh-probe/istio/skywalking.config.pb.html +++ /dev/null @@ -1,39 +0,0 @@ ---- -title: Apache SkyWalking -description: Adapter to deliver metrics to Apache SkyWalking. -location: https://istio.io/docs/reference/config/policy-and-telemetry/adapters/apache-skywalking.html -layout: protoc-gen-docs -generator: protoc-gen-docs -provider: Apache SkyWalking -contact_email: dev@skywalking.apache.org -support_link: -source_link: https://github.com/apache/skywalking -latest_release_link: https://skywalking.apache.org/downloads/ -helm_chart_link: -istio_versions: "1.0.3, 1.0.4, 1.1.0, 1.1.1" -supported_templates: metric -logo_link: https://github.com/apache/skywalking-website/raw/master/docs/.vuepress/public/assets/logo.svg -number_of_entries: 1 ---- - - - -

The SkyWalking adapter uses the Istio bypass adapter to collect metrics and make them available to -Apache SkyWalking. SkyWalking provides a topology map and metrics graph -to visualize the whole mesh.

- -

This adapter supports the metric template.

- -

Follow the official Apache SkyWalking documentation -and SkyWalking k8s documentation for details on configuring SkyWalking and the Istio bypass adapter.

diff --git a/reporter/protocol/v1/service-mesh-probe/service-mesh.proto b/reporter/protocol/v1/service-mesh-probe/service-mesh.proto deleted file mode 100644 index 87e0b70..0000000 --- a/reporter/protocol/v1/service-mesh-probe/service-mesh.proto +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.servicemesh"; - -import "common/common.proto"; - -service ServiceMeshMetricService { - rpc collect(stream ServiceMeshMetric) returns (MeshProbeDownstream) { - } -} - -message ServiceMeshMetric { - int64 startTime = 1; - int64 endTime = 2; - string sourceServiceName = 3; - int32 sourceServiceId = 4; - string sourceServiceInstance = 5; - int32 sourceServiceInstanceId = 6; - string destServiceName = 7; - int32 destServiceId = 8; - string destServiceInstance = 9; - int32 destServiceInstanceId = 10; - string endpoint = 11; - int32 latency = 12; - int32 responseCode = 13; - bool status = 14; - Protocol protocol = 15; - DetectPoint detectPoint = 16; -} - -enum Protocol { - HTTP = 0; - gRPC = 1; -} - -message MeshProbeDownstream { -} diff --git a/reporter/protocol/v2/README.md b/reporter/protocol/v2/README.md index ad649d3..536bc1f 100644 --- a/reporter/protocol/v2/README.md +++ b/reporter/protocol/v2/README.md @@ -1,13 +1,5 @@ # Apache SkyWalking data collect protocol -Apache SkyWalking typically collect data from -1. Language agent, including Java, .Net, PHP, Golang, NodeJS, Lua. -1. Service mesh proxy, especially Envoy controlled by Istio -1. 3rd libs, such as Zipkin, Jaeger - -This repo hosts the protocol of SkyWalking native report protocol, defined in gRPC. Read [Protocol DOC](https://github.com/apache/skywalking/blob/master/docs/en/protocols/README.md#probe-protocols) for more details - -## Release -This repo wouldn't release separately. All source codes have been included in the main repo release. The tags match the [main repo](https://github.com/apache/skywalking) tags. +Apache SkyWalking can collect data from different sources. Each kind of source should follow the protocols in this repo. ## License Apache 2.0 diff --git a/reporter/protocol/v2/browser/BrowserPerf.proto b/reporter/protocol/v2/browser/BrowserPerf.proto deleted file mode 100644 index 9b28e88..0000000 --- a/reporter/protocol/v2/browser/BrowserPerf.proto +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -package skywalking.network.protocol.browser; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; - -import "common/common.proto"; - -// Collect performance raw data from browser. -service BrowserPerfService { - - // report once per page - rpc collectPerfData (BrowserPerfData) returns (skywalking.network.protocol.common.Commands) { - } - - // report one or more error logs for pages, could report multiple times. - rpc collectErrorLogs (stream BrowserErrorLog) returns (skywalking.network.protocol.common.Commands) { - } -} - -message BrowserPerfData { - int32 serviceId = 1; - // Service version in browser is the Instance concept in the backend. - int32 serviceVersionId = 2; - // Perf data time - int64 time = 3; - // Page path in browser is the endpoint concept in the backend - // Page path in the browser, mostly it is URI, without parameter - string pagePath = 4; - int32 pagePathId = 5; - // Unit of all time related field should be `ms`. - int32 redirectTime = 6; - int32 dnsTime = 7; - int32 reqTime = 8; - // analysis dom tree time - int32 domAnalysisTime = 9; - int32 domReadyTime = 10; - // page blank time - int32 blankTime = 11; -} - -message BrowserErrorLog { - // UUID - string uniqueId = 1; - int32 serviceId = 2; - // Service version in browser is the Instance concept in the backend. - int32 serviceVersionId = 3; - // Error log time - int64 time = 4; - // Page path in browser is the endpoint concept in the backend - // Page path in the browser, mostly it is URI, without parameter - string pagePath = 5; - int32 pagePathId = 6; - ErrorCategory category = 7; - string grade = 8; - string message = 9; - int32 line = 10; - int32 col = 11; - string stack = 12; - string errorUrl = 13; - // Then the PV with error is only calculated when firstReportedError is true. - bool firstReportedError = 14; -} - -enum ErrorCategory { - ajax = 0; - resource = 1; - vue = 2; - promise = 3; - js = 4; - unknown = 5; -} - diff --git a/reporter/protocol/v2/common/CLR.proto b/reporter/protocol/v2/common/CLR.proto index f5e99c6..0b61b4a 100644 --- a/reporter/protocol/v2/common/CLR.proto +++ b/reporter/protocol/v2/common/CLR.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.common; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -27,21 +25,21 @@ option go_package = "skywalking/network/language/agent/v2"; import "common/common.proto"; -message CLRMetric { +message CLRMetricV2 { int64 time = 1; - skywalking.network.protocol.common.CPU cpu = 2; - ClrGC gc = 3; - ClrThread thread = 4; + CPUV2 cpu = 2; + ClrGCV2 gc = 3; + ClrThreadV2 thread = 4; } -message ClrGC { +message ClrGCV2 { int64 Gen0CollectCount = 1; int64 Gen1CollectCount = 2; int64 Gen2CollectCount = 3; int64 HeapMemory = 4; } -message ClrThread { +message ClrThreadV2 { int32 AvailableCompletionPortThreads = 1; int32 AvailableWorkerThreads = 2; int32 MaxCompletionPortThreads = 3; diff --git a/reporter/protocol/v2/common/JVM.proto b/reporter/protocol/v2/common/JVM.proto index 6986bb8..118f99a 100644 --- a/reporter/protocol/v2/common/JVM.proto +++ b/reporter/protocol/v2/common/JVM.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.common; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -27,15 +25,15 @@ option go_package = "skywalking/network/language/agent/v2"; import "common/common.proto"; -message JVMMetric { +message JVMMetricV2 { int64 time = 1; - skywalking.network.protocol.common.CPU cpu = 2; - repeated Memory memory = 3; - repeated MemoryPool memoryPool = 4; - repeated GC gc = 5; + CPUV2 cpu = 2; + repeated MemoryV2 memory = 3; + repeated MemoryPoolV2 memoryPool = 4; + repeated GCV2 gc = 5; } -message Memory { +message MemoryV2 { bool isHeap = 1; int64 init = 2; int64 max = 3; @@ -43,15 +41,15 @@ message Memory { int64 committed = 5; } -message MemoryPool { - PoolType type = 1; +message MemoryPoolV2 { + PoolTypeV2 type = 1; int64 init = 2; int64 max = 3; int64 used = 4; int64 commited = 5; } -enum PoolType { +enum PoolTypeV2 { CODE_CACHE_USAGE = 0; NEWGEN_USAGE = 1; OLDGEN_USAGE = 2; @@ -60,13 +58,13 @@ enum PoolType { METASPACE_USAGE = 5; } -message GC { - GCPhrase phrase = 1; +message GCV2 { + GCPhraseV2 phrase = 1; int64 count = 2; int64 time = 3; } -enum GCPhrase { +enum GCPhraseV2 { NEW = 0; OLD = 1; } diff --git a/reporter/protocol/v2/common/common.proto b/reporter/protocol/v2/common/common.proto index 31afe93..cbfe722 100644 --- a/reporter/protocol/v2/common/common.proto +++ b/reporter/protocol/v2/common/common.proto @@ -18,54 +18,39 @@ syntax = "proto3"; -package skywalking.network.protocol.common; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.common"; option csharp_namespace = "SkyWalking.NetworkProtocol"; option go_package = "skywalking/network/common/v2"; -message KeyStringValuePair { +message KeyStringValuePairV2 { string key = 1; string value = 2; } -message KeyIntValuePair { +message KeyIntValuePairV2 { string key = 1; int32 value = 2; } -message CPU { +message CPUV2 { double usagePercent = 2; } // In most cases, detect point should be `server` or `client`. // Even in service mesh, this means `server`/`client` side sidecar // `proxy` is reserved only. -enum DetectPoint { +enum DetectPointV2 { client = 0; server = 1; proxy = 2; } -message Commands { - repeated Command commands = 1; +message CommandsV2 { + repeated CommandV2 commands = 1; } -message Command { +message CommandV2 { string command = 1; - repeated KeyStringValuePair args = 2; -} - -enum ServiceType { - // An agent works inside the normal business application. - normal = 0; - // An agent works inside the database. - database = 1; - // An agent works inside the MQ. - mq = 2; - // An agent works inside the cache server. - cache = 3; - // An agent works inside the browser. - browser = 4; + repeated KeyStringValuePairV2 args = 2; } diff --git a/reporter/protocol/v2/common/trace-common.proto b/reporter/protocol/v2/common/trace-common.proto index 795e7d0..4697107 100644 --- a/reporter/protocol/v2/common/trace-common.proto +++ b/reporter/protocol/v2/common/trace-common.proto @@ -18,34 +18,32 @@ syntax = "proto3"; -package skywalking.network.protocol.common; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent"; option csharp_namespace = "SkyWalking.NetworkProtocol"; option go_package = "skywalking/network/language/agent/v2"; -message UpstreamSegment { - repeated UniqueId globalTraceIds = 1; +message UpstreamSegmentV2 { + repeated UniqueIdV2 globalTraceIds = 1; bytes segment = 2; // the byte array of TraceSegmentObject } -enum SpanType { +enum SpanTypeV2 { Entry = 0; Exit = 1; Local = 2; } -message UniqueId { +message UniqueIdV2 { repeated int64 idParts = 1; } -enum RefType { +enum RefTypeV2 { CrossProcess = 0; CrossThread = 1; } -enum SpanLayer { +enum SpanLayerV2 { Unknown = 0; Database = 1; RPCFramework = 2; diff --git a/reporter/protocol/v2/language-agent-v2/CLRMetric.proto b/reporter/protocol/v2/language-agent-v2/CLRMetric.proto index 0441998..a8078b6 100644 --- a/reporter/protocol/v2/language-agent-v2/CLRMetric.proto +++ b/reporter/protocol/v2/language-agent-v2/CLRMetric.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v2; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -29,11 +27,11 @@ import "common/common.proto"; import "common/CLR.proto"; service CLRMetricReportService { - rpc collect (CLRMetricCollection) returns (skywalking.network.protocol.common.Commands) { + rpc collect (CLRMetricCollectionV2) returns (CommandsV2) { } } -message CLRMetricCollection { - repeated skywalking.network.protocol.common.CLRMetric metrics = 1; +message CLRMetricCollectionV2 { + repeated CLRMetricV2 metrics = 1; int32 serviceInstanceId = 2; } \ No newline at end of file diff --git a/reporter/protocol/v2/language-agent-v2/JVMMetric.proto b/reporter/protocol/v2/language-agent-v2/JVMMetric.proto index b9d1244..f7564aa 100644 --- a/reporter/protocol/v2/language-agent-v2/JVMMetric.proto +++ b/reporter/protocol/v2/language-agent-v2/JVMMetric.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v2; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -29,11 +27,11 @@ import "common/common.proto"; import "common/JVM.proto"; service JVMMetricReportService { - rpc collect (JVMMetricCollection) returns (skywalking.network.protocol.common.Commands) { + rpc collect (JVMMetricCollectionV2) returns (CommandsV2) { } } -message JVMMetricCollection { - repeated skywalking.network.protocol.common.JVMMetric metrics = 1; +message JVMMetricCollectionV2 { + repeated JVMMetricV2 metrics = 1; int32 serviceInstanceId = 2; } diff --git a/reporter/protocol/v2/language-agent-v2/trace.proto b/reporter/protocol/v2/language-agent-v2/trace.proto index 52550cb..8abf839 100644 --- a/reporter/protocol/v2/language-agent-v2/trace.proto +++ b/reporter/protocol/v2/language-agent-v2/trace.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.v2; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.language.agent.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -29,21 +27,21 @@ import "common/common.proto"; import "common/trace-common.proto"; service TraceSegmentReportService { - rpc collect (stream skywalking.network.protocol.common.UpstreamSegment) returns (skywalking.network.protocol.common.Commands) { + rpc collect (stream UpstreamSegmentV2) returns (CommandsV2) { } } -message SegmentObject { - skywalking.network.protocol.common.UniqueId traceSegmentId = 1; +message SegmentObjectV2 { + UniqueIdV2 traceSegmentId = 1; repeated SpanObjectV2 spans = 2; int32 serviceId = 3; int32 serviceInstanceId = 4; bool isSizeLimited = 5; } -message SegmentReference { - skywalking.network.protocol.common.RefType refType = 1; - skywalking.network.protocol.common.UniqueId parentTraceSegmentId = 2; +message SegmentReferenceV2 { + RefTypeV2 refType = 1; + UniqueIdV2 parentTraceSegmentId = 2; int32 parentSpanId = 3; int32 parentServiceInstanceId = 4; string networkAddress = 5; @@ -60,21 +58,21 @@ message SpanObjectV2 { int32 parentSpanId = 2; int64 startTime = 3; int64 endTime = 4; - repeated SegmentReference refs = 5; + repeated SegmentReferenceV2 refs = 5; int32 operationNameId = 6; string operationName = 7; int32 peerId = 8; string peer = 9; - skywalking.network.protocol.common.SpanType spanType = 10; - skywalking.network.protocol.common.SpanLayer spanLayer = 11; + SpanTypeV2 spanType = 10; + SpanLayerV2 spanLayer = 11; int32 componentId = 12; string component = 13; bool isError = 14; - repeated skywalking.network.protocol.common.KeyStringValuePair tags = 15; - repeated Log logs = 16; + repeated KeyStringValuePairV2 tags = 15; + repeated LogV2 logs = 16; } -message Log { +message LogV2 { int64 time = 1; - repeated skywalking.network.protocol.common.KeyStringValuePair data = 2; + repeated KeyStringValuePairV2 data = 2; } diff --git a/reporter/protocol/v2/profile/Profile.proto b/reporter/protocol/v2/profile/Profile.proto index d222972..8b0c6b3 100644 --- a/reporter/protocol/v2/profile/Profile.proto +++ b/reporter/protocol/v2/profile/Profile.proto @@ -31,15 +31,15 @@ import "common/trace-common.proto"; service ProfileTask { // query all sniffer need to execute profile task commands - rpc getProfileTaskCommands (ProfileTaskCommandQuery) returns (skywalking.network.protocol.common.Commands) { + rpc getProfileTaskCommands (ProfileTaskCommandQuery) returns (CommandsV2) { } // collect dumped thread snapshot - rpc collectSnapshot (stream ThreadSnapshot) returns (skywalking.network.protocol.common.Commands) { + rpc collectSnapshot (stream ThreadSnapshot) returns (CommandsV2) { } // report profiling task finished - rpc reportTaskFinish (ProfileTaskFinishReport) returns (skywalking.network.protocol.common.Commands) { + rpc reportTaskFinish (ProfileTaskFinishReport) returns (CommandsV2) { } } @@ -58,7 +58,7 @@ message ThreadSnapshot { // profile task id string taskId = 1; // dumped segment id - skywalking.network.protocol.common.UniqueId traceSegmentId = 2; + UniqueIdV2 traceSegmentId = 2; // dump timestamp int64 time = 3; // snapshot dump sequence, start with zero diff --git a/reporter/protocol/v2/register/InstancePing.proto b/reporter/protocol/v2/register/InstancePing.proto index cdbfe88..46d00c6 100644 --- a/reporter/protocol/v2/register/InstancePing.proto +++ b/reporter/protocol/v2/register/InstancePing.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.register.v2; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.register.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -28,7 +26,7 @@ option go_package = "skywalking/network/register/v2"; import "common/common.proto"; service ServiceInstancePing { - rpc doPing (ServiceInstancePingPkg) returns (skywalking.network.protocol.common.Commands) { + rpc doPing (ServiceInstancePingPkg) returns (CommandsV2) { } } diff --git a/reporter/protocol/v2/register/Register.proto b/reporter/protocol/v2/register/Register.proto index 1873eca..c9dda17 100644 --- a/reporter/protocol/v2/register/Register.proto +++ b/reporter/protocol/v2/register/Register.proto @@ -18,8 +18,6 @@ syntax = "proto3"; -package skywalking.network.protocol.agent.register.v2; - option java_multiple_files = true; option java_package = "org.apache.skywalking.apm.network.register.v2"; option csharp_namespace = "SkyWalking.NetworkProtocol"; @@ -41,7 +39,7 @@ service Register { rpc doNetworkAddressRegister (NetAddresses) returns (NetAddressMapping) { } - rpc doServiceAndNetworkAddressMappingRegister (ServiceAndNetworkAddressMappings) returns(skywalking.network.protocol.common.Commands) { + rpc doServiceAndNetworkAddressMappingRegister (ServiceAndNetworkAddressMappings) returns(CommandsV2) { } } @@ -52,15 +50,12 @@ message Services { message Service { string serviceName = 1; - repeated skywalking.network.protocol.common.KeyStringValuePair tags = 3; - repeated skywalking.network.protocol.common.KeyStringValuePair properties = 4; - // Type of this register service. - // NULL means type=normal, such as all services before the 7.0.0. - skywalking.network.protocol.common.ServiceType type = 5; + repeated KeyStringValuePairV2 tags = 3; + repeated KeyStringValuePairV2 properties = 4; } message ServiceRegisterMapping { - repeated skywalking.network.protocol.common.KeyIntValuePair services = 1; + repeated KeyIntValuePairV2 services = 1; } // Service Instance register @@ -72,12 +67,12 @@ message ServiceInstance { int32 serviceId = 1; string instanceUUID = 2; int64 time = 3; - repeated skywalking.network.protocol.common.KeyStringValuePair tags = 4; - repeated skywalking.network.protocol.common.KeyStringValuePair properties = 5; + repeated KeyStringValuePairV2 tags = 4; + repeated KeyStringValuePairV2 properties = 5; } message ServiceInstanceRegisterMapping { - repeated skywalking.network.protocol.common.KeyIntValuePair serviceInstances = 1; + repeated KeyIntValuePairV2 serviceInstances = 1; } // Network address register @@ -89,7 +84,7 @@ message NetAddresses { } message NetAddressMapping { - repeated skywalking.network.protocol.common.KeyIntValuePair addressIds = 1; + repeated KeyIntValuePairV2 addressIds = 1; } // Endpoints register @@ -100,11 +95,11 @@ message Endpoints { message Endpoint { int32 serviceId = 1; string endpointName = 2; - repeated skywalking.network.protocol.common.KeyStringValuePair tags = 3; - repeated skywalking.network.protocol.common.KeyStringValuePair properties = 4; + repeated KeyStringValuePairV2 tags = 3; + repeated KeyStringValuePairV2 properties = 4; // For endpoint - // from DetectPoint is either `client` or `server`. No chance to be `proxy`. - skywalking.network.protocol.common.DetectPoint from = 5; + // from DetectPointV2 is either `client` or `server`. No chance to be `proxy`. + DetectPointV2 from = 5; } message EndpointMapping { @@ -115,7 +110,7 @@ message EndpointMappingElement { int32 serviceId = 1; string endpointName = 2; int32 endpointId = 3; - skywalking.network.protocol.common.DetectPoint from = 4; + DetectPointV2 from = 4; } message ServiceAndNetworkAddressMappings { diff --git a/reporter/protocol/v2/service-mesh-probe/istio/skywalking.config.pb.html b/reporter/protocol/v2/service-mesh-probe/istio/skywalking.config.pb.html deleted file mode 100644 index a92c804..0000000 --- a/reporter/protocol/v2/service-mesh-probe/istio/skywalking.config.pb.html +++ /dev/null @@ -1,39 +0,0 @@ ---- -title: Apache SkyWalking -description: Adapter to deliver metrics to Apache SkyWalking. -location: https://istio.io/docs/reference/config/policy-and-telemetry/adapters/apache-skywalking.html -layout: protoc-gen-docs -generator: protoc-gen-docs -provider: Apache SkyWalking -contact_email: dev@skywalking.apache.org -support_link: -source_link: https://github.com/apache/skywalking -latest_release_link: https://skywalking.apache.org/downloads/ -helm_chart_link: -istio_versions: "1.0.3, 1.0.4, 1.1.0, 1.1.1" -supported_templates: metric -logo_link: https://github.com/apache/skywalking-website/raw/master/docs/.vuepress/public/assets/logo.svg -number_of_entries: 1 ---- - - - -

The SkyWalking adapter uses the Istio bypass adapter to collect metrics and make them available to -Apache SkyWalking. SkyWalking provides a topology map and metrics graph -to visualize the whole mesh.

- -

This adapter supports the metric template.

- -

Follow the official Apache SkyWalking documentation -and SkyWalking k8s documentation for details on configuring SkyWalking and the Istio bypass adapter.

diff --git a/reporter/protocol/v2/service-mesh-probe/service-mesh.proto b/reporter/protocol/v2/service-mesh-probe/service-mesh.proto deleted file mode 100644 index 788cbfe..0000000 --- a/reporter/protocol/v2/service-mesh-probe/service-mesh.proto +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -package skywalking.network.protocol.servicemesh; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.servicemesh"; - -import "common/common.proto"; - -service ServiceMeshMetricService { - rpc collect(stream ServiceMeshMetric) returns (MeshProbeDownstream) { - } -} - -message ServiceMeshMetric { - int64 startTime = 1; - int64 endTime = 2; - string sourceServiceName = 3; - int32 sourceServiceId = 4; - string sourceServiceInstance = 5; - int32 sourceServiceInstanceId = 6; - string destServiceName = 7; - int32 destServiceId = 8; - string destServiceInstance = 9; - int32 destServiceInstanceId = 10; - string endpoint = 11; - int32 latency = 12; - int32 responseCode = 13; - bool status = 14; - Protocol protocol = 15; - skywalking.network.protocol.common.DetectPoint detectPoint = 16; -} - -enum Protocol { - HTTP = 0; - gRPC = 1; -} - -message MeshProbeDownstream { -} diff --git a/reporter/service/register.go b/reporter/service/register.go index 844abc0..a8675fd 100644 --- a/reporter/service/register.go +++ b/reporter/service/register.go @@ -261,30 +261,30 @@ func (t *Agent) doRegister(r *register) { hostName, _ := os.Hostname() var instances []*nr2.ServiceInstance - var properties []*nc2.KeyStringValuePair + var properties []*nc2.KeyStringValuePairV2 - properties = append(properties, &nc2.KeyStringValuePair{ + properties = append(properties, &nc2.KeyStringValuePairV2{ Key: "os_name", Value: runtime.GOOS, }) - properties = append(properties, &nc2.KeyStringValuePair{ + properties = append(properties, &nc2.KeyStringValuePairV2{ Key: "host_name", Value: hostName, }) - properties = append(properties, &nc2.KeyStringValuePair{ + properties = append(properties, &nc2.KeyStringValuePairV2{ Key: "process_no", Value: strconv.Itoa(pid), }) - properties = append(properties, &nc2.KeyStringValuePair{ + properties = append(properties, &nc2.KeyStringValuePairV2{ Key: "language", Value: "php", }) for _, ip := range ip4s() { - properties = append(properties, &nc2.KeyStringValuePair{ + properties = append(properties, &nc2.KeyStringValuePairV2{ Key: "ipv4", Value: ip, }) diff --git a/reporter/service/trace.go b/reporter/service/trace.go index 19edb7c..a51ab91 100644 --- a/reporter/service/trace.go +++ b/reporter/service/trace.go @@ -109,7 +109,7 @@ func (t *Agent) send(segments []*upstreamSegment) { if t.version == 5 { err = tsrsc1.Send(segment.segment.(*nla1.UpstreamSegment)) } else if t.version == 6 || t.version == 7 { - err = tsrsc2.Send(segment.segment.(*nla2.UpstreamSegment)) + err = tsrsc2.Send(segment.segment.(*nla2.UpstreamSegmentV2)) } else if t.version == 8 { err = tsrsc3.Send(segment.segment.(*nla3.SegmentObject)) } @@ -150,10 +150,10 @@ func format(version int, j string) (trace, *upstreamSegment) { globalTrace = append(globalTrace, buildUniqueId1(v)) } - var spans []*nla1.SpanObject + var spans []*nla1.SpanObjectV1 for _, v := range info.Segment.Spans { - span := &nla1.SpanObject{ + span := &nla1.SpanObjectV1{ SpanId: v.SpanId, ParentSpanId: v.ParentSpanId, StartTime: v.StartTime, @@ -169,17 +169,17 @@ func format(version int, j string) (trace, *upstreamSegment) { } if v.SpanType == 0 { - span.SpanType = nla1.SpanType_Entry + span.SpanType = nla1.SpanTypeV1_Entry } else if v.SpanType == 1 { - span.SpanType = nla1.SpanType_Exit + span.SpanType = nla1.SpanTypeV1_Exit } else if v.SpanType == 2 { - span.SpanType = nla1.SpanType_Local + span.SpanType = nla1.SpanTypeV1_Local } if v.SpanLayer == 3 { - span.SpanLayer = nla1.SpanLayer_Http + span.SpanLayer = nla1.SpanLayerV1_Http } else if v.SpanLayer == 1 { - span.SpanLayer = nla1.SpanLayer_Database + span.SpanLayer = nla1.SpanLayerV1_Database } buildTags(span, v.Tags) @@ -216,7 +216,7 @@ func format(version int, j string) (trace, *upstreamSegment) { } } else if version == 6 || version == 7 { - var globalTrace []*nla2.UniqueId + var globalTrace []*nla2.UniqueIdV2 for _, v := range info.GlobalTraceIds { globalTrace = append(globalTrace, buildUniqueId(v)) @@ -241,17 +241,17 @@ func format(version int, j string) (trace, *upstreamSegment) { } if v.SpanType == 0 { - span.SpanType = nla2.SpanType_Entry + span.SpanType = nla2.SpanTypeV2_Entry } else if v.SpanType == 1 { - span.SpanType = nla2.SpanType_Exit + span.SpanType = nla2.SpanTypeV2_Exit } else if v.SpanType == 2 { - span.SpanType = nla2.SpanType_Local + span.SpanType = nla2.SpanTypeV2_Local } if v.SpanLayer == 3 { - span.SpanLayer = nla2.SpanLayer_Http + span.SpanLayer = nla2.SpanLayerV2_Http } else if v.SpanLayer == 1 { - span.SpanLayer = nla2.SpanLayer_Database + span.SpanLayer = nla2.SpanLayerV2_Database } buildTags2(span, v.Tags) @@ -260,7 +260,7 @@ func format(version int, j string) (trace, *upstreamSegment) { spans = append(spans, span) } - segmentObject := &nla2.SegmentObject{ + segmentObject := &nla2.SegmentObjectV2{ TraceSegmentId: buildUniqueId(info.Segment.TraceSegmentId), Spans: spans, ServiceId: info.ApplicationId, @@ -277,7 +277,7 @@ func format(version int, j string) (trace, *upstreamSegment) { return info, nil } - segment := &nla2.UpstreamSegment{ + segment := &nla2.UpstreamSegmentV2{ GlobalTraceIds: globalTrace, Segment: seg, } @@ -341,15 +341,15 @@ func format(version int, j string) (trace, *upstreamSegment) { func buildRefs2(span *nla2.SpanObjectV2, refs []ref) { // refs - var spanRefs []*nla2.SegmentReference + var spanRefs []*nla2.SegmentReferenceV2 for _, rev := range refs { - var refType nla2.RefType + var refType nla2.RefTypeV2 if rev.Type == 0 { - refType = nla2.RefType_CrossProcess + refType = nla2.RefTypeV2_CrossProcess } - var reference = &nla2.SegmentReference{ + var reference = &nla2.SegmentReferenceV2{ RefType: refType, ParentTraceSegmentId: buildUniqueId(rev.ParentTraceSegmentId), ParentSpanId: rev.ParentSpanId, @@ -386,14 +386,14 @@ func buildRefs2(span *nla2.SpanObjectV2, refs []ref) { } } -func buildRefs(span *nla1.SpanObject, refs []ref) { +func buildRefs(span *nla1.SpanObjectV1, refs []ref) { // refs var spanRefs []*nla1.TraceSegmentReference for _, rev := range refs { - var refType nla1.RefType + var refType nla1.RefTypeV1 if rev.Type == 0 { - refType = nla1.RefType_CrossProcess + refType = nla1.RefTypeV1_CrossProcess } spanRefs = append(spanRefs, &nla1.TraceSegmentReference{ @@ -413,7 +413,7 @@ func buildRefs(span *nla1.SpanObject, refs []ref) { } } -func buildTags(span *nla1.SpanObject, t map[string]string) { +func buildTags(span *nla1.SpanObjectV1, t map[string]string) { // tags var tags []*nla1.KeyWithStringValue @@ -475,8 +475,8 @@ func buildUniqueId1(str string) *nla1.UniqueId { return uniqueId } -func buildUniqueId(str string) *nla2.UniqueId { - uniqueId := &nla2.UniqueId{} +func buildUniqueId(str string) *nla2.UniqueIdV2 { + uniqueId := &nla2.UniqueIdV2{} var ids []int64 for _, idStr := range strings.Split(str, ".") { id, err := strconv.ParseInt(idStr, 10, 64) @@ -493,10 +493,10 @@ func buildUniqueId(str string) *nla2.UniqueId { func buildTags2(span *nla2.SpanObjectV2, t map[string]string) { // tags - var tags []*nc2.KeyStringValuePair + var tags []*nc2.KeyStringValuePairV2 for k, v := range t { - kv := &nc2.KeyStringValuePair{ + kv := &nc2.KeyStringValuePairV2{ Key: k, Value: v, } -- GitLab