perf: Update Spring & Faster Startup and time to test (#2457)

tolgee · Sep 10, 2024 · a8fb3ee · a8fb3ee
1 parent 16d764c
commit a8fb3ee
Show file tree

Hide file tree

Showing 83 changed files with 193 additions and 54 deletions.
diff --git a/.github/workflows/prerelease-alpha.yml b/.github/workflows/prerelease-alpha.yml
@@ -14,7 +14,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node

diff --git a/.github/workflows/reportIntermittentTests.yml b/.github/workflows/reportIntermittentTests.yml
@@ -13,7 +13,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node
@@ -80,7 +80,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node
@@ -146,7 +146,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node
@@ -232,7 +232,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Cache Gradle packages

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node
@@ -83,7 +83,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node
@@ -122,7 +122,7 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: ${{ github.event_name == 'push' && 5 || 1 }}
-          command: ./gradlew ${{ matrix.command }} -x classes -x compileKotlin -x compileJava
+          command: ./gradlew ${{ matrix.command }} 
         env:
           SKIP_SERVER_BUILD: true
           CI_RELEASE: ${{ github.event_name == 'push' && true || false }}
@@ -163,7 +163,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node
@@ -269,7 +269,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Cache Gradle packages
@@ -420,7 +420,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
 
       - name: Setup node

diff --git a/backend/api/build.gradle b/backend/api/build.gradle
@@ -30,7 +30,7 @@ repositories {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 allOpen {

diff --git a/backend/api/src/main/kotlin/io/tolgee/websocket/WebSocketConfig.kt b/backend/api/src/main/kotlin/io/tolgee/websocket/WebSocketConfig.kt
@@ -5,6 +5,7 @@ import io.tolgee.security.authentication.JwtService
 import io.tolgee.security.authentication.TolgeeAuthentication
 import io.tolgee.service.security.SecurityService
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Lazy
 import org.springframework.messaging.Message
 import org.springframework.messaging.MessageChannel
 import org.springframework.messaging.MessagingException
@@ -21,7 +22,9 @@ import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerCo
 @Configuration
 @EnableWebSocketMessageBroker
 class WebSocketConfig(
+  @Lazy
   private val jwtService: JwtService,
+  @Lazy
   private val securityService: SecurityService,
 ) : WebSocketMessageBrokerConfigurer {
   override fun configureMessageBroker(config: MessageBrokerRegistry) {

diff --git a/backend/app/build.gradle b/backend/app/build.gradle
@@ -65,7 +65,7 @@ allOpen {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {
@@ -205,23 +205,23 @@ test {
     setTestRetry(it)
 }
 
-task runContextRecreatingTests(type: Test, group: 'verification') {
+tasks.register('runContextRecreatingTests', Test) {
     useJUnitPlatform {
         includeTags "contextRecreating"
     }
     maxHeapSize = "4096m"
     setTestRetry(it)
 }
 
-task runStandardTests(type: Test, group: 'verification') {
+tasks.register('runStandardTests', Test) {
     useJUnitPlatform {
         excludeTags "contextRecreating", "websocket"
     }
     maxHeapSize = "4096m"
     setTestRetry(it)
 }
 
-task runWebsocketTests(type: Test, group: 'verification') {
+tasks.register('runWebsocketTests', Test) {
     useJUnitPlatform {
         includeTags "websocket"
     }

diff --git a/backend/app/src/main/kotlin/io/tolgee/configuration/WebSecurityConfig.kt b/backend/app/src/main/kotlin/io/tolgee/configuration/WebSecurityConfig.kt
@@ -29,6 +29,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Lazy
 import org.springframework.core.Ordered
 import org.springframework.core.annotation.Order
 import org.springframework.security.config.Customizer
@@ -46,12 +47,19 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 @Configuration
 @EnableWebSecurity
 class WebSecurityConfig(
+  @Lazy
   private val authenticationFilter: AuthenticationFilter,
+  @Lazy
   private val globalIpRateLimitFilter: GlobalIpRateLimitFilter,
+  @Lazy
   private val globalUserRateLimitFilter: GlobalUserRateLimitFilter,
+  @Lazy
   private val rateLimitInterceptor: RateLimitInterceptor,
+  @Lazy
   private val authenticationInterceptor: AuthenticationInterceptor,
+  @Lazy
   private val organizationAuthorizationInterceptor: OrganizationAuthorizationInterceptor,
+  @Lazy
   private val projectAuthorizationInterceptor: ProjectAuthorizationInterceptor,
   private val exceptionHandlerFilter: ExceptionHandlerFilter,
 ) : WebMvcConfigurer {

diff --git a/backend/data/build.gradle b/backend/data/build.gradle
@@ -79,7 +79,7 @@ diff.dependsOn compileKotlin
 diffChangelog.dependsOn compileKotlin
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {

diff --git a/backend/data/src/main/kotlin/io/tolgee/batch/cleaning/ScheduledJobCleaner.kt b/backend/data/src/main/kotlin/io/tolgee/batch/cleaning/ScheduledJobCleaner.kt
@@ -12,18 +12,24 @@ import io.tolgee.util.addSeconds
 import io.tolgee.util.logger
 import io.tolgee.util.runSentryCatching
 import jakarta.persistence.EntityManager
+import org.springframework.context.annotation.Lazy
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional
 
 @Component
 class ScheduledJobCleaner(
+  @Lazy
   private val batchJobService: BatchJobService,
+  @Lazy
   private val lockingManager: BatchJobProjectLockingManager,
   private val currentDateProvider: CurrentDateProvider,
+  @Lazy
   private val batchJobStateProvider: BatchJobStateProvider,
   private val entityManager: EntityManager,
+  @Lazy
   private val cachingBatchJobService: CachingBatchJobService,
+  @Lazy
   private val batchJobStatusProvider: BatchJobStatusProvider,
 ) : Logging {
   /**

diff --git a/backend/data/src/main/kotlin/io/tolgee/configuration/MetricsConfiguration.kt b/backend/data/src/main/kotlin/io/tolgee/configuration/MetricsConfiguration.kt
@@ -1,8 +1,8 @@
 package io.tolgee.configuration
 
 import io.micrometer.core.instrument.MeterRegistry
-import io.micrometer.prometheus.PrometheusConfig
-import io.micrometer.prometheus.PrometheusMeterRegistry
+import io.micrometer.prometheusmetrics.PrometheusConfig
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 

diff --git a/backend/data/src/main/kotlin/io/tolgee/model/dataImport/ImportFile.kt b/backend/data/src/main/kotlin/io/tolgee/model/dataImport/ImportFile.kt
@@ -17,7 +17,7 @@ class ImportFile(
   @field:Size(max = 2000)
   @Column(length = 2000)
   var name: String?,
-  @ManyToOne(optional = false)
+  @field:ManyToOne(optional = false)
   val import: Import,
 ) : StandardAuditModel() {
   @OneToMany(mappedBy = "file", orphanRemoval = true)

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/AnnouncementRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/AnnouncementRepository.kt
@@ -3,11 +3,13 @@ package io.tolgee.repository
 import io.tolgee.model.DismissedAnnouncement
 import io.tolgee.model.DismissedAnnouncementId
 import io.tolgee.model.enums.announcement.Announcement
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 
 @Repository
+@Lazy
 interface AnnouncementRepository : JpaRepository<DismissedAnnouncement, DismissedAnnouncementId> {
   @Query(
     """

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/ApiKeyRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/ApiKeyRepository.kt
@@ -1,6 +1,7 @@
 package io.tolgee.repository
 
 import io.tolgee.model.ApiKey
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.EntityGraph
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Repository
 import java.util.*
 
 @Repository
+@Lazy
 interface ApiKeyRepository : JpaRepository<ApiKey, Long> {
   fun findByKeyHash(hash: String): Optional<ApiKey>
 

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/AutoTranslationConfigRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/AutoTranslationConfigRepository.kt
@@ -2,11 +2,13 @@ package io.tolgee.repository
 
 import io.tolgee.model.AutoTranslationConfig
 import io.tolgee.model.Project
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 
 @Repository
+@Lazy
 interface AutoTranslationConfigRepository : JpaRepository<AutoTranslationConfig, Long> {
   fun findOneByProjectAndTargetLanguageId(
     project: Project,

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/AutomationRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/AutomationRepository.kt
@@ -1,11 +1,13 @@
 package io.tolgee.repository
 
 import io.tolgee.model.automations.Automation
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 
 @Repository
+@Lazy
 interface AutomationRepository : JpaRepository<Automation?, Long?> {
   @Query(
     """

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/BatchJobRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/BatchJobRepository.kt
@@ -3,6 +3,7 @@ package io.tolgee.repository
 import io.tolgee.model.batch.BatchJob
 import io.tolgee.model.batch.BatchJobStatus
 import io.tolgee.model.views.JobErrorMessagesView
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Repository
 import java.util.*
 
 @Repository
+@Lazy
 interface BatchJobRepository : JpaRepository<BatchJob, Long> {
   @Query(
     value = """

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/EmailVerificationRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/EmailVerificationRepository.kt
@@ -1,8 +1,10 @@
 package io.tolgee.repository
 
 import io.tolgee.model.EmailVerification
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 
 @Repository
+@Lazy
 interface EmailVerificationRepository : JpaRepository<EmailVerification, Long>
diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/InvitationRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/InvitationRepository.kt
@@ -3,12 +3,14 @@ package io.tolgee.repository
 import io.tolgee.model.Invitation
 import io.tolgee.model.Organization
 import io.tolgee.model.Project
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import java.util.*
 
 @Repository
+@Lazy
 interface InvitationRepository : JpaRepository<Invitation?, Long?> {
   fun deleteAllByCreatedAtLessThan(date: Date)
 

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/KeyCodeReferenceRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/KeyCodeReferenceRepository.kt
@@ -1,13 +1,15 @@
 package io.tolgee.repository
 
 import io.tolgee.model.key.KeyCodeReference
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Modifying
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import org.springframework.transaction.annotation.Transactional
 
 @Repository
+@Lazy
 interface KeyCodeReferenceRepository : JpaRepository<KeyCodeReference, Long> {
   @Modifying
   @Transactional

diff --git a/backend/data/src/main/kotlin/io/tolgee/repository/KeyCommentRepository.kt b/backend/data/src/main/kotlin/io/tolgee/repository/KeyCommentRepository.kt
@@ -1,13 +1,15 @@
 package io.tolgee.repository
 
 import io.tolgee.model.key.KeyComment
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Modifying
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import org.springframework.transaction.annotation.Transactional
 
 @Repository
+@Lazy
 interface KeyCommentRepository : JpaRepository<KeyComment?, Long?> {
   @Modifying
   @Transactional