From 21f8d0940e5da00c0c7a7c18a7f2c5d38e0f5b52 Mon Sep 17 00:00:00 2001 From: Christian Haudum Date: Fri, 13 Dec 2024 10:37:04 +0100 Subject: [PATCH 1/2] Revert toolchain version update Signed-off-by: Christian Haudum --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 85ed5b458171c..5aca3328513b9 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/grafana/loki/v3 go 1.23.0 -toolchain go1.23.4 +toolchain go1.23.1 require ( cloud.google.com/go/bigtable v1.33.0 From 5e94136a9c949b61158988160422e7509a734467 Mon Sep 17 00:00:00 2001 From: Christian Haudum Date: Fri, 13 Dec 2024 10:46:04 +0100 Subject: [PATCH 2/2] Fix test compile error introduced with mergeing a not up-to-date PR Signed-off-by: Christian Haudum --- pkg/distributor/distributor_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/distributor/distributor_test.go b/pkg/distributor/distributor_test.go index b438780547ca0..310aa52df7708 100644 --- a/pkg/distributor/distributor_test.go +++ b/pkg/distributor/distributor_test.go @@ -648,7 +648,7 @@ func Test_DiscardEmptyStreamsAfterValidation(t *testing.T) { limits, ingester := setup() distributors, _ := prepare(t, 1, 5, limits, func(_ string) (ring_client.PoolClient, error) { return ingester, nil }) - _, err := distributors[0].Push(ctx, makeWriteRequestWithLabels(1, 1, []string{})) + _, err := distributors[0].Push(ctx, makeWriteRequestWithLabels(1, 1, []string{}, false, false, false)) require.Equal(t, err, httpgrpc.Errorf(http.StatusUnprocessableEntity, validation.MissingStreamsErrorMsg)) topVal := ingester.Peek() require.Nil(t, topVal)