Revert "feat: Add support for tags and trace context fields for termination watch (getsentry#5561)"

This reverts commit 186f06f.

Author: philipsawyerdd

CHANGELOG.md

@@ -83,6 +83,7 @@
 - Improve launch profile configuration management (#5318)
 - Deprecate getStoreEndpoint (#5591)
 - Record user for watchdog termination events (#5558)
+- Add support for dist and environment fields for termination watch (#5560)
 
 ## 8.53.1
 

Sentry.xcodeproj/project.pbxproj

@@ -1027,6 +1027,7 @@
 		F452438A2DE65968003E8F50 /* ExceptionCatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = F45243862DE65968003E8F50 /* ExceptionCatcher.h */; };
 		F452438C2DE65BC0003E8F50 /* SentryUseNSExceptionCallstackWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = F452438B2DE65BC0003E8F50 /* SentryUseNSExceptionCallstackWrapper.h */; };
 		F458D1132E180BB00028273E /* SentryFileManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F458D1122E180BB00028273E /* SentryFileManagerProtocol.swift */; };
+		F458D1152E1869AD0028273E /* SentryScopePersistentStore+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = F458D1142E1869AD0028273E /* SentryScopePersistentStore+String.swift */; };
 		F49D41982DEA27AF00D9244E /* SentryUseNSExceptionCallstackWrapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F49D41972DEA27AF00D9244E /* SentryUseNSExceptionCallstackWrapperTests.swift */; };
 		F49D419A2DEA2FB000D9244E /* SentryCrashExceptionApplicationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F49D41992DEA2FB000D9244E /* SentryCrashExceptionApplicationTests.swift */; };
 		F49D419C2DEA30C300D9244E /* SentryCrashExceptionApplicationHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = F49D419B2DEA30B800D9244E /* SentryCrashExceptionApplicationHelper.h */; };
@@ -2290,6 +2291,7 @@
 		F45243872DE65968003E8F50 /* ExceptionCatcher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExceptionCatcher.m; sourceTree = "<group>"; };
 		F452438B2DE65BC0003E8F50 /* SentryUseNSExceptionCallstackWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryUseNSExceptionCallstackWrapper.h; path = include/SentryUseNSExceptionCallstackWrapper.h; sourceTree = "<group>"; };
 		F458D1122E180BB00028273E /* SentryFileManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFileManagerProtocol.swift; sourceTree = "<group>"; };
+		F458D1142E1869AD0028273E /* SentryScopePersistentStore+String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+String.swift"; sourceTree = "<group>"; };
 		F49D41972DEA27AF00D9244E /* SentryUseNSExceptionCallstackWrapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUseNSExceptionCallstackWrapperTests.swift; sourceTree = "<group>"; };
 		F49D41992DEA2FB000D9244E /* SentryCrashExceptionApplicationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashExceptionApplicationTests.swift; sourceTree = "<group>"; };
 		F49D419B2DEA30B800D9244E /* SentryCrashExceptionApplicationHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryCrashExceptionApplicationHelper.h; path = include/SentryCrashExceptionApplicationHelper.h; sourceTree = "<group>"; };
@@ -4039,6 +4041,7 @@
 			isa = PBXGroup;
 			children = (
 				F4E3DCCA2E1579240093CB80 /* SentryScopePersistentStore.swift */,
+				F458D1142E1869AD0028273E /* SentryScopePersistentStore+String.swift */,
 			);
 			path = Persistence;
 			sourceTree = "<group>";

Sources/Sentry/SentryWatchdogTerminationScopeObserver.m

@@ -79,7 +79,7 @@ - (void)setLevel:(enum SentryLevel)level
 
 - (void)setTags:(nullable NSDictionary<NSString *, NSString *> *)tags
 {
-    [self.attributesProcessor setTags:tags];
+    // Left blank on purpose
 }
 
 - (void)setUser:(nullable SentryUser *)user
@@ -89,9 +89,7 @@ - (void)setUser:(nullable SentryUser *)user
 
 - (void)setTraceContext:(nullable NSDictionary<NSString *, id> *)traceContext
 {
-    // Nothing to do here, Trace Context is not persisted for watchdog termination events
-    // On regular events, we have the current trace in memory, but there isn't time to persist one
-    // in watchdog termination events
+    // Left blank on purpose
 }
 
 @end

Sources/Sentry/SentryWatchdogTerminationTracker.m

@@ -58,6 +58,8 @@ - (void)start
             [self addBreadcrumbsToEvent:event];
             [self addContextToEvent:event];
             event.user = [self.scopePersistentStore readPreviousUserFromDisk];
+            event.dist = [self.scopePersistentStore readPreviousDistFromDisk];
+            event.environment = [self.scopePersistentStore readPreviousEnvironmentFromDisk];
 
             SentryException *exception =
                 [[SentryException alloc] initWithValue:SentryWatchdogTerminationExceptionValue

Sources/Sentry/SentryWatchdogTerminationTrackingIntegration.m

@@ -97,6 +97,8 @@ - (BOOL)installWithOptions:(SentryOptions *)options
         // before installation.
         [scopeObserver setContext:outerScope.contextDictionary];
         [scopeObserver setUser:outerScope.userObject];
+        [scopeObserver setEnvironment:outerScope.environmentString];
+        [scopeObserver setDist:outerScope.distString];
     }];
 
     return YES;

Sources/Swift/Integrations/WatchdogTerminations/Processors/SentryWatchdogTerminationAttributesProcessor.swift

@@ -36,6 +36,18 @@ import Foundation
         }
     }
 
+    public func setDist(_ dist: String?) {
+        setData(data: dist, field: .dist) { [weak self] data in
+            self?.scopePersistentStore.writeDistToDisk(dist: data)
+        }
+    }
+    
+    public func setEnvironment(_ environment: String?) {
+        setData(data: environment, field: .environment) { [weak self] data in
+            self?.scopePersistentStore.writeEnvironmentToDisk(environment: data)
+        }
+    }
+    
     // MARK: - Private
     private func setData<T>(data: T?, field: SentryScopeField, save: @escaping (T) -> Void) {
         SentrySDKLog.debug("Setting \(field.name) in background queue: \(String(describing: data))")