Skip to content

Commit

Permalink
Merge 9100886 into 9578eab
Browse files Browse the repository at this point in the history
  • Loading branch information
lbloder authored Feb 27, 2024
2 parents 9578eab + 9100886 commit 9e2457c
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Add `enableScopePersistence` option to disable `PersistingScopeObserver` used for ANR reporting which may increase performance overhead. Defaults to `true` ([#3218](https://github.com/getsentry/sentry-java/pull/3218))
- When disabled, the SDK will not enrich ANRv2 events with scope data (e.g. breadcrumbs, user, tags, etc.)
- Show warning if incompatible spring boot version is detected ([#3233](https://github.com/getsentry/sentry-java/pull/3233))

### Fixes

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package io.sentry.spring.boot.jakarta;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.SpringBootVersion;
import org.springframework.boot.context.event.ApplicationContextInitializedEvent;
import org.springframework.context.ApplicationListener;

final class SentrySpringVersionChecker
implements ApplicationListener<ApplicationContextInitializedEvent> {

private static final Log logger = LogFactory.getLog(SentrySpringVersionChecker.class);

@Override
public void onApplicationEvent(ApplicationContextInitializedEvent event) {

if (!SpringBootVersion.getVersion().startsWith("3")) {
logger.warn("############################### WARNING ###############################");
logger.warn("## ##");
logger.warn("## !Incompatible Spring Boot Version detected! ##");
logger.warn("## Please see the sentry docs linked below ##");
logger.warn("## Choose your Spring Boot version and ##");
logger.warn("## install the matching dependency ##");
logger.warn("## ##");
logger.warn("## https://docs.sentry.io/platforms/java/guides/spring-boot/#install ##");
logger.warn("## ##");
logger.warn("#######################################################################");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.springframework.context.ApplicationListener=io.sentry.spring.boot.jakarta.SentrySpringVersionChecker
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package io.sentry.spring.boot;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.SpringBootVersion;
import org.springframework.boot.context.event.ApplicationContextInitializedEvent;
import org.springframework.context.ApplicationListener;

final class SentrySpringVersionChecker
implements ApplicationListener<ApplicationContextInitializedEvent> {

private static final Log logger = LogFactory.getLog(SentrySpringVersionChecker.class);

@Override
public void onApplicationEvent(ApplicationContextInitializedEvent event) {

if (!SpringBootVersion.getVersion().startsWith("2")) {
logger.warn("############################### WARNING ###############################");
logger.warn("## ##");
logger.warn("## !Incompatible Spring Boot Version detected! ##");
logger.warn("## Please see the sentry docs linked below ##");
logger.warn("## Choose your Spring Boot version and ##");
logger.warn("## install the matching dependency ##");
logger.warn("## ##");
logger.warn("## https://docs.sentry.io/platforms/java/guides/spring-boot/#install ##");
logger.warn("## ##");
logger.warn("#######################################################################");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.sentry.spring.boot.SentryAutoConfiguration,\
io.sentry.spring.boot.SentryLogbackAppenderAutoConfiguration,\
io.sentry.spring.boot.SentryWebfluxAutoConfiguration

org.springframework.context.ApplicationListener=io.sentry.spring.boot.SentrySpringVersionChecker

0 comments on commit 9e2457c

Please sign in to comment.