Skip to content

[ACM Obs bot] Bump stolostron/thanos to v0.39.1#253

Merged
openshift-merge-bot[bot] merged 162 commits intostolostron:release-2.15from
rhobs:automated-updates-acm-release-2.15
Aug 20, 2025
Merged

[ACM Obs bot] Bump stolostron/thanos to v0.39.1#253
openshift-merge-bot[bot] merged 162 commits intostolostron:release-2.15from
rhobs:automated-updates-acm-release-2.15

Conversation

@acm-observability-bot
Copy link

Description

This is an automated version bump from CI.
The logs for this run can be found in the syncbot repo actions.
If you wish to perform this manually, execute the following commands from stolostron/thanos repo:

git fetch https://github.com/thanos-io/thanos --tags
if ! git merge refs/tags/v0.39.1 --no-edit; then
  git checkout --theirs CHANGELOG.md VERSION docs go.mod go.sum pkg tutorials .busybox-versions .devcontainer
  git checkout --ours OWNERS
  git add CHANGELOG.md VERSION docs go.mod go.sum pkg tutorials .busybox-versions .devcontainer OWNERS
  git merge --continue
fi
go mod tidy
go mod vendor

if [ -f scripts/rh-manifest.sh ]; then
  bash scripts/rh-manifest.sh
  git add rh-manifest.txt
  git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

didukh86 and others added 30 commits September 4, 2024 17:58
Issue: thanos-io#7672

Signed-off-by: didukh86 <didukh86@gmail.com>
Signed-off-by: didukh86 <78904472+didukh86@users.noreply.github.com>
Signed-off-by: didukh86 <didukh86@gmail.com>
Signed-off-by: Taras Didukh <taras.didukh@advancedmd.com>
Signed-off-by: Taras Didukh <taras.didukh@advancedmd.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
…tlptracehttp (thanos-io#7666)

Bumps [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go) from 1.27.0 to 1.29.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-go@v1.27.0...v1.29.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Taras Didukh <taras.didukh@advancedmd.com>
Signed-off-by: milinddethe15 <milinddethe15@gmail.com>
Signed-off-by: Taras Didukh <taras.didukh@advancedmd.com>
…io#7667)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.2 to 3.26.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@429e197...2c779ab)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Taras Didukh <taras.didukh@advancedmd.com>
Bumps [golang.org/x/time](https://github.com/golang/time) from 0.5.0 to 0.6.0.
- [Commits](golang/time@v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: golang.org/x/time
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Taras Didukh <taras.didukh@advancedmd.com>
Signed-off-by: Taras Didukh <didukh86@gmail.com>
Signed-off-by: Taras Didukh <didukh86@gmail.com>
Signed-off-by: Taras Didukh <didukh86@gmail.com>
Port expanded postings cache from Cortex. Huge kudos to @alanprot for
the implementation. I added a TODO item to convert our whole internal
caching infra to be promise based.

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Porting cortexproject/cortex#6369 to our code
base. Add test that fails without the fix.

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
…os-io#7907)

Signed-off-by: Philip Gough <philip.p.gough@gmail.com>
…dis_fix

Query-frontend: Fix connection to Redis cluster with TLS.
Signed-off-by: Helen Tseng <bluesky6529@gmail.com>
* Capnp: Use segment from existing message

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>

* Downgrade capnproto

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>

---------

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
…thanos-io#7941)

* [Receive] fix race condition

Signed-off-by: Yi Jin <yi.jin@databricks.com>

* add a change log

Signed-off-by: Yi Jin <yi.jin@databricks.com>

* memorize tsdb local clients without race condition

Signed-off-by: Yi Jin <yi.jin@databricks.com>

* fix data race in testing with some concurrent safe helper functions

Signed-off-by: Yi Jin <yi.jin@databricks.com>

* address comments

Signed-off-by: Yi Jin <yi.jin@databricks.com>

---------

Signed-off-by: Yi Jin <yi.jin@databricks.com>
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
…Prometheus (thanos-io#7954)

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
…7.1-to-main

Merge release 0.37.1 to main
Signed-off-by: kade.lee <tjdwls1201@gmail.com>
* mark posting group lazy if it has a lot of add keys

Signed-off-by: Ben Ye <benye@amazon.com>

* update docs

Signed-off-by: Ben Ye <benye@amazon.com>

* rename labels

Signed-off-by: Ben Ye <benye@amazon.com>

* changelog

Signed-off-by: Ben Ye <benye@amazon.com>

* change to use max key series ratio

Signed-off-by: Ben Ye <benye@amazon.com>

* update docs

Signed-off-by: Ben Ye <benye@amazon.com>

* mention metrics

Signed-off-by: Ben Ye <benye@amazon.com>

* update docs

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
GiedriusS added 2 commits July 1, 2025 12:59
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
@openshift-ci
Copy link

openshift-ci bot commented Jul 17, 2025

Hi @acm-observability-bot[bot]. Thanks for your PR.

I'm waiting for a stolostron member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

MichaHoffmann and others added 4 commits July 17, 2025 14:17
Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
Thanos Query crashes with "concurrent map iteration and map write" panic
in distributed mode when multiple goroutines access the same `annotations.Annotations`
map concurrently.

```
panic: concurrent map iteration and map write
github.com/prometheus/prometheus/util/annotations.(*Annotations).Merge(...)
github.com/thanos-io/promql-engine/engine.(*compatibilityQuery).Exec(...)
```

Here I replaced direct access to `res.Warnings.AsErrors()` with a thread-safe copy:
```go
// Before (unsafe)
warnings = append(warnings, res.Warnings.AsErrors()...)

// After (thread-safe)
safeWarnings := annotations.New().Merge(res.Warnings)
warnings = append(warnings, safeWarnings.AsErrors()...)
```

Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
Co-authored-by: Joel Verezhak <jverezhak@open-systems.com>
Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
@acm-observability-commit-bot acm-observability-commit-bot bot force-pushed the automated-updates-acm-release-2.15 branch from 8246704 to d609781 Compare July 28, 2025 01:03
@coleenquadros
Copy link

/ok-to-test

@acm-observability-commit-bot acm-observability-commit-bot bot force-pushed the automated-updates-acm-release-2.15 branch from 201e3a2 to f23220c Compare August 18, 2025 01:00
@coleenquadros
Copy link

/ok-to-test

@coleenquadros
Copy link

/ok-to-test

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@coleenquadros
Copy link

/ok-to-test

Copy link

@philipgough philipgough left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Aug 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: acm-observability-bot[bot], philipgough

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 3242420 into stolostron:release-2.15 Aug 20, 2025
9 checks passed
@philipgough philipgough deleted the automated-updates-acm-release-2.15 branch August 20, 2025 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.