Skip to content

Commit

Permalink
Update prometheus fork to pick up concurrency fixes
Browse files Browse the repository at this point in the history
After a LOT of debugging around #579 I was able to trace the issue down to this race condition. I'm a bit surprised as this race didn't show up in `-race` -- but is definitely a race condition. This fix resolves the issue.

Fixes #579
  • Loading branch information
jacksontj committed Mar 30, 2023
1 parent 40f4bb4 commit 939814e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ vendor:

.PHONY: update-prom-fork
update-prom-fork:
GO111MODULE=on $(GO) mod edit -replace github.com/prometheus/prometheus=github.com/jacksontj/[email protected].4-fork
GO111MODULE=on $(GO) mod edit -replace github.com/prometheus/prometheus=github.com/jacksontj/[email protected].5-fork
$(MAKE) vendor
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/prometheus/prometheus => github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634
replace github.com/prometheus/prometheus => github.com/jacksontj/prometheus v1.8.1-0.20230330151148-3f6bd0d411b6

replace github.com/golang/glog => github.com/kubermatic/glog-gokit v0.0.0-20181129151237-8ab7e4c2d352

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/ionos-cloud/sdk-go/v6 v6.1.0 h1:0EZz5H+t6W23zHt6dgHYkKavr72/30O9nA97E3FZaS4=
github.com/ionos-cloud/sdk-go/v6 v6.1.0/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME=
github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634 h1:nZEyw8j2UOg7YCe9akUCqbyREm/UrcIXXeY1P+mZdwQ=
github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634/go.mod h1:637xk6elYZWENDfmM/Lpb9tzMI7oKvB7WAboalOs998=
github.com/jacksontj/prometheus v1.8.1-0.20230330151148-3f6bd0d411b6 h1:n1wPblSB43aXQCc9tabOAgti0+S8oir9S/UX+T0bwso=
github.com/jacksontj/prometheus v1.8.1-0.20230330151148-3f6bd0d411b6/go.mod h1:637xk6elYZWENDfmM/Lpb9tzMI7oKvB7WAboalOs998=
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
Expand Down
9 changes: 7 additions & 2 deletions vendor/github.com/prometheus/prometheus/promql/parser/ast.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ github.com/prometheus/exporter-toolkit/web
github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
github.com/prometheus/procfs/internal/util
# github.com/prometheus/prometheus v1.8.2-0.20210707132820-dc8f50559534 => github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634
# github.com/prometheus/prometheus v1.8.2-0.20210707132820-dc8f50559534 => github.com/jacksontj/prometheus v1.8.1-0.20230330151148-3f6bd0d411b6
## explicit; go 1.18
github.com/prometheus/prometheus/config
github.com/prometheus/prometheus/discovery
Expand Down Expand Up @@ -1103,6 +1103,6 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/prometheus/prometheus => github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634
# github.com/prometheus/prometheus => github.com/jacksontj/prometheus v1.8.1-0.20230330151148-3f6bd0d411b6
# github.com/golang/glog => github.com/kubermatic/glog-gokit v0.0.0-20181129151237-8ab7e4c2d352
# k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0

0 comments on commit 939814e

Please sign in to comment.