Skip to content

Commit

Permalink
Update changelog with patch release 1.58.1 (jaegertracing#5674)
Browse files Browse the repository at this point in the history
## Description of the changes
- Merging changelog update from `patch-1.58.1` branch
- Small fix to release notes to allow overriding branch name for pulling
changes (was tested when creating release notes for `1.58.1`)

Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro authored Jun 22, 2024
1 parent 108c29b commit ca8cdae
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ run `make changelog` to generate content

</details>

1.58.1 (2024-06-22)
-------------------

### Backend Changes

#### 🐞 Bug fixes, Minor Improvements

* SPM: Restore "operation" name in the metrics response ([@yurishkuro](https://github.com/yurishkuro) in [#5673](https://github.com/jaegertracing/jaeger/pull/5673))


1.58.0 (2024-06-11)
-------------------
### Backend Changes
Expand Down
16 changes: 8 additions & 8 deletions scripts/release-notes.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,13 @@ def eprint(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs)


def num_commits_since_prev_tag(token, base_url, verbose):
def num_commits_since_prev_tag(token, base_url, branch, verbose):
tags_url = f"{base_url}/tags"
trunk = "main"

req = Request(tags_url)
req.add_header("Authorization", f"token {token}")
tags = json.loads(urlopen(req).read())
prev_release_tag = tags[0]['name']
compare_url = f"{base_url}/compare/{trunk}...{prev_release_tag}"
compare_url = f"{base_url}/compare/{branch}...{prev_release_tag}"
req = Request(compare_url)
req.add_header("Authorization", f"token {token}")
compare_results = json.loads(urlopen(req).read())
Expand Down Expand Up @@ -66,15 +64,15 @@ def updateProgress(iteration, total_iterations):
print()
return iteration + 1

def main(token, repo, num_commits, exclude_dependabot, verbose):
def main(token, repo, branch, num_commits, exclude_dependabot, verbose):
accept_header = "application/vnd.github.groot-preview+json"
base_url = f"https://api.github.com/repos/jaegertracing/{repo}"
commits_url = f"{base_url}/commits"
skipped_dependabot = 0

# If num_commits isn't set, get the number of commits made since the previous release tag.
if not num_commits:
num_commits = num_commits_since_prev_tag(token, base_url, verbose)
num_commits = num_commits_since_prev_tag(token, base_url, branch, verbose)

if not num_commits:
return
Expand Down Expand Up @@ -170,7 +168,7 @@ def main(token, repo, num_commits, exclude_dependabot, verbose):
print()
print('### 📊 UI Changes')
print()
main(token, 'jaeger-ui', None, exclude_dependabot, False)
main(token, 'jaeger-ui', 'main', None, exclude_dependabot, False)

# Print pull requests in the 'UNCATTEGORIZED' category
if other_results:
Expand Down Expand Up @@ -208,6 +206,8 @@ def get_pull_request_labels(token, repo, pull_number):
'(default: ~/.github_token)')
parser.add_argument('--repo', type=str, default='jaeger',
help='The repository name to fetch commit logs from. (default: jaeger)')
parser.add_argument('--branch', type=str, default='main',
help='The branch name to fetch commit logs from. (default: main)')
parser.add_argument('--exclude-dependabot', action='store_true',
help='Excludes dependabot commits. (default: false)')
parser.add_argument('--num-commits', type=int,
Expand All @@ -234,4 +234,4 @@ def get_pull_request_labels(token, repo, pull_number):
eprint(f"{token_file} is missing your personal github token.\n{generate_err_msg}")
sys.exit(1)

main(token, args.repo, args.num_commits, args.exclude_dependabot, args.verbose)
main(token, args.repo, args.branch, args.num_commits, args.exclude_dependabot, args.verbose)

0 comments on commit ca8cdae

Please sign in to comment.