Add and modify mappings between version ids and release versions #103627

thecoop · 2023-12-20T14:51:29Z

Add a ReleaseVersions class to map between ids and release versions in error messages/logs, and gradle tasks to extract current version information and apply it to the version records in the repo

...ols-internal/src/main/java/org/elasticsearch/gradle/internal/release/ReleaseToolsPlugin.java

mark-vieira · 2023-12-21T18:47:15Z

...-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/TagVersionsTask.java

+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+public class TagVersionsTask extends DefaultTask {


Am I missing something? I don't see where this task is actually used/created.

No, this needs corresponding changes in release-tools (this PR is still WIP)

I've created a PR for the release tools to use these new tasks

rjernst

This will be a nice addition to give users back versions they know about! I have a few thoughts.

...-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/TagVersionsTask.java

server/src/main/java/org/elasticsearch/ReleaseVersions.java

rjernst · 2023-12-22T00:04:53Z

server/src/main/java/org/elasticsearch/ReleaseVersions.java

+    }
+
+    public static String findReleaseVersion(Class<?> versionContainer, int id) {
+        if (USES_VERSIONS == false) return Integer.toString(id);


I think this means in serverless we would print the raw id. Is that what we want? The id is just as useless to a user there. Are we assuming a serverless user should never hit an error that would need to print the release version since it is kept up to date?

This is mostly aimed at log messages - where transport/index versions do have meaning in serverless. If we ever need to print out anything for serverless, it should be the raw id, not the release version.

server/src/main/java/org/elasticsearch/ReleaseVersions.java

rjernst · 2023-12-22T00:17:46Z

...-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/TagVersionsTask.java

+
+        @Override
+        public void accept(FieldDeclaration fieldDeclaration) {
+            var ints = fieldDeclaration.findAll(IntegerLiteralExpr.class);


This seems fragile, wouldn't any other integer literal get caught up by this?

we do only have single int initializers in version classes. And it ignores those that have multiple ints in the initializer.

elasticsearchmachine · 2024-01-15T12:07:42Z

Pinging @elastic/es-core-infra (Team:Core/Infra)

elasticsearchmachine · 2024-01-15T12:07:43Z

Hi @thecoop, I've created a changelog YAML for you.

elasticsearchmachine · 2024-01-15T16:49:50Z

Hi @thecoop, I've created a changelog YAML for you.

...rnal/src/main/java/org/elasticsearch/gradle/internal/release/ExtractCurrentVersionsTask.java

thecoop · 2024-01-17T17:02:00Z

@elasticmachine update branch

rjernst

Looks good, a couple last thoughts, and Mark's comment on write options should be addressed as well.

server/src/main/java/org/elasticsearch/ReleaseVersions.java

server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java

add 8.12 version numbers

ldematte

I like it, and with the helpers in the XxxVersions classes it will be easy to use too.
I'm wondering if we should have something similar for features too - probably worth a separate discussion (and definitely a separate PR in case).

server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java

… release tag build infrastructure. (#104702) Backport the extract versions task from #103627, along with the dummy tagVersions task from #104532

`ReleaseVersions` does some nontrivial initialization. It shouldn't fail, but if it does then it should do so early in startup rather than waiting until the class is first used, which may be in a context in which failure is undesirable. This commit adds it to the list of classes that are initialized even before the security manager is installed. Relates elastic#103627

`ReleaseVersions` does some nontrivial initialization. It shouldn't fail, but if it does then it should do so early in startup rather than waiting until the class is first used, which may be in a context in which failure is undesirable. This commit adds it to the list of classes that are initialized even before the security manager is installed. Relates #103627

thecoop added >feature WIP :Core/Infra/Core Core issues without another label labels Dec 20, 2023

thecoop requested a review from a team as a code owner December 20, 2023 14:51

elasticsearchmachine added the v8.13.0 label Dec 20, 2023

mark-vieira reviewed Dec 20, 2023

View reviewed changes

...ols-internal/src/main/java/org/elasticsearch/gradle/internal/release/ReleaseToolsPlugin.java Outdated Show resolved Hide resolved

Add ReleaseVersions class for reading version record files

4df06c3

thecoop force-pushed the version-records branch from 773ae83 to 4df06c3 Compare December 21, 2023 11:17

Add a task to tag new versions in the version records

9507f7c

thecoop requested review from rjernst and mark-vieira December 21, 2023 16:04

thecoop changed the title ~~Add class to map between version ids and release versions~~ Add and modify mappings between version ids and release versions Dec 21, 2023

mark-vieira reviewed Dec 21, 2023

View reviewed changes

rjernst reviewed Dec 22, 2023

View reviewed changes

Merge remote-tracking branch 'upstream/main' into version-records

a0a98ff

thecoop requested a review from rjernst January 10, 2024 10:55

thecoop added 3 commits January 10, 2024 10:58

Add some comments to versions

4f8e744

Merge branch 'main' into version-records

241d685

Change version map to load on startup

7920370

thecoop removed the WIP label Jan 15, 2024

elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Jan 15, 2024

Update docs/changelog/103627.yaml

4203945

Merge remote-tracking branch 'upstream/main' into version-records

69c01cd

thecoop added the WIP label Jan 15, 2024

thecoop added 4 commits January 15, 2024 13:02

Delete docs/changelog/103627.yaml

be1cee5

Separate out extract & tag functionality into separate gradle tasks

085238f

Use constants for string constants

3f1399a

Fix setting outputfile parameter

e6087e9

Only sort on output

5027972

thecoop requested a review from mark-vieira January 16, 2024 15:29

mark-vieira requested changes Jan 16, 2024

View reviewed changes

...rnal/src/main/java/org/elasticsearch/gradle/internal/release/ExtractCurrentVersionsTask.java Outdated Show resolved Hide resolved

Create file if it does not exist already

5ce4286

thecoop requested a review from mark-vieira January 17, 2024 10:08

Merge branch 'main' into version-records

33510bc

Merge branch 'main' into version-records

1865d54

rjernst approved these changes Jan 17, 2024

View reviewed changes

server/src/main/java/org/elasticsearch/ReleaseVersions.java Outdated Show resolved Hide resolved

server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java Outdated Show resolved Hide resolved

thecoop added 2 commits January 18, 2024 10:05

Merge branch 'main' into version-records

16c983c

Use lists rather than sorted sets for version lists

3dc09d9

add 8.12 version numbers

ldematte reviewed Jan 18, 2024

View reviewed changes

server/src/test/java/org/elasticsearch/ReleaseVersionsTests.java Outdated Show resolved Hide resolved

Add extra checks to options

dbf0f90

thecoop mentioned this pull request Jan 18, 2024

Create extract/tag versions task for 7.17 #104532

Merged

thecoop added the v8.12.1 label Jan 18, 2024

Support processing Version from 7.17 releases

80fef71

mark-vieira approved these changes Jan 18, 2024

View reviewed changes

thecoop added 3 commits January 22, 2024 09:45

Merge remote-tracking branch 'upstream/main' into version-records

8cb7350

Make it clear raw ids are from snapshot builds

108749d

Some tweaks

702329b

thecoop merged commit a11812e into elastic:main Jan 22, 2024

thecoop deleted the version-records branch January 22, 2024 12:01

thecoop removed the v8.12.1 label Jan 24, 2024

This was referenced Jan 24, 2024

Create a gradle task to extract version information in 8.12 #104702

Merged

Add a few examples of using version mapping in error messages #104751

Merged

DaveCTurner mentioned this pull request Feb 9, 2024

Eagerly initialize ReleaseVersions #105364

Merged

Add and modify mappings between version ids and release versions #103627

Add and modify mappings between version ids and release versions #103627

Uh oh!

Conversation

thecoop commented Dec 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

mark-vieira Dec 21, 2023

Choose a reason for hiding this comment

Uh oh!

thecoop Dec 22, 2023

Choose a reason for hiding this comment

Uh oh!

thecoop Jan 15, 2024

Choose a reason for hiding this comment

Uh oh!

rjernst left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rjernst Dec 22, 2023

Choose a reason for hiding this comment

Uh oh!

thecoop Jan 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rjernst Dec 22, 2023

Choose a reason for hiding this comment

Uh oh!

thecoop Jan 10, 2024

Choose a reason for hiding this comment

Uh oh!

elasticsearchmachine commented Jan 15, 2024

Uh oh!

elasticsearchmachine commented Jan 15, 2024

Uh oh!

elasticsearchmachine commented Jan 15, 2024

Uh oh!

Uh oh!

thecoop commented Jan 17, 2024

Uh oh!

rjernst left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ldematte left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

thecoop commented Dec 20, 2023 •

edited

Loading

thecoop Jan 10, 2024 •

edited

Loading