fix(deps): update github.com/grafana/dskit digest to 736c44c (main)

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/google/gopacket v1.1.19
 	github.com/gorilla/mux v1.8.1
-	github.com/grafana/dskit v0.0.0-20240719153732-6e8a03e781de
+	github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382
 	github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/json-iterator/go v1.1.12

go.sum

@@ -514,8 +514,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
 github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
 github.com/grafana/alerting v0.0.0-20240708204730-284b8fe16cff h1:okOj0w7kyIfrENSFGVXTjn3aSiS2QUcqwDozQkoKdH0=
 github.com/grafana/alerting v0.0.0-20240708204730-284b8fe16cff/go.mod h1:DLj8frbtCaITljC2jc0L85JQViPF3mPfOSiYhm1osso=
-github.com/grafana/dskit v0.0.0-20240719153732-6e8a03e781de h1:wrFSxd0CUyluyAPfWpVipKSLZDsTYqrCArS4TrQzGpQ=
-github.com/grafana/dskit v0.0.0-20240719153732-6e8a03e781de/go.mod h1:lcjGB6SuaZ2o44A9nD6p/tR4QXSPbzViRY520Gy6pTQ=
+github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382 h1:hcVxOw584ov31MyEAuNNGjrj4vPZX626F39zuOtWQs0=
+github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382/go.mod h1:lcjGB6SuaZ2o44A9nD6p/tR4QXSPbzViRY520Gy6pTQ=
 github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc h1:BW+LjKJDz0So5LI8UZfW5neWeKpSkWqhmGjQFzcFfLM=
 github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
 github.com/grafana/goautoneg v0.0.0-20240607115440-f335c04c58ce h1:WI1olbgS+sEl77qxEYbmt9TgRUz7iLqmjh8lYPpGlKQ=

pkg/storage/ingest/pusher_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/dskit/concurrency"
 	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/tenant"
+	"github.com/grafana/regexp"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
@@ -211,12 +212,25 @@ func TestPusherConsumer(t *testing.T) {
 			var logLines []string
 			if logsStr := logs.String(); logsStr != "" {
 				logLines = strings.Split(strings.TrimSpace(logsStr), "\n")
+				logLines = removeUnimportantLogFields(logLines)
 			}
 			assert.Equal(t, tc.expectedLogLines, logLines)
 		})
 	}
 }
 
+var unimportantLogFieldsPattern = regexp.MustCompile(`\scaller=\S+\.go:\d+\s`)
+
+func removeUnimportantLogFields(lines []string) []string {
+	// The 'caller' field is not important to these tests (we just care about the message and other information),
+	// and can change as we refactor code, making these tests brittle. So we remove it before making assertions about the log lines.
+	for i, line := range lines {
+		lines[i] = unimportantLogFieldsPattern.ReplaceAllString(line, " ")
+	}
+
+	return lines
+}
+
 func TestPusherConsumer_clientErrorSampling(t *testing.T) {
 	type testCase struct {
 		sampler         *util_log.Sampler