Skip to content

Commit fb05a36

Browse files
authored
fix(deps): [Release 3.6.x] Update dskit to resolve Otel conflict (#20368)
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
1 parent bf45bee commit fb05a36

12 files changed

Lines changed: 14 additions & 14138 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
github.com/gorilla/mux v1.8.1
5454
github.com/gorilla/websocket v1.5.3
5555
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2
56-
github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb
56+
github.com/grafana/dskit v0.0.0-20250917065751-798f5a8fa154
5757
github.com/grafana/go-gelf/v2 v2.0.1
5858
github.com/grafana/gomemcache v0.0.0-20250828162811-a96f6acee2fe
5959
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,8 +676,8 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
676676
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
677677
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4Vp68H0tp/0iN17DM2ehRo1rLEdOFe/gB8I=
678678
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2/go.mod h1:w/aiO1POVIeXUQyl0VQSZjl5OAGDTL5aX+4v0RA1tcw=
679-
github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb h1:/7k3iGtgl99mhmsaMpB8REUEj8uEh6Nwo74fK342Gsc=
680-
github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb/go.mod h1:RtZNNRB6iArFqnfpaMP1KgMqTPfKbGmhRoj8MPcakfY=
679+
github.com/grafana/dskit v0.0.0-20250917065751-798f5a8fa154 h1:ojrJ/ctyUGsZ/gem0o6hnhe+keaZhMVq4cg/1kPALbE=
680+
github.com/grafana/dskit v0.0.0-20250917065751-798f5a8fa154/go.mod h1:VahT+GtfQIM+o8ht2StR6J9g+Ef+C2Vokh5uuSmOD/4=
681681
github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak=
682682
github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90=
683683
github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/IENCw+oLVdZB4G21VPhkHBgwSHY=

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

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/dskit/tracing/otel.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/go.opentelemetry.io/otel/semconv/v1.34.0/MIGRATION.md‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎vendor/go.opentelemetry.io/otel/semconv/v1.34.0/README.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)