feat: Add support for tags and trace context fields for termination watch #5561
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,11 +19,6 @@ | |
|
|
||
| @interface SentryScope () | ||
|
|
||
| /** | ||
| * Set global extra -> these will be sent with every event | ||
| */ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| @_implementationOnly import _SentryPrivate | ||
|
|
||
| extension SentryScopePersistentStore { | ||
| func encode(context: [String: [String: Any]]) -> Data? { | ||
| return encode(context, "context", true) | ||
| } | ||
|
|
||
| func decodeContext(from data: Data) -> [String: [String: Any]]? { | ||
| return decode(from: data, "context") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| @_implementationOnly import _SentryPrivate | ||
|
|
||
| extension SentryScopePersistentStore { | ||
| func encode<T>(_ genericModel: T, _ name: String, _ sanitize: Bool = false) -> Data? { | ||
| var model: Any = genericModel | ||
| if sanitize { | ||
| // We need to check if the context is a valid JSON object before encoding it. | ||
| // Otherwise it will throw an unhandled `NSInvalidArgumentException` exception. | ||
| // The error handler is required but will never be executed due to Swift type safety. | ||
| guard let wrapped = genericModel as? [AnyHashable: Any], | ||
| let sanitizedModel = sentry_sanitize(wrapped) else { | ||
| SentrySDKLog.error("Failed to sanitize \(name), reason: \(name) is not valid json: \(genericModel)") | ||
| return nil | ||
| } | ||
| model = sanitizedModel | ||
| } | ||
|
|
||
| guard let data = SentrySerialization.data(withJSONObject: model) else { | ||
| SentrySDKLog.error("Failed to serialize \(name), reason: \(name) is not valid json: \(genericModel)") | ||
| return nil | ||
| } | ||
|
|
||
| return data | ||
| } | ||
|
|
||
| func decode<T>(from data: Data, _ name: String) -> [String: T]? { | ||
| guard let deserialized = SentrySerialization.deserializeDictionary(fromJsonData: data) else { | ||
| SentrySDKLog.error("Failed to deserialize \(name), reason: data is not valid json") | ||
| return nil | ||
| } | ||
|
|
||
| // `SentrySerialization` is a wrapper around `NSJSONSerialization` which returns any type of data (`id`). | ||
| // It is the casted to a `NSDictionary`, which is then casted to a `[AnyHashable: Any]` in Swift. | ||
| // | ||
| // The responsibility of validating and casting the deserialized data from any data to a dictionary is delegated | ||
| // to the `SentrySerialization` class. | ||
| // | ||
| // As this decode Tags method specifically returns a dictionary of strings, we need to ensure that | ||
| // each value is a string. | ||
| // | ||
| // If the deserialized value is not a string, something clearly went wrong and we should discard the data. | ||
|
|
||
| // Iterate through the deserialized dictionary and check if the type is a dictionary. | ||
| // When all values are strings, we can safely cast it to `T` without allocating | ||
| // additional memory (like when mapping values). | ||
| for (key, value) in deserialized { | ||
| guard value is T else { | ||
| SentrySDKLog.error("Failed to deserialize \(name), reason: value for key \(key) is not a valid string") | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| return deserialized as? [String: T] | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| @_implementationOnly import _SentryPrivate | ||
|
|
||
| extension SentryScopePersistentStore { | ||
itaybre marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| func encode(tags: [String: String]) -> Data? { | ||
| return encode(tags, "tags", false) | ||
| } | ||
|
|
||
| func decodeTags(from data: Data) -> [String: String]? { | ||
| return decode(from: data, "tags") | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| @_implementationOnly import _SentryPrivate | ||
|
|
||
| extension SentryScopePersistentStore { | ||
| func encode(user: User) -> Data? { | ||
| guard let data = SentrySerialization.data(withJSONObject: user.serialize()) else { | ||
| SentrySDKLog.error("Failed to serialize user, reason: user is not valid json: \(user)") | ||
| return nil | ||
| } | ||
| return data | ||
| } | ||
|
|
||
| func decodeUser(from data: Data) -> User? { | ||
| return decoderUserHelper(data) | ||
| } | ||
|
|
||
| // Swift compiler can't infer T, even if I try to cast it | ||
itaybre marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private func decoderUserHelper(_ data: Data) -> UserDecodable? { | ||
| return decodeFromJSONData(jsonData: data) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.