Prepare release 1.62.0 / 2.0.0-rc2 (#6057)

CHANGELOG.md

@@ -9,7 +9,7 @@ Changes by Version
 <summary>next release template</summary>
 
 next release v1.x.x / v2.x.x-rcx (yyyy-mm-dd)
--------------------
+-------------------------------
 
 ### Backend Changes
 
@@ -21,8 +21,45 @@ copy from UI changelog
 
 </details>
 
+1.62.0 / 2.0.0-rc2 (2024-10-06)
+-------------------------------
+
+### Backend Changes
+
+#### ⛔ Breaking Changes
+
+* [query] change http and tls server configurations to use otel configurations ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6023](https://github.com/jaegertracing/jaeger/pull/6023))
+* [fix][spm]: change default metrics namespace to match new default in spanmetricsconnector ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6007](https://github.com/jaegertracing/jaeger/pull/6007))
+
+#### 🐞 Bug fixes, Minor Improvements
+
+* [grpc storage]: propagate tenant to grpc backend ([@frzifus](https://github.com/frzifus) in [#6030](https://github.com/jaegertracing/jaeger/pull/6030))
+* [feat] deduplicate spans based on their hashcode ([@cdanis](https://github.com/cdanis) in [#6009](https://github.com/jaegertracing/jaeger/pull/6009))
+
+#### 🚧 Experimental Features
+
+* [jaeger-v2] consolidate v1 and v2 configurations for grpc storage ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6042](https://github.com/jaegertracing/jaeger/pull/6042))
+* [jaeger-v2] use environment variables in kafka config ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6028](https://github.com/jaegertracing/jaeger/pull/6028))
+* [jaeger-v2] align cassandra storage config with otel ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#5949](https://github.com/jaegertracing/jaeger/pull/5949))
+* [jaeger-v2] refactor configuration for query service ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#5998](https://github.com/jaegertracing/jaeger/pull/5998))
+* [v2] add temporary expvar extension ([@yurishkuro](https://github.com/yurishkuro) in [#5986](https://github.com/jaegertracing/jaeger/pull/5986))
+
+#### 👷 CI Improvements
+
+* [ci] disable fail fast behaviour for ci workflows ([@mahadzaryab1](https://github.com/mahadzaryab1) in [#6052](https://github.com/jaegertracing/jaeger/pull/6052))
+* Testifylint: enable go-require ([@mmorel-35](https://github.com/mmorel-35) in [#5983](https://github.com/jaegertracing/jaeger/pull/5983))
+* Fix regex for publishing v2 image ([@yurishkuro](https://github.com/yurishkuro) in [#5988](https://github.com/jaegertracing/jaeger/pull/5988))
+
+
+### 📊 UI Changes
+
+#### 🐞 Bug fixes, Minor Improvements
+
+* Support uploads of .jsonl files ([@Saumya40-codes](https://github.com/Saumya40-codes) in [#2461](https://github.com/jaegertracing/jaeger-ui/pull/2461))
+
+
 1.61.0 / 2.0.0-rc1 (2024-09-14)
--------------------
+-------------------------------
 
 ### Backend Changes
 
@@ -83,7 +120,7 @@ Dependencies upgrades only.
 
 
 1.60.0 / 2.0.0-rc0 (2024-08-06)
--------------------
+-------------------------------
 
 ### Backend Changes
 

RELEASE.md

@@ -23,7 +23,7 @@
         cd jaeger-ui
         git checkout main
         git pull
-        git checkout {new_ui_version} //e.g. v1.5.0
+        git checkout {new_ui_version} # e.g. v1.5.0
         ```
       * If there are only dependency bumps, indicate this with "Dependencies upgrades only" ([example](https://github.com/jaegertracing/jaeger-ui/pull/2431/files)).
       * If there are no changes, indicate this with "No changes" ([example](https://github.com/jaegertracing/jaeger/pull/4131/files)).
@@ -79,8 +79,8 @@ Here are the release managers for future versions with the tentative release dat
 
 | Version | Release Manager | Tentative release date |
 |---------|-----------------|------------------------|
-| 1.62.0  | @albertteoh     | 2 October 2024         |
 | 1.63.0  | @pavolloffay    | 5 November 2024        |
 | 1.64.0  | @joe-elliott    | 4 December 2024        |
 | 1.65.0  | @jkowall        | 8 January 2025         |
-| 1.66.0  | @yurishkuro     | 3 February 2024        |
+| 1.66.0  | @yurishkuro     | 3 February 2025        |
+| 1.67.0  | @albertteoh     | 5 March 2025           |

scripts/draft-release.py

@@ -7,16 +7,23 @@
 import re
 import subprocess
 
+generic_release_header_pattern = re.compile(
+    r".*(1\.\d+\.\d+)", flags=0
+)
 
-release_header_pattern = re.compile(
+jaeger_release_header_pattern = re.compile(
     r".*(1\.\d+\.\d+) */ *(2\.\d+\.\d+-rc\d+) \(\d{4}-\d{2}-\d{2}\)", flags=0
 )
+
 underline_pattern = re.compile(r"^[-]+$", flags=0)
 
 
 def main(title, repo):
-    changelog_text, version_v1, version_v2 = get_changelog()
+    changelog_text, version_v1, version_v2 = get_changelog(repo)
     print(changelog_text)
+    header = f"{title} v{version_v1}"
+    if repo == "jaeger":
+        header += f" / v{version_v2}"
     output_string = subprocess.check_output(
         [
             "gh",
@@ -25,7 +32,7 @@ def main(title, repo):
             f"v{version_v1}",
             "--draft",
             "--title",
-            f"{title} v{version_v1} / v{version_v2}",
+            header,
             "--repo",
             f"jaegertracing/{repo}",
             "-F",
@@ -38,23 +45,28 @@ def main(title, repo):
     print("Please review, then edit it and click 'Publish release'.")
 
 
-def get_changelog():
+def get_changelog(repo):
     changelog_text = ""
     in_changelog_text = False
-    version = ""
+    version_v1 = ""
+    version_v2 = ""
     with open("CHANGELOG.md") as f:
         for line in f:
-            release_header_match = release_header_pattern.match(line)
+            release_header_match = generic_release_header_pattern.match(line)
 
-            if release_header_match is not None:
+            if release_header_match:
                 # Found the first release.
-                if not in_changelog_text:
-                    in_changelog_text = True
-                    version_v1 = release_header_match.group(1)
-                    version_v2 = release_header_match.group(2)
-                else:
+                if in_changelog_text:
                     # Found the next release.
                     break
+                else:
+                    if repo == "jaeger":
+                        jaeger_release_match = jaeger_release_header_pattern.match(line)
+                        version_v1 = jaeger_release_match.group(1)
+                        version_v2 = jaeger_release_match.group(2)
+                    else:
+                        version_v1 = release_header_match.group(1)
+                    in_changelog_text = True
             else:
                 underline_match = underline_pattern.match(line)
                 if underline_match is not None:

scripts/release-notes.py

@@ -175,10 +175,11 @@ def main(token, repo, branch, num_commits, exclude_dependabot, verbose):
 
     # Print pull requests in the 'UNCATTEGORIZED' category
     if other_results:
-        print(f'### 💩💩💩 The following commits cannot be categorized (missing changeglog labels):\n')
+        print(f'### 💩💩💩 The following commits cannot be categorized (missing "changelog:*" labels):')
         for result in other_results:
             print(result)
-        print()
+        print(f'### 💩💩💩 Please attach labels to these ^^^ PRs and rerun the script.')
+        print(f'### 💩💩💩 Do not include this section in the changelog.')
 
     # Print warnings for commits with more than one changelog label
     if commits_with_multiple_labels:
@@ -190,7 +191,8 @@ def main(token, repo, branch, num_commits, exclude_dependabot, verbose):
         print()
 
     if skipped_dependabot:
-        print(f"(Skipped dependabot commits: {skipped_dependabot})")
+        if verbose:
+            print(f"(Skipped dependabot commits: {skipped_dependabot})")
 
 
 def get_pull_request_labels(token, repo, pull_number):