Skip to content

internal: Remove loading integrations names from event.extra #4627

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 3 commits into from
Dec 13, 2024
Merged

internal: Remove loading integrations names from event.extra #4627

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec3f3d1
fix(envelope): SentrySdkInfo.packages should be an array
krystofwoldrich Dec 12, 2024
e3e564c
internal: Remove loading integrations names from event.extra
krystofwoldrich Dec 12, 2024
61bf0e7
Merge branch 'main' into kw/remove-integrations-from-extras
krystofwoldrich Dec 13, 2024
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@

- Improve compiler error message for missing Swift declarations due to APPLICATION_EXTENSION_API_ONLY (#4603)

### Fixes

- `SentrySdkInfo.packages` should be an array (#4626)

### Internal

- Remove loading `integrations` names from `event.extra` (#4627)

## 8.42.0-beta.2

### Fixes
Expand Down
12 changes: 5 additions & 7 deletions Sources/Sentry/SentryClient.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,16 +880,14 @@ - (void)setSdk:(SentryEvent *)event
return;
}

id integrations = event.extra[@"__sentry_sdk_integrations"];
if (!integrations) {
integrations = [SentrySDK.currentHub trimmedInstalledIntegrationNames];
NSMutableArray<NSString *> *integrations =
[SentrySDK.currentHub trimmedInstalledIntegrationNames];

#if SENTRY_HAS_UIKIT
if (self.options.enablePreWarmedAppStartTracing) {
[integrations addObject:@"PreWarmedAppStartTracing"];
}
#endif
if (self.options.enablePreWarmedAppStartTracing) {
[integrations addObject:@"PreWarmedAppStartTracing"];
}
#endif

NSArray<NSString *> *features =
[SentryEnabledFeaturesBuilder getEnabledFeaturesWithOptions:self.options];
Expand Down
10 changes: 6 additions & 4 deletions Sources/Sentry/SentrySdkInfo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,12 @@ - (nullable NSString *)getPackageName:(SentryPackageManagerOption)packageManager
if (self.packageManager != SentryPackageManagerUnkown) {
NSString *format = [self getPackageName:self.packageManager];
if (format != nil) {
sdk[@"packages"] = @{
@"name" : [NSString stringWithFormat:format, self.name],
@"version" : self.version
};
sdk[@"packages"] = @[
@{
@"name" : [NSString stringWithFormat:format, self.name],
@"version" : self.version
},
];
}
}

Expand Down
21 changes: 12 additions & 9 deletions Tests/SentryTests/Protocol/SentrySdkInfoTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ class SentrySdkInfoTests: XCTestCase {
if let sdkInfo = serialization["sdk"] as? [String: Any] {
XCTAssertEqual(3, sdkInfo.count)

let packageInfo = try XCTUnwrap(sdkInfo["packages"] as? [String: Any])
XCTAssertEqual(packageInfo["name"] as? String, "spm:getsentry/\(sdkName)")
XCTAssertEqual(packageInfo["version"] as? String, version)
let packages = try XCTUnwrap(sdkInfo["packages"] as? [[String: Any]])
XCTAssertEqual(1, packages.count)
XCTAssertEqual(packages[0]["name"] as? String, "spm:getsentry/\(sdkName)")
XCTAssertEqual(packages[0]["version"] as? String, version)
} else {
XCTFail("Serialization of SdkInfo doesn't contain sdk")
}
Expand All @@ -60,9 +61,10 @@ class SentrySdkInfoTests: XCTestCase {
if let sdkInfo = serialization["sdk"] as? [String: Any] {
XCTAssertEqual(3, sdkInfo.count)

let packageInfo = try XCTUnwrap(sdkInfo["packages"] as? [String: Any])
XCTAssertEqual(packageInfo["name"] as? String, "carthage:getsentry/\(sdkName)")
XCTAssertEqual(packageInfo["version"] as? String, version)
let packages = try XCTUnwrap(sdkInfo["packages"] as? [[String: Any]])
XCTAssertEqual(1, packages.count)
XCTAssertEqual(packages[0]["name"] as? String, "carthage:getsentry/\(sdkName)")
XCTAssertEqual(packages[0]["version"] as? String, version)
} else {
XCTFail("Serialization of SdkInfo doesn't contain sdk")
}
Expand All @@ -77,9 +79,10 @@ class SentrySdkInfoTests: XCTestCase {
if let sdkInfo = serialization["sdk"] as? [String: Any] {
XCTAssertEqual(3, sdkInfo.count)

let packageInfo = try XCTUnwrap(sdkInfo["packages"] as? [String: Any])
XCTAssertEqual(packageInfo["name"] as? String, "cocoapods:getsentry/\(sdkName)")
XCTAssertEqual(packageInfo["version"] as? String, version)
let packages = try XCTUnwrap(sdkInfo["packages"] as? [[String: Any]])
XCTAssertEqual(1, packages.count)
XCTAssertEqual(packages[0]["name"] as? String, "cocoapods:getsentry/\(sdkName)")
XCTAssertEqual(packages[0]["version"] as? String, version)
} else {
XCTFail("Serialization of SdkInfo doesn't contain sdk")
}
Expand Down
Loading