diff --git a/docs/proto/proto.md b/docs/proto/proto.md index 2d54a7659..dc1cbedde 100644 --- a/docs/proto/proto.md +++ b/docs/proto/proto.md @@ -1162,59 +1162,11 @@ Metric type enum | Name | Number | Description | | ---- | ------ | ----------- | -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= -======= ->>>>>>> adds updated generated files from protobuf ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: restoring metrics.proto comments | SYSTEM | 0 | System metric type | | INSTANCE | 1 | NGINX instance metric type | | AGENT | 2 | Agent metric type | | CACHE_ZONE | 3 | Cache zone metric type | | UPSTREAMS | 4 | Upstreams metric type | -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= ->>>>>>> adds updated generated files from protobuf -======= -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main -| SYSTEM | 0 | | -| INSTANCE | 1 | | -| AGENT | 2 | | -| CACHE_ZONE | 3 | | -| UPSTREAMS | 4 | | -<<<<<<< HEAD ->>>>>>> Create dedicated cache and upstream metrics reports -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= -======= ->>>>>>> adds updated generated files from protobuf ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main -======= ->>>>>>> feat: restoring metrics.proto comments diff --git a/sdk/proto/metrics.pb.go b/sdk/proto/metrics.pb.go index d1f83b02c..e6ad339ef 100644 --- a/sdk/proto/metrics.pb.go +++ b/sdk/proto/metrics.pb.go @@ -29,22 +29,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MetricsReport_Type int32 const ( -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= -======= ->>>>>>> adds updated generated files from protobuf ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: restoring metrics.proto comments // System metric type MetricsReport_SYSTEM MetricsReport_Type = 0 // NGINX instance metric type @@ -52,42 +36,9 @@ const ( // Agent metric type MetricsReport_AGENT MetricsReport_Type = 2 // Cache zone metric type -<<<<<<< HEAD -<<<<<<< HEAD MetricsReport_CACHE_ZONE MetricsReport_Type = 3 // Upstreams metric type MetricsReport_UPSTREAMS MetricsReport_Type = 4 -======= -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main - MetricsReport_SYSTEM MetricsReport_Type = 0 - MetricsReport_INSTANCE MetricsReport_Type = 1 - MetricsReport_AGENT MetricsReport_Type = 2 - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - MetricsReport_UPSTREAMS MetricsReport_Type = 4 -<<<<<<< HEAD ->>>>>>> Create dedicated cache and upstream metrics reports -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - // Upstreams metric type - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> adds updated generated files from protobuf -<<<<<<< HEAD -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main -======= - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - // Upstreams metric type - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> feat: restoring metrics.proto comments ) var MetricsReport_Type_name = map[int32]string{ @@ -375,49 +326,9 @@ func init() { func init() { proto.RegisterFile("metrics.proto", fileDescriptor_6039342a2ba47b72) } var fileDescriptor_6039342a2ba47b72 = []byte{ -<<<<<<< HEAD -<<<<<<< HEAD - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, - 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, - 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, - 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, - 0xac, 0x79, 0xef, 0x8d, 0xdf, 0xb3, 0xa1, 0xc1, 0xa8, 0x58, 0x24, 0xd3, 0x1c, 0x67, 0x0b, 0x2e, - 0x38, 0x42, 0xd7, 0x2f, 0x71, 0x1a, 0x27, 0xe9, 0x77, 0x1c, 0xc5, 0x34, 0x15, 0x38, 0x9f, 0xdd, - 0xb4, 0xeb, 0x53, 0xce, 0x18, 0x4f, 0xd5, 0x44, 0x1b, 0x62, 0x1e, 0xf3, 0xf2, 0x6e, 0xc7, 0x9c, - 0xc7, 0x73, 0xea, 0xc8, 0xee, 0x6a, 0x79, 0xed, 0x88, 0x84, 0xd1, 0x5c, 0x44, 0x2c, 0x53, 0x03, - 0xbd, 0x9f, 0x3a, 0x34, 0x7c, 0x25, 0x40, 0x68, 0xc6, 0x17, 0x02, 0xbd, 0x01, 0x83, 0x51, 0x11, - 0xb5, 0xb4, 0xae, 0xd6, 0xaf, 0x0d, 0xce, 0xf0, 0xbf, 0x7a, 0xd8, 0xa7, 0x22, 0x9a, 0x45, 0x22, - 0x72, 0xab, 0xdb, 0xb5, 0x2d, 0xa7, 0x89, 0xac, 0xe8, 0x1c, 0x0c, 0xb1, 0xca, 0x68, 0x4b, 0xef, - 0x6a, 0xfd, 0xe6, 0xe0, 0xd9, 0x7f, 0xb0, 0xf7, 0x62, 0x38, 0x5c, 0x65, 0x54, 0xb1, 0x14, 0x38, - 0x22, 0x2b, 0x7a, 0x07, 0x46, 0xc1, 0xde, 0xaa, 0x74, 0x2b, 0xfd, 0xda, 0xc0, 0x3e, 0xc6, 0x12, - 0x88, 0x48, 0xe4, 0x5e, 0x2a, 0x12, 0xb1, 0x52, 0xf0, 0x02, 0x40, 0x64, 0xed, 0x8d, 0xc1, 0x28, - 0x68, 0x11, 0xc0, 0x69, 0x70, 0x11, 0x84, 0x9e, 0x6f, 0x3d, 0x42, 0x75, 0xa8, 0x7e, 0x9c, 0x04, - 0xe1, 0x70, 0x32, 0xf2, 0x2c, 0x0d, 0x99, 0x70, 0x32, 0x7c, 0xef, 0x4d, 0x42, 0x4b, 0x47, 0x4d, - 0x80, 0xd1, 0x70, 0xf4, 0xc1, 0xfb, 0x7a, 0xf9, 0x69, 0xe2, 0x59, 0x15, 0xd4, 0x00, 0xf3, 0xcb, - 0xe7, 0x20, 0x24, 0xde, 0xd0, 0x0f, 0x2c, 0xa3, 0xe7, 0x43, 0x3d, 0x48, 0x58, 0x36, 0xa7, 0x6a, - 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, - 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, - 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, - 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, - 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, - 0x72, 0xe9, 0x59, 0xf9, 0xe1, 0xb6, 0x0c, 0xc9, 0xd8, 0x3d, 0x9a, 0xe3, 0x9e, 0xb9, 0xee, 0x93, - 0xed, 0xda, 0x3e, 0x84, 0x92, 0xc3, 0x76, 0x6c, 0x54, 0x75, 0xab, 0x42, 0x1e, 0x97, 0xad, 0xfb, - 0xea, 0xd7, 0xa6, 0xa3, 0xfd, 0xde, 0x74, 0xb4, 0x3f, 0x9b, 0x8e, 0x76, 0xf9, 0x3c, 0x4e, 0xc4, - 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, - 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, - 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, -======= - // 488 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0x8e, 0x5b, 0xe2, 0xc9, 0x8f, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, -======= // 487 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, ->>>>>>> feat: restoring metrics.proto comments 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, @@ -438,18 +349,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, -<<<<<<< HEAD - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x37, 0xf6, 0x72, 0x78, 0x6d, 0xac, 0x16, 0x03, 0xef, - 0x16, 0x03, 0x87, 0xbb, 0x0a, 0x72, 0x5f, 0x8c, 0x7c, 0x80, 0xd9, 0xae, 0xab, 0xbc, 0x74, 0xfd, - 0xe9, 0x31, 0xd7, 0xef, 0x7a, 0x77, 0x9b, 0xdb, 0xb5, 0xbd, 0x07, 0x22, 0x7b, 0x77, 0x74, 0x01, - 0x8d, 0x5c, 0x7a, 0x56, 0x2e, 0x6e, 0xcb, 0x90, 0x8c, 0xdd, 0xa3, 0x73, 0xdc, 0x33, 0xd7, 0x7d, - 0xb2, 0x5d, 0xdb, 0x87, 0x50, 0x72, 0x98, 0x8e, 0x8d, 0xaa, 0x6e, 0x55, 0xc8, 0xe3, 0x32, 0x75, - 0x5f, 0xfd, 0xda, 0x74, 0xb4, 0xdf, 0x9b, 0x8e, 0xf6, 0x67, 0xd3, 0xd1, 0x2e, 0x9f, 0xc7, 0x89, - 0xf8, 0xb6, 0xbc, 0xc2, 0x53, 0xce, 0x1c, 0xa9, 0xe3, 0x48, 0x1d, 0x27, 0x9f, 0xdd, 0x38, 0xb7, - 0x03, 0xf5, 0x38, 0xde, 0x2a, 0x27, 0x4e, 0xe5, 0xf1, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xee, 0x4a, 0xc6, 0xb7, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> Create dedicated cache and upstream metrics reports -======= 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, @@ -459,7 +358,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> feat: restoring metrics.proto comments } func (m *MetricsReport) Marshal() (dAtA []byte, err error) { diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go index 3f36399fb..e6ad339ef 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go @@ -29,10 +29,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MetricsReport_Type int32 const ( -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> feat: restoring metrics.proto comments // System metric type MetricsReport_SYSTEM MetricsReport_Type = 0 // NGINX instance metric type @@ -40,22 +36,9 @@ const ( // Agent metric type MetricsReport_AGENT MetricsReport_Type = 2 // Cache zone metric type -<<<<<<< HEAD MetricsReport_CACHE_ZONE MetricsReport_Type = 3 // Upstreams metric type MetricsReport_UPSTREAMS MetricsReport_Type = 4 -======= - MetricsReport_SYSTEM MetricsReport_Type = 0 - MetricsReport_INSTANCE MetricsReport_Type = 1 - MetricsReport_AGENT MetricsReport_Type = 2 - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> feat: fixed tests and rebased with nginx/agent main -======= - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - // Upstreams metric type - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> feat: restoring metrics.proto comments ) var MetricsReport_Type_name = map[int32]string{ @@ -343,49 +326,9 @@ func init() { func init() { proto.RegisterFile("metrics.proto", fileDescriptor_6039342a2ba47b72) } var fileDescriptor_6039342a2ba47b72 = []byte{ -<<<<<<< HEAD -<<<<<<< HEAD - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, - 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, - 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, - 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, - 0xac, 0x79, 0xef, 0x8d, 0xdf, 0xb3, 0xa1, 0xc1, 0xa8, 0x58, 0x24, 0xd3, 0x1c, 0x67, 0x0b, 0x2e, - 0x38, 0x42, 0xd7, 0x2f, 0x71, 0x1a, 0x27, 0xe9, 0x77, 0x1c, 0xc5, 0x34, 0x15, 0x38, 0x9f, 0xdd, - 0xb4, 0xeb, 0x53, 0xce, 0x18, 0x4f, 0xd5, 0x44, 0x1b, 0x62, 0x1e, 0xf3, 0xf2, 0x6e, 0xc7, 0x9c, - 0xc7, 0x73, 0xea, 0xc8, 0xee, 0x6a, 0x79, 0xed, 0x88, 0x84, 0xd1, 0x5c, 0x44, 0x2c, 0x53, 0x03, - 0xbd, 0x9f, 0x3a, 0x34, 0x7c, 0x25, 0x40, 0x68, 0xc6, 0x17, 0x02, 0xbd, 0x01, 0x83, 0x51, 0x11, - 0xb5, 0xb4, 0xae, 0xd6, 0xaf, 0x0d, 0xce, 0xf0, 0xbf, 0x7a, 0xd8, 0xa7, 0x22, 0x9a, 0x45, 0x22, - 0x72, 0xab, 0xdb, 0xb5, 0x2d, 0xa7, 0x89, 0xac, 0xe8, 0x1c, 0x0c, 0xb1, 0xca, 0x68, 0x4b, 0xef, - 0x6a, 0xfd, 0xe6, 0xe0, 0xd9, 0x7f, 0xb0, 0xf7, 0x62, 0x38, 0x5c, 0x65, 0x54, 0xb1, 0x14, 0x38, - 0x22, 0x2b, 0x7a, 0x07, 0x46, 0xc1, 0xde, 0xaa, 0x74, 0x2b, 0xfd, 0xda, 0xc0, 0x3e, 0xc6, 0x12, - 0x88, 0x48, 0xe4, 0x5e, 0x2a, 0x12, 0xb1, 0x52, 0xf0, 0x02, 0x40, 0x64, 0xed, 0x8d, 0xc1, 0x28, - 0x68, 0x11, 0xc0, 0x69, 0x70, 0x11, 0x84, 0x9e, 0x6f, 0x3d, 0x42, 0x75, 0xa8, 0x7e, 0x9c, 0x04, - 0xe1, 0x70, 0x32, 0xf2, 0x2c, 0x0d, 0x99, 0x70, 0x32, 0x7c, 0xef, 0x4d, 0x42, 0x4b, 0x47, 0x4d, - 0x80, 0xd1, 0x70, 0xf4, 0xc1, 0xfb, 0x7a, 0xf9, 0x69, 0xe2, 0x59, 0x15, 0xd4, 0x00, 0xf3, 0xcb, - 0xe7, 0x20, 0x24, 0xde, 0xd0, 0x0f, 0x2c, 0xa3, 0xe7, 0x43, 0x3d, 0x48, 0x58, 0x36, 0xa7, 0x6a, - 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, - 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, - 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, - 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, - 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, - 0x72, 0xe9, 0x59, 0xf9, 0xe1, 0xb6, 0x0c, 0xc9, 0xd8, 0x3d, 0x9a, 0xe3, 0x9e, 0xb9, 0xee, 0x93, - 0xed, 0xda, 0x3e, 0x84, 0x92, 0xc3, 0x76, 0x6c, 0x54, 0x75, 0xab, 0x42, 0x1e, 0x97, 0xad, 0xfb, - 0xea, 0xd7, 0xa6, 0xa3, 0xfd, 0xde, 0x74, 0xb4, 0x3f, 0x9b, 0x8e, 0x76, 0xf9, 0x3c, 0x4e, 0xc4, - 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, - 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, - 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, -======= - // 488 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0x8e, 0x5b, 0xe2, 0xc9, 0x8f, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, -======= // 487 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, ->>>>>>> feat: restoring metrics.proto comments 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, @@ -406,18 +349,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, -<<<<<<< HEAD - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x37, 0xf6, 0x72, 0x78, 0x6d, 0xac, 0x16, 0x03, 0xef, - 0x16, 0x03, 0x87, 0xbb, 0x0a, 0x72, 0x5f, 0x8c, 0x7c, 0x80, 0xd9, 0xae, 0xab, 0xbc, 0x74, 0xfd, - 0xe9, 0x31, 0xd7, 0xef, 0x7a, 0x77, 0x9b, 0xdb, 0xb5, 0xbd, 0x07, 0x22, 0x7b, 0x77, 0x74, 0x01, - 0x8d, 0x5c, 0x7a, 0x56, 0x2e, 0x6e, 0xcb, 0x90, 0x8c, 0xdd, 0xa3, 0x73, 0xdc, 0x33, 0xd7, 0x7d, - 0xb2, 0x5d, 0xdb, 0x87, 0x50, 0x72, 0x98, 0x8e, 0x8d, 0xaa, 0x6e, 0x55, 0xc8, 0xe3, 0x32, 0x75, - 0x5f, 0xfd, 0xda, 0x74, 0xb4, 0xdf, 0x9b, 0x8e, 0xf6, 0x67, 0xd3, 0xd1, 0x2e, 0x9f, 0xc7, 0x89, - 0xf8, 0xb6, 0xbc, 0xc2, 0x53, 0xce, 0x1c, 0xa9, 0xe3, 0x48, 0x1d, 0x27, 0x9f, 0xdd, 0x38, 0xb7, - 0x03, 0xf5, 0x38, 0xde, 0x2a, 0x27, 0x4e, 0xe5, 0xf1, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xee, 0x4a, 0xc6, 0xb7, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> feat: fixed tests and rebased with nginx/agent main -======= 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, @@ -427,7 +358,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> feat: restoring metrics.proto comments } func (m *MetricsReport) Marshal() (dAtA []byte, err error) { diff --git a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto index 5fb33f4bc..fa3cf941d 100644 --- a/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto +++ b/test/integration/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto @@ -9,71 +9,52 @@ option go_package = "github.com/nginx/agent/sdk/v2/proto;proto"; // Represents a metric report message MetricsReport { -<<<<<<< HEAD + // Metric type enum enum Type { + // System metric type SYSTEM = 0; + // NGINX instance metric type INSTANCE = 1; + // Agent metric type AGENT = 2; -<<<<<<< HEAD // Cache zone metric type CACHE_ZONE = 3; // Upstreams metric type -======= - CACHE_ZONE = 3; ->>>>>>> feat: fixed tests and rebased with nginx/agent main UPSTREAMS = 4; } - Metadata meta = 1 [(gogoproto.jsontag) = "meta" ]; - Type type = 2 [(gogoproto.jsontag) = "type" ]; - repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data" ]; -======= - // Metric type enum - enum Type { - // System metric type - SYSTEM = 0; - // NGINX instance metric type - INSTANCE = 1; - // Agent metric type - AGENT = 2; - // Cache zone metric type - CACHE_ZONE = 3; - // Upstreams metric type - UPSTREAMS = 4; - } - // Provides meta information about the metrics - Metadata meta = 1 [(gogoproto.jsontag) = "meta"]; - // Type of metrics - Type type = 2 [(gogoproto.jsontag) = "type"]; - // List of stats entities - repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data"]; ->>>>>>> feat: restoring metrics.proto comments + // Provides meta information about the metrics + Metadata meta = 1 [(gogoproto.jsontag) = "meta"]; + // Type of metrics + Type type = 2 [(gogoproto.jsontag) = "type"]; + // List of stats entities + repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data"]; } // Represents a simple metric message SimpleMetric { - // Metric name - string name = 1 [(gogoproto.jsontag) = "name"]; - // Metric value - double value = 2 [(gogoproto.jsontag) = "value"]; + // Metric name + string name = 1 [(gogoproto.jsontag) = "name"]; + // Metric value + double value = 2 [(gogoproto.jsontag) = "value"]; } // Represents a dimension which is a dimensional attribute used when classifying and categorizing data message Dimension { - // Dimension name - string name = 1 [(gogoproto.jsontag) = "name"]; - // Dimension value - string value = 2 [(gogoproto.jsontag) = "value"]; + // Dimension name + string name = 1 [(gogoproto.jsontag) = "name"]; + // Dimension value + string value = 2 [(gogoproto.jsontag) = "value"]; } // Represents a stats entity which is a timestamped entry for dimensions and metrics message StatsEntity { - // Timestamp defines the time of stats entity creation - google.protobuf.Timestamp timestamp = 1; - // DEPRECATED - reserved 2; - reserved "metrics"; - // List of dimensions - repeated Dimension dimensions = 3 [(gogoproto.jsontag) = "dimensions"]; - // List of metrics - repeated SimpleMetric simplemetrics = 4 [(gogoproto.jsontag) = "simplemetrics"]; + // Timestamp defines the time of stats entity creation + google.protobuf.Timestamp timestamp = 1; + // DEPRECATED + reserved 2; + reserved "metrics"; + // List of dimensions + repeated Dimension dimensions = 3 [(gogoproto.jsontag) = "dimensions"]; + // List of metrics + repeated SimpleMetric simplemetrics = 4 [(gogoproto.jsontag) = "simplemetrics"]; } diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go index d1f83b02c..e6ad339ef 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go @@ -29,22 +29,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MetricsReport_Type int32 const ( -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= -======= ->>>>>>> adds updated generated files from protobuf ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: restoring metrics.proto comments // System metric type MetricsReport_SYSTEM MetricsReport_Type = 0 // NGINX instance metric type @@ -52,42 +36,9 @@ const ( // Agent metric type MetricsReport_AGENT MetricsReport_Type = 2 // Cache zone metric type -<<<<<<< HEAD -<<<<<<< HEAD MetricsReport_CACHE_ZONE MetricsReport_Type = 3 // Upstreams metric type MetricsReport_UPSTREAMS MetricsReport_Type = 4 -======= -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main - MetricsReport_SYSTEM MetricsReport_Type = 0 - MetricsReport_INSTANCE MetricsReport_Type = 1 - MetricsReport_AGENT MetricsReport_Type = 2 - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - MetricsReport_UPSTREAMS MetricsReport_Type = 4 -<<<<<<< HEAD ->>>>>>> Create dedicated cache and upstream metrics reports -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - // Upstreams metric type - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> adds updated generated files from protobuf -<<<<<<< HEAD -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main -======= - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - // Upstreams metric type - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> feat: restoring metrics.proto comments ) var MetricsReport_Type_name = map[int32]string{ @@ -375,49 +326,9 @@ func init() { func init() { proto.RegisterFile("metrics.proto", fileDescriptor_6039342a2ba47b72) } var fileDescriptor_6039342a2ba47b72 = []byte{ -<<<<<<< HEAD -<<<<<<< HEAD - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, - 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, - 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, - 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, - 0xac, 0x79, 0xef, 0x8d, 0xdf, 0xb3, 0xa1, 0xc1, 0xa8, 0x58, 0x24, 0xd3, 0x1c, 0x67, 0x0b, 0x2e, - 0x38, 0x42, 0xd7, 0x2f, 0x71, 0x1a, 0x27, 0xe9, 0x77, 0x1c, 0xc5, 0x34, 0x15, 0x38, 0x9f, 0xdd, - 0xb4, 0xeb, 0x53, 0xce, 0x18, 0x4f, 0xd5, 0x44, 0x1b, 0x62, 0x1e, 0xf3, 0xf2, 0x6e, 0xc7, 0x9c, - 0xc7, 0x73, 0xea, 0xc8, 0xee, 0x6a, 0x79, 0xed, 0x88, 0x84, 0xd1, 0x5c, 0x44, 0x2c, 0x53, 0x03, - 0xbd, 0x9f, 0x3a, 0x34, 0x7c, 0x25, 0x40, 0x68, 0xc6, 0x17, 0x02, 0xbd, 0x01, 0x83, 0x51, 0x11, - 0xb5, 0xb4, 0xae, 0xd6, 0xaf, 0x0d, 0xce, 0xf0, 0xbf, 0x7a, 0xd8, 0xa7, 0x22, 0x9a, 0x45, 0x22, - 0x72, 0xab, 0xdb, 0xb5, 0x2d, 0xa7, 0x89, 0xac, 0xe8, 0x1c, 0x0c, 0xb1, 0xca, 0x68, 0x4b, 0xef, - 0x6a, 0xfd, 0xe6, 0xe0, 0xd9, 0x7f, 0xb0, 0xf7, 0x62, 0x38, 0x5c, 0x65, 0x54, 0xb1, 0x14, 0x38, - 0x22, 0x2b, 0x7a, 0x07, 0x46, 0xc1, 0xde, 0xaa, 0x74, 0x2b, 0xfd, 0xda, 0xc0, 0x3e, 0xc6, 0x12, - 0x88, 0x48, 0xe4, 0x5e, 0x2a, 0x12, 0xb1, 0x52, 0xf0, 0x02, 0x40, 0x64, 0xed, 0x8d, 0xc1, 0x28, - 0x68, 0x11, 0xc0, 0x69, 0x70, 0x11, 0x84, 0x9e, 0x6f, 0x3d, 0x42, 0x75, 0xa8, 0x7e, 0x9c, 0x04, - 0xe1, 0x70, 0x32, 0xf2, 0x2c, 0x0d, 0x99, 0x70, 0x32, 0x7c, 0xef, 0x4d, 0x42, 0x4b, 0x47, 0x4d, - 0x80, 0xd1, 0x70, 0xf4, 0xc1, 0xfb, 0x7a, 0xf9, 0x69, 0xe2, 0x59, 0x15, 0xd4, 0x00, 0xf3, 0xcb, - 0xe7, 0x20, 0x24, 0xde, 0xd0, 0x0f, 0x2c, 0xa3, 0xe7, 0x43, 0x3d, 0x48, 0x58, 0x36, 0xa7, 0x6a, - 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, - 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, - 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, - 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, - 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, - 0x72, 0xe9, 0x59, 0xf9, 0xe1, 0xb6, 0x0c, 0xc9, 0xd8, 0x3d, 0x9a, 0xe3, 0x9e, 0xb9, 0xee, 0x93, - 0xed, 0xda, 0x3e, 0x84, 0x92, 0xc3, 0x76, 0x6c, 0x54, 0x75, 0xab, 0x42, 0x1e, 0x97, 0xad, 0xfb, - 0xea, 0xd7, 0xa6, 0xa3, 0xfd, 0xde, 0x74, 0xb4, 0x3f, 0x9b, 0x8e, 0x76, 0xf9, 0x3c, 0x4e, 0xc4, - 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, - 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, - 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, -======= - // 488 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0x8e, 0x5b, 0xe2, 0xc9, 0x8f, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, -======= // 487 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, ->>>>>>> feat: restoring metrics.proto comments 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, @@ -438,18 +349,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, -<<<<<<< HEAD - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x37, 0xf6, 0x72, 0x78, 0x6d, 0xac, 0x16, 0x03, 0xef, - 0x16, 0x03, 0x87, 0xbb, 0x0a, 0x72, 0x5f, 0x8c, 0x7c, 0x80, 0xd9, 0xae, 0xab, 0xbc, 0x74, 0xfd, - 0xe9, 0x31, 0xd7, 0xef, 0x7a, 0x77, 0x9b, 0xdb, 0xb5, 0xbd, 0x07, 0x22, 0x7b, 0x77, 0x74, 0x01, - 0x8d, 0x5c, 0x7a, 0x56, 0x2e, 0x6e, 0xcb, 0x90, 0x8c, 0xdd, 0xa3, 0x73, 0xdc, 0x33, 0xd7, 0x7d, - 0xb2, 0x5d, 0xdb, 0x87, 0x50, 0x72, 0x98, 0x8e, 0x8d, 0xaa, 0x6e, 0x55, 0xc8, 0xe3, 0x32, 0x75, - 0x5f, 0xfd, 0xda, 0x74, 0xb4, 0xdf, 0x9b, 0x8e, 0xf6, 0x67, 0xd3, 0xd1, 0x2e, 0x9f, 0xc7, 0x89, - 0xf8, 0xb6, 0xbc, 0xc2, 0x53, 0xce, 0x1c, 0xa9, 0xe3, 0x48, 0x1d, 0x27, 0x9f, 0xdd, 0x38, 0xb7, - 0x03, 0xf5, 0x38, 0xde, 0x2a, 0x27, 0x4e, 0xe5, 0xf1, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xee, 0x4a, 0xc6, 0xb7, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> Create dedicated cache and upstream metrics reports -======= 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, @@ -459,7 +358,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> feat: restoring metrics.proto comments } func (m *MetricsReport) Marshal() (dAtA []byte, err error) { diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto index d880f0faa..fa3cf941d 100644 --- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto +++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto @@ -9,89 +9,52 @@ option go_package = "github.com/nginx/agent/sdk/v2/proto;proto"; // Represents a metric report message MetricsReport { -<<<<<<< HEAD + // Metric type enum enum Type { + // System metric type SYSTEM = 0; + // NGINX instance metric type INSTANCE = 1; + // Agent metric type AGENT = 2; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Create dedicated cache and upstream metrics reports // Cache zone metric type CACHE_ZONE = 3; // Upstreams metric type -======= - CACHE_ZONE = 3; ->>>>>>> Create dedicated cache and upstream metrics reports -======= -======= -======= ->>>>>>> adds updated generated files from protobuf ->>>>>>> adds updated generated files from protobuf - // Cache zone metric type - CACHE_ZONE = 3; - // Upstreams metric type ->>>>>>> adds updated generated files from protobuf -======= - CACHE_ZONE = 3; ->>>>>>> feat: fixed tests and rebased with nginx/agent main UPSTREAMS = 4; } - Metadata meta = 1 [(gogoproto.jsontag) = "meta" ]; - Type type = 2 [(gogoproto.jsontag) = "type" ]; - repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data" ]; -======= - // Metric type enum - enum Type { - // System metric type - SYSTEM = 0; - // NGINX instance metric type - INSTANCE = 1; - // Agent metric type - AGENT = 2; - // Cache zone metric type - CACHE_ZONE = 3; - // Upstreams metric type - UPSTREAMS = 4; - } - // Provides meta information about the metrics - Metadata meta = 1 [(gogoproto.jsontag) = "meta"]; - // Type of metrics - Type type = 2 [(gogoproto.jsontag) = "type"]; - // List of stats entities - repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data"]; ->>>>>>> feat: restoring metrics.proto comments + // Provides meta information about the metrics + Metadata meta = 1 [(gogoproto.jsontag) = "meta"]; + // Type of metrics + Type type = 2 [(gogoproto.jsontag) = "type"]; + // List of stats entities + repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data"]; } // Represents a simple metric message SimpleMetric { - // Metric name - string name = 1 [(gogoproto.jsontag) = "name"]; - // Metric value - double value = 2 [(gogoproto.jsontag) = "value"]; + // Metric name + string name = 1 [(gogoproto.jsontag) = "name"]; + // Metric value + double value = 2 [(gogoproto.jsontag) = "value"]; } // Represents a dimension which is a dimensional attribute used when classifying and categorizing data message Dimension { - // Dimension name - string name = 1 [(gogoproto.jsontag) = "name"]; - // Dimension value - string value = 2 [(gogoproto.jsontag) = "value"]; + // Dimension name + string name = 1 [(gogoproto.jsontag) = "name"]; + // Dimension value + string value = 2 [(gogoproto.jsontag) = "value"]; } // Represents a stats entity which is a timestamped entry for dimensions and metrics message StatsEntity { - // Timestamp defines the time of stats entity creation - google.protobuf.Timestamp timestamp = 1; - // DEPRECATED - reserved 2; - reserved "metrics"; - // List of dimensions - repeated Dimension dimensions = 3 [(gogoproto.jsontag) = "dimensions"]; - // List of metrics - repeated SimpleMetric simplemetrics = 4 [(gogoproto.jsontag) = "simplemetrics"]; + // Timestamp defines the time of stats entity creation + google.protobuf.Timestamp timestamp = 1; + // DEPRECATED + reserved 2; + reserved "metrics"; + // List of dimensions + repeated Dimension dimensions = 3 [(gogoproto.jsontag) = "dimensions"]; + // List of metrics + repeated SimpleMetric simplemetrics = 4 [(gogoproto.jsontag) = "simplemetrics"]; } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go index 721f4375d..b3a718215 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/core/metrics/metrics_util.go @@ -9,12 +9,8 @@ package metrics import ( "context" -<<<<<<< HEAD "math" "sort" -======= - "github.com/nginx/agent/v2/src/core" ->>>>>>> using StatsEntityWarpper in place of StatsEntity "sync" "time" @@ -43,13 +39,10 @@ type StatsEntityWrapper struct { Data *proto.StatsEntity } -<<<<<<< HEAD type MetricsReportBundle struct { Data []*proto.MetricsReport } -======= ->>>>>>> using StatsEntityWarpper in place of StatsEntity type NginxCollectorConfig struct { NginxId string StubStatus string @@ -384,11 +377,7 @@ func GetCalculationMap() map[string]string { } } -<<<<<<< HEAD func GenerateMetricsReports(entities []*StatsEntityWrapper) (bundles []core.Payload) { -======= -func GenerateMetricsReports(entities []*StatsEntityWrapper) (reports []core.Payload) { ->>>>>>> using StatsEntityWarpper in place of StatsEntity reportMap := make(map[proto.MetricsReport_Type]*proto.MetricsReport, 0) for _, entity := range entities { @@ -404,17 +393,12 @@ func GenerateMetricsReports(entities []*StatsEntityWrapper) (reports []core.Payl reportMap[entity.Type].Data = append(reportMap[entity.Type].Data, entity.Data) } -<<<<<<< HEAD if len(reportMap) > 0 { bundle := &MetricsReportBundle{Data: []*proto.MetricsReport{}} for _, report := range reportMap { bundle.Data = append(bundle.Data, report) } bundles = append(bundles, bundle) -======= - for _, report := range reportMap { - reports = append(reports, report) ->>>>>>> using StatsEntityWarpper in place of StatsEntity } return } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go index 43c2b527a..12fdad027 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics.go @@ -182,32 +182,9 @@ func (m *Metrics) metricsGoroutine() { } return case <-m.ticker.C: -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD stats := m.collectStats() for _, reportBundle := range metrics.GenerateMetricsReports(stats) { m.pipeline.Process(core.NewMessage(core.MetricReport, reportBundle)) -======= - for _, report := range generateMetricsReports(m.collectStats(), true) { -======= - stats := m.collectStats() - for _, report := range metrics.GenerateMetricsReports(stats) { ->>>>>>> using StatsEntityWarpper in place of StatsEntity -======= - stats := m.collectStats() - for _, report := range metrics.GenerateMetricsReports(stats) { -======= - for _, report := range generateMetricsReports(m.collectStats(), true) { ->>>>>>> Create dedicated cache and upstream metrics reports ->>>>>>> Create dedicated cache and upstream metrics reports -======= - stats := m.collectStats() - for _, report := range metrics.GenerateMetricsReports(stats) { ->>>>>>> feat: fixed tests and rebased with nginx/agent main - m.pipeline.Process(core.NewMessage(core.MetricReport, report)) ->>>>>>> Create dedicated cache and upstream metrics reports } if m.collectorsUpdate.Load() { m.ticker = time.NewTicker(m.conf.AgentMetrics.CollectionInterval) diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_throlling.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_throlling.go index 611e85cc8..1b046762c 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_throlling.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_throlling.go @@ -89,7 +89,6 @@ func (r *MetricsThrottle) Process(msg *core.Message) { return case msg.Exact(core.MetricReport): if r.metricsAggregation { -<<<<<<< HEAD switch bundle := msg.Data().(type) { case *metrics.MetricsReportBundle: if len(bundle.Data) > 0 { @@ -112,7 +111,6 @@ func (r *MetricsThrottle) Process(msg *core.Message) { } } } else { -<<<<<<< HEAD switch bundle := msg.Data().(type) { case *metrics.MetricsReportBundle: if len(bundle.Data) > 0 { @@ -123,46 +121,6 @@ func (r *MetricsThrottle) Process(msg *core.Message) { } } } -======= - r.metricBuffer = append(r.metricBuffer, - generateMetricsReports(getAllStatsEntities(msg.Data()), false)...) ->>>>>>> Create dedicated cache and upstream metrics reports -======= - switch report := msg.Data().(type) { - case *proto.MetricsReport: - if len(report.Data) > 0 { - r.mu.Lock() - if _, ok := r.metricsCollections[report.Type]; !ok { - r.metricsCollections[report.Type] = &metrics.Collections{ - Count: 0, - Data: make(map[string]metrics.PerDimension), - } - } - collection := metrics.SaveCollections(*r.metricsCollections[report.Type], report) - r.metricsCollections[report.Type] = &collection - r.mu.Unlock() - log.Debugf("MetricsThrottle: Metrics collection saved [Type: %d]", report.Type) - r.reportsReady.Store(true) - } - } - } else { - switch report := msg.Data().(type) { - case *proto.MetricsReport: - if len(report.Data) > 0 { - r.metricBuffer = append(r.metricBuffer, report) - } - } -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> using StatsEntityWarpper in place of StatsEntity -======= -======= - r.metricBuffer = append(r.metricBuffer, - generateMetricsReports(getAllStatsEntities(msg.Data()), false)...) ->>>>>>> Create dedicated cache and upstream metrics reports ->>>>>>> Create dedicated cache and upstream metrics reports -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main log.Tracef("MetricsThrottle buffer size: %d of %d", len(r.metricBuffer), r.BulkSize) if len(r.metricBuffer) >= r.BulkSize { log.Info("MetricsThrottle buffer flush") @@ -227,10 +185,6 @@ func (r *MetricsThrottle) syncAgentConfigChange() { r.conf = conf } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD func (r *MetricsThrottle) getAggregatedReports() (reports []core.Payload) { r.mu.Lock() defer r.mu.Unlock() @@ -250,54 +204,4 @@ func (r *MetricsThrottle) getAggregatedReports() (reports []core.Payload) { } return -======= -func (r *MetricsThrottle) getAggregatedReports() []core.Payload { -======= -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main -func (r *MetricsThrottle) getAggregatedReports() (reports []core.Payload) { ->>>>>>> using StatsEntityWarpper in place of StatsEntity - r.mu.Lock() - defer r.mu.Unlock() - - for reportType, collection := range r.metricsCollections { - reports = append(reports, &proto.MetricsReport{ - Meta: &proto.Metadata{ - Timestamp: types.TimestampNow(), - }, - Type: reportType, - Data: metrics.GenerateMetrics(*collection), - }) - r.metricsCollections[reportType] = &metrics.Collections{ - Count: 0, - Data: make(map[string]metrics.PerDimension), - } - } - -<<<<<<< HEAD - return reports ->>>>>>> Create dedicated cache and upstream metrics reports -======= - return -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> using StatsEntityWarpper in place of StatsEntity -======= -======= -func (r *MetricsThrottle) getAggregatedReports() []core.Payload { - r.mu.Lock() - defer r.mu.Unlock() - reports := generateMetricsReports(metrics.GenerateMetrics(r.metricsCollections), false) - r.metricsCollections = metrics.Collections{ - Count: 0, - Data: make(map[string]metrics.PerDimension), - } - - return reports ->>>>>>> Create dedicated cache and upstream metrics reports ->>>>>>> Create dedicated cache and upstream metrics reports -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_utils.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_utils.go deleted file mode 100644 index c3fdc48c8..000000000 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_utils.go +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright (c) F5, Inc. - * - * This source code is licensed under the Apache License, Version 2.0 license found in the - * LICENSE file in the root directory of this source tree. - */ - -package plugins - -import ( - "github.com/gogo/protobuf/types" - "github.com/nginx/agent/sdk/v2/proto" - "github.com/nginx/agent/v2/src/core" - "strings" -) - -func generateMetricsReports(stats []*proto.StatsEntity, singleReport bool) []core.Payload { - - reports := make([]core.Payload, 0) - cache_zones, upstreams, other := groupStatsEntities(stats, singleReport) - - for cz := range cache_zones { - reports = append(reports, &proto.MetricsReport{ - Meta: &proto.Metadata{ - Timestamp: types.TimestampNow(), - }, - Type: proto.MetricsReport_CACHE_ZONE, - Data: cache_zones[cz], - }) - } - - for ups := range upstreams { - reports = append(reports, &proto.MetricsReport{ - Meta: &proto.Metadata{ - Timestamp: types.TimestampNow(), - }, - Type: proto.MetricsReport_UPSTREAMS, - Data: upstreams[ups], - }) - } - - if len(other) > 0 { - reports = append(reports, &proto.MetricsReport{ - Meta: &proto.Metadata{ - Timestamp: types.TimestampNow(), - }, - Type: proto.MetricsReport_SYSTEM, - Data: other, - }) - } - - return reports -} - -func groupStatsEntities(stats []*proto.StatsEntity, singleReport bool) (map[string][]*proto.StatsEntity, map[string][]*proto.StatsEntity, []*proto.StatsEntity) { - cache_zones := make(map[string][]*proto.StatsEntity, 0) - upstreams := make(map[string][]*proto.StatsEntity, 0) - other := make([]*proto.StatsEntity, 0) - - for _, s := range stats { - if !singleReport { - if cz, exists := hasNonEmptyDimension(s, "cache_zone"); exists { - if _, ok := cache_zones[cz]; !ok { - cache_zones[cz] = make([]*proto.StatsEntity, 0) - } - cache_zones[cz] = append(cache_zones[cz], s) - } else if ups, exists := hasNonEmptyDimension(s, "upstream"); exists { - if _, ok := upstreams[ups]; !ok { - upstreams[ups] = make([]*proto.StatsEntity, 0) - } - upstreams[ups] = append(upstreams[ups], s) - } else { - other = append(other, s) - } - } else { - other = append(other, s) - } - } - - return cache_zones, upstreams, other -} - -func getAllStatsEntities(payload core.Payload) []*proto.StatsEntity { - ses := make([]*proto.StatsEntity, 0) - switch p := payload.(type) { - case *proto.MetricsReport: - ses = append(ses, p.GetData()...) - } - return ses -} - -func hasNonEmptyDimension(s *proto.StatsEntity, name string) (string, bool) { - if s == nil { - return "", false - } - dims := s.GetDimensions() - lcName := strings.ToLower(name) - for _, dim := range dims { - if strings.ToLower(dim.Name) == lcName && strings.TrimSpace(dim.Value) != "" { - return dim.Value, true - } - } - return "", false -} diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go b/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go index d1f83b02c..e6ad339ef 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.pb.go @@ -29,22 +29,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MetricsReport_Type int32 const ( -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= -======= ->>>>>>> adds updated generated files from protobuf ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: restoring metrics.proto comments // System metric type MetricsReport_SYSTEM MetricsReport_Type = 0 // NGINX instance metric type @@ -52,42 +36,9 @@ const ( // Agent metric type MetricsReport_AGENT MetricsReport_Type = 2 // Cache zone metric type -<<<<<<< HEAD -<<<<<<< HEAD MetricsReport_CACHE_ZONE MetricsReport_Type = 3 // Upstreams metric type MetricsReport_UPSTREAMS MetricsReport_Type = 4 -======= -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main - MetricsReport_SYSTEM MetricsReport_Type = 0 - MetricsReport_INSTANCE MetricsReport_Type = 1 - MetricsReport_AGENT MetricsReport_Type = 2 - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - MetricsReport_UPSTREAMS MetricsReport_Type = 4 -<<<<<<< HEAD ->>>>>>> Create dedicated cache and upstream metrics reports -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> adds updated generated files from protobuf -======= - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - // Upstreams metric type - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> adds updated generated files from protobuf -<<<<<<< HEAD -======= ->>>>>>> Create dedicated cache and upstream metrics reports -======= ->>>>>>> adds updated generated files from protobuf -======= ->>>>>>> feat: fixed tests and rebased with nginx/agent main -======= - MetricsReport_CACHE_ZONE MetricsReport_Type = 3 - // Upstreams metric type - MetricsReport_UPSTREAMS MetricsReport_Type = 4 ->>>>>>> feat: restoring metrics.proto comments ) var MetricsReport_Type_name = map[int32]string{ @@ -375,49 +326,9 @@ func init() { func init() { proto.RegisterFile("metrics.proto", fileDescriptor_6039342a2ba47b72) } var fileDescriptor_6039342a2ba47b72 = []byte{ -<<<<<<< HEAD -<<<<<<< HEAD - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, - 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, - 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, - 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, - 0xac, 0x79, 0xef, 0x8d, 0xdf, 0xb3, 0xa1, 0xc1, 0xa8, 0x58, 0x24, 0xd3, 0x1c, 0x67, 0x0b, 0x2e, - 0x38, 0x42, 0xd7, 0x2f, 0x71, 0x1a, 0x27, 0xe9, 0x77, 0x1c, 0xc5, 0x34, 0x15, 0x38, 0x9f, 0xdd, - 0xb4, 0xeb, 0x53, 0xce, 0x18, 0x4f, 0xd5, 0x44, 0x1b, 0x62, 0x1e, 0xf3, 0xf2, 0x6e, 0xc7, 0x9c, - 0xc7, 0x73, 0xea, 0xc8, 0xee, 0x6a, 0x79, 0xed, 0x88, 0x84, 0xd1, 0x5c, 0x44, 0x2c, 0x53, 0x03, - 0xbd, 0x9f, 0x3a, 0x34, 0x7c, 0x25, 0x40, 0x68, 0xc6, 0x17, 0x02, 0xbd, 0x01, 0x83, 0x51, 0x11, - 0xb5, 0xb4, 0xae, 0xd6, 0xaf, 0x0d, 0xce, 0xf0, 0xbf, 0x7a, 0xd8, 0xa7, 0x22, 0x9a, 0x45, 0x22, - 0x72, 0xab, 0xdb, 0xb5, 0x2d, 0xa7, 0x89, 0xac, 0xe8, 0x1c, 0x0c, 0xb1, 0xca, 0x68, 0x4b, 0xef, - 0x6a, 0xfd, 0xe6, 0xe0, 0xd9, 0x7f, 0xb0, 0xf7, 0x62, 0x38, 0x5c, 0x65, 0x54, 0xb1, 0x14, 0x38, - 0x22, 0x2b, 0x7a, 0x07, 0x46, 0xc1, 0xde, 0xaa, 0x74, 0x2b, 0xfd, 0xda, 0xc0, 0x3e, 0xc6, 0x12, - 0x88, 0x48, 0xe4, 0x5e, 0x2a, 0x12, 0xb1, 0x52, 0xf0, 0x02, 0x40, 0x64, 0xed, 0x8d, 0xc1, 0x28, - 0x68, 0x11, 0xc0, 0x69, 0x70, 0x11, 0x84, 0x9e, 0x6f, 0x3d, 0x42, 0x75, 0xa8, 0x7e, 0x9c, 0x04, - 0xe1, 0x70, 0x32, 0xf2, 0x2c, 0x0d, 0x99, 0x70, 0x32, 0x7c, 0xef, 0x4d, 0x42, 0x4b, 0x47, 0x4d, - 0x80, 0xd1, 0x70, 0xf4, 0xc1, 0xfb, 0x7a, 0xf9, 0x69, 0xe2, 0x59, 0x15, 0xd4, 0x00, 0xf3, 0xcb, - 0xe7, 0x20, 0x24, 0xde, 0xd0, 0x0f, 0x2c, 0xa3, 0xe7, 0x43, 0x3d, 0x48, 0x58, 0x36, 0xa7, 0x6a, - 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, - 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, - 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, - 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, - 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, - 0x72, 0xe9, 0x59, 0xf9, 0xe1, 0xb6, 0x0c, 0xc9, 0xd8, 0x3d, 0x9a, 0xe3, 0x9e, 0xb9, 0xee, 0x93, - 0xed, 0xda, 0x3e, 0x84, 0x92, 0xc3, 0x76, 0x6c, 0x54, 0x75, 0xab, 0x42, 0x1e, 0x97, 0xad, 0xfb, - 0xea, 0xd7, 0xa6, 0xa3, 0xfd, 0xde, 0x74, 0xb4, 0x3f, 0x9b, 0x8e, 0x76, 0xf9, 0x3c, 0x4e, 0xc4, - 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, - 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, - 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, -======= - // 488 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0x8e, 0x5b, 0xe2, 0xc9, 0x8f, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, -======= // 487 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x6f, 0xd3, 0x40, 0x10, 0xc5, 0x8e, 0x5b, 0xe2, 0xc9, 0x87, 0xcc, 0x9e, 0xa2, 0xa8, 0xc4, 0x51, 0x0e, 0x28, 0x5c, ->>>>>>> feat: restoring metrics.proto comments 0xd6, 0x52, 0x10, 0x02, 0x81, 0x38, 0xc4, 0xa9, 0x05, 0x44, 0x72, 0x40, 0x6b, 0x73, 0x68, 0x2f, 0xc8, 0x4d, 0xb6, 0xc6, 0x6a, 0xd6, 0x6b, 0xc5, 0x9b, 0x8a, 0xdc, 0xf8, 0x21, 0xfc, 0x20, 0x8e, 0xfc, 0x82, 0x08, 0xe5, 0x98, 0x5f, 0x81, 0xbc, 0xeb, 0xb4, 0x89, 0x08, 0x87, 0x5e, 0x66, 0x77, @@ -438,18 +349,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0x6d, 0x74, 0x06, 0x46, 0x1a, 0x31, 0x2a, 0xcd, 0x31, 0x95, 0x72, 0xd1, 0x13, 0x59, 0x91, 0x0d, 0x27, 0xb7, 0xd1, 0x7c, 0xa9, 0xde, 0x5f, 0x73, 0xcd, 0xed, 0xda, 0x56, 0x0f, 0x88, 0x3a, 0x7a, 0x63, 0x30, 0xcf, 0x13, 0x46, 0xd3, 0x3c, 0xe1, 0xe9, 0x43, 0xb8, 0xcc, 0x23, 0x5c, 0x3f, 0x74, -<<<<<<< HEAD - 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x37, 0xf6, 0x72, 0x78, 0x6d, 0xac, 0x16, 0x03, 0xef, - 0x16, 0x03, 0x87, 0xbb, 0x0a, 0x72, 0x5f, 0x8c, 0x7c, 0x80, 0xd9, 0xae, 0xab, 0xbc, 0x74, 0xfd, - 0xe9, 0x31, 0xd7, 0xef, 0x7a, 0x77, 0x9b, 0xdb, 0xb5, 0xbd, 0x07, 0x22, 0x7b, 0x77, 0x74, 0x01, - 0x8d, 0x5c, 0x7a, 0x56, 0x2e, 0x6e, 0xcb, 0x90, 0x8c, 0xdd, 0xa3, 0x73, 0xdc, 0x33, 0xd7, 0x7d, - 0xb2, 0x5d, 0xdb, 0x87, 0x50, 0x72, 0x98, 0x8e, 0x8d, 0xaa, 0x6e, 0x55, 0xc8, 0xe3, 0x32, 0x75, - 0x5f, 0xfd, 0xda, 0x74, 0xb4, 0xdf, 0x9b, 0x8e, 0xf6, 0x67, 0xd3, 0xd1, 0x2e, 0x9f, 0xc7, 0x89, - 0xf8, 0xb6, 0xbc, 0xc2, 0x53, 0xce, 0x1c, 0xa9, 0xe3, 0x48, 0x1d, 0x27, 0x9f, 0xdd, 0x38, 0xb7, - 0x03, 0xf5, 0x38, 0xde, 0x2a, 0x27, 0x4e, 0xe5, 0xf1, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xee, 0x4a, 0xc6, 0xb7, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> Create dedicated cache and upstream metrics reports -======= 0xa8, 0xed, 0xd9, 0x80, 0x5e, 0x83, 0x79, 0x17, 0x6e, 0x19, 0x5e, 0x1b, 0xab, 0xf8, 0xf1, 0x2e, 0x7e, 0x1c, 0xee, 0x26, 0xc8, 0xfd, 0x30, 0xf2, 0x01, 0x66, 0xbb, 0xad, 0xf2, 0xd2, 0xf5, 0xa7, 0xc7, 0x5c, 0xbf, 0xdb, 0xdd, 0x6d, 0x6e, 0xd7, 0xf6, 0x1e, 0x88, 0xec, 0xdd, 0xd1, 0x05, 0x34, @@ -459,7 +358,6 @@ var fileDescriptor_6039342a2ba47b72 = []byte{ 0xb7, 0xe5, 0x15, 0x9e, 0x72, 0xe6, 0x48, 0x1d, 0x47, 0xea, 0x38, 0xf9, 0xec, 0xc6, 0xb9, 0x1d, 0xa8, 0x5f, 0xe0, 0xad, 0x72, 0xe2, 0x54, 0x1e, 0x2f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, 0xa1, 0xae, 0x17, 0x5c, 0x03, 0x00, 0x00, ->>>>>>> feat: restoring metrics.proto comments } func (m *MetricsReport) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto b/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto index d880f0faa..fa3cf941d 100644 --- a/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto +++ b/vendor/github.com/nginx/agent/sdk/v2/proto/metrics.proto @@ -9,89 +9,52 @@ option go_package = "github.com/nginx/agent/sdk/v2/proto;proto"; // Represents a metric report message MetricsReport { -<<<<<<< HEAD + // Metric type enum enum Type { + // System metric type SYSTEM = 0; + // NGINX instance metric type INSTANCE = 1; + // Agent metric type AGENT = 2; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Create dedicated cache and upstream metrics reports // Cache zone metric type CACHE_ZONE = 3; // Upstreams metric type -======= - CACHE_ZONE = 3; ->>>>>>> Create dedicated cache and upstream metrics reports -======= -======= -======= ->>>>>>> adds updated generated files from protobuf ->>>>>>> adds updated generated files from protobuf - // Cache zone metric type - CACHE_ZONE = 3; - // Upstreams metric type ->>>>>>> adds updated generated files from protobuf -======= - CACHE_ZONE = 3; ->>>>>>> feat: fixed tests and rebased with nginx/agent main UPSTREAMS = 4; } - Metadata meta = 1 [(gogoproto.jsontag) = "meta" ]; - Type type = 2 [(gogoproto.jsontag) = "type" ]; - repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data" ]; -======= - // Metric type enum - enum Type { - // System metric type - SYSTEM = 0; - // NGINX instance metric type - INSTANCE = 1; - // Agent metric type - AGENT = 2; - // Cache zone metric type - CACHE_ZONE = 3; - // Upstreams metric type - UPSTREAMS = 4; - } - // Provides meta information about the metrics - Metadata meta = 1 [(gogoproto.jsontag) = "meta"]; - // Type of metrics - Type type = 2 [(gogoproto.jsontag) = "type"]; - // List of stats entities - repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data"]; ->>>>>>> feat: restoring metrics.proto comments + // Provides meta information about the metrics + Metadata meta = 1 [(gogoproto.jsontag) = "meta"]; + // Type of metrics + Type type = 2 [(gogoproto.jsontag) = "type"]; + // List of stats entities + repeated StatsEntity data = 3 [(gogoproto.jsontag) = "data"]; } // Represents a simple metric message SimpleMetric { - // Metric name - string name = 1 [(gogoproto.jsontag) = "name"]; - // Metric value - double value = 2 [(gogoproto.jsontag) = "value"]; + // Metric name + string name = 1 [(gogoproto.jsontag) = "name"]; + // Metric value + double value = 2 [(gogoproto.jsontag) = "value"]; } // Represents a dimension which is a dimensional attribute used when classifying and categorizing data message Dimension { - // Dimension name - string name = 1 [(gogoproto.jsontag) = "name"]; - // Dimension value - string value = 2 [(gogoproto.jsontag) = "value"]; + // Dimension name + string name = 1 [(gogoproto.jsontag) = "name"]; + // Dimension value + string value = 2 [(gogoproto.jsontag) = "value"]; } // Represents a stats entity which is a timestamped entry for dimensions and metrics message StatsEntity { - // Timestamp defines the time of stats entity creation - google.protobuf.Timestamp timestamp = 1; - // DEPRECATED - reserved 2; - reserved "metrics"; - // List of dimensions - repeated Dimension dimensions = 3 [(gogoproto.jsontag) = "dimensions"]; - // List of metrics - repeated SimpleMetric simplemetrics = 4 [(gogoproto.jsontag) = "simplemetrics"]; + // Timestamp defines the time of stats entity creation + google.protobuf.Timestamp timestamp = 1; + // DEPRECATED + reserved 2; + reserved "metrics"; + // List of dimensions + repeated Dimension dimensions = 3 [(gogoproto.jsontag) = "dimensions"]; + // List of metrics + repeated SimpleMetric simplemetrics = 4 [(gogoproto.jsontag) = "simplemetrics"]; }