diff --git a/pkg/querier/tripperware/custom.go b/pkg/querier/tripperware/custom.go index 283262af7d..9627bd94c8 100644 --- a/pkg/querier/tripperware/custom.go +++ b/pkg/querier/tripperware/custom.go @@ -1,28 +1,5 @@ package tripperware -import ( - "fmt" - - "github.com/gogo/protobuf/types" -) - -func (e *Extent) ToResponse() (Response, error) { - msg, err := types.EmptyAny(e.Response) - if err != nil { - return nil, err - } - - if err := types.UnmarshalAny(e.Response, msg); err != nil { - return nil, err - } - - resp, ok := msg.(Response) - if !ok { - return nil, fmt.Errorf("bad cached type") - } - return resp, nil -} - func (m *Sample) GetTimestampMs() int64 { if m != nil { if m.Sample != nil { diff --git a/pkg/querier/tripperware/instantquery/instant_query.go b/pkg/querier/tripperware/instantquery/instant_query.go index 5a8f875845..afed40adc4 100644 --- a/pkg/querier/tripperware/instantquery/instant_query.go +++ b/pkg/querier/tripperware/instantquery/instant_query.go @@ -66,7 +66,7 @@ func (c instantQueryCodec) DecodeRequest(_ context.Context, r *http.Request, for } func (instantQueryCodec) DecodeResponse(ctx context.Context, r *http.Response, _ tripperware.Request) (tripperware.Response, error) { - log, ctx := spanlogger.New(ctx, "tripperware.PrometheusResponse") //nolint:ineffassign,staticcheck + log, ctx := spanlogger.New(ctx, "DecodeQueryInstantResponse") //nolint:ineffassign,staticcheck defer log.Finish() if err := ctx.Err(); err != nil { diff --git a/pkg/querier/tripperware/queryrange/query_range.go b/pkg/querier/tripperware/queryrange/query_range.go index fc0b27a4f1..ac36e66b0d 100644 --- a/pkg/querier/tripperware/queryrange/query_range.go +++ b/pkg/querier/tripperware/queryrange/query_range.go @@ -41,6 +41,20 @@ var ( cacheControlHeader = "Cache-Control" ) +func (resp *PrometheusResponse) HTTPHeaders() map[string][]string { + if resp != nil && resp.GetHeaders() != nil { + r := map[string][]string{} + for _, header := range resp.GetHeaders() { + if header != nil { + r[header.Name] = header.Values + } + } + + return r + } + return nil +} + type prometheusCodec struct { sharded bool } @@ -57,6 +71,11 @@ func (c prometheusCodec) MergeResponse(ctx context.Context, req tripperware.Requ return tripperware.NewEmptyPrometheusResponse(false), nil } + // Safety guard in case any response from results cache middleware + // still uses the old queryrange.PrometheusResponse type. + for i, resp := range responses { + responses[i] = convertToTripperwarePrometheusResponse(resp) + } return tripperware.MergeResponse(ctx, c.sharded, nil, responses...) } diff --git a/pkg/querier/tripperware/queryrange/queryrange.pb.go b/pkg/querier/tripperware/queryrange/queryrange.pb.go new file mode 100644 index 0000000000..77290ee97a --- /dev/null +++ b/pkg/querier/tripperware/queryrange/queryrange.pb.go @@ -0,0 +1,1106 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: queryrange.proto + +package queryrange + +import ( + fmt "fmt" + tripperware "github.com/cortexproject/cortex/pkg/querier/tripperware" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + math_bits "math/bits" + reflect "reflect" + strings "strings" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type PrometheusResponse struct { + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data PrometheusData `protobuf:"bytes,2,opt,name=Data,proto3" json:"data,omitempty"` + ErrorType string `protobuf:"bytes,3,opt,name=ErrorType,proto3" json:"errorType,omitempty"` + Error string `protobuf:"bytes,4,opt,name=Error,proto3" json:"error,omitempty"` + Headers []*tripperware.PrometheusResponseHeader `protobuf:"bytes,5,rep,name=Headers,proto3" json:"-"` + Warnings []string `protobuf:"bytes,6,rep,name=Warnings,proto3" json:"warnings,omitempty"` +} + +func (m *PrometheusResponse) Reset() { *m = PrometheusResponse{} } +func (*PrometheusResponse) ProtoMessage() {} +func (*PrometheusResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_79b02382e213d0b2, []int{0} +} +func (m *PrometheusResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PrometheusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PrometheusResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PrometheusResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PrometheusResponse.Merge(m, src) +} +func (m *PrometheusResponse) XXX_Size() int { + return m.Size() +} +func (m *PrometheusResponse) XXX_DiscardUnknown() { + xxx_messageInfo_PrometheusResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_PrometheusResponse proto.InternalMessageInfo + +func (m *PrometheusResponse) GetStatus() string { + if m != nil { + return m.Status + } + return "" +} + +func (m *PrometheusResponse) GetData() PrometheusData { + if m != nil { + return m.Data + } + return PrometheusData{} +} + +func (m *PrometheusResponse) GetErrorType() string { + if m != nil { + return m.ErrorType + } + return "" +} + +func (m *PrometheusResponse) GetError() string { + if m != nil { + return m.Error + } + return "" +} + +func (m *PrometheusResponse) GetHeaders() []*tripperware.PrometheusResponseHeader { + if m != nil { + return m.Headers + } + return nil +} + +func (m *PrometheusResponse) GetWarnings() []string { + if m != nil { + return m.Warnings + } + return nil +} + +type PrometheusData struct { + ResultType string `protobuf:"bytes,1,opt,name=ResultType,proto3" json:"resultType"` + Result []tripperware.SampleStream `protobuf:"bytes,2,rep,name=Result,proto3" json:"result"` + Stats *tripperware.PrometheusResponseStats `protobuf:"bytes,3,opt,name=stats,proto3" json:"stats,omitempty"` +} + +func (m *PrometheusData) Reset() { *m = PrometheusData{} } +func (*PrometheusData) ProtoMessage() {} +func (*PrometheusData) Descriptor() ([]byte, []int) { + return fileDescriptor_79b02382e213d0b2, []int{1} +} +func (m *PrometheusData) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PrometheusData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PrometheusData.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PrometheusData) XXX_Merge(src proto.Message) { + xxx_messageInfo_PrometheusData.Merge(m, src) +} +func (m *PrometheusData) XXX_Size() int { + return m.Size() +} +func (m *PrometheusData) XXX_DiscardUnknown() { + xxx_messageInfo_PrometheusData.DiscardUnknown(m) +} + +var xxx_messageInfo_PrometheusData proto.InternalMessageInfo + +func (m *PrometheusData) GetResultType() string { + if m != nil { + return m.ResultType + } + return "" +} + +func (m *PrometheusData) GetResult() []tripperware.SampleStream { + if m != nil { + return m.Result + } + return nil +} + +func (m *PrometheusData) GetStats() *tripperware.PrometheusResponseStats { + if m != nil { + return m.Stats + } + return nil +} + +func init() { + proto.RegisterType((*PrometheusResponse)(nil), "queryrange.PrometheusResponse") + proto.RegisterType((*PrometheusData)(nil), "queryrange.PrometheusData") +} + +func init() { proto.RegisterFile("queryrange.proto", fileDescriptor_79b02382e213d0b2) } + +var fileDescriptor_79b02382e213d0b2 = []byte{ + // 470 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x6f, 0xd3, 0x30, + 0x14, 0xc7, 0xe3, 0x76, 0x0d, 0xd4, 0x95, 0x0a, 0xf2, 0xd0, 0x08, 0x3d, 0x38, 0x55, 0x05, 0x52, + 0x91, 0x20, 0x91, 0x8a, 0xb8, 0x43, 0x80, 0x89, 0x1b, 0x28, 0x45, 0x42, 0xe2, 0xe6, 0x75, 0x4f, + 0x59, 0x60, 0xa9, 0x8d, 0xed, 0x68, 0xf4, 0xc6, 0x47, 0xe0, 0x63, 0xf0, 0x51, 0x76, 0xec, 0x81, + 0xc3, 0x4e, 0x16, 0x4d, 0x2f, 0x28, 0xa7, 0x7d, 0x04, 0x14, 0x27, 0x5b, 0x33, 0x71, 0xe0, 0x96, + 0xf7, 0xcf, 0xef, 0xff, 0xec, 0xf7, 0xf7, 0xc3, 0x77, 0xbf, 0xe6, 0x20, 0x57, 0x92, 0x2d, 0x13, + 0x08, 0x84, 0xe4, 0x9a, 0x13, 0xbc, 0x53, 0x46, 0xf7, 0x12, 0x9e, 0x70, 0x2b, 0x87, 0xd5, 0x57, + 0x4d, 0x8c, 0x5e, 0x25, 0xa9, 0x3e, 0xc9, 0x8f, 0x82, 0x05, 0xcf, 0xc2, 0x05, 0x97, 0x1a, 0xbe, + 0x09, 0xc9, 0x3f, 0xc3, 0x42, 0x37, 0x55, 0x28, 0xbe, 0x24, 0x61, 0xd5, 0x25, 0x05, 0x19, 0x6a, + 0x99, 0x0a, 0x01, 0xf2, 0x8c, 0x49, 0xb0, 0xda, 0xaa, 0x6e, 0x32, 0x31, 0x1d, 0x4c, 0xde, 0x4b, + 0x9e, 0x81, 0x3e, 0x81, 0x5c, 0xc5, 0xa0, 0x04, 0x5f, 0x2a, 0x20, 0x13, 0xec, 0xce, 0x35, 0xd3, + 0xb9, 0xf2, 0xd0, 0x18, 0x4d, 0xfb, 0x11, 0x2e, 0x8d, 0xef, 0x2a, 0xab, 0xc4, 0xcd, 0x1f, 0x72, + 0x88, 0xf7, 0x5e, 0x33, 0xcd, 0xbc, 0xce, 0x18, 0x4d, 0x07, 0xb3, 0x51, 0xd0, 0x1a, 0x61, 0xd7, + 0xb1, 0x22, 0xa2, 0x83, 0x73, 0xe3, 0x3b, 0xa5, 0xf1, 0x87, 0xc7, 0x4c, 0xb3, 0x27, 0x3c, 0x4b, + 0x35, 0x64, 0x42, 0xaf, 0x62, 0xeb, 0x27, 0xcf, 0x71, 0xff, 0x8d, 0x94, 0x5c, 0x7e, 0x58, 0x09, + 0xf0, 0xba, 0xf6, 0xb8, 0xfb, 0xa5, 0xf1, 0xf7, 0xe1, 0x4a, 0x6c, 0x39, 0x76, 0x24, 0x79, 0x8c, + 0x7b, 0xb6, 0xf0, 0xf6, 0xac, 0x65, 0xbf, 0x34, 0xfe, 0x1d, 0x6b, 0x69, 0xe1, 0x35, 0x41, 0x0e, + 0xf1, 0xad, 0xb7, 0xc0, 0x8e, 0x41, 0x2a, 0xaf, 0x37, 0xee, 0x4e, 0x07, 0xb3, 0x47, 0x41, 0x2b, + 0x8f, 0xe0, 0xdf, 0xf9, 0x6b, 0x3a, 0xea, 0x95, 0xc6, 0x47, 0x4f, 0xe3, 0x2b, 0x33, 0x99, 0xe1, + 0xdb, 0x1f, 0x99, 0x5c, 0xa6, 0xcb, 0x44, 0x79, 0xee, 0xb8, 0x3b, 0xed, 0x47, 0x07, 0xa5, 0xf1, + 0xc9, 0x59, 0xa3, 0xb5, 0x0e, 0xbe, 0xe6, 0x26, 0xbf, 0x10, 0x1e, 0xde, 0x8c, 0x83, 0x04, 0x18, + 0xc7, 0xa0, 0xf2, 0x53, 0x6d, 0x27, 0xae, 0x03, 0x1e, 0x96, 0xc6, 0xc7, 0xf2, 0x5a, 0x8d, 0x5b, + 0x04, 0x79, 0x89, 0xdd, 0xba, 0xf2, 0x3a, 0xf6, 0xf6, 0x0f, 0x6e, 0xdc, 0x7e, 0xce, 0x32, 0x71, + 0x0a, 0x73, 0x2d, 0x81, 0x65, 0xd1, 0xb0, 0x49, 0xda, 0xad, 0x5b, 0xc5, 0x8d, 0x91, 0xbc, 0xc3, + 0xbd, 0xea, 0xf5, 0x94, 0xcd, 0x77, 0x30, 0x7b, 0xf8, 0x9f, 0xf9, 0xab, 0x17, 0x56, 0x75, 0xa4, + 0xd6, 0xd6, 0x8e, 0xd4, 0x0a, 0xd1, 0x8b, 0xf5, 0x86, 0x3a, 0x17, 0x1b, 0xea, 0x5c, 0x6e, 0x28, + 0xfa, 0x5e, 0x50, 0xf4, 0xb3, 0xa0, 0xe8, 0xbc, 0xa0, 0x68, 0x5d, 0x50, 0xf4, 0xbb, 0xa0, 0xe8, + 0x4f, 0x41, 0x9d, 0xcb, 0x82, 0xa2, 0x1f, 0x5b, 0xea, 0xac, 0xb7, 0xd4, 0xb9, 0xd8, 0x52, 0xe7, + 0x53, 0x6b, 0xa9, 0x8f, 0x5c, 0xbb, 0x80, 0xcf, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x7b, + 0x72, 0x81, 0xfb, 0x02, 0x00, 0x00, +} + +func (this *PrometheusResponse) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*PrometheusResponse) + if !ok { + that2, ok := that.(PrometheusResponse) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Status != that1.Status { + return false + } + if !this.Data.Equal(&that1.Data) { + return false + } + if this.ErrorType != that1.ErrorType { + return false + } + if this.Error != that1.Error { + return false + } + if len(this.Headers) != len(that1.Headers) { + return false + } + for i := range this.Headers { + if !this.Headers[i].Equal(that1.Headers[i]) { + return false + } + } + if len(this.Warnings) != len(that1.Warnings) { + return false + } + for i := range this.Warnings { + if this.Warnings[i] != that1.Warnings[i] { + return false + } + } + return true +} +func (this *PrometheusData) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*PrometheusData) + if !ok { + that2, ok := that.(PrometheusData) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.ResultType != that1.ResultType { + return false + } + if len(this.Result) != len(that1.Result) { + return false + } + for i := range this.Result { + if !this.Result[i].Equal(&that1.Result[i]) { + return false + } + } + if !this.Stats.Equal(that1.Stats) { + return false + } + return true +} +func (this *PrometheusResponse) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 10) + s = append(s, "&queryrange.PrometheusResponse{") + s = append(s, "Status: "+fmt.Sprintf("%#v", this.Status)+",\n") + s = append(s, "Data: "+strings.Replace(this.Data.GoString(), `&`, ``, 1)+",\n") + s = append(s, "ErrorType: "+fmt.Sprintf("%#v", this.ErrorType)+",\n") + s = append(s, "Error: "+fmt.Sprintf("%#v", this.Error)+",\n") + if this.Headers != nil { + s = append(s, "Headers: "+fmt.Sprintf("%#v", this.Headers)+",\n") + } + s = append(s, "Warnings: "+fmt.Sprintf("%#v", this.Warnings)+",\n") + s = append(s, "}") + return strings.Join(s, "") +} +func (this *PrometheusData) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 7) + s = append(s, "&queryrange.PrometheusData{") + s = append(s, "ResultType: "+fmt.Sprintf("%#v", this.ResultType)+",\n") + if this.Result != nil { + vs := make([]*tripperware.SampleStream, len(this.Result)) + for i := range vs { + vs[i] = &this.Result[i] + } + s = append(s, "Result: "+fmt.Sprintf("%#v", vs)+",\n") + } + if this.Stats != nil { + s = append(s, "Stats: "+fmt.Sprintf("%#v", this.Stats)+",\n") + } + s = append(s, "}") + return strings.Join(s, "") +} +func valueToGoStringQueryrange(v interface{}, typ string) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) +} +func (m *PrometheusResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PrometheusResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PrometheusResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Warnings) > 0 { + for iNdEx := len(m.Warnings) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Warnings[iNdEx]) + copy(dAtA[i:], m.Warnings[iNdEx]) + i = encodeVarintQueryrange(dAtA, i, uint64(len(m.Warnings[iNdEx]))) + i-- + dAtA[i] = 0x32 + } + } + if len(m.Headers) > 0 { + for iNdEx := len(m.Headers) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Headers[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQueryrange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } + if len(m.Error) > 0 { + i -= len(m.Error) + copy(dAtA[i:], m.Error) + i = encodeVarintQueryrange(dAtA, i, uint64(len(m.Error))) + i-- + dAtA[i] = 0x22 + } + if len(m.ErrorType) > 0 { + i -= len(m.ErrorType) + copy(dAtA[i:], m.ErrorType) + i = encodeVarintQueryrange(dAtA, i, uint64(len(m.ErrorType))) + i-- + dAtA[i] = 0x1a + } + { + size, err := m.Data.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQueryrange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Status) > 0 { + i -= len(m.Status) + copy(dAtA[i:], m.Status) + i = encodeVarintQueryrange(dAtA, i, uint64(len(m.Status))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *PrometheusData) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PrometheusData) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PrometheusData) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Stats != nil { + { + size, err := m.Stats.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQueryrange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if len(m.Result) > 0 { + for iNdEx := len(m.Result) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Result[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQueryrange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if len(m.ResultType) > 0 { + i -= len(m.ResultType) + copy(dAtA[i:], m.ResultType) + i = encodeVarintQueryrange(dAtA, i, uint64(len(m.ResultType))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintQueryrange(dAtA []byte, offset int, v uint64) int { + offset -= sovQueryrange(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *PrometheusResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Status) + if l > 0 { + n += 1 + l + sovQueryrange(uint64(l)) + } + l = m.Data.Size() + n += 1 + l + sovQueryrange(uint64(l)) + l = len(m.ErrorType) + if l > 0 { + n += 1 + l + sovQueryrange(uint64(l)) + } + l = len(m.Error) + if l > 0 { + n += 1 + l + sovQueryrange(uint64(l)) + } + if len(m.Headers) > 0 { + for _, e := range m.Headers { + l = e.Size() + n += 1 + l + sovQueryrange(uint64(l)) + } + } + if len(m.Warnings) > 0 { + for _, s := range m.Warnings { + l = len(s) + n += 1 + l + sovQueryrange(uint64(l)) + } + } + return n +} + +func (m *PrometheusData) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ResultType) + if l > 0 { + n += 1 + l + sovQueryrange(uint64(l)) + } + if len(m.Result) > 0 { + for _, e := range m.Result { + l = e.Size() + n += 1 + l + sovQueryrange(uint64(l)) + } + } + if m.Stats != nil { + l = m.Stats.Size() + n += 1 + l + sovQueryrange(uint64(l)) + } + return n +} + +func sovQueryrange(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozQueryrange(x uint64) (n int) { + return sovQueryrange(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (this *PrometheusResponse) String() string { + if this == nil { + return "nil" + } + repeatedStringForHeaders := "[]*PrometheusResponseHeader{" + for _, f := range this.Headers { + repeatedStringForHeaders += strings.Replace(fmt.Sprintf("%v", f), "PrometheusResponseHeader", "tripperware.PrometheusResponseHeader", 1) + "," + } + repeatedStringForHeaders += "}" + s := strings.Join([]string{`&PrometheusResponse{`, + `Status:` + fmt.Sprintf("%v", this.Status) + `,`, + `Data:` + strings.Replace(strings.Replace(this.Data.String(), "PrometheusData", "PrometheusData", 1), `&`, ``, 1) + `,`, + `ErrorType:` + fmt.Sprintf("%v", this.ErrorType) + `,`, + `Error:` + fmt.Sprintf("%v", this.Error) + `,`, + `Headers:` + repeatedStringForHeaders + `,`, + `Warnings:` + fmt.Sprintf("%v", this.Warnings) + `,`, + `}`, + }, "") + return s +} +func (this *PrometheusData) String() string { + if this == nil { + return "nil" + } + repeatedStringForResult := "[]SampleStream{" + for _, f := range this.Result { + repeatedStringForResult += fmt.Sprintf("%v", f) + "," + } + repeatedStringForResult += "}" + s := strings.Join([]string{`&PrometheusData{`, + `ResultType:` + fmt.Sprintf("%v", this.ResultType) + `,`, + `Result:` + repeatedStringForResult + `,`, + `Stats:` + strings.Replace(fmt.Sprintf("%v", this.Stats), "PrometheusResponseStats", "tripperware.PrometheusResponseStats", 1) + `,`, + `}`, + }, "") + return s +} +func valueToStringQueryrange(v interface{}) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("*%v", pv) +} +func (m *PrometheusResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: PrometheusResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PrometheusResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Status = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Data.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrorType", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ErrorType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Error = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Headers", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Headers = append(m.Headers, &tripperware.PrometheusResponseHeader{}) + if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Warnings", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Warnings = append(m.Warnings, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQueryrange(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthQueryrange + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQueryrange + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PrometheusData) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: PrometheusData: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PrometheusData: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ResultType", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ResultType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Result = append(m.Result, tripperware.SampleStream{}) + if err := m.Result[len(m.Result)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Stats", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQueryrange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQueryrange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQueryrange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Stats == nil { + m.Stats = &tripperware.PrometheusResponseStats{} + } + if err := m.Stats.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQueryrange(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthQueryrange + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQueryrange + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipQueryrange(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowQueryrange + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowQueryrange + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + return iNdEx, nil + case 1: + iNdEx += 8 + return iNdEx, nil + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowQueryrange + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthQueryrange + } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthQueryrange + } + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowQueryrange + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + innerWire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + innerWireType := int(innerWire & 0x7) + if innerWireType == 4 { + break + } + next, err := skipQueryrange(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthQueryrange + } + } + return iNdEx, nil + case 4: + return iNdEx, nil + case 5: + iNdEx += 4 + return iNdEx, nil + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + } + panic("unreachable") +} + +var ( + ErrInvalidLengthQueryrange = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowQueryrange = fmt.Errorf("proto: integer overflow") +) diff --git a/pkg/querier/tripperware/queryrange/queryrange.proto b/pkg/querier/tripperware/queryrange/queryrange.proto new file mode 100644 index 0000000000..8d2e024d13 --- /dev/null +++ b/pkg/querier/tripperware/queryrange/queryrange.proto @@ -0,0 +1,27 @@ +syntax = "proto3"; + +package queryrange; + +option go_package = "queryrange"; + +import "gogoproto/gogo.proto"; +import "github.com/cortexproject/cortex/pkg/querier/tripperware/query.proto"; + +option (gogoproto.marshaler_all) = true; +option (gogoproto.unmarshaler_all) = true; + +message PrometheusResponse { + string Status = 1 [(gogoproto.jsontag) = "status"]; + PrometheusData Data = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "data,omitempty"]; + string ErrorType = 3 [(gogoproto.jsontag) = "errorType,omitempty"]; + string Error = 4 [(gogoproto.jsontag) = "error,omitempty"]; + repeated tripperware.PrometheusResponseHeader Headers = 5 [(gogoproto.jsontag) = "-"]; + repeated string Warnings = 6 [(gogoproto.jsontag) = "warnings,omitempty"]; +} + +message PrometheusData { + string ResultType = 1 [(gogoproto.jsontag) = "resultType"]; + repeated tripperware.SampleStream Result = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "result"]; + tripperware.PrometheusResponseStats stats = 3 [(gogoproto.jsontag) = "stats,omitempty"]; +} + diff --git a/pkg/querier/tripperware/queryrange/results_cache.go b/pkg/querier/tripperware/queryrange/results_cache.go index 128a24130c..76757e72bb 100644 --- a/pkg/querier/tripperware/queryrange/results_cache.go +++ b/pkg/querier/tripperware/queryrange/results_cache.go @@ -252,6 +252,21 @@ func (s resultsCache) Do(ctx context.Context, r tripperware.Request) (tripperwar if err != nil { return nil, err } + // Make sure we only cache old response format for backward compatibility. + // TODO: expose a flag to switch to write new format. + for i, ext := range extents { + resp, err := extentToResponse(ext) + if err != nil { + return nil, err + } + // Convert response in extent to old format. + resp = convertFromTripperwarePrometheusResponse(resp) + any, err := types.MarshalAny(resp) + if err != nil { + return nil, err + } + extents[i].Response = any + } s.put(ctx, key, extents) } @@ -479,7 +494,7 @@ func (s resultsCache) handleHit(ctx context.Context, r tripperware.Request, exte accumulator.TraceId = jaegerTraceID(ctx) accumulator.End = extents[i].End - currentRes, err := extents[i].ToResponse() + currentRes, err := extentToResponse(extents[i]) if err != nil { return nil, nil, err } @@ -518,7 +533,7 @@ func merge(extents []tripperware.Extent, acc *accumulator) ([]tripperware.Extent } func newAccumulator(base tripperware.Extent) (*accumulator, error) { - res, err := base.ToResponse() + res, err := extentToResponse(base) if err != nil { return nil, err } @@ -541,6 +556,74 @@ func toExtent(ctx context.Context, req tripperware.Request, res tripperware.Resp }, nil } +func extentToResponse(e tripperware.Extent) (tripperware.Response, error) { + msg, err := types.EmptyAny(e.Response) + if err != nil { + return nil, err + } + + if err := types.UnmarshalAny(e.Response, msg); err != nil { + return nil, err + } + + resp, ok := msg.(tripperware.Response) + if ok { + return convertToTripperwarePrometheusResponse(resp), nil + } + return nil, fmt.Errorf("bad cached type") +} + +// convertToTripperwarePrometheusResponse converts response from queryrange.PrometheusResponse format to tripperware.PrometheusResponse +func convertToTripperwarePrometheusResponse(resp tripperware.Response) tripperware.Response { + r, ok := resp.(*PrometheusResponse) + if !ok { + // Should be tripperware.PrometheusResponse so we can return directly. + return resp + } + if r.Data.GetResult() == nil { + return tripperware.NewEmptyPrometheusResponse(false) + } + return &tripperware.PrometheusResponse{ + Status: r.Status, + Data: tripperware.PrometheusData{ + ResultType: r.Data.ResultType, + Result: tripperware.PrometheusQueryResult{ + Result: &tripperware.PrometheusQueryResult_Matrix{ + Matrix: &tripperware.Matrix{ + SampleStreams: r.Data.GetResult(), + }, + }, + }, + Stats: r.Data.Stats, + }, + ErrorType: r.ErrorType, + Error: r.Error, + Headers: r.Headers, + Warnings: r.Warnings, + } +} + +// convertFromTripperwarePrometheusResponse converts response from tripperware.PrometheusResponse format to queryrange.PrometheusResponse +func convertFromTripperwarePrometheusResponse(resp tripperware.Response) tripperware.Response { + r, ok := resp.(*tripperware.PrometheusResponse) + if !ok { + // Should be queryrange.PrometheusResponse so we can return directly. + return resp + } + return &PrometheusResponse{ + Status: r.Status, + Data: PrometheusData{ + ResultType: r.Data.ResultType, + Result: r.Data.Result.GetMatrix().GetSampleStreams(), + Stats: r.Data.Stats, + }, + ErrorType: r.ErrorType, + Error: r.Error, + Headers: r.Headers, + Warnings: r.Warnings, + } +} + // partition calculates the required requests to satisfy req given the cached data. // extents must be in order by start time. func (s resultsCache) partition(req tripperware.Request, extents []tripperware.Extent) ([]tripperware.Request, []tripperware.Response, error) { @@ -569,7 +652,7 @@ func (s resultsCache) partition(req tripperware.Request, extents []tripperware.E r := req.WithStartEnd(start, extent.Start) requests = append(requests, r) } - res, err := extent.ToResponse() + res, err := extentToResponse(extent) if err != nil { return nil, nil, err } @@ -599,7 +682,7 @@ func (s resultsCache) filterRecentExtents(req tripperware.Request, maxCacheFresh // Never cache data for the latest freshness period. if extents[i].End > maxCacheTime { extents[i].End = maxCacheTime - res, err := extents[i].ToResponse() + res, err := extentToResponse(extents[i]) if err != nil { return nil, err } diff --git a/pkg/querier/tripperware/queryrange/results_cache_test.go b/pkg/querier/tripperware/queryrange/results_cache_test.go index 721bbfe3c2..1a3d70e1cd 100644 --- a/pkg/querier/tripperware/queryrange/results_cache_test.go +++ b/pkg/querier/tripperware/queryrange/results_cache_test.go @@ -9,6 +9,7 @@ import ( "time" "github.com/go-kit/log" + "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" @@ -18,6 +19,7 @@ import ( "github.com/cortexproject/cortex/pkg/chunk/cache" "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/querier/tripperware" + "github.com/cortexproject/cortex/pkg/tenant" "github.com/cortexproject/cortex/pkg/util/flagext" ) @@ -112,11 +114,11 @@ var ( } ) -func mkAPIResponse(start, end, step int64) *tripperware.PrometheusResponse { - return mkAPIResponseWithStats(start, end, step, false) +func mkAPIResponse(start, end, step int64) tripperware.Response { + return mkAPIResponseWithStats(start, end, step, false, false) } -func mkAPIResponseWithStats(start, end, step int64, withStats bool) *tripperware.PrometheusResponse { +func mkAPIResponseWithStats(start, end, step int64, withStats bool, oldFormat bool) tripperware.Response { var samples []cortexpb.Sample var stats *tripperware.PrometheusResponseStats if withStats { @@ -138,6 +140,24 @@ func mkAPIResponseWithStats(start, end, step int64, withStats bool) *tripperware } } + if oldFormat { + return &PrometheusResponse{ + Status: StatusSuccess, + Data: PrometheusData{ + ResultType: matrix, + Stats: stats, + Result: []tripperware.SampleStream{ + { + Labels: []cortexpb.LabelAdapter{ + {Name: "foo", Value: "bar"}, + }, + Samples: samples, + }, + }, + }, + } + } + return &tripperware.PrometheusResponse{ Status: StatusSuccess, Data: tripperware.PrometheusData{ @@ -162,19 +182,27 @@ func mkAPIResponseWithStats(start, end, step int64, withStats bool) *tripperware } func mkExtentWithStats(start, end int64) tripperware.Extent { - return mkExtentWithStepWithStats(start, end, 10, true) + return mkExtentWithStepWithStatsWithFormat(start, end, 10, true, false) } func mkExtent(start, end int64) tripperware.Extent { - return mkExtentWithStepWithStats(start, end, 10, false) + return mkExtentWithStepWithStatsWithFormat(start, end, 10, false, false) +} + +func mkExtentWithOldFormat(start, end int64) tripperware.Extent { + return mkExtentWithStepWithStatsWithFormat(start, end, 10, false, true) } func mkExtentWithStep(start, end, step int64) tripperware.Extent { - return mkExtentWithStepWithStats(start, end, step, false) + return mkExtentWithStepWithStatsWithFormat(start, end, step, false, false) +} + +func mkExtentWithStepAndFormat(start, end, step int64, oldFormat bool) tripperware.Extent { + return mkExtentWithStepWithStatsWithFormat(start, end, step, false, false) } -func mkExtentWithStepWithStats(start, end, step int64, withStats bool) tripperware.Extent { - res := mkAPIResponseWithStats(start, end, step, withStats) +func mkExtentWithStepWithStatsWithFormat(start, end, step int64, withStats bool, oldFormat bool) tripperware.Extent { + res := mkAPIResponseWithStats(start, end, step, withStats, oldFormat) any, err := types.MarshalAny(res) if err != nil { panic(err) @@ -207,29 +235,29 @@ func TestStatsCacheQuerySamples(t *testing.T) { name: "should return response with stats", cacheQueryableSamplesStats: true, req: noCacheRequestWithStats, - upstreamResponse: mkAPIResponseWithStats(0, 100, 10, true), - expectedResponse: mkAPIResponseWithStats(0, 100, 10, true), + upstreamResponse: mkAPIResponseWithStats(0, 100, 10, true, false), + expectedResponse: mkAPIResponseWithStats(0, 100, 10, true, false), }, { name: "should return response strip stats if not requested", cacheQueryableSamplesStats: true, req: noCacheRequest, - upstreamResponse: mkAPIResponseWithStats(0, 100, 10, false), - expectedResponse: mkAPIResponseWithStats(0, 100, 10, false), + upstreamResponse: mkAPIResponseWithStats(0, 100, 10, false, false), + expectedResponse: mkAPIResponseWithStats(0, 100, 10, false, false), }, { name: "should not ask stats is cacheQueryableSamplesStats is disabled", cacheQueryableSamplesStats: false, req: noCacheRequest, - upstreamResponse: mkAPIResponseWithStats(0, 100, 10, false), - expectedResponse: mkAPIResponseWithStats(0, 100, 10, false), + upstreamResponse: mkAPIResponseWithStats(0, 100, 10, false, false), + expectedResponse: mkAPIResponseWithStats(0, 100, 10, false, false), }, { name: "should not forward stats when cacheQueryableSamplesStats is disabled", cacheQueryableSamplesStats: false, req: noCacheRequestWithStats, - upstreamResponse: mkAPIResponseWithStats(0, 100, 10, true), - expectedResponse: mkAPIResponseWithStats(0, 100, 10, false), + upstreamResponse: mkAPIResponseWithStats(0, 100, 10, true, false), + expectedResponse: mkAPIResponseWithStats(0, 100, 10, false, false), }, } { tc := tc @@ -525,6 +553,20 @@ func TestPartition(t *testing.T) { }, }, + { + name: "Test a complete hit with old format.", + input: &tripperware.PrometheusRequest{ + Start: 0, + End: 100, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithOldFormat(0, 100), + }, + expectedCachedResponse: []tripperware.Response{ + mkAPIResponse(0, 100, 10), + }, + }, + { name: "Test with a complete miss.", input: &tripperware.PrometheusRequest{ @@ -559,6 +601,25 @@ func TestPartition(t *testing.T) { mkAPIResponse(50, 100, 10), }, }, + { + name: "Test a partial hit with old format.", + input: &tripperware.PrometheusRequest{ + Start: 0, + End: 100, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithOldFormat(50, 100), + }, + expectedRequests: []tripperware.Request{ + &tripperware.PrometheusRequest{ + Start: 0, + End: 50, + }, + }, + expectedCachedResponse: []tripperware.Response{ + mkAPIResponse(50, 100, 10), + }, + }, { name: "Test multiple partial hits.", input: &tripperware.PrometheusRequest{ @@ -580,6 +641,27 @@ func TestPartition(t *testing.T) { mkAPIResponse(160, 200, 10), }, }, + { + name: "Test multiple partial hits with old format.", + input: &tripperware.PrometheusRequest{ + Start: 100, + End: 200, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithOldFormat(50, 120), + mkExtentWithOldFormat(160, 250), + }, + expectedRequests: []tripperware.Request{ + &tripperware.PrometheusRequest{ + Start: 120, + End: 160, + }, + }, + expectedCachedResponse: []tripperware.Response{ + mkAPIResponse(100, 120, 10), + mkAPIResponse(160, 200, 10), + }, + }, { name: "Partial hits with tiny gap.", input: &tripperware.PrometheusRequest{ @@ -600,6 +682,26 @@ func TestPartition(t *testing.T) { mkAPIResponse(100, 120, 10), }, }, + { + name: "Partial hits with tiny gap with old format.", + input: &tripperware.PrometheusRequest{ + Start: 100, + End: 160, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithOldFormat(50, 120), + mkExtentWithOldFormat(122, 130), + }, + expectedRequests: []tripperware.Request{ + &tripperware.PrometheusRequest{ + Start: 120, + End: 160, + }, + }, + expectedCachedResponse: []tripperware.Response{ + mkAPIResponse(100, 120, 10), + }, + }, { name: "Extent is outside the range and the request has a single step (same start and end).", input: &tripperware.PrometheusRequest{ @@ -630,6 +732,20 @@ func TestPartition(t *testing.T) { mkAPIResponse(100, 105, 10), }, }, + { + name: "Test when hit has a large step and only a single sample extent with old format.", + // If there is a only a single sample in the split interval, start and end will be the same. + input: &tripperware.PrometheusRequest{ + Start: 100, + End: 100, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithOldFormat(100, 100), + }, + expectedCachedResponse: []tripperware.Response{ + mkAPIResponse(100, 105, 10), + }, + }, { name: "[Stats] Test a complete hit.", input: &tripperware.PrometheusRequest{ @@ -640,7 +756,21 @@ func TestPartition(t *testing.T) { mkExtentWithStats(0, 100), }, expectedCachedResponse: []tripperware.Response{ - mkAPIResponseWithStats(0, 100, 10, true), + mkAPIResponseWithStats(0, 100, 10, true, false), + }, + }, + + { + name: "[Stats] Test a complete hit with old format.", + input: &tripperware.PrometheusRequest{ + Start: 0, + End: 100, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithStepWithStatsWithFormat(0, 100, 10, true, true), + }, + expectedCachedResponse: []tripperware.Response{ + mkAPIResponseWithStats(0, 100, 10, true, false), }, }, @@ -659,6 +789,21 @@ func TestPartition(t *testing.T) { End: 100, }}, }, + { + name: "[Stats] Test with a complete miss with old format.", + input: &tripperware.PrometheusRequest{ + Start: 0, + End: 100, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithStepWithStatsWithFormat(110, 210, 10, true, true), + }, + expectedRequests: []tripperware.Request{ + &tripperware.PrometheusRequest{ + Start: 0, + End: 100, + }}, + }, { name: "[stats] Test a partial hit.", input: &tripperware.PrometheusRequest{ @@ -675,7 +820,7 @@ func TestPartition(t *testing.T) { }, }, expectedCachedResponse: []tripperware.Response{ - mkAPIResponseWithStats(50, 100, 10, true), + mkAPIResponseWithStats(50, 100, 10, true, false), }, }, { @@ -695,8 +840,8 @@ func TestPartition(t *testing.T) { }, }, expectedCachedResponse: []tripperware.Response{ - mkAPIResponseWithStats(100, 120, 10, true), - mkAPIResponseWithStats(160, 200, 10, true), + mkAPIResponseWithStats(100, 120, 10, true, false), + mkAPIResponseWithStats(160, 200, 10, true, false), }, }, { @@ -716,7 +861,7 @@ func TestPartition(t *testing.T) { }, }, expectedCachedResponse: []tripperware.Response{ - mkAPIResponseWithStats(100, 120, 10, true), + mkAPIResponseWithStats(100, 120, 10, true, false), }, }, { @@ -746,7 +891,21 @@ func TestPartition(t *testing.T) { mkExtentWithStats(100, 100), }, expectedCachedResponse: []tripperware.Response{ - mkAPIResponseWithStats(100, 105, 10, true), + mkAPIResponseWithStats(100, 105, 10, true, false), + }, + }, + { + name: "[stats] Test when hit has a large step and only a single sample extent with old format.", + // If there is a only a single sample in the split interval, start and end will be the same. + input: &tripperware.PrometheusRequest{ + Start: 100, + End: 100, + }, + prevCachedResponse: []tripperware.Extent{ + mkExtentWithStepWithStatsWithFormat(100, 100, 10, true, true), + }, + expectedCachedResponse: []tripperware.Response{ + mkAPIResponseWithStats(100, 105, 10, true, false), }, }, } { @@ -951,6 +1110,54 @@ func TestHandleHit(t *testing.T) { mkExtentWithStep(60, 180, 20), }, }, + { + name: "Should replace tiny extents with old format that are cover by bigger request", + input: &tripperware.PrometheusRequest{ + Start: 100, + End: 200, + Step: 5, + }, + cachedEntry: []tripperware.Extent{ + mkExtentWithStepAndFormat(0, 50, 5, true), + mkExtentWithStepAndFormat(60, 65, 5, true), + mkExtentWithStepAndFormat(100, 105, 5, true), + mkExtentWithStepAndFormat(110, 115, 5, true), + mkExtentWithStepAndFormat(120, 125, 5, true), + mkExtentWithStepAndFormat(220, 225, 5, true), + mkExtentWithStepAndFormat(240, 250, 5, true), + }, + expectedUpdatedCachedEntry: []tripperware.Extent{ + mkExtentWithStep(0, 50, 5), + mkExtentWithStep(60, 65, 5), + mkExtentWithStep(100, 200, 5), + mkExtentWithStep(220, 225, 5), + mkExtentWithStep(240, 250, 5), + }, + }, + { + name: "Should replace tiny extents with mixed of new and old format that are cover by bigger request", + input: &tripperware.PrometheusRequest{ + Start: 100, + End: 200, + Step: 5, + }, + cachedEntry: []tripperware.Extent{ + mkExtentWithStepAndFormat(0, 50, 5, true), + mkExtentWithStepAndFormat(60, 65, 5, false), + mkExtentWithStepAndFormat(100, 105, 5, true), + mkExtentWithStepAndFormat(110, 115, 5, false), + mkExtentWithStepAndFormat(120, 125, 5, true), + mkExtentWithStepAndFormat(220, 225, 5, false), + mkExtentWithStepAndFormat(240, 250, 5, true), + }, + expectedUpdatedCachedEntry: []tripperware.Extent{ + mkExtentWithStep(0, 50, 5), + mkExtentWithStep(60, 65, 5), + mkExtentWithStep(100, 200, 5), + mkExtentWithStep(220, 225, 5), + mkExtentWithStep(240, 250, 5), + }, + }, } { tc := tc t.Run(tc.name, func(t *testing.T) { @@ -1066,7 +1273,7 @@ func TestResultsCacheMaxFreshness(t *testing.T) { for i, tc := range []struct { fakeLimits tripperware.Limits Handler tripperware.HandlerFunc - expectedResponse *tripperware.PrometheusResponse + expectedResponse tripperware.Response }{ { fakeLimits: mockLimits{maxCacheFreshness: 5 * time.Second}, @@ -1266,6 +1473,46 @@ func TestResultsCacheShouldCacheFunc(t *testing.T) { } } +func TestResultsCacheFillCompatibility(t *testing.T) { + var cfg ResultsCacheConfig + flagext.DefaultValues(&cfg) + c := cache.NewMockCache() + cfg.CacheConfig.Cache = c + rcm, _, err := NewResultsCacheMiddleware( + log.NewNopLogger(), + cfg, + constSplitter(day), + mockLimits{maxCacheFreshness: 10 * time.Minute}, + PrometheusCodec, + PrometheusResponseExtractor{}, + nil, + nil, + ) + require.NoError(t, err) + rc := rcm.Wrap(tripperware.HandlerFunc(func(_ context.Context, req tripperware.Request) (tripperware.Response, error) { + return parsedResponse, nil + })) + ctx := user.InjectOrgID(context.Background(), "1") + _, err = rc.Do(ctx, parsedRequest) + require.NoError(t, err) + + // Check cache and make sure we write response in old format even though the response is new format. + tenantIDs, err := tenant.TenantIDs(ctx) + require.NoError(t, err) + cacheKey := cache.HashKey(constSplitter(day).GenerateCacheKey(tenant.JoinTenantIDs(tenantIDs), parsedRequest)) + found, bufs, _ := c.Fetch(ctx, []string{cacheKey}) + require.Equal(t, []string{cacheKey}, found) + require.Len(t, bufs, 1) + + var resp tripperware.CachedResponse + require.NoError(t, proto.Unmarshal(bufs[0], &resp)) + require.Len(t, resp.Extents, 1) + expectedResp := convertFromTripperwarePrometheusResponse(parsedResponse) + any, err := types.MarshalAny(expectedResp) + require.NoError(t, err) + require.Equal(t, any, resp.Extents[0].Response) +} + func toMs(t time.Duration) int64 { return int64(t / time.Millisecond) }