Hubs/Scopes Merge 13 - Replace IHub with IScopes in samples (#3310)

* Introduce `IScopes` interface. * Replace `IHub` with `IScopes` in core * Replace `IHub` with `IScopes` in android core * Replace `IHub` with `IScopes` in android integrations * Replace `IHub` with `IScopes` in apollo integrations * Replace `IHub` with `IScopes` in okhttp integration * Replace `IHub` with `IScopes` in graphql integration * Replace `IHub` with `IScopes` in logging integrations * Replace `IHub` with `IScopes` in more integrations * Replace `IHub` with `IScopes` in OTel integration * Replace `IHub` with `IScopes` in Spring 5 / Spring Boot 2 integrations * Replace `IHub` with `IScopes` in Spring 6 / Spring Boot 3 integrations * Replace `IHub` with `IScopes` in samples
getsentry · Apr 16, 2024 · ec30e19 · ec30e19
1 parent e11f8b1
commit ec30e19
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/...mples/sentry-samples-android/src/main/java/io/sentry/samples/android/ProfilingActivity.kt b/...mples/sentry-samples-android/src/main/java/io/sentry/samples/android/ProfilingActivity.kt
@@ -100,7 +100,7 @@ class ProfilingActivity : AppCompatActivity() {
             val traceData = ProfilingTraceData(profile, t)
             // Create envelope item from copied profile
             val item =
-                SentryEnvelopeItem.fromProfilingTrace(traceData, Long.MAX_VALUE, Sentry.getCurrentHub().options.serializer)
+                SentryEnvelopeItem.fromProfilingTrace(traceData, Long.MAX_VALUE, Sentry.getCurrentScopes().options.serializer)
             val itemData = item.data
 
             // Compress the envelope item using Gzip

diff --git a/...ntry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/AppConfig.java b/...ntry-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.IHub;
+import io.sentry.IScopes;
 import io.sentry.spring.jakarta.SentryUserFilter;
 import io.sentry.spring.jakarta.SentryUserProvider;
 import java.util.List;
@@ -14,7 +14,7 @@ public class AppConfig {
 
   @Bean
   SentryUserFilter sentryUserFilter(
-      final IHub hub, final List<SentryUserProvider> sentryUserProviders) {
-    return new SentryUserFilter(hub, sentryUserProviders);
+      final IScopes scopes, final List<SentryUserProvider> sentryUserProviders) {
+    return new SentryUserFilter(scopes, sentryUserProviders);
   }
 }
diff --git a/...ntry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java b/...ntry-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.IHub;
+import io.sentry.IScopes;
 import io.sentry.spring.jakarta.tracing.SentrySpanClientHttpRequestInterceptor;
 import java.util.Collections;
 import org.springframework.context.annotation.Bean;
@@ -20,14 +20,14 @@ public class WebConfig {
    * Creates a {@link RestTemplate} which calls are intercepted with {@link
    * SentrySpanClientHttpRequestInterceptor} to create spans around HTTP calls.
    *
-   * @param hub - sentry hub
+   * @param scopes - sentry scopes
    * @return RestTemplate
    */
   @Bean
-  RestTemplate restTemplate(IHub hub) {
+  RestTemplate restTemplate(IScopes scopes) {
     RestTemplate restTemplate = new RestTemplate();
     SentrySpanClientHttpRequestInterceptor sentryRestTemplateInterceptor =
-        new SentrySpanClientHttpRequestInterceptor(hub);
+        new SentrySpanClientHttpRequestInterceptor(scopes);
     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
@@ -1,6 +1,6 @@
 package io.sentry.samples.spring;
 
-import io.sentry.IHub;
+import io.sentry.IScopes;
 import io.sentry.spring.SentryUserFilter;
 import io.sentry.spring.SentryUserProvider;
 import java.util.List;
@@ -14,7 +14,7 @@ public class AppConfig {
 
   @Bean
   SentryUserFilter sentryUserFilter(
-      final IHub hub, final List<SentryUserProvider> sentryUserProviders) {
-    return new SentryUserFilter(hub, sentryUserProviders);
+      final IScopes scopes, final List<SentryUserProvider> sentryUserProviders) {
+    return new SentryUserFilter(scopes, 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
@@ -1,6 +1,6 @@
 package io.sentry.samples.spring;
 
-import io.sentry.IHub;
+import io.sentry.IScopes;
 import io.sentry.spring.tracing.SentrySpanClientHttpRequestInterceptor;
 import java.util.Collections;
 import org.springframework.context.annotation.Bean;
@@ -20,14 +20,14 @@ public class WebConfig {
    * Creates a {@link RestTemplate} which calls are intercepted with {@link
    * SentrySpanClientHttpRequestInterceptor} to create spans around HTTP calls.
    *
-   * @param hub - sentry hub
+   * @param scopes - sentry scopes
    * @return RestTemplate
    */
   @Bean
-  RestTemplate restTemplate(IHub hub) {
+  RestTemplate restTemplate(IScopes scopes) {
     RestTemplate restTemplate = new RestTemplate();
     SentrySpanClientHttpRequestInterceptor sentryRestTemplateInterceptor =
-        new SentrySpanClientHttpRequestInterceptor(hub);
+        new SentrySpanClientHttpRequestInterceptor(scopes);
     restTemplate.setInterceptors(Collections.singletonList(sentryRestTemplateInterceptor));
     return restTemplate;
   }