Skip to content

Commit 2541b9b

Browse files
committed
Switch to latest dskit main
Pulls in grafana/dskit#632 Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
1 parent 403f510 commit 2541b9b

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/golang/snappy v0.0.4
2323
github.com/google/gopacket v1.1.19
2424
github.com/gorilla/mux v1.8.1
25-
github.com/grafana/dskit v0.0.0-20250122122458-53db97b18080
25+
github.com/grafana/dskit v0.0.0-20250128193928-104df19e2080
2626
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc
2727
github.com/hashicorp/golang-lru v1.0.2 // indirect
2828
github.com/influxdata/influxdb/v2 v2.7.11
@@ -326,5 +326,3 @@ replace github.com/twmb/franz-go => github.com/grafana/franz-go v0.0.0-202410091
326326
// Pin Google GRPC to v1.65.0 as v1.66.0 has API changes and also potentially performance regressions.
327327
// Following https://github.com/grafana/dskit/pull/581
328328
replace google.golang.org/grpc => google.golang.org/grpc v1.65.0
329-
330-
replace github.com/grafana/dskit => github.com/grafana/dskit v0.0.0-20250122173303-e72fd2fc7563

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1271,8 +1271,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
12711271
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
12721272
github.com/grafana/alerting v0.0.0-20250113170557-b4ab2ba363a8 h1:mdI6P22PgFD7bQ0Yf4h8cfHSldak4nxogvlsTHZyZmc=
12731273
github.com/grafana/alerting v0.0.0-20250113170557-b4ab2ba363a8/go.mod h1:QsnoKX/iYZxA4Cv+H+wC7uxutBD8qi8ZW5UJvD2TYmU=
1274-
github.com/grafana/dskit v0.0.0-20250122173303-e72fd2fc7563 h1:uGaV6LlJJm9vsREQbXtroAcX2Lek1rKl0sawaDlVzpU=
1275-
github.com/grafana/dskit v0.0.0-20250122173303-e72fd2fc7563/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
1274+
github.com/grafana/dskit v0.0.0-20250128193928-104df19e2080 h1:IHRsAMdemxPu9g9zPxTFcU3hLhfd5cl6W4fqRovAzkU=
1275+
github.com/grafana/dskit v0.0.0-20250128193928-104df19e2080/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
12761276
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc h1:BW+LjKJDz0So5LI8UZfW5neWeKpSkWqhmGjQFzcFfLM=
12771277
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
12781278
github.com/grafana/franz-go v0.0.0-20241009100846-782ba1442937 h1:fwwnG/NcygoS6XbAaEyK2QzMXI/BZIEJvQ3CD+7XZm8=

vendor/github.com/grafana/dskit/middleware/instrument.go

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)