Skip to content

Merge Release 1.20 back to main #1627

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

Jump to bottom
Merged
merged 11 commits into from
Sep 17, 2024
Merged

Merge Release 1.20 back to main #1627

merged 11 commits into from
Sep 17, 2024

Conversation

ArthurSens
Copy link
Member

Merging @krajorama's bugfixes back to main

krajorama and others added 11 commits September 4, 2024 21:10
@krajorama
native histogram: use exemplars in concurrency test
e061dfa 
Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Use a trivial solution to #1605
dc819ce 
Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
fix: native histogram: Simplify and fix addExemplar
dc8e9a4 
mdIdx was redundant when len(exemplars)>1, so got rid of it, rIdx
is enough.

Don't compare timestamp of incoming exemplar to timestamp of
minimal distance exemplar. Most of the time the incoming exemplar
will be newer. And if not, the previous code just replaced an
exemplar one index after the minimal distance exemplar. Which had
an index out of range bug, plus is essentially random.

Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Use simplified solution from #1609 for the data race
504566f 
Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Update comments with more explanations
d6b8c89 
Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Merge pull request #1608 from krajorama/index-out-of-range-native-his…
6e9914d 
…togram-exemplar

bugfix: native histogram: exemplars index out of range
@ArthurSens
Add changelog entry for 1.20.3
937ac63 
Signed-off-by: Arthur Silva Sens <[email protected]>
@ArthurSens
Merge pull request #1620 from prometheus/arthursens/prepare-1.20.3
ef2f87e 
Add changelog entry for 1.20.3
@krajorama
native histogram: Fix race between Write and addExemplar
1e398cc 
Follow-up to 1608

Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Add changelog
209f4c0 
Signed-off-by: György Krajcsovits <[email protected]>
@krajorama
Merge pull request #1623 from krajorama/data-race-in-histogram-write
05fcde9 
native histogram: Fix race between Write and addExemplar
@ArthurSens ArthurSens merged commit 39e7c23 into main Sep 17, 2024
18 checks passed
This was referenced Feb 19, 2025
Merged
Merged
@dghubble-renovate dghubble-renovate bot mentioned this pull request Feb 19, 2025
Merged
1 task
@mr-borboto mr-borboto bot mentioned this pull request Feb 19, 2025
Merged
1 task
@pull-bunyan pull-bunyan bot mentioned this pull request Feb 19, 2025
Closed
1 task
@pb-renovate pb-renovate bot mentioned this pull request Feb 19, 2025
Closed
1 task
@theriver-bot theriver-bot bot mentioned this pull request Feb 19, 2025
Merged
1 task
@larsl-renovate larsl-renovate bot mentioned this pull request Feb 19, 2025
Merged
1 task
@cilium-renovate cilium-renovate bot mentioned this pull request Feb 17, 2025
Merged
1 task
This was referenced Feb 19, 2025
Merged
Merged
Merged
Merged
This was referenced Aug 3, 2025
Closed
Closed
Merged
Open
Closed
Open
@mend-for-github-com mend-for-github-com bot mentioned this pull request Aug 6, 2025
Open
1 task
This was referenced Aug 6, 2025
Merged
Open
Open
@renovate-bot renovate-bot mentioned this pull request Aug 8, 2025
Open
1 task
This was referenced Aug 8, 2025
Merged
Merged
@renovate-bot renovate-bot mentioned this pull request Aug 11, 2025
Open
1 task