Skip to content

Commit 2dccab5

Browse files
authored
Merge branch 'main' into kakkoyun/goroutine_leak
2 parents b137906 + 2c6e6c1 commit 2dccab5

5 files changed

Lines changed: 39 additions & 17 deletions

File tree

.github/dependabot.yml

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,44 @@
1+
###
2+
# Avoid syncing from prometheus/prometheus: no_prometheus_repo_sync
3+
###
4+
15
version: 2
26
updates:
37
- package-ecosystem: "gomod"
4-
directory: "/"
5-
schedule:
6-
interval: "monthly"
7-
- package-ecosystem: "gomod"
8-
directory: "/tutorial/whatsup"
9-
schedule:
10-
interval: "monthly"
11-
- package-ecosystem: "gomod"
12-
directory: "/exp"
8+
directories:
9+
- /
10+
- /exp
11+
- /tutorial/whatsup
1312
schedule:
1413
interval: "monthly"
14+
groups:
15+
aws:
16+
patterns:
17+
- "github.com/aws/*"
18+
go.opentelemetry.io:
19+
patterns:
20+
- "go.opentelemetry.io/*"
21+
golang.org-x:
22+
patterns:
23+
- "golang.org/x/*"
24+
k8s.io:
25+
patterns:
26+
- "k8s.io/*"
1527
- package-ecosystem: "github-actions"
1628
directory: "/"
1729
schedule:
1830
interval: "monthly"
1931
groups:
20-
github-actions:
32+
promci:
33+
patterns:
34+
- "prometheus/promci*"
35+
codeql:
2136
patterns:
22-
- "*"
37+
- "github/codeql-action*"
38+
# Exclude configs synced from upstream prometheus/prometheus.
39+
exclude-paths:
40+
- .github/workflows/container_description.yml
41+
- .github/workflows/golangci-lint.yml
42+
- .github/workflows/govulncheck.yml
43+
- .github/workflows/scorecards.yml
44+
- .github/workflows/stale.yml

exp/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.0
44

55
require (
66
github.com/google/go-cmp v0.7.0
7-
github.com/klauspost/compress v1.18.7
7+
github.com/klauspost/compress v1.19.0
88
github.com/prometheus/common v0.69.0
99
google.golang.org/protobuf v1.36.11
1010
)

exp/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
44
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
5-
github.com/klauspost/compress v1.18.7 h1:aUyZsS4kH3QTKurYhAOwAHxllVPnOthb3vPfnF1Ehjw=
6-
github.com/klauspost/compress v1.18.7/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
5+
github.com/klauspost/compress v1.19.0 h1:sXLILfc9jV2QYWkzFOPWStmcUVH2RHEB1JCdY2oVvCQ=
6+
github.com/klauspost/compress v1.19.0/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
77
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
88
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
99
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/cespare/xxhash/v2 v2.3.0
88
github.com/google/go-cmp v0.7.0
99
github.com/json-iterator/go v1.1.12
10-
github.com/klauspost/compress v1.18.7
10+
github.com/klauspost/compress v1.19.0
1111
github.com/kylelemons/godebug v1.1.0
1212
github.com/prometheus/client_model v0.6.2
1313
github.com/prometheus/common v0.69.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2E
1616
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
1717
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
1818
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
19-
github.com/klauspost/compress v1.18.7 h1:aUyZsS4kH3QTKurYhAOwAHxllVPnOthb3vPfnF1Ehjw=
20-
github.com/klauspost/compress v1.18.7/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
19+
github.com/klauspost/compress v1.19.0 h1:sXLILfc9jV2QYWkzFOPWStmcUVH2RHEB1JCdY2oVvCQ=
20+
github.com/klauspost/compress v1.19.0/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
2121
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
2222
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
2323
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

0 commit comments

Comments
 (0)