Skip to content

ref: Use scope observer protocol in dependency container #6423

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

Merged
merged 1 commit into from
Oct 15, 2025
+7 −9
Merged

ref: Use scope observer protocol in dependency container #6423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions Sources/Sentry/SentryDependencyContainer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,7 @@ - (SentryDebugImageProvider *)debugImageProvider SENTRY_THREAD_SANITIZER_DOUBLE_
}

#if SENTRY_HAS_UIKIT
- (SentryWatchdogTerminationScopeObserver *)getWatchdogTerminationScopeObserverWithOptions:
(SentryOptions *)options
- (id<SentryScopeObserver>)getWatchdogTerminationScopeObserverWithOptions:(SentryOptions *)options
{
// This method is only a factory, therefore do not keep a reference.
// The scope observer will be created each time it is needed.
Expand Down
5 changes: 2 additions & 3 deletions Sources/Sentry/SentryWatchdogTerminationTrackingIntegration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ - (BOOL)installWithOptions:(SentryOptions *)options

self.appStateManager = appStateManager;

SentryWatchdogTerminationScopeObserver *scopeObserver =
[SentryDependencyContainer.sharedInstance
getWatchdogTerminationScopeObserverWithOptions:options];
id<SentryScopeObserver> scopeObserver = [SentryDependencyContainer.sharedInstance
getWatchdogTerminationScopeObserverWithOptions:options];

[SentrySDKInternal.currentHub configureScope:^(SentryScope *_Nonnull outerScope) {
// Add the observer to the scope so that it can be notified when the scope changes.
Expand Down
5 changes: 2 additions & 3 deletions Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
@class SentryScreenshotSource;
@class SentryViewHierarchyProvider;
@class SentryUIViewControllerPerformanceTracker;
@class SentryWatchdogTerminationScopeObserver;
@class SentryWatchdogTerminationAttributesProcessor;
@protocol SentryScopeObserver;
#endif // SENTRY_UIKIT_AVAILABLE

#if SENTRY_HAS_UIKIT
Expand Down Expand Up @@ -136,8 +136,7 @@ SENTRY_NO_INIT
@property (nonatomic, strong) id<SentryObjCRuntimeWrapper> objcRuntimeWrapper;

#if SENTRY_HAS_UIKIT
- (SentryWatchdogTerminationScopeObserver *)getWatchdogTerminationScopeObserverWithOptions:
(SentryOptions *)options;
- (id<SentryScopeObserver>)getWatchdogTerminationScopeObserverWithOptions:(SentryOptions *)options;
@property (nonatomic, strong)
SentryWatchdogTerminationAttributesProcessor *watchdogTerminationAttributesProcessor;
#endif
Expand Down
3 changes: 2 additions & 1 deletion Sources/Sentry/include/SentryScope+Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#import <Foundation/Foundation.h>

#import "SentryScope.h"
#import "SentryScopeObserver.h"

@class SentryAttachment;
@class SentryPropagationContext;
@class SentrySession;

@protocol SentryScopeObserver;

NS_ASSUME_NONNULL_BEGIN

@interface SentryScope ()
Expand Down
Loading