chore: fix submodule for v3 (#12438)

Signed-off-by: Edward Welch <edward.welch@grafana.com>

clients/pkg/logentry/stages/structuredmetadata_test.go

@@ -8,7 +8,8 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/loki/v3/pkg/push"
+	"github.com/grafana/loki/pkg/push"
+
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
 )
 

clients/pkg/promtail/client/client_test.go

@@ -22,8 +22,9 @@ import (
 	"github.com/grafana/loki/v3/clients/pkg/promtail/api"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/utils"
 
+	"github.com/grafana/loki/pkg/push"
+
 	"github.com/grafana/loki/v3/pkg/logproto"
-	"github.com/grafana/loki/v3/pkg/push"
 	lokiflag "github.com/grafana/loki/v3/pkg/util/flagext"
 )
 

clients/pkg/promtail/promtail_wal_test.go

@@ -27,7 +27,8 @@ import (
 	"github.com/grafana/loki/v3/clients/pkg/promtail/utils"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/wal"
 
-	"github.com/grafana/loki/v3/pkg/push"
+	"github.com/grafana/loki/pkg/push"
+
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
 )
 

go.mod

@@ -125,7 +125,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gogo/googleapis v1.4.0
 	github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d
-	github.com/grafana/loki/v3/pkg/push v0.0.0-20231124142027-e52380921608
+	github.com/grafana/loki/pkg/push v0.0.0-20231124142027-e52380921608
 	github.com/heroku/x v0.0.61
 	github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b
 	github.com/prometheus/alertmanager v0.27.0
@@ -358,4 +358,4 @@ replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-
 // Insist on the optimised version of grafana/regexp
 replace github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd
 
-replace github.com/grafana/loki/v3/pkg/push => ./pkg/push
+replace github.com/grafana/loki/pkg/push => ./pkg/push

integration/loki_micro_services_delete_test.go

@@ -16,9 +16,10 @@ import (
 	"github.com/grafana/loki/v3/integration/client"
 	"github.com/grafana/loki/v3/integration/cluster"
 
+	"github.com/grafana/loki/pkg/push"
+
 	"github.com/grafana/loki/v3/pkg/logproto"
 	"github.com/grafana/loki/v3/pkg/logql/syntax"
-	"github.com/grafana/loki/v3/pkg/push"
 	"github.com/grafana/loki/v3/pkg/storage"
 )
 

pkg/chunkenc/memchunk_test.go

@@ -18,13 +18,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/loki/pkg/push"
+
 	"github.com/grafana/loki/v3/pkg/chunkenc/testdata"
 	"github.com/grafana/loki/v3/pkg/iter"
 	"github.com/grafana/loki/v3/pkg/logproto"
 	"github.com/grafana/loki/v3/pkg/logql/log"
 	"github.com/grafana/loki/v3/pkg/logql/syntax"
 	"github.com/grafana/loki/v3/pkg/logqlmodel/stats"
-	"github.com/grafana/loki/v3/pkg/push"
 	"github.com/grafana/loki/v3/pkg/storage/chunk"
 	"github.com/grafana/loki/v3/pkg/util/filter"
 )

pkg/distributor/distributor_test.go

@@ -30,12 +30,13 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
+	"github.com/grafana/loki/pkg/push"
+
 	"github.com/grafana/loki/v3/pkg/ingester"
 	"github.com/grafana/loki/v3/pkg/ingester/client"
 	loghttp_push "github.com/grafana/loki/v3/pkg/loghttp/push"
 	"github.com/grafana/loki/v3/pkg/logproto"
 	"github.com/grafana/loki/v3/pkg/logql/syntax"
-	"github.com/grafana/loki/v3/pkg/push"
 	"github.com/grafana/loki/v3/pkg/runtime"
 	"github.com/grafana/loki/v3/pkg/util/constants"
 	fe "github.com/grafana/loki/v3/pkg/util/flagext"

pkg/distributor/tee_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/grafana/loki/v3/pkg/push"
+	"github.com/grafana/loki/pkg/push"
 )
 
 type mockedTee struct {

pkg/distributor/validator_test.go

@@ -11,9 +11,10 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/grafana/loki/pkg/push"
+
 	"github.com/grafana/loki/v3/pkg/logproto"
 	"github.com/grafana/loki/v3/pkg/logql/syntax"
-	"github.com/grafana/loki/v3/pkg/push"
 	"github.com/grafana/loki/v3/pkg/validation"
 )
 

pkg/loghttp/push/otlp.go

@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/pdata/plog/plogotlp"
 
-	"github.com/grafana/loki/v3/pkg/push"
+	"github.com/grafana/loki/pkg/push"
 
 	"github.com/grafana/loki/v3/pkg/logproto"
 	loki_util "github.com/grafana/loki/v3/pkg/util"

pkg/loghttp/push/otlp_test.go

@@ -13,8 +13,9 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/plog"
 
+	"github.com/grafana/loki/pkg/push"
+
 	"github.com/grafana/loki/v3/pkg/logproto"
-	"github.com/grafana/loki/v3/pkg/push"
 )
 
 func TestOTLPToLokiPushRequest(t *testing.T) {

pkg/loghttp/push/push.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/go-kit/log/level"
 
-	"github.com/grafana/loki/v3/pkg/push"
+	"github.com/grafana/loki/pkg/push"
 
 	"github.com/dustin/go-humanize"
 	"github.com/go-kit/log"

pkg/logproto/alias.go

@@ -3,7 +3,7 @@ package logproto
 import (
 	"google.golang.org/grpc"
 
-	"github.com/grafana/loki/v3/pkg/push"
+	"github.com/grafana/loki/pkg/push"
 )
 
 // Aliases to avoid renaming all the imports of logproto