Merge a3d88a4 into 6f23a76

Author: lcian

sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java

@@ -1,6 +1,6 @@
 package io.sentry.samples.spring.jakarta;
 
-import io.sentry.IScopes;
+import io.sentry.ScopesAdapter;
 import io.sentry.spring.jakarta.SentryUserFilter;
 import io.sentry.spring.jakarta.SentryUserProvider;
 import java.util.List;
@@ -13,8 +13,7 @@
 public class AppConfig {
 
   @Bean
-  SentryUserFilter sentryUserFilter(
-      final IScopes scopes, final List<SentryUserProvider> sentryUserProviders) {
-    return new SentryUserFilter(scopes, sentryUserProviders);
+  SentryUserFilter sentryUserFilter(final List<SentryUserProvider> sentryUserProviders) {
+    return new SentryUserFilter(ScopesAdapter.getInstance(), sentryUserProviders);
   }
 }

sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java

@@ -1,6 +1,6 @@
 package io.sentry.samples.spring.jakarta;
 
-import io.sentry.IScopes;
+import io.sentry.ScopesAdapter;
 import io.sentry.spring.jakarta.tracing.SentrySpanClientHttpRequestInterceptor;
 import java.util.Collections;
 import org.springframework.context.annotation.Bean;
@@ -20,14 +20,13 @@ public class WebConfig {
    * 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(ScopesAdapter.getInstance());
     restTemplate.setInterceptors(Collections.singletonList(sentryRestTemplateInterceptor));
     return restTemplate;
   }

sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/AppConfig.java

@@ -1,6 +1,6 @@
 package io.sentry.samples.spring;
 
-import io.sentry.IScopes;
+import io.sentry.ScopesAdapter;
 import io.sentry.spring.SentryUserFilter;
 import io.sentry.spring.SentryUserProvider;
 import java.util.List;
@@ -13,8 +13,7 @@
 public class AppConfig {
 
   @Bean
-  SentryUserFilter sentryUserFilter(
-      final IScopes scopes, final List<SentryUserProvider> sentryUserProviders) {
-    return new SentryUserFilter(scopes, sentryUserProviders);
+  SentryUserFilter sentryUserFilter(final List<SentryUserProvider> sentryUserProviders) {
+    return new SentryUserFilter(ScopesAdapter.getInstance(), sentryUserProviders);
   }
 }

sentry-samples/sentry-samples-spring/src/main/java/io/sentry/samples/spring/WebConfig.java

@@ -1,6 +1,6 @@
 package io.sentry.samples.spring;
 
-import io.sentry.IScopes;
+import io.sentry.ScopesAdapter;
 import io.sentry.spring.tracing.SentrySpanClientHttpRequestInterceptor;
 import java.util.Collections;
 import org.springframework.context.annotation.Bean;
@@ -20,14 +20,13 @@ public class WebConfig {
    * 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(ScopesAdapter.getInstance());
     restTemplate.setInterceptors(Collections.singletonList(sentryRestTemplateInterceptor));
     return restTemplate;
   }