Skip to content

Fix SentryUserFilter in spring and spring-jakarta samples #4316

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.

Sign up for GitHub

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

Closed
lcian wants to merge 4 commits into from
Closed

Fix SentryUserFilter in spring and spring-jakarta samples #4316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29da740
Fix SentryUserFilter in Spring samples
lcian Apr 4, 2025
a3d88a4
also fix WebConfig
lcian Apr 4, 2025
75af4b2
retrieve bean instead
lcian Apr 4, 2025
d2565a4
Merge branch 'main' into lcian/fix/user-filter-spring-samples
lcian Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...ntry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import io.sentry.spring.jakarta.SentryUserFilter;
import io.sentry.spring.jakarta.SentryUserProvider;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
Expand All @@ -12,9 +14,10 @@
@Import(SentryConfig.class)
public class AppConfig {

@Autowired private ApplicationContext applicationContext;

@Bean
SentryUserFilter sentryUserFilter(
final IScopes scopes, final List<SentryUserProvider> sentryUserProviders) {
return new SentryUserFilter(scopes, sentryUserProviders);
SentryUserFilter sentryUserFilter(final List<SentryUserProvider> sentryUserProviders) {
return new SentryUserFilter(applicationContext.getBean(IScopes.class), sentryUserProviders);
}
}
9 changes: 6 additions & 3 deletions ...ntry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import io.sentry.IScopes;
import io.sentry.spring.jakarta.tracing.SentrySpanClientHttpRequestInterceptor;
import java.util.Collections;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
Expand All @@ -16,18 +18,19 @@
@EnableWebMvc
public class WebConfig {

@Autowired private ApplicationContext applicationContext;

/**
* Creates a {@link RestTemplate} which calls are intercepted with {@link
* SentrySpanClientHttpRequestInterceptor} to create spans around HTTP calls.
*
* @param scopes - sentry scopes
* @return RestTemplate
*/
@Bean
RestTemplate restTemplate(IScopes scopes) {
RestTemplate restTemplate() {
RestTemplate restTemplate = new RestTemplate();
SentrySpanClientHttpRequestInterceptor sentryRestTemplateInterceptor =
new SentrySpanClientHttpRequestInterceptor(scopes);
new SentrySpanClientHttpRequestInterceptor(applicationContext.getBean(IScopes.class));
restTemplate.setInterceptors(Collections.singletonList(sentryRestTemplateInterceptor));
return restTemplate;
}
Expand Down
9 changes: 6 additions & 3 deletions sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import io.sentry.spring.SentryUserFilter;
import io.sentry.spring.SentryUserProvider;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
Expand All @@ -12,9 +14,10 @@
@Import(SentryConfig.class)
public class AppConfig {

@Autowired private ApplicationContext applicationContext;

@Bean
SentryUserFilter sentryUserFilter(
final IScopes scopes, final List<SentryUserProvider> sentryUserProviders) {
return new SentryUserFilter(scopes, sentryUserProviders);
SentryUserFilter sentryUserFilter(final List<SentryUserProvider> sentryUserProviders) {
return new SentryUserFilter(applicationContext.getBean(IScopes.class), sentryUserProviders);
}
}
9 changes: 6 additions & 3 deletions sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/WebConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import io.sentry.IScopes;
import io.sentry.spring.tracing.SentrySpanClientHttpRequestInterceptor;
import java.util.Collections;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
Expand All @@ -16,18 +18,19 @@
@EnableWebMvc
public class WebConfig {

@Autowired private ApplicationContext applicationContext;

/**
* Creates a {@link RestTemplate} which calls are intercepted with {@link
* SentrySpanClientHttpRequestInterceptor} to create spans around HTTP calls.
*
* @param scopes - sentry scopes
* @return RestTemplate
*/
@Bean
RestTemplate restTemplate(IScopes scopes) {
RestTemplate restTemplate() {
RestTemplate restTemplate = new RestTemplate();
SentrySpanClientHttpRequestInterceptor sentryRestTemplateInterceptor =
new SentrySpanClientHttpRequestInterceptor(scopes);
new SentrySpanClientHttpRequestInterceptor(applicationContext.getBean(IScopes.class));
restTemplate.setInterceptors(Collections.singletonList(sentryRestTemplateInterceptor));
return restTemplate;
}
Expand Down
Loading