Support Spring 6 and Spring Boot 3 #2289

adinauer · 2022-10-11T12:04:01Z

📜 Description

Support jakarta which is required for Spring 6 and Spring Boot 3.
Also need to bump environment to Java 17 for building.

💡 Motivation and Context

Newer versions of Spring (Boot) use jakarta imports instead of javax imports that were used in older versions.

💚 How did you test it?

Samples

📝 Checklist

I reviewed the submitted code
I added tests to verify the changes
I updated the docs if needed
No breaking changes

🔮 Next steps

Some tests have been removed (@Ignore), they should be reactivated
Test coverage min has been set to 0 (jacoco), it should be set back to 0.6
Some explicit dependencies have been added to force newer versions (byte-buddy, asm), maybe there's a way to avoid that

…ot to jakarta

…utoConfiguration.imports for autoconfig

…autoinstall

This reverts commit cbf6abf.

This reverts commit 6a0634e.

github-actions · 2022-10-13T11:13:42Z

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	317.31 ms	353.55 ms	36.24 ms
Size	1.73 MiB	2.29 MiB	580.38 KiB

Previous results on branch: gh-1984

Startup times

Revision	Plain	With Sentry	Diff
`b0b8572`	350.30 ms	354.92 ms	4.62 ms
`7902403`	343.80 ms	389.35 ms	45.55 ms
`6629cd8`	318.63 ms	350.76 ms	32.13 ms
`b9eab61`	308.98 ms	339.26 ms	30.28 ms
`84c97c5`	284.34 ms	317.28 ms	32.94 ms

App size

Revision	Plain	With Sentry	Diff
`b0b8572`	1.73 MiB	2.29 MiB	579.57 KiB
`7902403`	1.73 MiB	2.29 MiB	579.57 KiB
`6629cd8`	1.73 MiB	2.29 MiB	579.57 KiB
`b9eab61`	1.73 MiB	2.29 MiB	579.88 KiB
`84c97c5`	1.73 MiB	2.29 MiB	579.88 KiB

sentry-samples/sentry-samples-spring-boot-jakarta/spy.log

romtsn · 2022-10-14T08:22:04Z

sentry-samples/sentry-samples-spring-boot-jakarta/README.md

@@ -0,0 +1,19 @@
+# Sentry Sample Spring Boot
+
+Sample application showing how to use Sentry with [Spring boot](http://spring.io/projects/spring-boot).


I guess we should mention that it's Spring boot Jakarta or something?

Need to check how exactly the duplication stuff works here. Can add if easily possible

Ah it's on the samples.

romtsn · 2022-10-14T08:25:35Z

sentry-samples/sentry-samples-spring-jakarta/README.md

@@ -0,0 +1,19 @@
+# Sentry Sample Spring
+
+Sample application showing how to use Sentry with [Spring](http://spring.io/).


also Jakarta is missing here

Same as above. Will check.

romtsn · 2022-10-14T08:30:49Z

sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts

+    }
+}
+
+task("jakartaTransformation", JavaExec::class) {


why do we need this transform in the samples actually? Can't we just manually have samples with the correct package name?

also, I don't see that this task depends on anything, so we'd need to manually run it?

Yeah it was a one time command to initially clone the samples. Not sure if we need it again in case we change a lot of stuff. @lbloder do you think we should keep this in case we need to clone again?

romtsn · 2022-10-14T09:03:08Z

I think I need a better understanding of how this supposed to work to properly review it. What's the supposed workflow for this? If we change something in the sentry-spring-boot-starter, we should then go and manually trigger a build in the sentry-spring-boot-starter-jakarta module? How does this work with the resources folder, I assume the transform works only source code right?

Do we really need to have all those classes under source control, since they are synthetic? Can't we just have symlinks or something and generate them on the fly (e.g. only when running CI checks + when publishing)?

adinauer · 2022-10-14T10:24:25Z

If we don't have it checked in, how do we add the dependency on it for the sample? We'd need to publish it somewhere, no?

adinauer · 2022-10-14T11:06:50Z

Started an internal discussion whether it makes sense to move forward with this approach based on Eclipse Transformer. It feels like a lot of complexity just to save us from maintaining a few more files. That said, I'd like this to be released as an initial alpha asap so people can get their hands on it and provide feedback.

marandaneto · 2022-10-17T06:29:15Z

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
        uses: actions/setup-java@v2
        with:
          java-version: ${{ matrix.java }}
-          distribution: 'adopt'


Any reason to change the distribution?

I think this is a good move since they have rebranded and recommend people move from Adopt to Termurin.

See - https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/

CHANGELOG.md

marandaneto · 2022-10-17T06:30:29Z

gradle.properties

@@ -1,5 +1,5 @@
 # Daemon’s heap size
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=1536m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1536m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC


IIRC, MaxPermSize was helping with Android builds.

It's been removed in Java 17, see https://stackoverflow.com/questions/69402824/java-17-with-maven-wrapper-results-in-unrecognized-vm-option-maxpermsize-512m

build.gradle.kts

marandaneto · 2022-10-17T06:35:47Z

Is there a specific commit hash we should look into? 300 files are hard to review, and GH does not render correctly.
I'd recommend all refactoring such as org.mockito.kotlin going to separate PRs.

adinauer · 2022-10-17T08:53:53Z

Is there a specific commit hash we should look into?

No. The most important changes are probably the build files for the new modules. I guess it's easier to check out the branch and view them in the IDE. After this has been released my preference would be to rework them, remove the automated transformation code and just have two sets of gradle modules for each of the spring modules.

github-actions · 2022-10-18T07:07:11Z

	Fails
🚫	Please consider adding a changelog entry for the next release.

Instructions and example for changelog

Please add an entry to CHANGELOG.md to the "Unreleased" section. Make sure the entry includes this PR's number.

Example:

## Unreleased

- Support Spring 6 and Spring Boot 3 ([#2289](https://github.com/getsentry/sentry-java/pull/2289))

If none of the above apply, you can opt out of this check by adding #skip-changelog to the PR description.

Generated by 🚫 dangerJS against b253c97

maciejwalkowiak and others added 14 commits July 22, 2022 16:00

First attempt to bring sentry-spring-jakarta module.

a475ef2

Merge branch 'main' into gh-1984

3e3dc41

wip update to latest eclipse transformer, with locally built plugin

fff8560

WIP use eclipse transformer to transform javax to jakarta

f549b95

make sentry-spring-jakarta tests runnable, transform sentry-spring-bo…

fbfb0b8

…ot to jakarta

add spring boot jakarta samples

7020f8b

remove spring.factories, add org.springframework.boot.autoconfigure.A…

32a060a

…utoConfiguration.imports for autoconfig

upgrade spotless and errorprone, change sdk name in build config and …

22d4d1c

…autoinstall

rename packages

218620e

fix samples, fix spring boot jakarta tests

2a2ba5b

Use newer version of byte buddy to allow mockito with Java 17

1ff1653

Ignore some tests; disable jacoco min percent

dfa0d8a

Fix javadoc headings; fix test

0d9de66

Merge branch 'main' into gh-1984

8ae17ab

adinauer changed the base branch from main to feat/6.6.x October 13, 2022 09:57

adinauer added 3 commits October 13, 2022 12:59

Merge branch 'feat/6.6.x' into gh-1984

208d378

Revert "Use Java 17 on CI"

6a0634e

This reverts commit cbf6abf.

Revert "Revert "Use Java 17 on CI""

b5b1eb2

This reverts commit 6a0634e.

lbloder and others added 7 commits October 13, 2022 13:57

update mockitokotlin for apache and ndk tests

bb7d43e

replace om.nhaarman.mockitokotlin2 with org.mockito.kotlin

5f27c1d

Remove dependency version override for byte-buddy

4fd8c42

Change changelog

0e7d0c2

Merge branch 'feat/6.6.x' into gh-1984

37bf80a

Re-add min code coverage

0cfe7e5

Use Java 17 on CI again

1a98fde

adinauer marked this pull request as ready for review October 13, 2022 14:25

adinauer requested review from romtsn and stefanosiano as code owners October 13, 2022 14:25

romtsn reviewed Oct 14, 2022

View reviewed changes

sentry-samples/sentry-samples-spring-boot-jakarta/spy.log Outdated Show resolved Hide resolved

romtsn reviewed Oct 14, 2022

View reviewed changes

adinauer added 2 commits October 14, 2022 12:28

Remove spy.log from sample

a2cb819

Update sample readmes

7057701

marandaneto reviewed Oct 17, 2022

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

marandaneto reviewed Oct 17, 2022

View reviewed changes

build.gradle.kts Outdated Show resolved Hide resolved

Merge branch 'feat/6.6.x' into gh-1984

01792ca

adinauer requested a review from markushi as a code owner October 17, 2022 07:25

Remove ktlint explicit version; move from fixes to features in changelog

b445bb9

romtsn approved these changes Oct 17, 2022

View reviewed changes

Change build source and target back to Java 8 (was 11 by accident)

b253c97

markushi approved these changes Oct 18, 2022

View reviewed changes

adinauer merged commit 0b78c36 into feat/6.7.x Oct 18, 2022

adinauer deleted the gh-1984 branch October 18, 2022 07:05

adinauer changed the title ~~Support newer versions of Spring and Spring Boot~~ Support Spring 6 and Spring Boot 3 Oct 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Spring 6 and Spring Boot 3 #2289

Support Spring 6 and Spring Boot 3 #2289

adinauer commented Oct 11, 2022 •

edited

github-actions bot commented Oct 13, 2022 •

edited

Previous results on branch: gh-1984

Startup times

App size

romtsn Oct 14, 2022

adinauer Oct 14, 2022

adinauer Oct 14, 2022

adinauer Oct 14, 2022

romtsn Oct 14, 2022

adinauer Oct 14, 2022

adinauer Oct 14, 2022

romtsn Oct 14, 2022

romtsn Oct 14, 2022

adinauer Oct 14, 2022

romtsn commented Oct 14, 2022

adinauer commented Oct 14, 2022

adinauer commented Oct 14, 2022

marandaneto Oct 17, 2022

TomBeckett Oct 17, 2022

marandaneto Oct 17, 2022

adinauer Oct 17, 2022

marandaneto commented Oct 17, 2022

adinauer commented Oct 17, 2022

github-actions bot commented Oct 18, 2022

		@@ -0,0 +1,19 @@
		# Sentry Sample Spring Boot

		Sample application showing how to use Sentry with [Spring boot](http://spring.io/projects/spring-boot).

		@@ -0,0 +1,19 @@
		# Sentry Sample Spring

		Sample application showing how to use Sentry with [Spring](http://spring.io/).

Support Spring 6 and Spring Boot 3 #2289

Support Spring 6 and Spring Boot 3 #2289

Conversation

adinauer commented Oct 11, 2022 • edited

📜 Description

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

🔮 Next steps

github-actions bot commented Oct 13, 2022 • edited

Performance metrics 🚀

Previous results on branch: gh-1984

Startup times

App size

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

romtsn commented Oct 14, 2022

adinauer commented Oct 14, 2022

adinauer commented Oct 14, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marandaneto commented Oct 17, 2022

adinauer commented Oct 17, 2022

github-actions bot commented Oct 18, 2022

Instructions and example for changelog

adinauer commented Oct 11, 2022 •

edited

github-actions bot commented Oct 13, 2022 •

edited