From 72a016c3982c634449b481f6b037100dbb20878d Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Tue, 1 Apr 2025 18:38:24 +0000 Subject: [PATCH 1/2] Fix nil meta apply on parent context cancelation --- tempodb/blocklist/poller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tempodb/blocklist/poller.go b/tempodb/blocklist/poller.go index 2326635a447..22da96a7676 100644 --- a/tempodb/blocklist/poller.go +++ b/tempodb/blocklist/poller.go @@ -175,7 +175,7 @@ func (p *Poller) Do(parentCtx context.Context, previous *List) (PerTenant, PerTe if parentCtx.Err() != nil { // Wait for our work to complete. wg.Wait() - return nil, nil, nil + return nil, nil, parentCtx.Err() } // Exit early if we have exceeded our tolerance for number of failing tenants. From 53f0fb09da767dcba743e4e25c050ff1b5a9d8fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 16:59:34 +0000 Subject: [PATCH 2/2] Bump actions/create-github-app-token from 1 to 2 Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1 to 2. - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](https://github.com/actions/create-github-app-token/compare/v1...v2) --- updated-dependencies: - dependency-name: actions/create-github-app-token dependency-version: '2' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/metrics-collector.yml | 2 +- .github/workflows/milestoned_to_project.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/metrics-collector.yml b/.github/workflows/metrics-collector.yml index 174be165c2a..80f42c00bb3 100644 --- a/.github/workflows/metrics-collector.yml +++ b/.github/workflows/metrics-collector.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Get app token - uses: actions/create-github-app-token@v1 + uses: actions/create-github-app-token@v2 id: get-github-app-token with: app-id: ${{secrets.APP_ID}} diff --git a/.github/workflows/milestoned_to_project.yml b/.github/workflows/milestoned_to_project.yml index e88b02f092e..adfdff84eb5 100644 --- a/.github/workflows/milestoned_to_project.yml +++ b/.github/workflows/milestoned_to_project.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Get app token - uses: actions/create-github-app-token@v1 + uses: actions/create-github-app-token@v2 id: get-github-app-token with: app-id: ${{secrets.APP_ID}}