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

[PF-2979] Upgrade Janitor to Spring Boot 3 #171

Merged
merged 9 commits into from
Jan 5, 2024
Merged

[PF-2979] Upgrade Janitor to Spring Boot 3 #171

merged 9 commits into from
Jan 5, 2024

Conversation

rtitle
Copy link
Contributor

@rtitle rtitle commented Dec 8, 2023

https://broadworkbench.atlassian.net/browse/PF-2979

Used DataBiosphere/terra-resource-buffer#285 as a model, which is similar to Janitor.

Upgrades Janitor to Spring Boot 3, along with:

  • New TCL (including new logback)
  • Jakarta client
  • OpenTelemetry
  • etc

Tested via unit and integration tests. Also ran Janitor locally and manually submitted pubsub messages, and verified resources were deleted.

@rtitle rtitle changed the title WIP: first pass at Janitor Spring Boot 3 upgrade [PF-2979] Upgrade Janitor to Spring Boot 3 Dec 8, 2023
@rtitle rtitle marked this pull request as ready for review January 4, 2024 19:20
implementation group: 'com.google.cloud', name: 'google-cloud-billing', version: '2.3.0'
implementation group: 'com.google.cloud', name: 'google-cloud-core-http', version: '2.8.0'
implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.120.0'
implementation group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.9.2'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed some Google dependencies that get included through CRL.

private MetricsHelper() {}

@Component
public class MetricsHelper {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored MetricsHelper to use OpenTelemetry API. Really used RBS as a model.

Copy link

@okotsopoulos okotsopoulos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but I'm less savvy with the OTEL stuff!

@@ -131,27 +149,6 @@ dependencies {
implementation('org.bouncycastle:bcpkix-jdk15on:1.70')
implementation('org.bouncycastle:bcprov-jdk15on:1.70')
spotbugs('org.apache.bcel:bcel:6.6.1')
// TODO(PF-2299): Remove these once all dependencies are using >3.0.0. This

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

Copy link

@dvoet dvoet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, the other reviewers are on top of it

Copy link

sonarqubecloud bot commented Jan 5, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@rtitle rtitle merged commit df3381b into master Jan 5, 2024
@rtitle rtitle deleted the rt-pf-2979 branch January 5, 2024 01:56
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.

4 participants