Skip to content

Commit

Permalink
Merge cc6972c into 3cda41b
Browse files Browse the repository at this point in the history
  • Loading branch information
lbloder committed Sep 11, 2023
2 parents 3cda41b + cc6972c commit 1cf9e84
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Add `sentry.enable-aot-compatibility` property to SpringBoot Jakarta `SentryAutoConfiguration` to enable building for GraalVM ([#2915](https://github.com/getsentry/sentry-java/pull/2915))

### Dependencies

- Bump Gradle from v8.2.1 to v8.3.0 ([#2900](https://github.com/getsentry/sentry-java/pull/2900))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ sentry.enable-tracing=true
sentry.debug=true
in-app-includes="io.sentry.samples"

# Uncomment and set to true to enable aot compatibility
# This flag disables all AOP related features (i.e. @SentryTransaction, @SentrySpan)
# to successfully compile to GraalVM
# sentry.enable-aot-compatibility=false

# Database configuration
spring.datasource.url=jdbc:p6spy:hsqldb:mem:testdb
spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ public FilterRegistrationBean<SentryTracingFilter> sentryTracingFilter(
}

@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(
value = "sentry.enable-aot-compatibility",
havingValue = "false",
matchIfMissing = true)
@Conditional(SentryTracingCondition.class)
@ConditionalOnClass(ProceedingJoinPoint.class)
@Import(SentryAdviceConfiguration.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ public class SentryProperties extends SentryOptions {
/** Reactive framework (e.g. WebFlux) integration properties */
private @NotNull Reactive reactive = new Reactive();

/**
* If set to true, this flag disables all AOP related features (e.g. {@link
* io.sentry.spring.jakarta.tracing.SentryTransaction}, {@link
* io.sentry.spring.jakarta.tracing.SentrySpan}) to successfully compile to GraalVM
*/
private boolean enableAotCompatibility = false;

public boolean isUseGitCommitIdAsRelease() {
return useGitCommitIdAsRelease;
}
Expand Down Expand Up @@ -85,6 +92,14 @@ public void setReactive(@NotNull Reactive reactive) {
this.reactive = reactive;
}

public boolean isEnableAotCompatibility() {
return enableAotCompatibility;
}

public void setEnableAotCompatibility(boolean enableAotCompatibility) {
this.enableAotCompatibility = enableAotCompatibility;
}

@Open
public static class Logging {
/** Enable/Disable logging auto-configuration. */
Expand Down

0 comments on commit 1cf9e84

Please sign in to comment.