From 8427e01aea7457d9f3fde64869571bd04c8013d3 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sun, 5 Sep 2021 23:44:35 -0400 Subject: [PATCH] Prepare release 1.26.0 Signed-off-by: Yuri Shkuro --- CHANGELOG.md | 25 ++++++++++++++- RELEASE.md | 6 ++-- jaeger-ui | 2 +- scripts/release-notes.py | 67 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 scripts/release-notes.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 89bc428f47c..710b130331d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,29 @@ Changes by Version ================== +1.26.0 (2021-09-06) +------------------- +### Backend Changes +#### New Features +* Add cassandra v4 support ([@Ashmita152](https://github.com/Ashmita152) in [#3225](https://github.com/jaegertracing/jaeger/pull/3225)) +* Add es-index-cleaner golang implementation ([@pavolloffay](https://github.com/pavolloffay) in [#3204](https://github.com/jaegertracing/jaeger/pull/3204)) +* Add CLI Option for gRPC Max Receive Message Size ([@js8080](https://github.com/js8080) in [#3214](https://github.com/jaegertracing/jaeger/pull/3214) and [#3192](https://github.com/jaegertracing/jaeger/pull/3192)) +* Automatically detect OpenSearch version ([@pavolloffay](https://github.com/pavolloffay) in [#3198](https://github.com/jaegertracing/jaeger/pull/3198)) +* Add SendGetBodyAs on elasticsearch ([@NatMarchand](https://github.com/NatMarchand) in [#3193](https://github.com/jaegertracing/jaeger/pull/3193)) +* Set lookback in ES rollover to distant past ([@pavolloffay](https://github.com/pavolloffay) in [#3169](https://github.com/jaegertracing/jaeger/pull/3169)) + +#### Bug fixes, Minor Improvements +* Check for invalid --agent.tags ([@esnible](https://github.com/esnible) in [#3246](https://github.com/jaegertracing/jaeger/pull/3246)) +* Replace old linters with golangci-lint ([@albertteoh](https://github.com/albertteoh) in [#3237](https://github.com/jaegertracing/jaeger/pull/3237)) +* Fix panic on empty findTraces query ([@akuzni2](https://github.com/akuzni2) in [#3232](https://github.com/jaegertracing/jaeger/pull/3232)) +* Upgrade to Go v1.17 ([@Ashmita152](https://github.com/Ashmita152) in [#3220](https://github.com/jaegertracing/jaeger/pull/3220)) +* Add docker buildx make target ([@pavolloffay](https://github.com/pavolloffay) in [#3213](https://github.com/jaegertracing/jaeger/pull/3213)) +* Fix the name for elasticsearch integration tests ([@Ashmita152](https://github.com/Ashmita152) in [#3208](https://github.com/jaegertracing/jaeger/pull/3208)) +* Upgrade ES images in integration tests ([@pavolloffay](https://github.com/pavolloffay) in [#3185](https://github.com/jaegertracing/jaeger/pull/3185)) + +### UI Changes +* UI pinned to version 1.16.0 - https://github.com/jaegertracing/jaeger-ui/releases/tag/v1.16.0 + 1.25.0 (2021-08-04) ------------------- #### New Features @@ -109,7 +132,7 @@ Changes by Version * Remove incorrectly scoped downsample flags from the query service ([#2782](https://github.com/jaegertracing/jaeger/pull/2782), [@joe-elliott](https://github.com/joe-elliott)) * `--downsampling.hashsalt` removed from jaeger-query * `--downsampling.ratio` removed from jaeger-query - + #### New Features * Add TLS Support for gRPC and HTTP endpoints of the Query and Collector servers ([#2337](https://github.com/jaegertracing/jaeger/pull/2337), [#2772](https://github.com/jaegertracing/jaeger/pull/2772), [#2798](https://github.com/jaegertracing/jaeger/pull/2798), [@rjs211](https://github.com/rjs211)) diff --git a/RELEASE.md b/RELEASE.md index fbf1ce45604..f68c53488c8 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,7 +2,7 @@ 1. Create a PR "Preparing release X.Y.Z" against master or maintenance branch ([example](https://github.com/jaegertracing/jaeger/pull/543/files)) by updating CHANGELOG.md to include: * A new section with the header ` (YYYY-MM-DD)` - * A curated list of notable changes and links to PRs. Do not simply dump git log, select the changes that affect the users. To obtain the list of all changes run `make changelog`. + * A curated list of notable changes and links to PRs. Do not simply dump git log, select the changes that affect the users. To obtain the list of all changes run `make changelog` or use `scripts/release-notes.py`. * The section can be split into sub-section if necessary, e.g. UI Changes, Backend Changes, Bug Fixes, etc. * If the submodules have new releases, please also upgrade the submodule versions then commit, for example: ``` @@ -13,7 +13,7 @@ ``` 2. Add all merged pull requests to the milestone for the release and create a new milestone for a next release e.g. `Release 1.16`. 3. After the PR is merged, create a release on Github: - * Title "Release X.Y.Z" + * Title "Release X.Y.Z" * Tag `vX.Y.Z` (note the `v` prefix) and choose appropriate branch * Copy the new CHANGELOG.md section into the release notes 4. The release tag will trigger a build of the docker images. Since forks don't have jaegertracingbot dockerhub token, they can never publish images to jaegertracing organisation. @@ -39,6 +39,6 @@ Here are the release managers for future versions with the tentative release dat | 1.26.0 | @yurishkuro | 1 September 2021 | | 1.27.0 | @joe-elliott | 6 October 2021 | | 1.28.0 | @albertteoh | 3 November 2021 | -| 1.29.0 | @jpkrohling | 1 December 2021 | +| 1.29.0 | @jpkrohling | 1 December 2021 | | 1.30.0 | @pavolloffay | 5 January 2022 | | 1.31.0 | @vprithvi | 2 February 2022 | diff --git a/jaeger-ui b/jaeger-ui index 493a0f19079..3a99ad677b1 160000 --- a/jaeger-ui +++ b/jaeger-ui @@ -1 +1 @@ -Subproject commit 493a0f190792550e9d8252e2d61ab246fb1eaa19 +Subproject commit 3a99ad677b1d9afabee1dd102ab68e3738433944 diff --git a/scripts/release-notes.py b/scripts/release-notes.py new file mode 100644 index 00000000000..ee3f585e029 --- /dev/null +++ b/scripts/release-notes.py @@ -0,0 +1,67 @@ + +# This script can read N latest commits from one of Jaeger repos +# and output them in the release notes format: +# {title} ({author} in {pull_request}) +# +# Requires personal GitHub token with default permissions: +# https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token +# +# Usage: python release-notes.py +# + +import json +from urllib.request import ( + urlopen, + Request +) +import urllib.parse +import sys + +def eprint(*args, **kwargs): + print(*args, file=sys.stderr, **kwargs) + +if len(sys.argv) < 4: + eprint("Usage: python release-notes.py ") + sys.exit(1) + +token=sys.argv[1] +repo=sys.argv[2] +num_commits=sys.argv[3] + +accept_header="application/vnd.github.groot-preview+json" +commits_url='https://api.github.com/repos/jaegertracing/{repo}/commits'.format(repo=repo) +pulls_url="{commits_url}/{commit_sha}/pulls" + +# load commits +data = urllib.parse.urlencode({'per_page': num_commits}) +req=Request(commits_url + '?' + data) +print(req.full_url) +req.add_header('Authorization', 'token {token}'.format(token=token)) +commits=json.loads(urlopen(req).read()) +print('Retrieved', len(commits), 'commits') + +# load PR for each commit and print summary +for commit in commits: + sha = commit['sha'] + msg_lines = commit['commit']['message'].split('\n') + msg = msg_lines[0] + req = Request(pulls_url.format(commits_url=commits_url,commit_sha=sha)) + req.add_header('accept', accept_header) + req.add_header('Authorization', 'token {token}'.format(token=token)) + pulls = json.loads(urlopen(req).read()) + if len(pulls) > 1: + print("More than one pull request for commit {commit}".format(commit=sha)) + # TODO handle commits without pull requests + pull = pulls[0] + pull_no = pull['number'] + pull_url = pull['html_url'] + author = pull['user']['login'] + author_url = pull['user']['html_url'] + msg = msg.replace('(#{pull})'.format(pull=pull_no), '').strip() + print('* {msg} ([@{author}]({author_url}) in [#{pull}]({pull_url}))'.format( + msg=msg, + author=author, + author_url=author_url, + pull=pull_no, + pull_url=pull_url, + ))