chore(internal): Add packages set to SentrySdkInfo
#4598
+555
−83
There are no files selected for viewing
This file contains 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 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 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 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 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 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 |
|---|---|---|
|
|
@@ -31,7 +31,8 @@ - (instancetype)initWithId:(nullable SentryId *)eventId | |
| traceContext:(nullable SentryTraceContext *)traceContext | ||
| { | ||
| SentrySdkInfo *sdkInfo = [[SentrySdkInfo alloc] initWithName:SentryMeta.sdkName | ||
| andVersion:SentryMeta.versionString | ||
| andPackages:[SentryMeta getSdkPackages]]; | ||
|
Comment on lines
+34
to
+35
There was a problem hiding this comment.
Now that we touch both SDKInfo for the envelope header and the event payload, I think it would be great to merge the different implementations. To make this easier we could do this in an extra PR before adding the new packages implementation. |
||
| self = [self initWithId:eventId sdkInfo:sdkInfo traceContext:traceContext]; | ||
| return self; | ||
| } | ||
|
|
||
This file contains 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 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 |
|---|---|---|
| @@ -1,49 +1,32 @@ | ||
| #import "SentrySdkInfo.h" | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface SentrySdkInfo () | ||
|
|
||
| @end | ||
|
|
||
| @implementation SentrySdkInfo | ||
|
|
||
| - (instancetype)initWithName:(NSString *)name | ||
| andVersion:(NSString *)version | ||
| andPackages:(NSSet<SentrySdkPackage *> *)packages | ||
| { | ||
| if (self = [super init]) { | ||
| _name = name ?: @""; | ||
| _version = version ?: @""; | ||
| _packages = packages ?: [NSSet set]; | ||
| } | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
| - (instancetype)initWithName:(NSString *)name andVersion:(NSString *)version | ||
| { | ||
| return [self initWithName:name andVersion:version andPackages:[NSSet set]]; | ||
| } | ||
|
|
||
| - (instancetype)initWithDict:(NSDictionary *)dict | ||
| { | ||
| return [self initWithDictInternal:dict orDefaults:nil]; | ||
|
|
@@ -58,6 +41,7 @@ | |
| { | ||
| NSString *name = @""; | ||
| NSString *version = @""; | ||
| NSSet *packages = [NSSet set]; | ||
|
|
||
| if (nil != dict[@"sdk"] && [dict[@"sdk"] isKindOfClass:[NSDictionary class]]) { | ||
| NSDictionary<NSString *, id> *sdkInfoDict = dict[@"sdk"]; | ||
|
|
@@ -72,43 +56,41 @@ | |
| } else if (info && info.version) { | ||
| version = info.version; | ||
| } | ||
|
|
||
| if ([sdkInfoDict[@"packages"] isKindOfClass:[NSArray class]]) { | ||
| NSMutableSet *newPackages = [NSMutableSet set]; | ||
| for (id maybePackageDict in sdkInfoDict[@"packages"]) { | ||
| if ([maybePackageDict isKindOfClass:[NSDictionary class]]) { | ||
| SentrySdkPackage *package = | ||
| [[SentrySdkPackage alloc] initWithDict:maybePackageDict]; | ||
| if (package != nil) { | ||
| [newPackages addObject:package]; | ||
| } | ||
| } | ||
| } | ||
| packages = newPackages; | ||
| } else if (info && info.packages) { | ||
| packages = info.packages; | ||
| } | ||
| } | ||
|
|
||
| return [self initWithName:name andVersion:version andPackages:packages]; | ||
| } | ||
|
|
||
| - (NSDictionary<NSString *, id> *)serialize | ||
| { | ||
|
Comment on lines
-104
to
-107
There was a problem hiding this comment. Based on the development docs this should be an array, I don't know if this value was used anywhere, so I just updated it to the array. If it's not used I would consider removing it completely and only create packages in SentryClient (same as features, integrations...). Headers docs: https://develop.sentry.dev/sdk/data-model/envelopes/#envelope-headers SDK Info interface docs: https://develop.sentry.dev/sdk/data-model/event-payloads/sdk/ |
||
| NSMutableArray *serializedPackages = [NSMutableArray array]; | ||
| for (SentrySdkPackage *package in self.packages) { | ||
| [serializedPackages addObject:[package serialize]]; | ||
| } | ||
|
|
||
| return @{ | ||
| @"sdk" : @ { | ||
| @"name" : self.name, | ||
| @"version" : self.version, | ||
| @"packages" : serializedPackages, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
This file contains 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,13 @@ | ||
| #import "SentrySdkPackage.h" | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface SentrySdkPackage (Equality) | ||
|
There was a problem hiding this comment.
|
||
|
|
||
| - (BOOL)isEqual:(id _Nullable)object; | ||
|
|
||
| - (NSUInteger)hash; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
This file contains 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,35 @@ | ||
| #import "SentrySdkPackage+Equality.h" | ||
|
|
||
| @implementation SentrySdkPackage (Equality) | ||
|
|
||
| - (BOOL)isEqual:(id _Nullable)object | ||
| { | ||
| if (object == self) | ||
| return YES; | ||
| if ([self class] != [object class]) | ||
| return NO; | ||
|
|
||
| SentrySdkPackage *other = (SentrySdkPackage *)object; | ||
|
|
||
| if (![self.name isEqualToString:other.name]) { | ||
| return NO; | ||
| } | ||
|
|
||
| if (![self.version isEqualToString:other.version]) { | ||
| return NO; | ||
| } | ||
|
|
||
| return YES; | ||
| } | ||
|
|
||
| - (NSUInteger)hash | ||
| { | ||
| NSUInteger hash = 17; | ||
|
|
||
| hash = hash * 23 + [self.name hash]; | ||
| hash = hash * 23 + [self.version hash]; | ||
|
|
||
| return hash; | ||
| } | ||
|
|
||
| @end | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
## 8.42.0.Consider moving the entry to the
## Unreleasedsection, please.