Skip to content

Commit

Permalink
fix: Fix Sentry logging (#2026)
Browse files Browse the repository at this point in the history
  • Loading branch information
JanCizmar committed Dec 17, 2023
1 parent edea884 commit 761538c
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion backend/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ plugins {
id 'org.jetbrains.kotlin.jvm'
id 'org.springframework.boot' apply false
id "kotlin-allopen"
id "io.sentry.jvm.gradle"
}

group = 'io.tolgee'
Expand Down Expand Up @@ -60,7 +61,6 @@ dependencies {
* Misc
*/
implementation libs.commonsCodec
implementation libs.sentry
implementation libs.jjwtApi
implementation libs.jjwtImpl
implementation libs.jjwtJackson
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ class ProjectWithStatsFacade(
return try {
this.toBigDecimal().setScale(3, RoundingMode.HALF_UP)
} catch (e: NumberFormatException) {
Sentry.captureException(e, "Failed to convert $this to BigDecimal")
Sentry.captureMessage("Failed to convert $this to BigDecimal")
Sentry.captureException(e)
BigDecimal(0)
}
}
Expand Down
2 changes: 1 addition & 1 deletion backend/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ plugins {
id "kotlin-jpa"
id "org.jetbrains.kotlin.kapt"
id "kotlin-allopen"
id "io.sentry.jvm.gradle"
}

group = 'io.tolgee'
Expand Down Expand Up @@ -97,7 +98,6 @@ dependencies {
/**
* MISC
*/
implementation libs.sentry
implementation libs.commonsCodec
implementation libs.amazonS3
implementation libs.amazonSTS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package io.tolgee.configuration

import io.sentry.spring.SentryTaskDecorator
import io.sentry.spring.jakarta.SentryTaskDecorator
import org.springframework.context.annotation.Configuration
import org.springframework.scheduling.annotation.AsyncConfigurerSupport
import org.springframework.scheduling.annotation.AsyncConfigurer
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
import java.util.concurrent.Executor

@Configuration
internal class AsyncMethodConfiguration : AsyncConfigurerSupport() {
class AsyncMethodConfiguration : AsyncConfigurer {
override fun getAsyncExecutor(): Executor {
val executor = ThreadPoolTaskExecutor()
executor.setTaskDecorator(SentryTaskDecorator())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.tolgee.configuration

import io.sentry.spring.SentryTaskDecorator
import io.sentry.spring.jakarta.SentryTaskDecorator
import org.springframework.context.annotation.Configuration
import org.springframework.core.task.AsyncTaskExecutor
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
Expand All @@ -9,7 +9,7 @@ import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer

@Configuration
internal class AsyncWebMvcConfiguration : WebMvcConfigurer {
class AsyncWebMvcConfiguration : WebMvcConfigurer {
override fun configureAsyncSupport(configurer: AsyncSupportConfigurer) {
configurer.setTaskExecutor(asyncExecutor())
}
Expand Down
2 changes: 1 addition & 1 deletion backend/data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
id "org.jetbrains.kotlin.kapt"
id "kotlin-allopen"
id "org.hibernate.orm"
id "io.sentry.jvm.gradle"
}

group = 'io.tolgee'
Expand Down Expand Up @@ -166,7 +167,6 @@ dependencies {
implementation 'net.datafaker:datafaker:1.5.0'
implementation 'jaxen:jaxen:1.2.0'
implementation libs.sendInBlue
implementation libs.sentry
implementation libs.hibernateTypes
liquibaseRuntime libs.hibernateTypes
implementation 'com.eatthepath:java-otp:0.4.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class BatchJobActionService(
fn()
} catch (e: Throwable) {
logger.error("Error processing chunk ${executionItem.chunkExecutionId}", e)
Sentry.captureException(e, "Processing of chunk unexpectedly failed ${executionItem.chunkExecutionId}")
Sentry.captureException(e)
val maxRetries = 10
if (++executionItem.managementErrorRetrials > maxRetries) {
logger.error("Chunk ${executionItem.chunkExecutionId} failed $maxRetries times, failing...")
Expand Down
3 changes: 1 addition & 2 deletions backend/security/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id 'org.jetbrains.kotlin.jvm'
id 'org.springframework.boot' apply false
id "kotlin-allopen"

id "io.sentry.jvm.gradle"
}

group = 'io.tolgee.security'
Expand Down Expand Up @@ -56,7 +56,6 @@ dependencies {
* Misc
*/
implementation libs.commonsCodec
implementation libs.sentry
implementation libs.jjwtApi
implementation libs.jjwtImpl
implementation libs.jjwtJackson
Expand Down
1 change: 1 addition & 0 deletions ee/backend/tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ plugins {
id 'org.springframework.boot' apply false
id "java"
id "kotlin-allopen"
id "io.sentry.jvm.gradle"
}

apply plugin: "kotlin-allopen"
Expand Down
4 changes: 3 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ pluginManagement {
if (requested.id.id == 'org.hibernate.orm') {
useVersion(hibernateVersion)
}
if(requested.id.id == 'io.sentry.jvm.gradle'){
useVersion('4.0.0')
}
}
}
}
Expand Down Expand Up @@ -55,7 +58,6 @@ dependencyResolutionManagement {
library('amazonSTS', "software.amazon.awssdk:sts:$amazonAwsSdkVersion")
library('amazonTranslate', "software.amazon.awssdk:translate:$amazonAwsSdkVersion")
library('googleCloud', "com.google.cloud:libraries-bom:24.0.0")
library('sentry', "io.sentry:sentry-spring-boot-starter:5.7.3")
library('liquibaseCore', "org.liquibase:liquibase-core:4.25.0")
library('liquibaseHibernate', "org.liquibase.ext:liquibase-hibernate6:4.25.0")
library('liquibasePicoli', "info.picocli:picocli:4.6.3")
Expand Down

0 comments on commit 761538c

Please sign in to comment.