mirror of https://github.com/linkerd/linkerd2.git
Add Protocol field to Transports telemetry (#138)
See #132. This PR adds a protocol field to the ClientTransport and ServerTransport messages, and modifies the proxy to report a value for this field (currently, it's only ever HTTP). Currently, HTTP/1 and HTTP/2 are collapsed into one Protocol variant, see #132 (comment). I expect that we can treat H1 as a subset of H2 as far as metrics goes. Note that after discussing it with @klingerf, I learned that the control plane telemetry API currently does not do anything with the ClientTransport and ServerTransport messages, so beyond regenerating the protobuf-generated code, no controller changes were actually necessary. As we actually add metrics to TCP transports, we'll want to make some additions to the telemetry API to ingest these metrics. If any metrics are shared between HTTP and raw TCP transports (say, bytes sent), we'll want to differentiate between them in Prometheus. All the metrics that the control plane currently ingests from telemetry reports are likely to be HTTP-specific (requests, responses, response latencies), or at least, do not apply to raw TCP. Actually adding metrics to raw TCP transports will probably have to wait until there are raw TCP transports implemented in the proxy... Signed-off-by: Eliza Weisman <eliza@buoyant.io>
This commit is contained in:
Eliza Weisman
GitHub
parent
1dc1c00a2a
commit
63d1a5d70d
|
|
@ -34,6 +34,27 @@ var _ = math.Inf
|
|||
// proto package needs to be updated.
|
||||
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
|
||||
|
||||
type Protocol int32
|
||||
|
||||
const (
|
||||
Protocol_HTTP Protocol = 0
|
||||
Protocol_TCP Protocol = 1
|
||||
)
|
||||
|
||||
var Protocol_name = map[int32]string{
|
||||
0: "HTTP",
|
||||
1: "TCP",
|
||||
}
|
||||
var Protocol_value = map[string]int32{
|
||||
"HTTP": 0,
|
||||
"TCP": 1,
|
||||
}
|
||||
|
||||
func (x Protocol) String() string {
|
||||
return proto.EnumName(Protocol_name, int32(x))
|
||||
}
|
||||
func (Protocol) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
|
||||
|
||||
type HttpMethod_Registered int32
|
||||
|
||||
const (
|
||||
|
|
@ -936,6 +957,7 @@ func init() {
|
|||
proto.RegisterType((*TapEvent_Http_RequestInit)(nil), "conduit.common.TapEvent.Http.RequestInit")
|
||||
proto.RegisterType((*TapEvent_Http_ResponseInit)(nil), "conduit.common.TapEvent.Http.ResponseInit")
|
||||
proto.RegisterType((*TapEvent_Http_ResponseEnd)(nil), "conduit.common.TapEvent.Http.ResponseEnd")
|
||||
proto.RegisterEnum("conduit.common.Protocol", Protocol_name, Protocol_value)
|
||||
proto.RegisterEnum("conduit.common.HttpMethod_Registered", HttpMethod_Registered_name, HttpMethod_Registered_value)
|
||||
proto.RegisterEnum("conduit.common.Scheme_Registered", Scheme_Registered_name, Scheme_Registered_value)
|
||||
}
|
||||
|
|
@ -943,55 +965,56 @@ func init() {
|
|||
func init() { proto.RegisterFile("common/common.proto", fileDescriptor0) }
|
||||
|
||||
var fileDescriptor0 = []byte{
|
||||
// 789 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x54, 0xdb, 0x6e, 0xf2, 0x46,
|
||||
0x10, 0xc6, 0xc6, 0x18, 0x18, 0x20, 0x72, 0xf7, 0x8f, 0x7e, 0xa5, 0xa8, 0x87, 0x3f, 0xa8, 0xa9,
|
||||
0x92, 0x5c, 0x38, 0x15, 0xa9, 0x90, 0x7a, 0xc9, 0xc1, 0x0a, 0xa8, 0x2d, 0xd0, 0xc5, 0xbd, 0x8e,
|
||||
0x0c, 0xde, 0x80, 0xa5, 0x60, 0xbb, 0xbb, 0xeb, 0x48, 0x79, 0x99, 0x4a, 0xed, 0x13, 0xf4, 0x7d,
|
||||
0xfa, 0x10, 0xbd, 0xe8, 0x0b, 0x54, 0x7b, 0xc0, 0x98, 0x24, 0x4d, 0xaa, 0xf6, 0xa2, 0x57, 0x9e,
|
||||
0x19, 0xcf, 0x7c, 0xfb, 0xcd, 0x37, 0xb3, 0x0b, 0xef, 0x56, 0xc9, 0x76, 0x9b, 0xc4, 0x57, 0xea,
|
||||
0xe3, 0xa6, 0x34, 0xe1, 0x09, 0x3a, 0x5a, 0x25, 0x71, 0x98, 0x45, 0xdc, 0x55, 0xd1, 0xf6, 0x67,
|
||||
0xeb, 0x24, 0x59, 0xdf, 0x93, 0x2b, 0xf9, 0x77, 0x99, 0xdd, 0x5d, 0x85, 0x19, 0x0d, 0x78, 0xb4,
|
||||
0xcb, 0xef, 0xfc, 0x69, 0x00, 0x8c, 0x39, 0x4f, 0xbf, 0x27, 0x7c, 0x93, 0x84, 0xe8, 0x06, 0x80,
|
||||
0x92, 0x75, 0xc4, 0x38, 0xa1, 0x24, 0x3c, 0x31, 0x3e, 0x18, 0xe7, 0x47, 0xdd, 0x33, 0xf7, 0x10,
|
||||
0xd3, 0xdd, 0xe7, 0xbb, 0x38, 0x4f, 0x1e, 0x97, 0x70, 0xa1, 0x14, 0x7d, 0x01, 0xcd, 0x2c, 0x2e,
|
||||
0x40, 0x99, 0x1f, 0x8c, 0xf3, 0xfa, 0xb8, 0x84, 0x0f, 0xa2, 0x9d, 0x18, 0x60, 0x8f, 0x80, 0xaa,
|
||||
0x50, 0xbe, 0xf1, 0x7c, 0xa7, 0x84, 0x6a, 0x60, 0xcd, 0x67, 0x0b, 0xdf, 0x31, 0x44, 0x68, 0xfe,
|
||||
0xa3, 0xef, 0x98, 0x08, 0xc0, 0x1e, 0x79, 0xdf, 0x79, 0xbe, 0xe7, 0x94, 0x51, 0x1d, 0x2a, 0xf3,
|
||||
0xbe, 0x3f, 0x1c, 0x3b, 0x16, 0x6a, 0x40, 0x75, 0x36, 0xf7, 0x27, 0xb3, 0xe9, 0xc2, 0xa9, 0x08,
|
||||
0x67, 0x38, 0x9b, 0x4e, 0xbd, 0xa1, 0xef, 0xd8, 0x02, 0x63, 0xec, 0xf5, 0x47, 0x4e, 0x55, 0xa4,
|
||||
0xfb, 0xb8, 0x3f, 0xf4, 0x9c, 0xda, 0xc0, 0x06, 0x8b, 0x3f, 0xa6, 0xa4, 0xf3, 0xb3, 0x01, 0xf6,
|
||||
0x62, 0xb5, 0x21, 0x5b, 0x82, 0x86, 0x2f, 0x74, 0x7c, 0xfa, 0xb4, 0x63, 0x95, 0xfb, 0x5f, 0xbb,
|
||||
0x3d, 0x3d, 0xe8, 0x56, 0x10, 0xf4, 0xfd, 0xb9, 0x53, 0x12, 0x04, 0x85, 0xb5, 0x70, 0x8c, 0x9c,
|
||||
0xe0, 0x02, 0xea, 0x93, 0x79, 0x3f, 0x0c, 0x29, 0x61, 0x0c, 0x1d, 0x83, 0x15, 0xa5, 0x0f, 0x5f,
|
||||
0x4b, 0x72, 0xd5, 0x71, 0x09, 0x4b, 0x0f, 0x5d, 0xca, 0x68, 0x4f, 0x9e, 0xd5, 0xe8, 0x1e, 0x3f,
|
||||
0xa5, 0x3c, 0x99, 0x3f, 0xf4, 0x74, 0x6e, 0x6f, 0x60, 0x81, 0x19, 0xa5, 0x9d, 0xaf, 0xc0, 0x12,
|
||||
0x51, 0x74, 0x0c, 0x95, 0xbb, 0x88, 0x32, 0x2e, 0x01, 0x6d, 0xac, 0x1c, 0x84, 0xc0, 0xba, 0x0f,
|
||||
0x18, 0x97, 0x78, 0x36, 0x96, 0x76, 0xe7, 0x5b, 0x00, 0x7f, 0x95, 0xee, 0x78, 0x5c, 0x08, 0x14,
|
||||
0x59, 0xd4, 0xe8, 0x7e, 0xfc, 0xfc, 0x3c, 0x9d, 0x86, 0xcd, 0x28, 0x15, 0x60, 0x69, 0x42, 0x15,
|
||||
0x58, 0x0b, 0x4b, 0xbb, 0xf3, 0x0d, 0x34, 0x46, 0x84, 0xf1, 0x28, 0x96, 0xfb, 0x87, 0xde, 0x83,
|
||||
0xcd, 0xa4, 0xac, 0x12, 0xb1, 0x8e, 0xb5, 0x27, 0x4b, 0x03, 0xbe, 0x51, 0x1a, 0x62, 0x69, 0x77,
|
||||
0x7e, 0xad, 0x43, 0xcd, 0x0f, 0x52, 0xef, 0x81, 0xc4, 0x1c, 0x75, 0xc1, 0x66, 0x49, 0x46, 0x57,
|
||||
0x44, 0x53, 0x69, 0x3f, 0xa5, 0xb2, 0xa7, 0x8c, 0x75, 0xa6, 0xa8, 0xe1, 0x01, 0x5d, 0x13, 0xae,
|
||||
0xe5, 0x7a, 0xb5, 0x46, 0x65, 0xa2, 0x6b, 0xb0, 0x36, 0x9c, 0xa7, 0x27, 0x65, 0x59, 0xf1, 0xe9,
|
||||
0xb3, 0x0a, 0xcd, 0x47, 0x5e, 0x07, 0xa1, 0xb4, 0x48, 0x6e, 0xff, 0x51, 0x05, 0x4b, 0x04, 0xd0,
|
||||
0x14, 0x9a, 0x94, 0xfc, 0x94, 0x11, 0xc6, 0x6f, 0xa3, 0x38, 0xe2, 0x9a, 0xeb, 0xc5, 0xab, 0x28,
|
||||
0x2e, 0x56, 0x15, 0x93, 0x38, 0xe2, 0xe3, 0x12, 0x6e, 0xd0, 0xbd, 0x8b, 0x7e, 0x80, 0x16, 0x25,
|
||||
0x2c, 0x4d, 0x62, 0x46, 0x14, 0xa0, 0x6a, 0xe4, 0xf2, 0x2d, 0x40, 0x55, 0xa2, 0x11, 0x9b, 0xb4,
|
||||
0xe0, 0x2b, 0x8a, 0x1a, 0x92, 0xc4, 0xa1, 0x6e, 0xf4, 0xe2, 0x9f, 0x21, 0x7a, 0x71, 0xa8, 0x28,
|
||||
0xe6, 0x6e, 0xbb, 0x07, 0xb5, 0x05, 0xa7, 0x24, 0xd8, 0x4e, 0x42, 0x31, 0xc5, 0x65, 0xc0, 0xd4,
|
||||
0x88, 0x5a, 0x58, 0xda, 0x72, 0xe2, 0xf2, 0xbf, 0xe4, 0x6e, 0x61, 0xed, 0xb5, 0x7f, 0x37, 0xa0,
|
||||
0x51, 0xe8, 0x1c, 0xf5, 0xc0, 0x8c, 0x42, 0x2d, 0xd8, 0x97, 0xaf, 0xb3, 0xd9, 0x9d, 0x87, 0xcd,
|
||||
0x28, 0x14, 0x43, 0xde, 0xca, 0x67, 0xe9, 0xef, 0x86, 0xbc, 0x7f, 0xb8, 0xb0, 0xce, 0x44, 0x6e,
|
||||
0xbe, 0x85, 0xaa, 0xfb, 0xf7, 0x2f, 0x5f, 0xfd, 0x7c, 0x3b, 0x3f, 0x81, 0x7a, 0x90, 0xf1, 0x4d,
|
||||
0x42, 0x23, 0xfe, 0x78, 0x62, 0xc9, 0x15, 0xdd, 0x07, 0xf2, 0xdd, 0xad, 0xec, 0x77, 0xb7, 0xfd,
|
||||
0x9b, 0x01, 0xcd, 0xe2, 0x18, 0xfe, 0x75, 0x7b, 0x37, 0x80, 0x58, 0x14, 0xaf, 0xc8, 0xed, 0xc1,
|
||||
0x5e, 0x99, 0xfa, 0x3a, 0xaa, 0x77, 0xde, 0xdd, 0xbd, 0xf3, 0xee, 0x48, 0xbf, 0xf3, 0xd8, 0x91,
|
||||
0x45, 0x45, 0x7d, 0x3f, 0x87, 0x86, 0xd8, 0xd5, 0x5b, 0xc6, 0x03, 0x9e, 0x31, 0xd9, 0x78, 0x0b,
|
||||
0x83, 0x08, 0x2d, 0x64, 0xa4, 0xfd, 0x8b, 0x29, 0x06, 0x92, 0x0f, 0xf6, 0xff, 0x67, 0x3c, 0x81,
|
||||
0x77, 0x3b, 0xa0, 0xe2, 0x15, 0x28, 0xbf, 0x85, 0xf4, 0x91, 0x46, 0x2a, 0xa8, 0x7f, 0x06, 0x47,
|
||||
0x39, 0xc8, 0xf2, 0x91, 0x13, 0x26, 0xa7, 0x68, 0xe1, 0xfc, 0x76, 0x0d, 0x44, 0x50, 0x68, 0xb4,
|
||||
0xa6, 0xe9, 0x6a, 0xa7, 0x51, 0x45, 0x69, 0x24, 0x42, 0x4a, 0xa3, 0x41, 0x15, 0x2a, 0x44, 0xb4,
|
||||
0x9d, 0x1b, 0x4b, 0x5b, 0x9e, 0x7f, 0xfd, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0xa0, 0x18,
|
||||
0x48, 0x98, 0x07, 0x00, 0x00,
|
||||
// 808 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x54, 0xdd, 0x6e, 0xe3, 0x54,
|
||||
0x10, 0x8e, 0x1d, 0xc7, 0x49, 0x26, 0x4d, 0x65, 0xce, 0x56, 0xab, 0x12, 0xb1, 0xb0, 0x1b, 0xb1,
|
||||
0x68, 0xdb, 0x0b, 0x17, 0x65, 0x51, 0x24, 0x2e, 0xf3, 0x63, 0x35, 0x11, 0x90, 0x98, 0x13, 0x73,
|
||||
0x5d, 0x39, 0xf6, 0xd9, 0xc4, 0x52, 0x63, 0x9b, 0x73, 0x8e, 0x2b, 0xf5, 0x65, 0x90, 0xe0, 0x09,
|
||||
0x78, 0x1f, 0x1e, 0x82, 0x0b, 0x5e, 0x00, 0x9d, 0x9f, 0x38, 0x4e, 0x77, 0x69, 0x11, 0x5c, 0xec,
|
||||
0x55, 0x66, 0x26, 0x33, 0x9f, 0xbf, 0xf9, 0x66, 0xce, 0xc0, 0xb3, 0x28, 0xdb, 0xed, 0xb2, 0xf4,
|
||||
0x4a, 0xfd, 0xb8, 0x39, 0xcd, 0x78, 0x86, 0x4e, 0xa3, 0x2c, 0x8d, 0x8b, 0x84, 0xbb, 0x2a, 0xda,
|
||||
0xfb, 0x7c, 0x93, 0x65, 0x9b, 0x5b, 0x72, 0x25, 0xff, 0x5d, 0x17, 0xef, 0xae, 0xe2, 0x82, 0x86,
|
||||
0x3c, 0xd9, 0xe7, 0xf7, 0xff, 0x32, 0x00, 0x66, 0x9c, 0xe7, 0x3f, 0x10, 0xbe, 0xcd, 0x62, 0x74,
|
||||
0x0d, 0x40, 0xc9, 0x26, 0x61, 0x9c, 0x50, 0x12, 0x9f, 0x1b, 0x2f, 0x8d, 0x37, 0xa7, 0x83, 0xd7,
|
||||
0xee, 0x31, 0xa6, 0x7b, 0xc8, 0x77, 0x71, 0x99, 0x3c, 0xab, 0xe1, 0x4a, 0x29, 0xfa, 0x12, 0x4e,
|
||||
0x8a, 0xb4, 0x02, 0x65, 0xbe, 0x34, 0xde, 0xb4, 0x67, 0x35, 0x7c, 0x14, 0xed, 0xa7, 0x00, 0x07,
|
||||
0x04, 0xd4, 0x84, 0xfa, 0xb5, 0x17, 0x38, 0x35, 0xd4, 0x02, 0xcb, 0x5f, 0xae, 0x02, 0xc7, 0x10,
|
||||
0x21, 0xff, 0xa7, 0xc0, 0x31, 0x11, 0x80, 0x3d, 0xf5, 0xbe, 0xf7, 0x02, 0xcf, 0xa9, 0xa3, 0x36,
|
||||
0x34, 0xfc, 0x51, 0x30, 0x99, 0x39, 0x16, 0xea, 0x40, 0x73, 0xe9, 0x07, 0xf3, 0xe5, 0x62, 0xe5,
|
||||
0x34, 0x84, 0x33, 0x59, 0x2e, 0x16, 0xde, 0x24, 0x70, 0x6c, 0x81, 0x31, 0xf3, 0x46, 0x53, 0xa7,
|
||||
0x29, 0xd2, 0x03, 0x3c, 0x9a, 0x78, 0x4e, 0x6b, 0x6c, 0x83, 0xc5, 0xef, 0x73, 0xd2, 0xff, 0xc5,
|
||||
0x00, 0x7b, 0x15, 0x6d, 0xc9, 0x8e, 0xa0, 0xc9, 0x07, 0x3a, 0x7e, 0xf5, 0xb0, 0x63, 0x95, 0xfb,
|
||||
0x7f, 0xbb, 0x7d, 0x75, 0xd4, 0xad, 0x20, 0x18, 0x04, 0xbe, 0x53, 0x13, 0x04, 0x85, 0xb5, 0x72,
|
||||
0x8c, 0x92, 0xe0, 0x0a, 0xda, 0x73, 0x7f, 0x14, 0xc7, 0x94, 0x30, 0x86, 0xce, 0xc0, 0x4a, 0xf2,
|
||||
0xbb, 0x6f, 0x24, 0xb9, 0xe6, 0xac, 0x86, 0xa5, 0x87, 0x2e, 0x65, 0x74, 0x28, 0xbf, 0xd5, 0x19,
|
||||
0x9c, 0x3d, 0xa4, 0x3c, 0xf7, 0xef, 0x86, 0x3a, 0x77, 0x38, 0xb6, 0xc0, 0x4c, 0xf2, 0xfe, 0xd7,
|
||||
0x60, 0x89, 0x28, 0x3a, 0x83, 0xc6, 0xbb, 0x84, 0x32, 0x2e, 0x01, 0x6d, 0xac, 0x1c, 0x84, 0xc0,
|
||||
0xba, 0x0d, 0x19, 0x97, 0x78, 0x36, 0x96, 0x76, 0xff, 0x3b, 0x80, 0x20, 0xca, 0xf7, 0x3c, 0x2e,
|
||||
0x04, 0x8a, 0x2c, 0xea, 0x0c, 0x3e, 0x7d, 0xff, 0x7b, 0x3a, 0x0d, 0x9b, 0x49, 0x2e, 0xc0, 0xf2,
|
||||
0x8c, 0x2a, 0xb0, 0x2e, 0x96, 0x76, 0xff, 0x5b, 0xe8, 0x4c, 0x09, 0xe3, 0x49, 0x2a, 0xf7, 0x0f,
|
||||
0x3d, 0x07, 0x9b, 0x49, 0x59, 0x25, 0x62, 0x1b, 0x6b, 0x4f, 0x96, 0x86, 0x7c, 0xab, 0x34, 0xc4,
|
||||
0xd2, 0xee, 0xff, 0xd6, 0x86, 0x56, 0x10, 0xe6, 0xde, 0x1d, 0x49, 0x39, 0x1a, 0x80, 0xcd, 0xb2,
|
||||
0x82, 0x46, 0x44, 0x53, 0xe9, 0x3d, 0xa4, 0x72, 0xa0, 0x8c, 0x75, 0xa6, 0xa8, 0xe1, 0x21, 0xdd,
|
||||
0x10, 0xae, 0xe5, 0x7a, 0xb4, 0x46, 0x65, 0xa2, 0xb7, 0x60, 0x6d, 0x39, 0xcf, 0xcf, 0xeb, 0xb2,
|
||||
0xe2, 0xc5, 0x7b, 0x15, 0x9a, 0x8f, 0x7c, 0x0e, 0x42, 0x69, 0x91, 0xdc, 0xfb, 0xb3, 0x09, 0x96,
|
||||
0x08, 0xa0, 0x05, 0x9c, 0x50, 0xf2, 0x73, 0x41, 0x18, 0xbf, 0x49, 0xd2, 0x84, 0x6b, 0xae, 0x17,
|
||||
0x8f, 0xa2, 0xb8, 0x58, 0x55, 0xcc, 0xd3, 0x84, 0xcf, 0x6a, 0xb8, 0x43, 0x0f, 0x2e, 0xfa, 0x11,
|
||||
0xba, 0x94, 0xb0, 0x3c, 0x4b, 0x19, 0x51, 0x80, 0xaa, 0x91, 0xcb, 0xa7, 0x00, 0x55, 0x89, 0x46,
|
||||
0x3c, 0xa1, 0x15, 0x5f, 0x51, 0xd4, 0x90, 0x24, 0x8d, 0x75, 0xa3, 0x17, 0xff, 0x0e, 0xd1, 0x4b,
|
||||
0x63, 0x45, 0xb1, 0x74, 0x7b, 0x43, 0x68, 0xad, 0x38, 0x25, 0xe1, 0x6e, 0x1e, 0x8b, 0x29, 0xae,
|
||||
0x43, 0xa6, 0x46, 0xd4, 0xc5, 0xd2, 0x96, 0x13, 0x97, 0xff, 0x4b, 0xee, 0x16, 0xd6, 0x5e, 0xef,
|
||||
0x0f, 0x03, 0x3a, 0x95, 0xce, 0xd1, 0x10, 0xcc, 0x24, 0xd6, 0x82, 0x7d, 0xf5, 0x38, 0x9b, 0xfd,
|
||||
0xf7, 0xb0, 0x99, 0xc4, 0x62, 0xc8, 0x3b, 0x79, 0x96, 0xfe, 0x69, 0xc8, 0x87, 0xc3, 0x85, 0x75,
|
||||
0x26, 0x72, 0xcb, 0x2d, 0x54, 0xdd, 0x3f, 0xff, 0xf0, 0xd3, 0x2f, 0xb7, 0xf3, 0x33, 0x68, 0x87,
|
||||
0x05, 0xdf, 0x66, 0x34, 0xe1, 0xf7, 0xe7, 0x96, 0x5c, 0xd1, 0x43, 0xa0, 0xdc, 0xdd, 0xc6, 0x61,
|
||||
0x77, 0x7b, 0xbf, 0x1b, 0x70, 0x52, 0x1d, 0xc3, 0x7f, 0x6e, 0xef, 0x1a, 0x10, 0x4b, 0xd2, 0x88,
|
||||
0xdc, 0x1c, 0xed, 0x95, 0xa9, 0x9f, 0xa3, 0xba, 0xf3, 0xee, 0xfe, 0xce, 0xbb, 0x53, 0x7d, 0xe7,
|
||||
0xb1, 0x23, 0x8b, 0xaa, 0xfa, 0x7e, 0x01, 0x1d, 0xb1, 0xab, 0x37, 0x8c, 0x87, 0xbc, 0x60, 0xb2,
|
||||
0xf1, 0x2e, 0x06, 0x11, 0x5a, 0xc9, 0x48, 0xef, 0x57, 0x53, 0x0c, 0xa4, 0x1c, 0xec, 0xc7, 0x67,
|
||||
0x3c, 0x87, 0x67, 0x7b, 0xa0, 0xea, 0x13, 0xa8, 0x3f, 0x85, 0xf4, 0x89, 0x46, 0xaa, 0xa8, 0xff,
|
||||
0x1a, 0x4e, 0x4b, 0x90, 0xf5, 0x3d, 0x27, 0x4c, 0x4e, 0xd1, 0xc2, 0xe5, 0xeb, 0x1a, 0x8b, 0xa0,
|
||||
0xd0, 0x68, 0x43, 0xf3, 0x68, 0xaf, 0x51, 0x43, 0x69, 0x24, 0x42, 0x4a, 0xa3, 0x71, 0x13, 0x1a,
|
||||
0x44, 0xb4, 0x5d, 0x1a, 0x97, 0x2f, 0xa0, 0xe5, 0x0b, 0x06, 0x51, 0x76, 0x5b, 0x39, 0xee, 0x4d,
|
||||
0xa8, 0x07, 0x13, 0xdf, 0x31, 0xd6, 0xb6, 0xa4, 0xf7, 0xf6, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff,
|
||||
0x2d, 0x99, 0x17, 0xde, 0xb7, 0x07, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@ type ServerTransport struct {
|
|||
SourceIp *conduit_common.IPAddress `protobuf:"bytes,1,opt,name=source_ip,json=sourceIp" json:"source_ip,omitempty"`
|
||||
Connects uint32 `protobuf:"varint,2,opt,name=connects" json:"connects,omitempty"`
|
||||
Disconnects []*TransportSummary `protobuf:"bytes,3,rep,name=disconnects" json:"disconnects,omitempty"`
|
||||
Protocol conduit_common.Protocol `protobuf:"varint,4,opt,name=protocol,enum=conduit.common.Protocol" json:"protocol,omitempty"`
|
||||
}
|
||||
|
||||
func (m *ServerTransport) Reset() { *m = ServerTransport{} }
|
||||
|
|
@ -179,10 +180,18 @@ func (m *ServerTransport) GetDisconnects() []*TransportSummary {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *ServerTransport) GetProtocol() conduit_common.Protocol {
|
||||
if m != nil {
|
||||
return m.Protocol
|
||||
}
|
||||
return conduit_common.Protocol_HTTP
|
||||
}
|
||||
|
||||
type ClientTransport struct {
|
||||
TargetAddr *conduit_common.TcpAddress `protobuf:"bytes,1,opt,name=target_addr,json=targetAddr" json:"target_addr,omitempty"`
|
||||
Connects uint32 `protobuf:"varint,2,opt,name=connects" json:"connects,omitempty"`
|
||||
Disconnects []*TransportSummary `protobuf:"bytes,3,rep,name=disconnects" json:"disconnects,omitempty"`
|
||||
Protocol conduit_common.Protocol `protobuf:"varint,4,opt,name=protocol,enum=conduit.common.Protocol" json:"protocol,omitempty"`
|
||||
}
|
||||
|
||||
func (m *ClientTransport) Reset() { *m = ClientTransport{} }
|
||||
|
|
@ -211,6 +220,13 @@ func (m *ClientTransport) GetDisconnects() []*TransportSummary {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *ClientTransport) GetProtocol() conduit_common.Protocol {
|
||||
if m != nil {
|
||||
return m.Protocol
|
||||
}
|
||||
return conduit_common.Protocol_HTTP
|
||||
}
|
||||
|
||||
type TransportSummary struct {
|
||||
DurationMs uint64 `protobuf:"varint,1,opt,name=duration_ms,json=durationMs" json:"duration_ms,omitempty"`
|
||||
BytesSent uint64 `protobuf:"varint,2,opt,name=bytes_sent,json=bytesSent" json:"bytes_sent,omitempty"`
|
||||
|
|
@ -692,60 +708,61 @@ var _Telemetry_serviceDesc = grpc.ServiceDesc{
|
|||
func init() { proto.RegisterFile("proxy/telemetry/telemetry.proto", fileDescriptor0) }
|
||||
|
||||
var fileDescriptor0 = []byte{
|
||||
// 867 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0x23, 0x35,
|
||||
0x14, 0xee, 0x34, 0x49, 0x93, 0x9c, 0x6c, 0xba, 0xa9, 0x17, 0x41, 0xa8, 0x40, 0x2d, 0x03, 0x2c,
|
||||
0x01, 0x41, 0x2a, 0x82, 0x76, 0x11, 0x70, 0xc3, 0xb6, 0xbb, 0x52, 0x2b, 0x76, 0xdb, 0x95, 0xd3,
|
||||
0x5e, 0x71, 0x31, 0x9a, 0xf5, 0x1c, 0x36, 0x23, 0x75, 0xec, 0xc1, 0xf6, 0xa0, 0xe6, 0x02, 0xed,
|
||||
0xb3, 0x20, 0xf1, 0x04, 0xdc, 0xf0, 0x18, 0x3c, 0x06, 0xaf, 0x81, 0x6c, 0x8f, 0x27, 0xd3, 0xd0,
|
||||
0x34, 0xfc, 0x48, 0x7b, 0x15, 0xfb, 0x9c, 0xef, 0xfb, 0x7c, 0xfe, 0xec, 0x09, 0xec, 0xe5, 0x52,
|
||||
0x5c, 0xcd, 0x0f, 0x34, 0x5e, 0x62, 0x86, 0x5a, 0xd6, 0x56, 0xe3, 0x5c, 0x0a, 0x2d, 0xc8, 0x5b,
|
||||
0x4c, 0xf0, 0xa4, 0x48, 0xf5, 0xd8, 0x02, 0xc7, 0x95, 0x7b, 0xf7, 0x1e, 0x13, 0x59, 0x26, 0xf8,
|
||||
0x81, 0xfb, 0x71, 0xe8, 0xf0, 0xd7, 0x06, 0xf4, 0x29, 0xe6, 0x42, 0x6a, 0x8a, 0x3f, 0x16, 0xa8,
|
||||
0x34, 0xf9, 0x1a, 0xda, 0xb9, 0x14, 0x0c, 0x95, 0x1a, 0x06, 0xfb, 0xc1, 0xa8, 0x37, 0xd9, 0x1f,
|
||||
0xaf, 0x50, 0x1c, 0x3f, 0x77, 0x38, 0xea, 0x09, 0xe4, 0x10, 0x5a, 0x16, 0x33, 0xdc, 0xdc, 0x0f,
|
||||
0x46, 0xdb, 0x93, 0x4f, 0x57, 0x32, 0xaf, 0x1d, 0x69, 0x74, 0xae, 0xe6, 0xd4, 0x51, 0xc9, 0x05,
|
||||
0xec, 0x28, 0x94, 0x3f, 0xa1, 0x8c, 0xb4, 0x8c, 0xb9, 0x32, 0x38, 0x35, 0x6c, 0xec, 0x37, 0x46,
|
||||
0xbd, 0xc9, 0x68, 0xa5, 0xde, 0xd4, 0x32, 0xce, 0x3d, 0x81, 0x0e, 0xd4, 0x75, 0x83, 0x32, 0xb2,
|
||||
0xec, 0x32, 0x45, 0xae, 0xeb, 0xb2, 0xcd, 0x35, 0xb2, 0x47, 0x96, 0x51, 0x93, 0x65, 0xd7, 0x0d,
|
||||
0x8a, 0x3c, 0x82, 0x8e, 0x74, 0x59, 0xa8, 0x61, 0xcb, 0xaa, 0x7d, 0x78, 0x4b, 0xd2, 0x16, 0x38,
|
||||
0x65, 0x22, 0x47, 0x5a, 0xd1, 0xc2, 0x10, 0x5a, 0xb6, 0x00, 0xa4, 0x07, 0xed, 0x93, 0xd3, 0xc3,
|
||||
0xb3, 0x8b, 0xd3, 0xc7, 0x83, 0x0d, 0x72, 0x07, 0x3a, 0x67, 0x17, 0xe7, 0x6e, 0x17, 0x84, 0x3f,
|
||||
0x43, 0xbb, 0x2c, 0x36, 0x21, 0xd0, 0xe4, 0x22, 0x41, 0xdb, 0x9c, 0x2e, 0xb5, 0x6b, 0xf2, 0x19,
|
||||
0x10, 0xc5, 0x66, 0x98, 0x14, 0x97, 0x98, 0x44, 0x29, 0x57, 0x3a, 0xe6, 0x0c, 0x6d, 0x13, 0xba,
|
||||
0x74, 0xa7, 0xf2, 0x9c, 0x94, 0x0e, 0x72, 0x00, 0xf7, 0x16, 0x70, 0x1e, 0x67, 0xa8, 0xf2, 0x98,
|
||||
0xe1, 0xb0, 0x61, 0xf1, 0x0b, 0xa5, 0x53, 0xef, 0x09, 0x7f, 0x0b, 0xe0, 0xee, 0x52, 0x89, 0xc9,
|
||||
0x43, 0xe8, 0x2a, 0x51, 0x48, 0x86, 0x51, 0x9a, 0x97, 0x93, 0xf2, 0x76, 0x95, 0x7a, 0x39, 0x63,
|
||||
0x27, 0xcf, 0x1f, 0x25, 0x89, 0x34, 0x23, 0xd2, 0x71, 0xd8, 0x93, 0x9c, 0xec, 0x42, 0x87, 0x09,
|
||||
0xce, 0x91, 0x69, 0x65, 0x23, 0xec, 0xd3, 0x6a, 0x4f, 0xbe, 0x83, 0x5e, 0x92, 0xaa, 0xca, 0xed,
|
||||
0xba, 0xfe, 0xf1, 0xca, 0x82, 0x56, 0xc1, 0x4c, 0x8b, 0x2c, 0x8b, 0xe5, 0x9c, 0xd6, 0xd9, 0xe1,
|
||||
0xef, 0x01, 0xdc, 0x5d, 0x6a, 0x20, 0xf9, 0x06, 0x7a, 0x3a, 0x96, 0x2f, 0x51, 0x47, 0x71, 0x92,
|
||||
0xc8, 0x32, 0xec, 0xdd, 0xe5, 0xb0, 0xcf, 0x59, 0xee, 0xe3, 0x06, 0x07, 0x37, 0xdb, 0xd7, 0x17,
|
||||
0x39, 0x85, 0xc1, 0x32, 0x80, 0xec, 0x41, 0x2f, 0x29, 0x64, 0xac, 0x53, 0xc1, 0xa3, 0xcc, 0x5d,
|
||||
0xcd, 0x26, 0x05, 0x6f, 0x7a, 0xa6, 0xc8, 0xbb, 0x00, 0x2f, 0xe6, 0x1a, 0x55, 0xa4, 0x90, 0x6b,
|
||||
0x1b, 0x5f, 0x93, 0x76, 0xad, 0x65, 0x8a, 0x5c, 0x87, 0xbf, 0x04, 0x70, 0xa7, 0x3e, 0x80, 0xe4,
|
||||
0x01, 0x34, 0x98, 0xbe, 0x2a, 0x4b, 0xf0, 0xfe, 0xba, 0xa1, 0x3d, 0xd2, 0x57, 0xd4, 0xe0, 0xc9,
|
||||
0x1b, 0xd0, 0x62, 0xa2, 0x28, 0x4f, 0xe8, 0x53, 0xb7, 0x21, 0x8f, 0xa1, 0x2b, 0x51, 0xe5, 0x82,
|
||||
0x2b, 0xf4, 0xc9, 0xdf, 0xbf, 0x45, 0xd2, 0x21, 0xdd, 0x45, 0x58, 0x10, 0xc3, 0x3f, 0x03, 0x80,
|
||||
0xc5, 0x79, 0xff, 0x79, 0xc2, 0x96, 0x9a, 0xbc, 0xf9, 0xaf, 0x9a, 0xfc, 0x0e, 0x74, 0xe3, 0x42,
|
||||
0xcf, 0x84, 0x4c, 0xf5, 0xbc, 0xbc, 0x11, 0x0b, 0x03, 0x99, 0xc0, 0x56, 0x86, 0x7a, 0x26, 0x92,
|
||||
0x61, 0xf3, 0x66, 0xd5, 0x63, 0xad, 0xf3, 0x67, 0x16, 0x41, 0x4b, 0xa4, 0xb9, 0xb0, 0x79, 0xac,
|
||||
0x67, 0xc3, 0x96, 0xbb, 0xb0, 0x66, 0x1d, 0x7e, 0x05, 0xed, 0xa7, 0xb1, 0x46, 0xce, 0xe6, 0x64,
|
||||
0x08, 0xed, 0x4b, 0xb7, 0xb4, 0x39, 0xf6, 0xa9, 0xdf, 0xde, 0x5c, 0xea, 0xf0, 0x8f, 0xc0, 0xbc,
|
||||
0xd8, 0xb5, 0x0a, 0x92, 0x87, 0xf5, 0x4e, 0x7e, 0xb0, 0xb6, 0xec, 0x55, 0x2b, 0xcf, 0x80, 0xf8,
|
||||
0xda, 0x47, 0xee, 0xcc, 0x14, 0xcd, 0x64, 0x37, 0x6e, 0x7d, 0xf4, 0xcb, 0xb8, 0xe9, 0x8e, 0xe7,
|
||||
0x3e, 0xf5, 0x54, 0xf2, 0x00, 0x9a, 0xc8, 0x13, 0x3f, 0x00, 0xef, 0xad, 0x94, 0x78, 0x22, 0x94,
|
||||
0xeb, 0xbd, 0x85, 0x87, 0x5f, 0x42, 0xaf, 0x16, 0x1b, 0x19, 0xc1, 0x60, 0xa6, 0x75, 0x1e, 0x29,
|
||||
0x1d, 0xeb, 0x42, 0x45, 0xcc, 0x3f, 0x76, 0x7d, 0xba, 0x6d, 0xec, 0x53, 0x6b, 0x3e, 0x12, 0x09,
|
||||
0x86, 0xaf, 0xa0, 0xe3, 0xa5, 0xc8, 0xe7, 0xf5, 0x22, 0xec, 0xdd, 0x76, 0x74, 0x95, 0xff, 0xb7,
|
||||
0xd0, 0x56, 0x5a, 0x62, 0x9c, 0xf9, 0xa4, 0x57, 0x8f, 0xec, 0xd4, 0xe2, 0xfc, 0x65, 0xf5, 0xb4,
|
||||
0xf0, 0x15, 0x6c, 0x39, 0x41, 0xf2, 0x09, 0x0c, 0x5e, 0xca, 0x9c, 0xfd, 0x3d, 0xe8, 0xe3, 0x0d,
|
||||
0xba, 0x6d, 0x3c, 0x8b, 0xb0, 0x0d, 0x56, 0xa2, 0x42, 0x1d, 0xa1, 0x94, 0x42, 0x3a, 0xec, 0xa6,
|
||||
0xc7, 0x5a, 0xcf, 0x13, 0xe3, 0xb0, 0xd8, 0x37, 0xa1, 0x25, 0xf4, 0x0c, 0xa5, 0x1d, 0xc5, 0xce,
|
||||
0xf1, 0x06, 0x75, 0xdb, 0xc3, 0x16, 0x34, 0x90, 0x27, 0x61, 0x0e, 0xfd, 0x6b, 0xa1, 0xfd, 0xdf,
|
||||
0x67, 0xc2, 0xf0, 0x7f, 0x90, 0xe6, 0xdd, 0x77, 0xfe, 0x86, 0xad, 0x3b, 0x38, 0x93, 0x7d, 0x47,
|
||||
0x06, 0xb0, 0xed, 0x3f, 0xde, 0xae, 0x65, 0x93, 0x19, 0x74, 0xcf, 0x7d, 0xa1, 0xc8, 0xf7, 0xb0,
|
||||
0xe5, 0xdc, 0xe4, 0xfe, 0x3f, 0xfb, 0xf8, 0xef, 0x7e, 0xb4, 0x16, 0xe7, 0xce, 0x09, 0x37, 0x5e,
|
||||
0x6c, 0xd9, 0xff, 0x2c, 0x5f, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0xff, 0xc4, 0xbb, 0x61, 0x04,
|
||||
0x09, 0x00, 0x00,
|
||||
// 888 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x5f, 0x6f, 0x23, 0x35,
|
||||
0x10, 0xef, 0x36, 0x49, 0x93, 0x4c, 0x2e, 0xbd, 0xd4, 0x87, 0x60, 0xa9, 0x40, 0x2d, 0x0b, 0x1c,
|
||||
0x01, 0x41, 0x2a, 0x02, 0x77, 0x08, 0x78, 0xe1, 0xda, 0x3b, 0xa9, 0x15, 0x77, 0x6d, 0xe5, 0xb4,
|
||||
0x4f, 0x3c, 0xac, 0xf6, 0xbc, 0xc3, 0x25, 0x52, 0xd6, 0x5e, 0x6c, 0x2f, 0x6a, 0x1e, 0xd0, 0x7d,
|
||||
0x16, 0x24, 0xbe, 0x0f, 0x1f, 0x03, 0x5e, 0xf8, 0x0e, 0xc8, 0xf6, 0x7a, 0xb3, 0x0d, 0x97, 0x96,
|
||||
0x3f, 0x2f, 0x3c, 0xc5, 0x9e, 0xf9, 0xcd, 0xcf, 0x33, 0xbf, 0x19, 0x7b, 0x03, 0x7b, 0xb9, 0x14,
|
||||
0x57, 0x8b, 0x03, 0x8d, 0x73, 0xcc, 0x50, 0xcb, 0xda, 0x6a, 0x94, 0x4b, 0xa1, 0x05, 0x79, 0x83,
|
||||
0x09, 0x9e, 0x16, 0x33, 0x3d, 0xb2, 0xc0, 0x51, 0xe5, 0xde, 0xbd, 0xc7, 0x44, 0x96, 0x09, 0x7e,
|
||||
0xe0, 0x7e, 0x1c, 0x3a, 0xfa, 0xa5, 0x01, 0x7d, 0x8a, 0xb9, 0x90, 0x9a, 0xe2, 0x0f, 0x05, 0x2a,
|
||||
0x4d, 0xbe, 0x82, 0x76, 0x2e, 0x05, 0x43, 0xa5, 0xc2, 0x60, 0x3f, 0x18, 0xf6, 0xc6, 0xfb, 0xa3,
|
||||
0x35, 0x8c, 0xa3, 0x73, 0x87, 0xa3, 0x3e, 0x80, 0x1c, 0x42, 0xcb, 0x62, 0xc2, 0xcd, 0xfd, 0x60,
|
||||
0xb8, 0x3d, 0xfe, 0x78, 0x6d, 0xe4, 0xb5, 0x23, 0x0d, 0xcf, 0xd5, 0x82, 0xba, 0x50, 0x72, 0x09,
|
||||
0x3b, 0x0a, 0xe5, 0x8f, 0x28, 0x63, 0x2d, 0x13, 0xae, 0x0c, 0x4e, 0x85, 0x8d, 0xfd, 0xc6, 0xb0,
|
||||
0x37, 0x1e, 0xae, 0xe5, 0x9b, 0xd8, 0x88, 0x0b, 0x1f, 0x40, 0x07, 0xea, 0xba, 0x41, 0x19, 0x5a,
|
||||
0x36, 0x9f, 0x21, 0xd7, 0x75, 0xda, 0xe6, 0x2d, 0xb4, 0x47, 0x36, 0xa2, 0x46, 0xcb, 0xae, 0x1b,
|
||||
0x14, 0x79, 0x04, 0x1d, 0xe9, 0xaa, 0x50, 0x61, 0xcb, 0xb2, 0xbd, 0x7f, 0x43, 0xd1, 0x16, 0x38,
|
||||
0x61, 0x22, 0x47, 0x5a, 0x85, 0x45, 0x11, 0xb4, 0xac, 0x00, 0xa4, 0x07, 0xed, 0x93, 0xd3, 0xc3,
|
||||
0xb3, 0xcb, 0xd3, 0xc7, 0x83, 0x0d, 0x72, 0x07, 0x3a, 0x67, 0x97, 0x17, 0x6e, 0x17, 0x44, 0x3f,
|
||||
0x41, 0xbb, 0x14, 0x9b, 0x10, 0x68, 0x72, 0x91, 0xa2, 0x6d, 0x4e, 0x97, 0xda, 0x35, 0xf9, 0x04,
|
||||
0x88, 0x62, 0x53, 0x4c, 0x8b, 0x39, 0xa6, 0xf1, 0x8c, 0x2b, 0x9d, 0x70, 0x86, 0xb6, 0x09, 0x5d,
|
||||
0xba, 0x53, 0x79, 0x4e, 0x4a, 0x07, 0x39, 0x80, 0x7b, 0x4b, 0x38, 0x4f, 0x32, 0x54, 0x79, 0xc2,
|
||||
0x30, 0x6c, 0x58, 0xfc, 0x92, 0xe9, 0xd4, 0x7b, 0xa2, 0xdf, 0x03, 0xb8, 0xbb, 0x22, 0x31, 0x79,
|
||||
0x08, 0x5d, 0x25, 0x0a, 0xc9, 0x30, 0x9e, 0xe5, 0xe5, 0xa4, 0xbc, 0x59, 0x95, 0x5e, 0xce, 0xd8,
|
||||
0xc9, 0xf9, 0xa3, 0x34, 0x95, 0x66, 0x44, 0x3a, 0x0e, 0x7b, 0x92, 0x93, 0x5d, 0xe8, 0x30, 0xc1,
|
||||
0x39, 0x32, 0xad, 0x6c, 0x86, 0x7d, 0x5a, 0xed, 0xc9, 0xb7, 0xd0, 0x4b, 0x67, 0xaa, 0x72, 0xbb,
|
||||
0xae, 0x7f, 0xb8, 0x56, 0xd0, 0x2a, 0x99, 0x49, 0x91, 0x65, 0x89, 0x5c, 0xd0, 0x7a, 0x34, 0xf9,
|
||||
0x1c, 0x3a, 0x76, 0xc6, 0x99, 0x98, 0x87, 0x4d, 0x3b, 0x8f, 0xe1, 0x6a, 0x7e, 0xe7, 0xa5, 0x9f,
|
||||
0x56, 0xc8, 0xe8, 0x8f, 0x00, 0xee, 0xae, 0xb4, 0x9d, 0x7c, 0x0d, 0x3d, 0x9d, 0xc8, 0x17, 0xa8,
|
||||
0xe3, 0x24, 0x4d, 0x65, 0x59, 0xec, 0xee, 0x2a, 0xd9, 0x05, 0xcb, 0x7d, 0xb5, 0xe0, 0xe0, 0x66,
|
||||
0xfb, 0x7f, 0xaf, 0x97, 0xc2, 0x60, 0x95, 0x96, 0xec, 0x41, 0x2f, 0x2d, 0x64, 0xa2, 0x67, 0x82,
|
||||
0xc7, 0x99, 0x7b, 0x06, 0x9a, 0x14, 0xbc, 0xe9, 0x99, 0x22, 0x6f, 0x03, 0x3c, 0x5f, 0x68, 0x54,
|
||||
0xb1, 0x42, 0xae, 0x6d, 0x55, 0x4d, 0xda, 0xb5, 0x96, 0x09, 0x72, 0x1d, 0xfd, 0x1c, 0xc0, 0x9d,
|
||||
0xfa, 0xb0, 0x93, 0x07, 0xd0, 0x60, 0xfa, 0xaa, 0x14, 0xee, 0xdd, 0xdb, 0x2e, 0xc8, 0x91, 0xbe,
|
||||
0xa2, 0x06, 0x4f, 0x5e, 0x83, 0x16, 0x13, 0x45, 0x79, 0x42, 0x9f, 0xba, 0x0d, 0x79, 0x0c, 0x5d,
|
||||
0x89, 0x2a, 0x17, 0x5c, 0xa1, 0x97, 0xec, 0xfe, 0x0d, 0x94, 0x0e, 0xe9, 0x2e, 0xdd, 0x32, 0x30,
|
||||
0xfa, 0x2d, 0x00, 0x58, 0x9e, 0xf7, 0xaf, 0xa7, 0x79, 0x65, 0x34, 0x36, 0xff, 0xd1, 0x68, 0xbc,
|
||||
0x05, 0xdd, 0xa4, 0xd0, 0x53, 0x21, 0x67, 0x7a, 0x51, 0xde, 0xbe, 0xa5, 0x81, 0x8c, 0x61, 0x2b,
|
||||
0x43, 0x3d, 0x15, 0xa9, 0xed, 0xe6, 0x2b, 0x58, 0x8f, 0xb5, 0xce, 0x9f, 0x59, 0x04, 0x2d, 0x91,
|
||||
0xe6, 0x71, 0xc8, 0x13, 0x3d, 0x0d, 0x5b, 0xee, 0x71, 0x30, 0xeb, 0xe8, 0x4b, 0x68, 0x3f, 0x4d,
|
||||
0x34, 0x72, 0xb6, 0x20, 0x21, 0xb4, 0xe7, 0x6e, 0x69, 0x6b, 0xec, 0x53, 0xbf, 0x7d, 0xb5, 0xd4,
|
||||
0xd1, 0xaf, 0x81, 0xf9, 0x3a, 0xd4, 0x14, 0x24, 0x0f, 0xeb, 0x9d, 0x7c, 0xef, 0x56, 0xd9, 0xab,
|
||||
0x56, 0x9e, 0x01, 0xf1, 0xda, 0xc7, 0xee, 0xcc, 0x19, 0x9a, 0xfb, 0xd0, 0xb8, 0xf1, 0x03, 0x53,
|
||||
0xe6, 0x4d, 0x77, 0x7c, 0xec, 0x53, 0x1f, 0x4a, 0x1e, 0x40, 0x13, 0x79, 0xea, 0x07, 0xe0, 0x9d,
|
||||
0xb5, 0x14, 0x4f, 0x84, 0x72, 0xbd, 0xb7, 0xf0, 0xe8, 0x0b, 0xe8, 0xd5, 0x72, 0x23, 0x43, 0x18,
|
||||
0x4c, 0xb5, 0xce, 0x63, 0xa5, 0x13, 0x5d, 0xa8, 0x98, 0xf9, 0x87, 0xb5, 0x4f, 0xb7, 0x8d, 0x7d,
|
||||
0x62, 0xcd, 0x47, 0x22, 0xc5, 0xe8, 0x25, 0x74, 0x3c, 0x15, 0xf9, 0xb4, 0x2e, 0xc2, 0xde, 0x4d,
|
||||
0x47, 0x57, 0xf5, 0x7f, 0x03, 0x6d, 0xa5, 0x25, 0x26, 0x99, 0x2f, 0x7a, 0xfd, 0xc8, 0x4e, 0x2c,
|
||||
0xce, 0x5f, 0x71, 0x1f, 0x16, 0xbd, 0x84, 0x2d, 0x47, 0x48, 0x3e, 0x82, 0xc1, 0x0b, 0x99, 0xb3,
|
||||
0xbf, 0x26, 0x7d, 0xbc, 0x41, 0xb7, 0x8d, 0x67, 0x99, 0xb6, 0xc1, 0x4a, 0x54, 0xa8, 0x63, 0x94,
|
||||
0x52, 0x48, 0x87, 0xdd, 0xf4, 0x58, 0xeb, 0x79, 0x62, 0x1c, 0x16, 0xfb, 0x3a, 0xb4, 0x84, 0x9e,
|
||||
0xa2, 0xb4, 0xa3, 0xd8, 0x39, 0xde, 0xa0, 0x6e, 0x7b, 0xd8, 0x82, 0x06, 0xf2, 0x34, 0xca, 0xa1,
|
||||
0x7f, 0x2d, 0xb5, 0xff, 0xfa, 0x4c, 0x98, 0xf8, 0xef, 0xa5, 0xf9, 0xc6, 0x38, 0x7f, 0xc3, 0xea,
|
||||
0x0e, 0xce, 0x64, 0xdf, 0x91, 0x01, 0x6c, 0xfb, 0x3f, 0x0a, 0xae, 0x65, 0xe3, 0x29, 0x74, 0x2f,
|
||||
0xbc, 0x50, 0xe4, 0x3b, 0xd8, 0x72, 0x6e, 0x72, 0xff, 0xef, 0xfd, 0xd1, 0xd8, 0xfd, 0xe0, 0x56,
|
||||
0x9c, 0x3b, 0x27, 0xda, 0x78, 0xbe, 0x65, 0x5f, 0xc8, 0xcf, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff,
|
||||
0x94, 0x14, 0x47, 0x5a, 0x70, 0x09, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -899,7 +899,7 @@ func (c *apiClient) Stat(ctx context.Context, in *MetricRequest, opts ...grpc.Ca
|
|||
out := new(MetricResponse)
|
||||
err := grpc.Invoke(ctx, "/conduit.public.Api/Stat", in, out, c.cc, opts...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Error invoking gRPC service: %v", err)
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,3 +108,8 @@ message TapEvent {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
enum Protocol {
|
||||
HTTP = 0;
|
||||
TCP = 1;
|
||||
}
|
||||
|
|
@ -38,12 +38,14 @@ message ServerTransport {
|
|||
common.IPAddress source_ip = 1;
|
||||
uint32 connects = 2;
|
||||
repeated TransportSummary disconnects = 3;
|
||||
common.Protocol protocol = 4;
|
||||
}
|
||||
|
||||
message ClientTransport {
|
||||
common.TcpAddress target_addr = 1;
|
||||
uint32 connects = 2;
|
||||
repeated TransportSummary disconnects = 3;
|
||||
common.Protocol protocol = 4;
|
||||
}
|
||||
|
||||
message TransportSummary {
|
||||
|
|
|
|||
|
|
@ -134,13 +134,17 @@ where
|
|||
{
|
||||
pub fn bind_service(&self, addr: &SocketAddr) -> Service<B> {
|
||||
trace!("bind_service {}", addr);
|
||||
let client_ctx = ctx::transport::Client::new(&self.ctx, addr);
|
||||
let client_ctx = ctx::transport::Client::new(
|
||||
&self.ctx,
|
||||
addr,
|
||||
control::pb::proxy::common::Protocol::Http,
|
||||
);
|
||||
|
||||
// Map a socket address to an HTTP/2.0 connection.
|
||||
let connect = {
|
||||
let c = Timeout::new(
|
||||
transport::Connect::new(*addr, &self.executor),
|
||||
self.connect_timeout,
|
||||
self.connect_timeout,
|
||||
&self.executor,
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#![cfg_attr(feature = "cargo-clippy", allow(clippy))]
|
||||
|
||||
use std::error::Error;
|
||||
use std::fmt;
|
||||
use std::{fmt, hash};
|
||||
use std::sync::Arc;
|
||||
|
||||
use http;
|
||||
|
|
@ -396,6 +396,13 @@ impl<'a> From<&'a ::std::net::SocketAddr> for common::TcpAddress {
|
|||
}
|
||||
}
|
||||
|
||||
impl hash::Hash for common::Protocol {
|
||||
// it's necessary to implement Hash for Protocol as it's a field on
|
||||
// ctx::Transport, which derives Hash.
|
||||
fn hash<H: hash::Hasher>(&self, state: &mut H) {
|
||||
(*self as i32).hash(state)
|
||||
}
|
||||
}
|
||||
|
||||
fn pb_duration(d: &::std::time::Duration) -> ::prost_types::Duration {
|
||||
let seconds = if d.as_secs() > ::std::i64::MAX as u64 {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
use std::net::SocketAddr;
|
||||
use std::sync::Arc;
|
||||
|
||||
use control::pb::common::Protocol;
|
||||
|
||||
use ctx;
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
|
||||
|
|
@ -16,6 +18,7 @@ pub struct Server {
|
|||
pub remote: SocketAddr,
|
||||
pub local: SocketAddr,
|
||||
pub orig_dst: Option<SocketAddr>,
|
||||
pub protocol: Protocol,
|
||||
}
|
||||
|
||||
/// Identifies a connection from the proxy to another process.
|
||||
|
|
@ -23,6 +26,7 @@ pub struct Server {
|
|||
pub struct Client {
|
||||
pub proxy: Arc<ctx::Proxy>,
|
||||
pub remote: SocketAddr,
|
||||
pub protocol: Protocol,
|
||||
}
|
||||
|
||||
impl Ctx {
|
||||
|
|
@ -40,12 +44,14 @@ impl Server {
|
|||
local: &SocketAddr,
|
||||
remote: &SocketAddr,
|
||||
orig_dst: &Option<SocketAddr>,
|
||||
protocol: Protocol,
|
||||
) -> Arc<Server> {
|
||||
let s = Server {
|
||||
proxy: Arc::clone(proxy),
|
||||
local: *local,
|
||||
remote: *remote,
|
||||
orig_dst: *orig_dst,
|
||||
protocol: protocol,
|
||||
};
|
||||
|
||||
Arc::new(s)
|
||||
|
|
@ -53,10 +59,15 @@ impl Server {
|
|||
}
|
||||
|
||||
impl Client {
|
||||
pub fn new(proxy: &Arc<ctx::Proxy>, remote: &SocketAddr) -> Arc<Client> {
|
||||
pub fn new(
|
||||
proxy: &Arc<ctx::Proxy>,
|
||||
remote: &SocketAddr,
|
||||
protocol: Protocol,
|
||||
) -> Arc<Client> {
|
||||
let c = Client {
|
||||
proxy: Arc::clone(proxy),
|
||||
remote: *remote,
|
||||
protocol: protocol,
|
||||
};
|
||||
|
||||
Arc::new(c)
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ mod tests {
|
|||
use tower_router::Recognize;
|
||||
|
||||
use super::Inbound;
|
||||
use control::pb::common::Protocol;
|
||||
use bind::Bind;
|
||||
use ctx;
|
||||
|
||||
|
|
@ -182,7 +183,13 @@ mod tests {
|
|||
|
||||
let mut req = http::Request::new(());
|
||||
req.extensions_mut()
|
||||
.insert(ctx::transport::Server::new(&ctx, &local, &remote, &Some(orig_dst)));
|
||||
.insert(ctx::transport::Server::new(
|
||||
&ctx,
|
||||
&local,
|
||||
&remote,
|
||||
&Some(orig_dst),
|
||||
Protocol::Http,
|
||||
));
|
||||
|
||||
let rec = if Inbound::<()>::same_addr(&orig_dst, &local) {
|
||||
None
|
||||
|
|
@ -204,7 +211,13 @@ mod tests {
|
|||
|
||||
let mut req = http::Request::new(());
|
||||
req.extensions_mut()
|
||||
.insert(ctx::transport::Server::new(&ctx, &local, &remote, &None));
|
||||
.insert(ctx::transport::Server::new(
|
||||
&ctx,
|
||||
&local,
|
||||
&remote,
|
||||
&None,
|
||||
Protocol::Http,
|
||||
));
|
||||
|
||||
inbound.recognize(&req) == default
|
||||
}
|
||||
|
|
@ -230,7 +243,13 @@ mod tests {
|
|||
|
||||
let mut req = http::Request::new(());
|
||||
req.extensions_mut()
|
||||
.insert(ctx::transport::Server::new(&ctx, &local, &remote, &Some(local)));
|
||||
.insert(ctx::transport::Server::new(
|
||||
&ctx,
|
||||
&local,
|
||||
&remote,
|
||||
&Some(local),
|
||||
Protocol::Http,
|
||||
));
|
||||
|
||||
inbound.recognize(&req) == default
|
||||
}
|
||||
|
|
|
|||
|
|
@ -317,8 +317,16 @@ where
|
|||
let opened_at = Instant::now();
|
||||
let orig_dst = connection.original_dst_addr();
|
||||
let local_addr = connection.local_addr().unwrap_or(listen_addr);
|
||||
// TODO: detect protocol.
|
||||
let protocol = control::pb::common::Protocol::Http;
|
||||
let srv_ctx =
|
||||
ctx::transport::Server::new(&proxy_ctx, &local_addr, &remote_addr, &orig_dst);
|
||||
ctx::transport::Server::new(
|
||||
&proxy_ctx,
|
||||
&local_addr,
|
||||
&remote_addr,
|
||||
&orig_dst,
|
||||
protocol,
|
||||
);
|
||||
|
||||
let io = sensors.accept(connection, opened_at, &srv_ctx);
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use std::time::Duration;
|
|||
use http;
|
||||
use ordermap::OrderMap;
|
||||
|
||||
use control::pb::common::{HttpMethod, TcpAddress};
|
||||
use control::pb::common::{HttpMethod, TcpAddress, Protocol};
|
||||
use control::pb::proxy::telemetry::{
|
||||
eos_ctx,
|
||||
ClientTransport,
|
||||
|
|
@ -81,6 +81,7 @@ enum End {
|
|||
|
||||
#[derive(Debug, Default)]
|
||||
struct TransportStats {
|
||||
protocol: Protocol,
|
||||
connects: u32,
|
||||
disconnects: Vec<TransportSummary>,
|
||||
}
|
||||
|
|
@ -199,11 +200,17 @@ impl Metrics {
|
|||
let source = s.remote.ip();
|
||||
self.sources
|
||||
.entry(source)
|
||||
.or_insert_with(TransportStats::default)
|
||||
.or_insert_with(|| TransportStats {
|
||||
protocol: s.protocol,
|
||||
..TransportStats::default()
|
||||
})
|
||||
}
|
||||
ctx::transport::Ctx::Client(ref c) => self.destinations
|
||||
.entry(c.remote)
|
||||
.or_insert_with(TransportStats::default),
|
||||
.or_insert_with(|| TransportStats {
|
||||
protocol: c.protocol,
|
||||
..TransportStats::default()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -216,6 +223,7 @@ impl Metrics {
|
|||
source_ip: Some(ip.into()),
|
||||
connects: stats.connects,
|
||||
disconnects: stats.disconnects,
|
||||
protocol: stats.protocol as i32,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -227,6 +235,7 @@ impl Metrics {
|
|||
}),
|
||||
connects: stats.connects,
|
||||
disconnects: stats.disconnects,
|
||||
protocol: stats.protocol as i32,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue