Copy `cortex/pkg/frontend` package dependency into Loki (#5044)

* Move `cortex/pkg/frontend` to `loki/pkg/lokifrontend/frontend`.

* Update modules.txt with removed Cortex frontend.

* Use `pkg/lokifrontend` instead of cortex `pkg/frontend`.

pkg/loki/modules.go

@@ -11,8 +11,6 @@ import (
 	"time"
 
 	"github.com/NYTimes/gziphandler"
-	"github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb"
-	"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
 	cortex_ruler "github.com/cortexproject/cortex/pkg/ruler"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/go-kit/log/level"
@@ -28,19 +26,20 @@ import (
 	"github.com/weaveworks/common/server"
 	"github.com/weaveworks/common/user"
 
-	"github.com/grafana/loki/pkg/scheduler/schedulerpb"
-
 	"github.com/grafana/loki/pkg/distributor"
 	"github.com/grafana/loki/pkg/ingester"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logql"
 	"github.com/grafana/loki/pkg/lokifrontend/frontend"
 	"github.com/grafana/loki/pkg/lokifrontend/frontend/transport"
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb"
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb"
 	"github.com/grafana/loki/pkg/querier"
 	"github.com/grafana/loki/pkg/querier/queryrange"
 	"github.com/grafana/loki/pkg/ruler"
 	"github.com/grafana/loki/pkg/runtime"
 	"github.com/grafana/loki/pkg/scheduler"
+	"github.com/grafana/loki/pkg/scheduler/schedulerpb"
 	loki_storage "github.com/grafana/loki/pkg/storage"
 	"github.com/grafana/loki/pkg/storage/chunk"
 	"github.com/grafana/loki/pkg/storage/chunk/cache"

pkg/lokifrontend/frontend/v1/frontend.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb"
 	"github.com/cortexproject/cortex/pkg/querier/stats"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/validation"
@@ -20,8 +19,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/weaveworks/common/httpgrpc"
 
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb"
 	"github.com/grafana/loki/pkg/scheduler/queue"
-
 	"github.com/grafana/loki/pkg/tenant"
 	lokigrpc "github.com/grafana/loki/pkg/util/httpgrpc"
 )

pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: frontend.proto
+// source: pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto
 
 // Protobuf package should not be changed when moving around go packages
 // in order to not break backward compatibility.
@@ -53,7 +53,7 @@ var Type_value = map[string]int32{
 }
 
 func (Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_eca3873955a29cfe, []int{0}
+	return fileDescriptor_e58870c6eb9e26f7, []int{0}
 }
 
 type FrontendToClient struct {
@@ -67,7 +67,7 @@ type FrontendToClient struct {
 func (m *FrontendToClient) Reset()      { *m = FrontendToClient{} }
 func (*FrontendToClient) ProtoMessage() {}
 func (*FrontendToClient) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eca3873955a29cfe, []int{0}
+	return fileDescriptor_e58870c6eb9e26f7, []int{0}
 }
 func (m *FrontendToClient) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -126,7 +126,7 @@ type ClientToFrontend struct {
 func (m *ClientToFrontend) Reset()      { *m = ClientToFrontend{} }
 func (*ClientToFrontend) ProtoMessage() {}
 func (*ClientToFrontend) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eca3873955a29cfe, []int{1}
+	return fileDescriptor_e58870c6eb9e26f7, []int{1}
 }
 func (m *ClientToFrontend) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -183,7 +183,7 @@ type NotifyClientShutdownRequest struct {
 func (m *NotifyClientShutdownRequest) Reset()      { *m = NotifyClientShutdownRequest{} }
 func (*NotifyClientShutdownRequest) ProtoMessage() {}
 func (*NotifyClientShutdownRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eca3873955a29cfe, []int{2}
+	return fileDescriptor_e58870c6eb9e26f7, []int{2}
 }
 func (m *NotifyClientShutdownRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -225,7 +225,7 @@ type NotifyClientShutdownResponse struct {
 func (m *NotifyClientShutdownResponse) Reset()      { *m = NotifyClientShutdownResponse{} }
 func (*NotifyClientShutdownResponse) ProtoMessage() {}
 func (*NotifyClientShutdownResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eca3873955a29cfe, []int{3}
+	return fileDescriptor_e58870c6eb9e26f7, []int{3}
 }
 func (m *NotifyClientShutdownResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -262,41 +262,44 @@ func init() {
 	proto.RegisterType((*NotifyClientShutdownResponse)(nil), "frontend.NotifyClientShutdownResponse")
 }
 
-func init() { proto.RegisterFile("frontend.proto", fileDescriptor_eca3873955a29cfe) }
-
-var fileDescriptor_eca3873955a29cfe = []byte{
-	// 496 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x86, 0x3d, 0x50, 0x4a, 0x98, 0x44, 0x91, 0xb5, 0x02, 0x14, 0x19, 0xb4, 0x8a, 0x2c, 0x40,
-	0x11, 0x12, 0x36, 0x04, 0x24, 0x04, 0x12, 0x97, 0xd2, 0x50, 0x7a, 0x41, 0xc5, 0x31, 0x17, 0x2e,
-	0x55, 0xec, 0x6c, 0x9c, 0xd0, 0xc6, 0xeb, 0xda, 0xeb, 0x86, 0xdc, 0x78, 0x02, 0x84, 0xc4, 0x4b,
-	0xf0, 0x0c, 0x3c, 0x01, 0xc7, 0x1c, 0x7b, 0x24, 0xce, 0x85, 0x63, 0x1f, 0x01, 0x65, 0xd7, 0x71,
-	0x9d, 0xa8, 0x82, 0xcb, 0x6a, 0xc7, 0x33, 0xff, 0xcc, 0x37, 0xbf, 0x17, 0xeb, 0x83, 0x98, 0x87,
-	0x82, 0x85, 0x7d, 0x2b, 0x8a, 0xb9, 0xe0, 0xa4, 0xb2, 0x8a, 0x8d, 0x47, 0xc1, 0x48, 0x0c, 0x53,
-	0xcf, 0xf2, 0xf9, 0xd8, 0x0e, 0x78, 0xc0, 0x6d, 0x59, 0xe0, 0xa5, 0x03, 0x19, 0xc9, 0x40, 0xde,
-	0x94, 0xd0, 0x78, 0x56, 0x2a, 0x9f, 0xb0, 0xde, 0x29, 0x9b, 0xf0, 0xf8, 0x28, 0xb1, 0x7d, 0x3e,
-	0x1e, 0xf3, 0xd0, 0x1e, 0x0a, 0x11, 0x05, 0x71, 0xe4, 0x17, 0x97, 0x5c, 0xf5, 0xaa, 0xa4, 0xf2,
-	0x79, 0x2c, 0xd8, 0xe7, 0x28, 0xe6, 0x9f, 0x98, 0x2f, 0xf2, 0xc8, 0x8e, 0x8e, 0x02, 0xfb, 0x24,
-	0x65, 0xf1, 0x88, 0xc5, 0x76, 0x22, 0x7a, 0x22, 0x51, 0xa7, 0x92, 0x9b, 0xdf, 0x01, 0xf5, 0x37,
-	0x39, 0xb0, 0xcb, 0x5f, 0x1f, 0x8f, 0x58, 0x28, 0xc8, 0x73, 0xac, 0x2e, 0xa7, 0x38, 0xec, 0x24,
-	0x65, 0x89, 0x68, 0x40, 0x13, 0x5a, 0xd5, 0xf6, 0x2d, 0xab, 0x98, 0xfc, 0xd6, 0x75, 0x0f, 0xf2,
-	0xa4, 0x53, 0xae, 0x24, 0x26, 0x6e, 0x89, 0x69, 0xc4, 0x1a, 0x57, 0x9a, 0xd0, 0xaa, 0xb7, 0xeb,
-	0x56, 0x61, 0x8d, 0x3b, 0x8d, 0x98, 0x23, 0x73, 0xc4, 0xc4, 0x9a, 0x04, 0xe8, 0x84, 0x3d, 0xef,
-	0x98, 0xf5, 0x1b, 0x57, 0x9b, 0xd0, 0xaa, 0x38, 0x6b, 0xdf, 0xcc, 0xaf, 0x80, 0xba, 0x62, 0x71,
-	0xf9, 0x8a, 0x8e, 0xbc, 0xc4, 0x9a, 0x9a, 0x95, 0x44, 0x3c, 0x4c, 0x58, 0x8e, 0x75, 0x7b, 0x13,
-	0x4b, 0x65, 0x9d, 0xb5, 0x5a, 0x62, 0x60, 0xc5, 0x97, 0xfd, 0xf6, 0x77, 0x25, 0xdc, 0x0d, 0xa7,
-	0x88, 0x89, 0x89, 0xd7, 0xe4, 0x70, 0x49, 0x52, 0x6d, 0xd7, 0x2c, 0xe5, 0x4f, 0x77, 0x79, 0x3a,
-	0x2a, 0x65, 0xbe, 0xc0, 0x3b, 0xef, 0xb8, 0x18, 0x0d, 0xa6, 0x8a, 0xaa, 0x3b, 0x4c, 0x45, 0x9f,
-	0x4f, 0xc2, 0xd5, 0xde, 0xe5, 0xf6, 0xb0, 0xde, 0xde, 0xa4, 0x78, 0xf7, 0x72, 0xa9, 0x42, 0x7b,
-	0x78, 0x0f, 0xb7, 0x96, 0xee, 0x10, 0x1d, 0x6b, 0xcb, 0x05, 0x0e, 0x9d, 0xce, 0xfb, 0x0f, 0x9d,
-	0xae, 0xab, 0x6b, 0x04, 0x71, 0x7b, 0xaf, 0xe3, 0x1e, 0xee, 0xef, 0xea, 0xd0, 0xfe, 0x09, 0x58,
-	0x29, 0x9c, 0xd8, 0xc3, 0xeb, 0x07, 0x31, 0xf7, 0x59, 0x92, 0x10, 0xe3, 0xc2, 0xe3, 0x4d, 0xc3,
-	0x8c, 0x52, 0x6e, 0xf3, 0x17, 0x9b, 0x5a, 0x0b, 0x1e, 0x03, 0x61, 0x78, 0xf3, 0x32, 0x36, 0x72,
-	0xff, 0x42, 0xf9, 0x8f, 0xb5, 0x8d, 0x07, 0xff, 0x2b, 0x53, 0x2b, 0xee, 0xec, 0xcc, 0xe6, 0x54,
-	0x3b, 0x9b, 0x53, 0xed, 0x7c, 0x4e, 0xe1, 0x4b, 0x46, 0xe1, 0x47, 0x46, 0xe1, 0x57, 0x46, 0x61,
-	0x96, 0x51, 0xf8, 0x9d, 0x51, 0xf8, 0x93, 0x51, 0xed, 0x3c, 0xa3, 0xf0, 0x6d, 0x41, 0xb5, 0xd9,
-	0x82, 0x6a, 0x67, 0x0b, 0xaa, 0x7d, 0xac, 0xad, 0x9a, 0x9f, 0x3e, 0x89, 0x3c, 0x6f, 0x5b, 0xbe,
-	0xd7, 0xa7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xe0, 0x35, 0xe6, 0x6f, 0x03, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto", fileDescriptor_e58870c6eb9e26f7)
+}
+
+var fileDescriptor_e58870c6eb9e26f7 = []byte{
+	// 510 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
+	0x10, 0xc6, 0xbd, 0x50, 0x4a, 0xd8, 0x5a, 0x95, 0xb5, 0x02, 0x14, 0x19, 0xb4, 0x8a, 0x2c, 0x40,
+	0x11, 0x12, 0x36, 0x0d, 0x48, 0xfc, 0x91, 0xb8, 0x94, 0x86, 0xd2, 0x0b, 0x2a, 0x8e, 0xb9, 0x70,
+	0xa9, 0x62, 0x67, 0xe3, 0x98, 0x24, 0x1e, 0xd7, 0x5e, 0x27, 0xe4, 0xc6, 0x13, 0x20, 0x24, 0x5e,
+	0x82, 0x67, 0xe0, 0x09, 0x38, 0xe6, 0xd8, 0x23, 0x71, 0x2e, 0x1c, 0xfb, 0x08, 0xc8, 0xbb, 0x8e,
+	0xeb, 0x44, 0x15, 0x5c, 0x56, 0x33, 0x9e, 0xf9, 0x76, 0x7e, 0xf3, 0xd9, 0xc6, 0xcf, 0xa3, 0xa1,
+	0x6f, 0x8d, 0x60, 0x18, 0xf4, 0x63, 0x08, 0x39, 0x0b, 0x7b, 0x56, 0x19, 0x4c, 0xf6, 0xca, 0x78,
+	0xb2, 0x17, 0xb9, 0x65, 0x62, 0x46, 0x31, 0x70, 0x20, 0xb5, 0x55, 0xae, 0x3f, 0xf2, 0x03, 0x3e,
+	0x48, 0x5d, 0xd3, 0x83, 0xb1, 0xe5, 0x83, 0x0f, 0x96, 0x68, 0x70, 0xd3, 0xbe, 0xc8, 0x44, 0x22,
+	0x22, 0x29, 0xd4, 0x9f, 0x56, 0xda, 0xa7, 0xac, 0x3b, 0x61, 0x53, 0x88, 0x87, 0x89, 0xe5, 0xc1,
+	0x78, 0x0c, 0xa1, 0x35, 0xe0, 0x3c, 0xf2, 0xe3, 0xc8, 0x2b, 0x83, 0x42, 0xf5, 0xaa, 0xa2, 0xf2,
+	0x20, 0xe6, 0xec, 0x73, 0x14, 0xc3, 0x27, 0xe6, 0xf1, 0x22, 0xb3, 0xf2, 0x45, 0x4e, 0x53, 0x16,
+	0x07, 0x2c, 0xb6, 0x12, 0xde, 0xe5, 0x89, 0x3c, 0xa5, 0xdc, 0xf8, 0x8e, 0xb0, 0xf6, 0xa6, 0x00,
+	0x76, 0xe0, 0xf5, 0x28, 0x60, 0x21, 0x27, 0xcf, 0xf0, 0x4e, 0x3e, 0xc5, 0x66, 0xa7, 0x29, 0x4b,
+	0x78, 0x1d, 0x35, 0x50, 0x73, 0xa7, 0x75, 0xcb, 0x2c, 0x27, 0xbf, 0x75, 0x9c, 0xe3, 0xa2, 0x68,
+	0x57, 0x3b, 0x89, 0x81, 0xb7, 0xf8, 0x2c, 0x62, 0xf5, 0x2b, 0x0d, 0xd4, 0xdc, 0x6d, 0xed, 0x9a,
+	0xa5, 0x35, 0xce, 0x2c, 0x62, 0xb6, 0xa8, 0x11, 0x03, 0xab, 0x02, 0xa0, 0x1d, 0x76, 0xdd, 0x11,
+	0xeb, 0xd5, 0xaf, 0x36, 0x50, 0xb3, 0x66, 0xaf, 0x3d, 0x33, 0xbe, 0x22, 0xac, 0x49, 0x16, 0x07,
+	0x56, 0x74, 0xe4, 0x25, 0x56, 0xe5, 0xac, 0x24, 0x82, 0x30, 0x61, 0x05, 0xd6, 0xed, 0x4d, 0x2c,
+	0x59, 0xb5, 0xd7, 0x7a, 0x89, 0x8e, 0x6b, 0x9e, 0xb8, 0xef, 0xe8, 0x40, 0xc0, 0xdd, 0xb0, 0xcb,
+	0x9c, 0x18, 0xf8, 0x9a, 0x18, 0x2e, 0x48, 0x76, 0x5a, 0xaa, 0x29, 0xfd, 0xe9, 0xe4, 0xa7, 0x2d,
+	0x4b, 0xc6, 0x0b, 0x7c, 0xe7, 0x1d, 0xf0, 0xa0, 0x3f, 0x93, 0x54, 0x9d, 0x41, 0xca, 0x7b, 0x30,
+	0x0d, 0x57, 0x7b, 0x57, 0xaf, 0x47, 0xeb, 0xd7, 0x1b, 0x14, 0xdf, 0xbd, 0x5c, 0x2a, 0xd1, 0x1e,
+	0xde, 0xc3, 0x5b, 0xb9, 0x3b, 0x44, 0xc3, 0x6a, 0xbe, 0xc0, 0x89, 0xdd, 0x7e, 0xff, 0xa1, 0xdd,
+	0x71, 0x34, 0x85, 0x60, 0xbc, 0x7d, 0xd8, 0x76, 0x4e, 0x8e, 0x0e, 0x34, 0xd4, 0xfa, 0x89, 0x70,
+	0xad, 0x74, 0xe2, 0x10, 0x5f, 0x3f, 0x8e, 0xc1, 0x63, 0x49, 0x42, 0xf4, 0x0b, 0x8f, 0x37, 0x0d,
+	0xd3, 0x2b, 0xb5, 0xcd, 0x57, 0x6c, 0x28, 0x4d, 0xf4, 0x18, 0x11, 0x86, 0x6f, 0x5e, 0xc6, 0x46,
+	0xee, 0x5f, 0x28, 0xff, 0xb1, 0xb6, 0xfe, 0xe0, 0x7f, 0x6d, 0x72, 0xc5, 0xfd, 0xfd, 0xf9, 0x82,
+	0x2a, 0x67, 0x0b, 0xaa, 0x9c, 0x2f, 0x28, 0xfa, 0x92, 0x51, 0xf4, 0x23, 0xa3, 0xe8, 0x57, 0x46,
+	0xd1, 0x3c, 0xa3, 0xe8, 0x77, 0x46, 0xd1, 0x9f, 0x8c, 0x2a, 0xe7, 0x19, 0x45, 0xdf, 0x96, 0x54,
+	0x99, 0x2f, 0xa9, 0x72, 0xb6, 0xa4, 0xca, 0x47, 0xb5, 0xfa, 0x97, 0xb9, 0xdb, 0xe2, 0x7b, 0x7d,
+	0xf2, 0x37, 0x00, 0x00, 0xff, 0xff, 0x53, 0x52, 0xa7, 0xba, 0x99, 0x03, 0x00, 0x00,
 }
 
 func (x Type) String() string {
@@ -621,7 +624,7 @@ var _Frontend_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "frontend.proto",
+	Metadata: "pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto",
 }
 
 func (m *FrontendToClient) Marshal() (dAtA []byte, err error) {

pkg/lokifrontend/frontend/v2/frontend.go

@@ -9,7 +9,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
 	"github.com/cortexproject/cortex/pkg/querier/stats"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
@@ -24,6 +23,7 @@ import (
 	"github.com/weaveworks/common/httpgrpc"
 	"go.uber.org/atomic"
 
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb"
 	"github.com/grafana/loki/pkg/tenant"
 	lokigrpc "github.com/grafana/loki/pkg/util/httpgrpc"
 )

pkg/lokifrontend/frontend/v2/frontend_scheduler_worker.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
@@ -17,8 +16,8 @@ import (
 	"github.com/weaveworks/common/httpgrpc"
 	"google.golang.org/grpc"
 
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb"
 	"github.com/grafana/loki/pkg/scheduler/schedulerpb"
-
 	lokiutil "github.com/grafana/loki/pkg/util"
 )
 

pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: frontend.proto
+// source: pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.proto
 
 package frontendv2pb
 
@@ -40,7 +40,7 @@ type QueryResultRequest struct {
 func (m *QueryResultRequest) Reset()      { *m = QueryResultRequest{} }
 func (*QueryResultRequest) ProtoMessage() {}
 func (*QueryResultRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eca3873955a29cfe, []int{0}
+	return fileDescriptor_85a7e5cdf8261f06, []int{0}
 }
 func (m *QueryResultRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -96,7 +96,7 @@ type QueryResultResponse struct {
 func (m *QueryResultResponse) Reset()      { *m = QueryResultResponse{} }
 func (*QueryResultResponse) ProtoMessage() {}
 func (*QueryResultResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_eca3873955a29cfe, []int{1}
+	return fileDescriptor_85a7e5cdf8261f06, []int{1}
 }
 func (m *QueryResultResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -130,32 +130,35 @@ func init() {
 	proto.RegisterType((*QueryResultResponse)(nil), "frontendv2pb.QueryResultResponse")
 }
 
-func init() { proto.RegisterFile("frontend.proto", fileDescriptor_eca3873955a29cfe) }
-
-var fileDescriptor_eca3873955a29cfe = []byte{
-	// 351 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcd, 0x4e, 0x3a, 0x31,
-	0x14, 0xc5, 0xdb, 0xff, 0xdf, 0x8f, 0xa4, 0x10, 0x17, 0x35, 0x9a, 0x09, 0x8b, 0x06, 0x67, 0xc5,
-	0xc6, 0x69, 0x82, 0xae, 0x4c, 0xdc, 0x10, 0x43, 0x74, 0x27, 0x23, 0x2b, 0x77, 0xcc, 0x58, 0x86,
-	0x0f, 0x99, 0x96, 0xb6, 0x03, 0xb2, 0xf3, 0x09, 0x8c, 0x8f, 0xe1, 0xa3, 0xb8, 0x64, 0xc9, 0x52,
-	0xca, 0xc6, 0x25, 0x8f, 0x60, 0x68, 0x81, 0x0c, 0x31, 0x71, 0xd3, 0xdc, 0x93, 0x7b, 0x7e, 0xb9,
-	0xe7, 0xde, 0xa2, 0xa3, 0xb6, 0xe4, 0xa9, 0x66, 0xe9, 0x53, 0x20, 0x24, 0xd7, 0x1c, 0x17, 0x37,
-	0x7a, 0x54, 0x15, 0x51, 0xe9, 0x3c, 0xe9, 0xea, 0x4e, 0x16, 0x05, 0x31, 0x1f, 0xd0, 0x84, 0x27,
-	0x9c, 0x5a, 0x53, 0x94, 0xb5, 0xad, 0xb2, 0xc2, 0x56, 0x0e, 0x2e, 0x5d, 0xe6, 0xec, 0x63, 0xd6,
-	0x1a, 0xb1, 0x31, 0x97, 0x7d, 0x45, 0x63, 0x3e, 0x18, 0xf0, 0x94, 0x76, 0xb4, 0x16, 0x89, 0x14,
-	0xf1, 0xb6, 0x58, 0x53, 0xd7, 0x39, 0x2a, 0xe6, 0x52, 0xb3, 0x17, 0x21, 0x79, 0x8f, 0xc5, 0x7a,
-	0xad, 0xa8, 0xe8, 0x27, 0x74, 0x98, 0x31, 0xd9, 0x65, 0x92, 0x2a, 0xdd, 0xd2, 0xca, 0xbd, 0x0e,
-	0xf7, 0xdf, 0x20, 0xc2, 0x8d, 0x8c, 0xc9, 0x49, 0xc8, 0x54, 0xf6, 0xac, 0x43, 0x36, 0xcc, 0x98,
-	0xd2, 0xd8, 0x43, 0x87, 0x2b, 0x66, 0x72, 0x77, 0xe3, 0xc1, 0x32, 0xac, 0xec, 0x85, 0x1b, 0x89,
-	0xaf, 0x50, 0x71, 0x95, 0x20, 0x64, 0x4a, 0xf0, 0x54, 0x31, 0xef, 0x5f, 0x19, 0x56, 0x0a, 0xd5,
-	0xd3, 0x60, 0x1b, 0xeb, 0xb6, 0xd9, 0xbc, 0xdf, 0x74, 0xc3, 0x1d, 0x2f, 0xf6, 0xd1, 0xbe, 0x9d,
-	0xed, 0xfd, 0xb7, 0x50, 0x31, 0x70, 0x49, 0x1e, 0x56, 0x6f, 0xe8, 0x5a, 0xfe, 0x09, 0x3a, 0xde,
-	0xc9, 0xe3, 0xd0, 0x6a, 0x0f, 0xe1, 0xfa, 0xfa, 0xb6, 0x75, 0x2e, 0x1b, 0x6e, 0x1f, 0xdc, 0x44,
-	0x85, 0x9c, 0x19, 0x97, 0x83, 0xfc, 0xfd, 0x83, 0xdf, 0x7b, 0x95, 0xce, 0xfe, 0x70, 0xb8, 0x49,
-	0x3e, 0xa8, 0xd5, 0xa6, 0x73, 0x02, 0x66, 0x73, 0x02, 0x96, 0x73, 0x02, 0x5f, 0x0d, 0x81, 0x1f,
-	0x86, 0xc0, 0x4f, 0x43, 0xe0, 0xd4, 0x10, 0xf8, 0x65, 0x08, 0xfc, 0x36, 0x04, 0x2c, 0x0d, 0x81,
-	0xef, 0x0b, 0x02, 0xa6, 0x0b, 0x02, 0x66, 0x0b, 0x02, 0x1e, 0x77, 0xfe, 0x3e, 0x3a, 0xb0, 0xe7,
-	0xbd, 0xf8, 0x09, 0x00, 0x00, 0xff, 0xff, 0x02, 0xb0, 0x28, 0xb5, 0x22, 0x02, 0x00, 0x00,
+func init() {
+	proto.RegisterFile("pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.proto", fileDescriptor_85a7e5cdf8261f06)
+}
+
+var fileDescriptor_85a7e5cdf8261f06 = []byte{
+	// 362 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x4e, 0xc3, 0x30,
+	0x10, 0xc6, 0x63, 0xfe, 0x4a, 0x6e, 0x27, 0x23, 0x50, 0xd4, 0xc1, 0x2a, 0x99, 0xba, 0x10, 0x4b,
+	0x81, 0x01, 0x21, 0xb1, 0x54, 0xa8, 0x82, 0x8d, 0x86, 0x4e, 0x6c, 0x4d, 0x70, 0xd3, 0xbf, 0xb9,
+	0xd4, 0x71, 0x5a, 0xba, 0xf1, 0x04, 0x88, 0xc7, 0xe0, 0x51, 0x18, 0x3b, 0x76, 0xa4, 0xe9, 0xc2,
+	0xd8, 0x47, 0x40, 0xb1, 0xdb, 0x28, 0x15, 0x12, 0x8b, 0x75, 0x9f, 0xee, 0xfb, 0xe9, 0xbe, 0x3b,
+	0xe3, 0xeb, 0x68, 0x10, 0xb0, 0x21, 0x0c, 0x7a, 0x1d, 0x01, 0xa1, 0xe4, 0xe1, 0x0b, 0xcb, 0x8b,
+	0x89, 0x93, 0xd7, 0x13, 0x27, 0xf2, 0x72, 0x61, 0x47, 0x02, 0x24, 0x90, 0x72, 0xb1, 0x59, 0xb9,
+	0x08, 0x7a, 0xb2, 0x9b, 0x78, 0xb6, 0x0f, 0x23, 0x16, 0x40, 0x00, 0x4c, 0x99, 0xbc, 0xa4, 0xa3,
+	0x94, 0x12, 0xaa, 0xd2, 0x70, 0xe5, 0xaa, 0x60, 0x9f, 0xf2, 0xf6, 0x84, 0x4f, 0x41, 0x0c, 0x62,
+	0xe6, 0xc3, 0x68, 0x04, 0x21, 0xeb, 0x4a, 0x19, 0x05, 0x22, 0xf2, 0xf3, 0x62, 0x43, 0xdd, 0x16,
+	0x28, 0x1f, 0x84, 0xe4, 0xaf, 0x91, 0x80, 0x3e, 0xf7, 0xe5, 0x46, 0xb1, 0x6c, 0x99, 0x71, 0xc2,
+	0x45, 0x8f, 0x0b, 0x16, 0xcb, 0xb6, 0x8c, 0xf5, 0xab, 0x71, 0xeb, 0x1d, 0x61, 0xd2, 0x4c, 0xb8,
+	0x98, 0xb9, 0x3c, 0x4e, 0x86, 0xd2, 0xe5, 0xe3, 0x84, 0xc7, 0x92, 0x98, 0xf8, 0x38, 0x63, 0x66,
+	0x0f, 0x77, 0x26, 0xaa, 0xa2, 0xda, 0x81, 0xbb, 0x95, 0xe4, 0x06, 0x97, 0xb3, 0x04, 0x2e, 0x8f,
+	0x23, 0x08, 0x63, 0x6e, 0xee, 0x55, 0x51, 0xad, 0xe4, 0x9c, 0xd9, 0x79, 0xac, 0xfb, 0x56, 0xeb,
+	0x71, 0xdb, 0x75, 0x77, 0xbc, 0xc4, 0xc2, 0x87, 0x6a, 0xb6, 0xb9, 0xaf, 0xa0, 0xb2, 0xad, 0x93,
+	0x3c, 0x65, 0xaf, 0xab, 0x5b, 0xd6, 0x29, 0x3e, 0xd9, 0xc9, 0xa3, 0x51, 0xa7, 0x8f, 0x49, 0x63,
+	0x73, 0xdb, 0x06, 0x88, 0xa6, 0xde, 0x87, 0xb4, 0x70, 0xa9, 0x60, 0x26, 0x55, 0xbb, 0x78, 0x7f,
+	0xfb, 0xef, 0x5e, 0x95, 0xf3, 0x7f, 0x1c, 0x7a, 0x92, 0x65, 0xd4, 0xeb, 0xf3, 0x25, 0x35, 0x16,
+	0x4b, 0x6a, 0xac, 0x97, 0x14, 0xbd, 0xa5, 0x14, 0x7d, 0xa6, 0x14, 0x7d, 0xa5, 0x14, 0xcd, 0x53,
+	0x8a, 0xbe, 0x53, 0x8a, 0x7e, 0x52, 0x6a, 0xac, 0x53, 0x8a, 0x3e, 0x56, 0xd4, 0x98, 0xaf, 0xa8,
+	0xb1, 0x58, 0x51, 0xe3, 0x79, 0xe7, 0xef, 0xbd, 0x23, 0x75, 0xde, 0xcb, 0xdf, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xc1, 0x8d, 0x41, 0x35, 0x4c, 0x02, 0x00, 0x00,
 }
 
 func (this *QueryResultRequest) Equal(that interface{}) bool {
@@ -320,7 +323,7 @@ var _FrontendForQuerier_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "frontend.proto",
+	Metadata: "pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.proto",
 }
 
 func (m *QueryResultRequest) Marshal() (dAtA []byte, err error) {

pkg/querier/worker/frontend_processor.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb"
 	"github.com/cortexproject/cortex/pkg/querier/stats"
 	querier_stats "github.com/cortexproject/cortex/pkg/querier/stats"
 	"github.com/go-kit/log"
@@ -14,6 +13,8 @@ import (
 	"github.com/grafana/dskit/backoff"
 	"github.com/weaveworks/common/httpgrpc"
 	"google.golang.org/grpc"
+
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb"
 )
 
 var (

pkg/querier/worker/scheduler_processor.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
 	querier_stats "github.com/cortexproject/cortex/pkg/querier/stats"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/go-kit/log"
@@ -27,6 +26,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb"
 	"github.com/grafana/loki/pkg/scheduler/schedulerpb"
 )
 

pkg/scheduler/scheduler.go

@@ -11,7 +11,6 @@ import (
 
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 
-	"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/validation"
 	"github.com/go-kit/log"
@@ -36,6 +35,7 @@ import (
 
 	"github.com/grafana/loki/pkg/tenant"
 
+	"github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb"
 	lokiutil "github.com/grafana/loki/pkg/util"
 	lokigrpc "github.com/grafana/loki/pkg/util/httpgrpc"
 	lokihttpreq "github.com/grafana/loki/pkg/util/httpreq"

vendor/modules.txt

@@ -266,8 +266,6 @@ github.com/cortexproject/cortex/pkg/configs/client
 github.com/cortexproject/cortex/pkg/configs/legacy_promql
 github.com/cortexproject/cortex/pkg/configs/userconfig
 github.com/cortexproject/cortex/pkg/cortexpb
-github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb
-github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb
 github.com/cortexproject/cortex/pkg/ingester/client
 github.com/cortexproject/cortex/pkg/prom1/storage/metric
 github.com/cortexproject/cortex/pkg/querier