Prepares for 3.0 by updating to Spring Boot 3 and floor Java 8 #3684

codefromthecrypt · 2024-01-10T04:13:21Z

We currently still have a problem as the latest version shows up as 3.0.0-rc0 due to an accidental release. Moreover, a request to delete that version hasn't happened. This switches to 3.x by dropping support for Java 6 and moving to Spring Boot 3.

As noted, recent Zipkin Reporter 3 and Brave 6 decouple instrumentation from this core jar. While it is still in use for other formats, the call sites using them are all minimum Java 8 anyway. By updating to floor Java 8, we can use later JDKs to release than 11, though this change doesn't include doing that, yet.

As Spring Boot requires JRE 17, we update the floor JDK to 17. However, zipkin-dependencies is currently stuck at 11, so until that's not the case, this leaves collector and storage modules at Java 11, even if the server can only run in 17+.

This will be mergable once I manually verify Spring Boot 3 doesn't break modularity with zipkin-aws and -gcp.

We currently still have a problem as the latest version shows up as 3.0.0-rc0 due to an accidental release. Moreover, a request to delete that version hasn't happened. This switches to 3.x by dropping support for Java 6 and moving to Spring Boot 3. As noted, recent Zipkin Reporter 3 and Brave 6 decouple instrumentation from this core jar. While it is still in use for other formats, the call sites using them are all minimum Java 8 anyway. By updating to floor Java 8, we can use later JDKs to release than 11, though this change doesn't include doing that, yet. This will be mergable once I manually verify Spring Boot 3 doesn't break modularity with zipkin-aws and -gcp. Signed-off-by: Adrian Cole <[email protected]>

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt · 2024-01-10T08:53:32Z

used openrewrite to migrate tests and server code to 17, by doing this and reverting the opposite

https://docs.openrewrite.org/recipes/java/migrate/upgradetojava17

mvn -U org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-migrate-java:RELEASE -Drewrite.activeRecipes=org.openrewrite.java.migrate.UpgradeToJava17

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt · 2024-01-10T09:12:21Z

@timtebeek fyi, the last commit fixes some things that were mostly, but not completely done with the 17 update recipe. It seemed to dislike some things about how our linefeeds work as well unicode specifically 💩

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt · 2024-01-10T09:32:36Z

@timtebeek just a hunch, but I think it is about multi-line literal conversion where the <17 has no trailing newline or unicode. Was easy to fix these, so no biggie!

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt · 2024-01-10T09:43:34Z

oh wow it is green

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt · 2024-01-10T09:46:18Z

surprised this worked. here are the minimal changes for zipkin-gcp. I'll add more to the branch after using openrewrite to migrate some stuff https://github.com/openzipkin/zipkin-gcp/compare/zipkin3?expand=1

anuraaga · 2024-01-10T09:50:41Z

.github/workflows/create_release.yml

@@ -24,13 +24,13 @@ jobs:
        uses: actions/setup-java@v4
        with:
          distribution: 'zulu'  # zulu as it supports a wide version range
-          java-version: '11'  # earliest LTS and last that can compile the 1.6 release profile.
+          java-version: '17'  # earliest LTS and last that can compile the 1.6 release profile.


I guess this can't compile 1.6 profile

yeah 11 was the last that could

for posterity! https://bugs.openjdk.org/browse/JDK-8206440

anuraaga · 2024-01-10T09:52:36Z

zipkin-collector/scribe/src/test/java/zipkin2/collector/scribe/ScribeSpanConsumerTest.java

-    entry.message = ""
-      + "CgABq/sBMnzE048LAAMAAAAOZ2V0VHJhY2VzQnlJZHMKAATN0p+4EGfTdAoABav7ATJ8xNOPDwAGDAAAAAQKAAEABR/wq+2DeAsAAgAAAAJzcgwAAwgAAX8AAAEGAAIkwwsAAwAAAAx6aXBraW4tcXVlcnkAAAoAAQAFH/Cr7zj4CwACAAAIAGFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh\n"
-      + "YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhDAADCAABfwAAAQYAAiTDCwADAAAADHppcGtpbi1xdWVyeQAACgABAAUf8KwLPyILAAIAAABOR2MoOSwwLlBTU2NhdmVuZ2UsMjAxNS0wOS0xNyAxMjozNzowMiArMDAwMCwzMDQubWlsbGlzZWNvbmRzKzc2Mi5taWNyb3NlY29uZHMpDAADCAABfwAAAQYAAiTDCwADAAAADHppcGtpbi1xdWVyeQAIAAQABKZ6AAoAAQAFH/CsDLfACwACAAAAAnNzDAADCAABfwAAAQYAAiTDCwADAAAADHppcGtpbi1xdWVyeQAADwAIDAAAAAULAAEAAAATc3J2L2ZpbmFnbGUudmVyc2lvbgsAAgAAAAY2LjI4LjAIAAMAAAAGDAAECAABfwAAAQYAAgAACwADAAAADHppcGtpbi1xdWVyeQAACwABAAAAD3Nydi9tdXgvZW5hYmxlZAsAAgAAAAEBCAADAAAAAAwABAgAAX8AAAEGAAIAAAsAAwAAAAx6aXBraW4tcXVlcnkAAAsAAQAAAAJzYQsAAgAAAAEBCAADAAAAAAwABAgAAX8AAAEGAAIkwwsAAwAAAAx6aXBraW4tcXVlcnkAAAsAAQAAAAJjYQsAAgAAAAEBCAADAAAAAAwABAgAAX8AAAEGAAL5YAsAAwAAAAx6aXBraW4tcXVlcnkAAAsAAQAAAAZudW1JZHMLAAIAAAAEAAAAAQgAAwAAAAMMAAQIAAF/AAABBgACJMMLAAMAAAAMemlwa2luLXF1ZXJ5AAACAAkAAA==\n";
+    entry.message = """


codefromthecrypt · 2024-01-10T11:28:06Z

merging and will reference zipkin-aws and zipkin-gcp via the snapshot repository and link back PRs. Thanks for the review @anuraaga!

This updates server modules to Zipkin 3, Spring Boot 3 and JRE 17. It leaves the client side modules at Java 8. In order to compile the server module, we can no longer compile with JDK 11. See openzipkin/zipkin#3684 Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt · 2024-01-10T12:25:18Z

and here's zipkin-aws openzipkin/zipkin-aws#209

codefromthecrypt · 2024-01-10T12:25:49Z

here's zipkin-gcp openzipkin/zipkin-gcp#209

codefromthecrypt · 2024-01-10T12:26:00Z

will cut 3.0 tomorrow morning unless screams!

This updates server modules to Zipkin 3, Spring Boot 3 and JRE 17. It leaves the client side modules at Java 8. In order to compile the server module, we can no longer compile with JDK 11. See openzipkin/zipkin#3684 Signed-off-by: Adrian Cole <[email protected]> Co-authored-by: Andriy Redko <[email protected]>

shakuzen · 2024-01-11T04:04:46Z

I'm late but great work, @codefromthecrypt.

timtebeek · 2024-01-16T22:42:54Z

zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/TestResponses.java

@@ -36,7 +36,7 @@ final class TestResponses {
        "minimum_index_compatibility_version" : "5.0.0"
      },
      "tagline" : "You Know, for Search"
-    }\
+    }


I'm trying to understand these reverts better; I'd thought text block without trailing new line would be correctly converted with a test like this.

JShell seems to agree at first glance:

jshell> var old = "foo\n" + "bar"; old ==> "foo\nbar" jshell> old.equals(""" ...> foo ...> bar\ ...> """) $2 ==> true

How did this then end up with something that needed to be reverted?

Not 100pct sure as thinking about other things, but we had a lot of stuff in this format style... which may be an uncommon pattern

String json = "{\n" + " \"traceId\": \"6b221d5bc9e6496c\",\n" + " \"name\": \"get-traces\",\n" + " \"id\": \"6b221d5bc9e6496c\",\n" + " \"annotations\": [\n" + " { \"timestamp\": 1472470996199000}\n" + " ]\n" + "}";

codefromthecrypt requested review from anuraaga, reta and shakuzen January 10, 2024 04:13

Adrian Cole added 14 commits January 10, 2024 12:17

fix path

a54efc9

Signed-off-by: Adrian Cole <[email protected]>

more

abe464f

Signed-off-by: Adrian Cole <[email protected]>

more

6d46aa4

Signed-off-by: Adrian Cole <[email protected]>

more

63b8af1

Signed-off-by: Adrian Cole <[email protected]>

match autoconfig

06c039a

Signed-off-by: Adrian Cole <[email protected]>

more

ca8e45e

Signed-off-by: Adrian Cole <[email protected]>

uh

5e10c30

Signed-off-by: Adrian Cole <[email protected]>

more

f5cfff6

Signed-off-by: Adrian Cole <[email protected]>

deflake

b529b14

Signed-off-by: Adrian Cole <[email protected]>

fix cache

a721ca4

Signed-off-by: Adrian Cole <[email protected]>

fix javadoc

41f132a

Signed-off-by: Adrian Cole <[email protected]>

build with 17 as spring boot needs it

895b39e

Signed-off-by: Adrian Cole <[email protected]>

license

9a4102a

Signed-off-by: Adrian Cole <[email protected]>

17 the tests

b9fd1c6

Signed-off-by: Adrian Cole <[email protected]>

corrects some fuzz

bfea072

Signed-off-by: Adrian Cole <[email protected]>

fuzz

cb68369

Signed-off-by: Adrian Cole <[email protected]>

last maybe

5edc480

Signed-off-by: Adrian Cole <[email protected]>

none of our modules use slf4j2

787a4ac

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt marked this pull request as ready for review January 10, 2024 09:45

anuraaga approved these changes Jan 10, 2024

View reviewed changes

codefromthecrypt merged commit e19058d into master Jan 10, 2024
13 checks passed

codefromthecrypt deleted the updates-for-3.x branch January 10, 2024 11:28

codefromthecrypt mentioned this pull request Jan 10, 2024

Updates to Zipkin 3, Spring Boot 3 and JRE 17 openzipkin/zipkin-gcp#209

Merged

codefromthecrypt mentioned this pull request Jan 10, 2024

Updates to Zipkin 3, Spring Boot 3 and JRE 17 openzipkin/zipkin-aws#209

Merged

timtebeek reviewed Jan 16, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prepares for 3.0 by updating to Spring Boot 3 and floor Java 8 #3684

Prepares for 3.0 by updating to Spring Boot 3 and floor Java 8 #3684

codefromthecrypt commented Jan 10, 2024 •

edited

Loading

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

anuraaga Jan 10, 2024

codefromthecrypt Jan 10, 2024

codefromthecrypt Jan 10, 2024

anuraaga Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

shakuzen commented Jan 11, 2024

timtebeek Jan 16, 2024

codefromthecrypt Jan 17, 2024

Prepares for 3.0 by updating to Spring Boot 3 and floor Java 8 #3684

Prepares for 3.0 by updating to Spring Boot 3 and floor Java 8 #3684

Conversation

codefromthecrypt commented Jan 10, 2024 • edited Loading

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

anuraaga Jan 10, 2024

Choose a reason for hiding this comment

codefromthecrypt Jan 10, 2024

Choose a reason for hiding this comment

codefromthecrypt Jan 10, 2024

Choose a reason for hiding this comment

anuraaga Jan 10, 2024

Choose a reason for hiding this comment

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

codefromthecrypt commented Jan 10, 2024

shakuzen commented Jan 11, 2024

timtebeek Jan 16, 2024

Choose a reason for hiding this comment

codefromthecrypt Jan 17, 2024

Choose a reason for hiding this comment

codefromthecrypt commented Jan 10, 2024 •

edited

Loading