diff --git a/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java index 72ecb14e2f..e89221603d 100644 --- a/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java +++ b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java @@ -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; @@ -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); } } diff --git a/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java index 73d425b286..f4711bc79d 100644 --- a/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java +++ b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java @@ -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; @@ -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; } diff --git a/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/AppConfig.java b/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/AppConfig.java index 89a968834a..cacb82cee5 100644 --- a/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/AppConfig.java +++ b/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/AppConfig.java @@ -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; @@ -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); } } diff --git a/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/WebConfig.java b/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/WebConfig.java index 2990ba8a38..257b74f4cb 100644 --- a/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/WebConfig.java +++ b/sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/WebConfig.java @@ -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; @@ -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; }