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.

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

Bump Prometheus to include new label regex optimization #7232

Merged
merged 12 commits into from
Mar 28, 2024

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Mar 25, 2024

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Update Prometheus version to latest main to include prometheus/prometheus#13461.

Verification

@yeya24
Copy link
Contributor Author

yeya24 commented Mar 25, 2024

This requires upgrading thanos promql engine first.

@yeya24
Copy link
Contributor Author

yeya24 commented Mar 27, 2024

Promql engine update done. Updated this pr.

@yeya24
Copy link
Contributor Author

yeya24 commented Mar 27, 2024

=== NAME  TestQueryFrontendExplain
    query_frontend_test.go:1170: 
        	Error Trace:	/home/runner/work/thanos/thanos/test/e2e/query_frontend_test.go:1170
        	Error:      	Not equal: 
        	            	expected: "{\"status\":\"success\",\"data\":{\"name\":\"[noArgFunction] time()\"}}"
        	            	actual  : "{\"status\":\"success\",\"data\":{\"name\":\"[duplicateLabelCheck]\",\"children\":[{\"name\":\"[noArgFunction]\"}]}}"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-{"status":"success","data":{"name":"[noArgFunction] time()"}}
        	            	+{"status":"success","data":{"name":"[duplicateLabelCheck]","children":[{"name":"[noArgFunction]"}]}}
        	Test:       	TestQueryFrontendExplain

This test failed. @GiedriusS Can you please help me figure out how I can fix it

@fpetkovski
Copy link
Contributor

Looks like a feature that was added by @mhoffm-aiven to detect duplicate series from each operator output. I think it is safe to change the expected result unless we want to hide this from analysis.

Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
@fpetkovski
Copy link
Contributor

fpetkovski commented Mar 28, 2024

Looks like we cannot create OOO chunks in TSDB anymore, some test setups fail.

@yeya24
Copy link
Contributor Author

yeya24 commented Mar 28, 2024

@fpetkovski PTAL again

Copy link
Contributor

@fpetkovski fpetkovski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work

@yeya24 yeya24 merged commit 4f664e3 into thanos-io:main Mar 28, 2024
20 checks passed
@yeya24 yeya24 deleted the sg-regex-match-optimize branch March 28, 2024 17:45
jnyi pushed a commit to jnyi/thanos that referenced this pull request Apr 4, 2024
* bump Prometheus version to include new label matcher regex value optimization

Signed-off-by: Ben Ye <[email protected]>

* update

Signed-off-by: Ben Ye <[email protected]>

* fix again

Signed-off-by: Ben Ye <[email protected]>

* include latest fix

Signed-off-by: Ben Ye <[email protected]>

* update go mod

Signed-off-by: Ben Ye <[email protected]>

* fix explain test

Signed-off-by: Ben Ye <[email protected]>

* fix test again

Signed-off-by: Ben Ye <[email protected]>

* update again

Signed-off-by: Ben Ye <[email protected]>

* update

Signed-off-by: Ben Ye <[email protected]>

* fix tests so far

Signed-off-by: Ben Ye <[email protected]>

* fix compactor tests

Signed-off-by: Ben Ye <[email protected]>

* use own out of order chunk index

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants