Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Spring Boot Jakarta to Spring Boot 3.0.0-RC2 #2347

Merged
merged 26 commits into from Nov 11, 2022

Conversation

lbloder
Copy link
Collaborator

@lbloder lbloder commented Nov 8, 2022

Co-authored-by: Maciej Walkowiak walkowiak.maciej@yahoo.com
Co-authored-by: Lukas Bloder lukas.bloder@gmail.com

📜 Description

Update Spring Boot 3.0.0 to RC1, adapt code for removals and deprecations

💡 Motivation and Context

Expands on #1984 by upgrading from Spring Boot 3.0.0-M5 to RC2

💚 How did you test it?

📝 Checklist

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

🔮 Next steps

adinauer and others added 16 commits October 13, 2022 12:57
This reverts commit cbf6abf.
Co-authored-by: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Co-authored-by: Lukas Bloder <lukas.bloder@gmail.com>
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/format-code.yml
#	.github/workflows/generate-javadocs.yml
#	.github/workflows/integration-tests-benchmarks.yml
#	.github/workflows/integration-tests-ui.yml
#	CHANGELOG.md
#	buildSrc/src/main/java/Config.kt
#	sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/EnvelopeTests.kt
#	sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
#	sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonService.java
#	sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/SecurityConfiguration.java
#	sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
#	sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java
#	sentry-spring-boot-starter-jakarta/build.gradle.kts
#	sentry-spring-boot-starter-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/it/SentrySpringIntegrationTest.kt
#	sentry-spring-jakarta/build.gradle.kts
#	sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientHttpRequestInterceptor.java
#	sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientWebRequestFilter.java
#	sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryRequestResolver.java
#	sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/SentryWebFilter.java
#	sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/TransactionNameProvider.java
#	sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/mvc/SentrySpringIntegrationTest.kt
@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Messages
📖 Do not forget to update Sentry-docs with your feature once the pull request gets approved.

Generated by 🚫 dangerJS against 1653497

@lbloder lbloder changed the title Use Java 17 on CI Update Spring Boot Jakarta to Spring Boot 3.0.0-RC1 Nov 9, 2022
http.csrf().disable().authorizeRequests().anyRequest().authenticated().and().httpBasic();
@Bean
public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();

Check failure

Code scanning / CodeQL

Disabled Spring CSRF protection

CSRF vulnerability due to protection being disabled.
http.csrf().disable().authorizeRequests().anyRequest().authenticated().and().httpBasic();
@Bean
public SecurityFilterChain filterChain(final @NotNull HttpSecurity http) throws Exception {
http.csrf().disable().authorizeHttpRequests().anyRequest().authenticated().and().httpBasic();

Check failure

Code scanning / CodeQL

Disabled Spring CSRF protection

CSRF vulnerability due to protection being disabled.
@adinauer adinauer changed the title Update Spring Boot Jakarta to Spring Boot 3.0.0-RC1 Update Spring Boot Jakarta to Spring Boot 3.0.0-RC2 Nov 11, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
@adinauer adinauer marked this pull request as ready for review November 11, 2022 09:59
@github-actions
Copy link
Contributor

github-actions bot commented Nov 11, 2022

Performance metrics 🚀

  Plain With Sentry Diff
Startup time 354.70 ms 394.40 ms 39.70 ms
Size 1.73 MiB 2.32 MiB 609.82 KiB

Baseline results on branch: main

Startup times

Revision Plain With Sentry Diff
90e9745 314.68 ms 357.28 ms 42.60 ms
a04f788 321.78 ms 354.12 ms 32.35 ms
f809aac 301.51 ms 346.60 ms 45.09 ms
7597ded 289.60 ms 339.69 ms 50.09 ms

App size

Revision Plain With Sentry Diff
90e9745 1.73 MiB 2.32 MiB 608.63 KiB
a04f788 1.73 MiB 2.32 MiB 609.88 KiB
f809aac 1.73 MiB 2.32 MiB 608.63 KiB
7597ded 1.73 MiB 2.32 MiB 609.88 KiB

Previous results on branch: feat/spring-boot-3.0.0-RC1

Startup times

Revision Plain With Sentry Diff
f63df3a 347.19 ms 381.40 ms 34.21 ms
4171e0b 357.46 ms 408.42 ms 50.96 ms

App size

Revision Plain With Sentry Diff
f63df3a 1.73 MiB 2.32 MiB 609.82 KiB
4171e0b 1.73 MiB 2.32 MiB 609.82 KiB

@codecov-commenter
Copy link

codecov-commenter commented Nov 11, 2022

Codecov Report

Base: 80.36% // Head: 80.31% // Decreases project coverage by -0.05% ⚠️

Coverage data is based on head (1653497) compared to base (51e7326).
Patch coverage: 37.50% of modified lines in pull request are covered.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #2347      +/-   ##
============================================
- Coverage     80.36%   80.31%   -0.06%     
  Complexity     3670     3670              
============================================
  Files           290      290              
  Lines         13712    13724      +12     
  Branches       1801     1809       +8     
============================================
+ Hits          11020    11022       +2     
- Misses         2001     2005       +4     
- Partials        691      697       +6     
Impacted Files Coverage Δ
...racing/SentrySpanClientHttpRequestInterceptor.java 0.00% <0.00%> (ø)
...racing/SentrySpanClientHttpRequestInterceptor.java 0.00% <0.00%> (ø)
...arta/tracing/SentrySpanClientWebRequestFilter.java 73.33% <50.00%> (ø)
.../spring/jakarta/webflux/SentryRequestResolver.java 70.00% <50.00%> (-3.69%) ⬇️
...sentry/spring/jakarta/webflux/SentryWebFilter.java 95.23% <50.00%> (-4.77%) ⬇️
...ring/tracing/SentrySpanClientWebRequestFilter.java 73.33% <50.00%> (ø)
...o/sentry/spring/webflux/SentryRequestResolver.java 70.00% <50.00%> (-3.69%) ⬇️
...java/io/sentry/spring/webflux/SentryWebFilter.java 95.23% <50.00%> (-4.77%) ⬇️
...pring/jakarta/webflux/TransactionNameProvider.java 55.55% <75.00%> (+5.55%) ⬆️
...sentry/spring/webflux/TransactionNameProvider.java 55.55% <75.00%> (+5.55%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@lbloder lbloder merged commit 38e4f11 into main Nov 11, 2022
@lbloder lbloder deleted the feat/spring-boot-3.0.0-RC1 branch November 11, 2022 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants