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

Cut 0.23.0-rc.1 and cherry picked 3 critical commits from main. #4684

Merged
merged 4 commits into from
Sep 20, 2021

Conversation

bwplotka
Copy link
Member

Things I cherry picked:

Also, let's make sure we merge this PR without squash.

Let's not try to add too many things in this release, we already waited long.

hanjm and others added 3 commits September 20, 2021 10:49
…tes config type (#4657)

* Sidecar: Fix process external label when promethues v2.28+ use units.Bytes config type (#4656)

Signed-off-by: hanjm <hanjinming@outlook.com>

* E2E: Upgrade prometheus image version

Signed-off-by: hanjm <hanjinming@outlook.com>
* upgrade Prometheus dependency version to v2.30.0

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* fix unit test

Signed-off-by: Ben Ye <ben.ye@bytedance.com>
# Conflicts:
#	go.mod
#	go.sum
…/(*targetsStreamStream).receive infinite loop when target response Unimplemented error (#4676) (#4681)

Signed-off-by: hanjm <hanjinming@outlook.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Copy link
Member

@onprem onprem left a comment

Choose a reason for hiding this comment

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

LGTM!

@kakkoyun kakkoyun merged commit 2bf7e1c into release-0.23 Sep 20, 2021
@kakkoyun kakkoyun deleted the cherry-picking-fixes-0.23 branch September 20, 2021 09:38
@hanjm
Copy link
Member

hanjm commented Sep 20, 2021

Hi @yeya24 @bwplotka , #4680 add exemplar.partial-response flag also critical for compatible with old version sidecar. If there is a old version sidecar in sidecar cluster, thanos-query query exemplar will response fail.

@bwplotka
Copy link
Member Author

@hanjm It's just a flag addition, so I did not have enough context to merge this one... We can't postpone release forever, can we release without it, since mitigation is known and exemplars are not core functionality?

@hanjm
Copy link
Member

hanjm commented Sep 20, 2021

@hanjm It's just a flag addition, so I did not have enough context to merge this one... We can't postpone release forever, can we release without it, since mitigation is known and exemplars are not core functionality?

@bwplotka more context is: if without this flag. the exemplar-partial-response is always false. exemplar will response fail if many sidecar has one old version.

if enablePartialResponse {

i just upgrade from 0.22 to 0.23.0 and the useful exemplar api break,then i fixed :) ,since exemplar is not core function it will be ok to release. thanks.

@bwplotka
Copy link
Member Author

Yes, especially for power users like you and @yeya24 using main is the best choice (we do that too 🤗 )

@John-Lin
Copy link

John-Lin commented Oct 5, 2021

Hi, team

I'm facing this errors after upgrade to v0.23.0 however I didn't use exemplar feature. As far as I know, it should not show error like this (I have no idea how to reproduce. I guess grafana enable exemplar feature by default cause this error)

level=error ts=2021-10-01T01:48:19.727416223Z caller=proxy.go:146 err="receiving exemplars from exemplars client &{0xc0162da000}: rpc error: code = Canceled desc = context canceled"
level=error ts=2021-10-01T01:48:23.383270697Z caller=proxy.go:146 err="fetching exemplars from exemplars client &{0xc0162da000}: rpc error: code = Canceled desc = context canceled"
level=error ts=2021-10-01T01:48:23.525155169Z caller=proxy.go:146 err="receiving exemplars from exemplars client &{0xc0000a4700}: rpc error: code = Canceled desc = context canceled"
level=error ts=2021-10-01T01:48:25.387262601Z caller=proxy.go:146 err="fetching exemplars from exemplars client &{0xc0162da000}: rpc error: code = Canceled desc = context canceled"

then I found these PRs #4680, #4681 might related. my question is will #4680, #4681 be merged in next release?
it seems like those PRs could fix this issue.

bwplotka added a commit that referenced this pull request Oct 6, 2021
* Cut release 0.23.0-rc.0 (#4625)

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Updated version.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Cut 0.23.0-rc.1 and cherry picked 3 critical commits from main. (#4684)

* Sidecar: Fix process external label on promethues v2.28+ use units.Bytes config type (#4657)

* Sidecar: Fix process external label when promethues v2.28+ use units.Bytes config type (#4656)

Signed-off-by: hanjm <hanjinming@outlook.com>

* E2E: Upgrade prometheus image version

Signed-off-by: hanjm <hanjinming@outlook.com>

* upgrade Prometheus dependency version to v2.30.0 (#4669)

* upgrade Prometheus dependency version to v2.30.0

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* fix unit test

Signed-off-by: Ben Ye <ben.ye@bytedance.com>
# Conflicts:
#	go.mod
#	go.sum

* Query: Fix (*exemplarsStream).receive/(*metricMetadataStream).receive/(*targetsStreamStream).receive infinite loop when target response Unimplemented error (#4676) (#4681)

Signed-off-by: hanjm <hanjinming@outlook.com>

* Cut 0.23.0-rc.1

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

Co-authored-by: Jimmiehan <hanjinming@outlook.com>
Co-authored-by: Ben Ye <yb532204897@gmail.com>

* Cut 0.23.0 release. (#4697)

* Endpointset: Do not use info client to obtain metadata (for now) (#4714)

* Do not use info client to obtain metadata

Signed-off-by: Matej Gera <matejgera@gmail.com>

* Update CHANGELOG.

Signed-off-by: Matej Gera <matejgera@gmail.com>

* Comment out client.info usage

Signed-off-by: Matej Gera <matejgera@gmail.com>

* Fix lint error

Signed-off-by: Matej Gera <matejgera@gmail.com>

* Cutting 0.23.1 (#4718)

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Moved tutorials Thanos versions to 0.23.1

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Added volounteer for shepharding, fixed VERSION.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

Co-authored-by: Jimmiehan <hanjinming@outlook.com>
Co-authored-by: Ben Ye <yb532204897@gmail.com>
Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants