From 7361e15356bd2819d09fa612888ca1a7da6426f7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 10 Jul 2024 04:52:33 +0200 Subject: [PATCH 1/6] Update github-actions deps (#5722) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/setup-node](https://github.com/actions/setup-node) | action | patch | `v4.0.2` -> `v4.0.3` | | [actions/upload-artifact](https://github.com/actions/upload-artifact) | action | patch | `v4.3.3` -> `v4.3.4` | | [anchore/sbom-action](https://github.com/anchore/sbom-action) | action | patch | `v0.16.0` -> `v0.16.1` | --- ### Release Notes
actions/setup-node (actions/setup-node) ### [`v4.0.3`](https://github.com/actions/setup-node/compare/v4.0.2...v4.0.3) [Compare Source](https://github.com/actions/setup-node/compare/v4.0.2...v4.0.3)
actions/upload-artifact (actions/upload-artifact) ### [`v4.3.4`](https://github.com/actions/upload-artifact/releases/tag/v4.3.4) [Compare Source](https://github.com/actions/upload-artifact/compare/v4.3.3...v4.3.4) ##### What's Changed - Update [@​actions/artifact](https://github.com/actions/artifact) version, bump dependencies by [@​robherley](https://github.com/robherley) in [https://github.com/actions/upload-artifact/pull/584](https://github.com/actions/upload-artifact/pull/584) **Full Changelog**: https://github.com/actions/upload-artifact/compare/v4.3.3...v4.3.4
anchore/sbom-action (anchore/sbom-action) ### [`v0.16.1`](https://github.com/anchore/sbom-action/releases/tag/v0.16.1) [Compare Source](https://github.com/anchore/sbom-action/compare/v0.16.0...v0.16.1) #### Changes in v0.16.1 - fix: workaround windows install issue ([#​477](https://github.com/anchore/sbom-action/issues/477)) \[[willmurphyscode](https://github.com/willmurphyscode)] - fix: allow users to properly use the file input over the default path value ([#​471](https://github.com/anchore/sbom-action/issues/471)) \[[komish](https://github.com/komish)] - chore(deps): update Syft to v1.5.0 ([#​470](https://github.com/anchore/sbom-action/issues/470)) \[[anchore-actions-token-generator](https://github.com/anchore-actions-token-generator)] - docs: notes for matrix and required permissions ([#​469](https://github.com/anchore/sbom-action/issues/469)) \[[kzantow](https://github.com/kzantow)] - chore(deps): bump actions/checkout from 4.1.5 to 4.1.6 ([#​466](https://github.com/anchore/sbom-action/issues/466)) \[[dependabot](https://github.com/dependabot)]
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ‘» **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/jaegertracing/jaeger). Signed-off-by: Mend Renovate --- .github/actions/setup-node.js/action.yml | 2 +- .github/workflows/ci-release-testing.yml | 2 +- .github/workflows/ci-release.yml | 2 +- .github/workflows/scorecard.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-node.js/action.yml b/.github/actions/setup-node.js/action.yml index 21344f6c734..389604490ac 100644 --- a/.github/actions/setup-node.js/action.yml +++ b/.github/actions/setup-node.js/action.yml @@ -8,7 +8,7 @@ runs: run: | echo "JAEGER_UI_NODE_JS_VERSION=$(cat jaeger-ui/.nvmrc)" >> ${GITHUB_ENV} - - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: ${{ env.JAEGER_UI_NODE_JS_VERSION }} cache: 'yarn' diff --git a/.github/workflows/ci-release-testing.yml b/.github/workflows/ci-release-testing.yml index 985485ca055..06c25c10ad4 100644 --- a/.github/workflows/ci-release-testing.yml +++ b/.github/workflows/ci-release-testing.yml @@ -88,7 +88,7 @@ jobs: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: Generate SBOM - uses: anchore/sbom-action@e8d2a6937ecead383dfe75190d104edd1f9c5751 # v0.16.0 + uses: anchore/sbom-action@95b086ac308035dc0850b3853be5b7ab108236a8 # v0.16.1 with: output-file: jaeger-SBOM.spdx.json upload-release-assets: false diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 8390a918f52..1c79cfd2228 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -112,7 +112,7 @@ jobs: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: Generate SBOM - uses: anchore/sbom-action@e8d2a6937ecead383dfe75190d104edd1f9c5751 # v0.16.0 + uses: anchore/sbom-action@95b086ac308035dc0850b3853be5b7ab108236a8 # v0.16.1 with: output-file: jaeger-SBOM.spdx.json upload-release-assets: false diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index d9afd92f2de..611e740f498 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -64,7 +64,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: SARIF file path: results.sarif From 3b7eef0435fa26fa20b7fd4e0416bb3ec4644ef1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 22:52:52 -0400 Subject: [PATCH 2/6] Bump actions/upload-artifact from 4.3.3 to 4.3.4 (#5719) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.3.4.
Release notes

Sourced from actions/upload-artifact's releases.

v4.3.4

What's Changed

Full Changelog: https://github.com/actions/upload-artifact/compare/v4.3.3...v4.3.4

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/upload-artifact&package-manager=github_actions&previous-version=4.3.3&new-version=4.3.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From 653ca2c3a9b02edb316930d742de797c3f69eee8 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 10 Jul 2024 07:10:59 -0700 Subject: [PATCH 3/6] Apply 'latest' tag to latest published snapshot images (#5724) --- scripts/compute-tags.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/compute-tags.sh b/scripts/compute-tags.sh index abb11bde10d..2feec3c850c 100644 --- a/scripts/compute-tags.sh +++ b/scripts/compute-tags.sh @@ -22,7 +22,6 @@ fi # for docker.io and quay.io BUILD_IMAGE=${BUILD_IMAGE:-"${BASE_BUILD_IMAGE}:${MAJOR_MINOR_PATCH}"} IMAGE_TAGS="--tag docker.io/${BASE_BUILD_IMAGE} --tag docker.io/${BUILD_IMAGE} --tag quay.io/${BASE_BUILD_IMAGE} --tag quay.io/${BUILD_IMAGE}" -SNAPSHOT_TAG="${BASE_BUILD_IMAGE}-snapshot:${GITHUB_SHA}" if [ "${MAJOR_MINOR}x" != "x" ]; then MAJOR_MINOR_IMAGE="${BASE_BUILD_IMAGE}:${MAJOR_MINOR}" @@ -34,6 +33,9 @@ if [ "${MAJOR}x" != "x" ]; then IMAGE_TAGS="${IMAGE_TAGS} --tag docker.io/${MAJOR_IMAGE} --tag quay.io/${MAJOR_IMAGE}" fi -IMAGE_TAGS="${IMAGE_TAGS} --tag docker.io/${SNAPSHOT_TAG} --tag quay.io/${SNAPSHOT_TAG}" +SNAPSHOT_TAG1="${BASE_BUILD_IMAGE}-snapshot:${GITHUB_SHA}" +IMAGE_TAGS="${IMAGE_TAGS} --tag docker.io/${SNAPSHOT_TAG1} --tag quay.io/${SNAPSHOT_TAG1}" +SNAPSHOT_TAG2="${BASE_BUILD_IMAGE}-snapshot:latest" +IMAGE_TAGS="${IMAGE_TAGS} --tag docker.io/${SNAPSHOT_TAG2} --tag quay.io/${SNAPSHOT_TAG2}" echo "${IMAGE_TAGS}" From 8c9f6c6df758d647f1cdb8b123b34a5743eaf87d Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Wed, 10 Jul 2024 11:12:40 -0400 Subject: [PATCH 4/6] Prepare release v1.59.0 (#5726) Prepares Jaeger for the 1.59.0 release. Updates changelog, jaeger-ui and rotates release managers. --------- Signed-off-by: Joe Elliott Signed-off-by: Yuri Shkuro Co-authored-by: Yuri Shkuro Co-authored-by: Yuri Shkuro --- CHANGELOG.md | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ RELEASE.md | 2 +- jaeger-ui | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e4949327a1..9e42ec99dae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,66 @@ run `make changelog` to generate content +1.59.0 (2024-07-10) +------------------- + +### Backend Changes + +#### β›” Breaking Changes + +* Update opentelemetry-go to v1.28.0 and refactor references to semantic conventions ([@renovate-bot](https://github.com/renovate-bot) in [#5698](https://github.com/jaegertracing/jaeger/pull/5698)) + +#### ✨ New Features + +* Run jaeger-es-index-cleaner and jaeger-es-rollover locally ([@hellspawn679](https://github.com/hellspawn679) in [#5714](https://github.com/jaegertracing/jaeger/pull/5714)) +* [tracegen] allow use of adaptive sampling ([@yurishkuro](https://github.com/yurishkuro) in [#5718](https://github.com/jaegertracing/jaeger/pull/5718)) +* [v2] add v1 factory converter to v2 storage factory ([@james-ryans](https://github.com/james-ryans) in [#5497](https://github.com/jaegertracing/jaeger/pull/5497)) +* Upgrade badger v3->badger v4 ([@hellspawn679](https://github.com/hellspawn679) in [#5619](https://github.com/jaegertracing/jaeger/pull/5619)) + +#### 🐞 Bug fixes, Minor Improvements + +* Cleanup the prometheus config ([@FlamingSaint](https://github.com/FlamingSaint) in [#5720](https://github.com/jaegertracing/jaeger/pull/5720)) +* Upgrade microsim to v0.4.1 ([@FlamingSaint](https://github.com/FlamingSaint) in [#5702](https://github.com/jaegertracing/jaeger/pull/5702)) +* Add all mocks to mockery config file and regenerate ([@danish9039](https://github.com/danish9039) in [#5626](https://github.com/jaegertracing/jaeger/pull/5626)) +* Add better logging options ([@yurishkuro](https://github.com/yurishkuro) in [#5675](https://github.com/jaegertracing/jaeger/pull/5675)) +* Restore "operation" name in the metrics response ([@yurishkuro](https://github.com/yurishkuro) in [#5673](https://github.com/jaegertracing/jaeger/pull/5673)) +* Add flag for custom authenticators in cassandra storage ([@hellspawn679](https://github.com/hellspawn679) in [#5628](https://github.com/jaegertracing/jaeger/pull/5628)) +* Rename strategy store to sampling strategy provider ([@yurishkuro](https://github.com/yurishkuro) in [#5634](https://github.com/jaegertracing/jaeger/pull/5634)) +* [query] avoid errors when closing shared listener ([@vermaaatul07](https://github.com/vermaaatul07) in [#5559](https://github.com/jaegertracing/jaeger/pull/5559)) +* Bump github.com/golangci/golangci-lint from 1.55.2 to 1.59.1 and fix linter errors ([@FlamingSaint](https://github.com/FlamingSaint) in [#5579](https://github.com/jaegertracing/jaeger/pull/5579)) +* Fix binary path in package-deploy.sh ([@yurishkuro](https://github.com/yurishkuro) in [#5561](https://github.com/jaegertracing/jaeger/pull/5561)) + +#### 🚧 Experimental Features + +* Implement telemetery struct for v1 components initialization ([@Wise-Wizard](https://github.com/Wise-Wizard) in [#5695](https://github.com/jaegertracing/jaeger/pull/5695)) +* Support default configs for storage backends ([@yurishkuro](https://github.com/yurishkuro) in [#5691](https://github.com/jaegertracing/jaeger/pull/5691)) +* Simplify configs organization ([@yurishkuro](https://github.com/yurishkuro) in [#5690](https://github.com/jaegertracing/jaeger/pull/5690)) +* Create metrics.factory adapter for otel metrics ([@Wise-Wizard](https://github.com/Wise-Wizard) in [#5661](https://github.com/jaegertracing/jaeger/pull/5661)) + +#### πŸ‘· CI Improvements + +* Apply 'latest' tag to latest published snapshot images ([@yurishkuro](https://github.com/yurishkuro) in [#5724](https://github.com/jaegertracing/jaeger/pull/5724)) +* [bug] use correct argument as jaeger-version ([@yurishkuro](https://github.com/yurishkuro) in [#5716](https://github.com/jaegertracing/jaeger/pull/5716)) +* Add spm integration tests ([@hellspawn679](https://github.com/hellspawn679) in [#5640](https://github.com/jaegertracing/jaeger/pull/5640)) +* Add spm build to ci ([@yurishkuro](https://github.com/yurishkuro) in [#5663](https://github.com/jaegertracing/jaeger/pull/5663)) +* Remove unnecessary .nocover files ([@yurishkuro](https://github.com/yurishkuro) in [#5642](https://github.com/jaegertracing/jaeger/pull/5642)) +* Add tests for anonymizer/app/query. ([@shanukun](https://github.com/shanukun) in [#5638](https://github.com/jaegertracing/jaeger/pull/5638)) +* Add alternate way to install gotip ([@EraKin575](https://github.com/EraKin575) in [#5618](https://github.com/jaegertracing/jaeger/pull/5618)) +* Add semver to dependencies ([@danish9039](https://github.com/danish9039) in [#5590](https://github.com/jaegertracing/jaeger/pull/5590)) +* Create config file for mockery instead of using explicit cli flags in the makefile ([@jesslourenco](https://github.com/jesslourenco) in [#5623](https://github.com/jaegertracing/jaeger/pull/5623)) +* Update renovate bot to not apply patches to e2e test dependencies ([@DustyMMiller](https://github.com/DustyMMiller) in [#5622](https://github.com/jaegertracing/jaeger/pull/5622)) +* Require renovate bot to run go mod tidy ([@yurishkuro](https://github.com/yurishkuro) in [#5612](https://github.com/jaegertracing/jaeger/pull/5612)) +* Fix new warnings from the linter upgrade ([@WaterLemons2k](https://github.com/WaterLemons2k) in [#5589](https://github.com/jaegertracing/jaeger/pull/5589)) +* [ci] validate that generated mocks are up to date ([@yurishkuro](https://github.com/yurishkuro) in [#5568](https://github.com/jaegertracing/jaeger/pull/5568)) + +### πŸ“Š UI Changes + +#### 🐞 Bug fixes, Minor Improvements + +* Add escaped example to tag search help popup ([@yurishkuro](https://github.com/yurishkuro) in [#2354](https://github.com/jaegertracing/jaeger-ui/pull/2354)) + + + 1.58.1 (2024-06-22) ------------------- diff --git a/RELEASE.md b/RELEASE.md index 16055c03d93..559a836b7f7 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -60,8 +60,8 @@ Here are the release managers for future versions with the tentative release dat | Version | Release Manager | Tentative release date | |---------|-----------------|------------------------| -| 1.59.0 | @joe-elliott | 3 July 2024 | | 1.60.0 | @jkowall | 7 August 2024 | | 1.61.0 | @yurishkuro | 3 September 2024 | | 1.62.0 | @albertteoh | 2 October 2024 | | 1.63.0 | @pavolloffay | 5 November 2024 | +| 1.64.0 | @joe-elliott | 4 December 2024 | diff --git a/jaeger-ui b/jaeger-ui index 560c749b481..1704a9a66ae 160000 --- a/jaeger-ui +++ b/jaeger-ui @@ -1 +1 @@ -Subproject commit 560c749b481f8244bf76b0afe001174fa9ce11f5 +Subproject commit 1704a9a66ae780ec6bb2f524116176aa9c8a23f8 From 336a615424027d6f59916e4e71ddd8e10c1e9754 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 10 Jul 2024 21:25:56 +0200 Subject: [PATCH 5/6] Update actions/setup-go action to v5.0.2 (#5727) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/setup-go](https://github.com/actions/setup-go) | action | patch | `v5.0.1` -> `v5.0.2` | --- ### Release Notes
actions/setup-go (actions/setup-go) ### [`v5.0.2`](https://github.com/actions/setup-go/compare/v5.0.1...v5.0.2) [Compare Source](https://github.com/actions/setup-go/compare/v5.0.1...v5.0.2)
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/jaegertracing/jaeger). Signed-off-by: Mend Renovate --- .github/actions/setup-go-tip/action.yml | 2 +- .github/workflows/ci-all-in-one-build.yml | 2 +- .github/workflows/ci-badger.yaml | 2 +- .github/workflows/ci-build-binaries.yml | 2 +- .github/workflows/ci-build-spm.yml | 2 +- .github/workflows/ci-cassandra.yml | 2 +- .github/workflows/ci-crossdock.yml | 2 +- .github/workflows/ci-docker-build.yml | 2 +- .github/workflows/ci-elasticsearch.yml | 2 +- .github/workflows/ci-grpc.yml | 2 +- .github/workflows/ci-hotrod.yml | 2 +- .github/workflows/ci-kafka.yml | 2 +- .github/workflows/ci-lint-checks.yaml | 2 +- .github/workflows/ci-opensearch.yml | 2 +- .github/workflows/ci-protogen-tests.yml | 2 +- .github/workflows/ci-release-testing.yml | 2 +- .github/workflows/ci-release.yml | 2 +- .github/workflows/ci-unit-tests.yml | 2 +- .github/workflows/fossa.yml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/actions/setup-go-tip/action.yml b/.github/actions/setup-go-tip/action.yml index 5b56d1ff801..4d0be775881 100644 --- a/.github/actions/setup-go-tip/action.yml +++ b/.github/actions/setup-go-tip/action.yml @@ -43,7 +43,7 @@ runs: # This requires Go toolchain, so install it first. - name: Install Go toolchain if: steps.download.outputs.success == 'false' - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml index c8e0dd71745..9cc91cb8fc2 100644 --- a/.github/workflows/ci-all-in-one-build.yml +++ b/.github/workflows/ci-all-in-one-build.yml @@ -42,7 +42,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-badger.yaml b/.github/workflows/ci-badger.yaml index 82d23b76621..e91e031409d 100644 --- a/.github/workflows/ci-badger.yaml +++ b/.github/workflows/ci-badger.yaml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml index 56255ed8b17..3d2fa327fd6 100644 --- a/.github/workflows/ci-build-binaries.yml +++ b/.github/workflows/ci-build-binaries.yml @@ -50,7 +50,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-build-spm.yml b/.github/workflows/ci-build-spm.yml index 54095cb187f..8f58de52f91 100644 --- a/.github/workflows/ci-build-spm.yml +++ b/.github/workflows/ci-build-spm.yml @@ -32,7 +32,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-cassandra.yml b/.github/workflows/ci-cassandra.yml index 97501f55a7f..f5455d52113 100644 --- a/.github/workflows/ci-cassandra.yml +++ b/.github/workflows/ci-cassandra.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml index 26f28d87446..23938fb4802 100644 --- a/.github/workflows/ci-crossdock.yml +++ b/.github/workflows/ci-crossdock.yml @@ -33,7 +33,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml index 160c6d156f9..227ee0aff02 100644 --- a/.github/workflows/ci-docker-build.yml +++ b/.github/workflows/ci-docker-build.yml @@ -33,7 +33,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml index 21c381bad06..c80dc0f8686 100644 --- a/.github/workflows/ci-elasticsearch.yml +++ b/.github/workflows/ci-elasticsearch.yml @@ -49,7 +49,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-grpc.yml b/.github/workflows/ci-grpc.yml index d21c59e7fdf..a366488f267 100644 --- a/.github/workflows/ci-grpc.yml +++ b/.github/workflows/ci-grpc.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-hotrod.yml b/.github/workflows/ci-hotrod.yml index 32474c2cab0..16f39344404 100644 --- a/.github/workflows/ci-hotrod.yml +++ b/.github/workflows/ci-hotrod.yml @@ -32,7 +32,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-kafka.yml b/.github/workflows/ci-kafka.yml index 5d570e3aa4c..eb2530dc210 100644 --- a/.github/workflows/ci-kafka.yml +++ b/.github/workflows/ci-kafka.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml index 41c30b023ed..7233689a50c 100644 --- a/.github/workflows/ci-lint-checks.yaml +++ b/.github/workflows/ci-lint-checks.yaml @@ -39,7 +39,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-opensearch.yml b/.github/workflows/ci-opensearch.yml index 037003e2145..50ee0586386 100644 --- a/.github/workflows/ci-opensearch.yml +++ b/.github/workflows/ci-opensearch.yml @@ -46,7 +46,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-protogen-tests.yml b/.github/workflows/ci-protogen-tests.yml index 8aec34caa1c..99cde657896 100644 --- a/.github/workflows/ci-protogen-tests.yml +++ b/.github/workflows/ci-protogen-tests.yml @@ -28,7 +28,7 @@ jobs: with: submodules: recursive - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-release-testing.yml b/.github/workflows/ci-release-testing.yml index 06c25c10ad4..9d2295f2971 100644 --- a/.github/workflows/ci-release-testing.yml +++ b/.github/workflows/ci-release-testing.yml @@ -33,7 +33,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 1c79cfd2228..580c6bc6606 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -42,7 +42,7 @@ jobs: run: | git fetch --prune --unshallow --tags - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index 8863da6c7e2..daa4e4840cf 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x cache-dependency-path: ./go.sum diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 3be346b137c..d69d008d23f 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: 1.22.x From 7a158cbcd80eee6f2ad97bf097707f8d1639578f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 10 Jul 2024 23:24:17 +0200 Subject: [PATCH 6/6] Replace pinned Jaeger version with a parameter/default=latest (#5729) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | jaegertracing/example-hotrod | minor | `1.58` -> `1.59` | --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/jaegertracing/jaeger). --------- Signed-off-by: Mend Renovate Signed-off-by: Yuri Shkuro Co-authored-by: Yuri Shkuro --- plugin/storage/scylladb/docker-compose.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/plugin/storage/scylladb/docker-compose.yml b/plugin/storage/scylladb/docker-compose.yml index eecfb83fbba..2e5a69c2a44 100644 --- a/plugin/storage/scylladb/docker-compose.yml +++ b/plugin/storage/scylladb/docker-compose.yml @@ -1,10 +1,16 @@ +# docker compose file to test Scylla with Jaeger. + +# Disclaimer: This defaults to using 'latest' image tag for Jaeger images, +# which can be stale in your local repository. In case of issues try running +# against the actual Jaeger version like JAEGER_VERSION=1.59.0. + networks: jaeger-scylladb: services: collector: restart: unless-stopped - image: jaegertracing/jaeger-collector:1.58 + image: jaegertracing/jaeger-collector:${JAEGER_VERSION:-latest} environment: SPAN_STORAGE_TYPE: cassandra CASSANDRA_SERVERS: scylladb @@ -15,7 +21,7 @@ services: - cassandra-schema web: - image: jaegertracing/jaeger-query:1.58 + image: jaegertracing/jaeger-query:${JAEGER_VERSION:-latest} restart: unless-stopped ports: - 16686:16686 @@ -30,7 +36,7 @@ services: - cassandra-schema cassandra-schema: - image: jaegertracing/jaeger-cassandra-schema:1.58 + image: jaegertracing/jaeger-cassandra-schema:${JAEGER_VERSION:-latest} environment: CASSANDRA_PROTOCOL_VERSION: 4 CASSANDRA_VERSION: 4 @@ -77,7 +83,7 @@ services: - jaeger-scylladb hotrod: - image: jaegertracing/example-hotrod:1.58 + image: jaegertracing/example-hotrod:${JAEGER_VERSION:-latest} ports: - 8080:8080 command: [ "all" ]