Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Parallel walk edge-case panic #563

Merged
merged 2 commits into from
Mar 16, 2023
Merged

Fix Parallel walk edge-case panic #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab0c743
Add test case for #562
jacksontj Mar 16, 2023
04eb178
Update prom fork to pick up fix #562
jacksontj Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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/prometheus@v0.2.37.3-fork
GO111MODULE=on $(GO) mod edit -replace github.com/prometheus/prometheus=github.com/jacksontj/prometheus@v0.2.37.4-fork
$(MAKE) vendor
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ require (
golang.org/x/time v0.0.0-20220609170525-579cf78fd858
gopkg.in/yaml.v2 v2.4.0
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
)

require (
Expand Down Expand Up @@ -158,13 +159,12 @@ require (
k8s.io/client-go v0.24.2 // indirect
k8s.io/klog/v2 v2.70.0 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/prometheus/prometheus => github.com/jacksontj/prometheus v1.8.1-0.20230309220703-968ded36c597
replace github.com/prometheus/prometheus => github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,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.20230309220703-968ded36c597 h1:EdeyyTk+pKFaBK81FuooCIfc2GZaI3NIFJngKBRSuS0=
github.com/jacksontj/prometheus v1.8.1-0.20230309220703-968ded36c597/go.mod h1:637xk6elYZWENDfmM/Lpb9tzMI7oKvB7WAboalOs998=
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/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
7 changes: 7 additions & 0 deletions test/testdata/issue_562.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Test for https://github.com/jacksontj/promxy/issues/562
load 5m
metric_1{a="1"} 0+10x1000 100+30x1000

eval instant at 5m max_over_time(metric_1[5m]) + metric_1
{a="1", az="a"} 20
{a="1", az="b"} 20
7 changes: 6 additions & 1 deletion vendor/github.com/prometheus/prometheus/promql/engine_extra.go
View file
Open in desktop

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
View file
Open in desktop
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.20230309220703-968ded36c597
# github.com/prometheus/prometheus v1.8.2-0.20210707132820-dc8f50559534 => github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634
## explicit; go 1.18
github.com/prometheus/prometheus/config
github.com/prometheus/prometheus/discovery
Expand Down Expand Up @@ -1104,6 +1104,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.20230309220703-968ded36c597
# github.com/prometheus/prometheus => github.com/jacksontj/prometheus v1.8.1-0.20230316162245-bf26a7edb634
# 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