Skip to content

Commit 1c4c700

Browse files
noahsmartinnoahsmartin
authored
fix: Delete unused SentrySDKInfo init and cleanup code (#7001)
1 parent 2c7bc4b commit 1c4c700

File tree

6 files changed

+19
-75
lines changed

6 files changed

+19
-75
lines changed

‎Sources/Swift/Helper/SentrySdkInfo.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Foundation
66
* @note Both name and version are required.
77
* @see https://develop.sentry.dev/sdk/event-payloads/sdk/
88
*/
9-
final class SentrySdkInfo {
9+
struct SentrySdkInfo {
1010

1111
static func global() -> Self {
1212
if let options = SentrySDKInternal.currentHub().getClient()?.getOptions() {
@@ -56,12 +56,12 @@ final class SentrySdkInfo {
5656
*/
5757
let settings: SentrySDKSettings
5858

59-
convenience init(withOptions options: Options?) {
59+
init(withOptions options: Options?) {
6060
let features = SentryEnabledFeaturesBuilder.getEnabledFeatures(options: options)
6161
self.init(withEnabledFeatures: features, sendDefaultPii: options?.sendDefaultPii ?? false)
6262
}
6363

64-
convenience init(withEnabledFeatures features: [String], sendDefaultPii: Bool) {
64+
init(withEnabledFeatures features: [String], sendDefaultPii: Bool) {
6565
let integrations = SentrySDKInternal.currentHub().trimmedInstalledIntegrationNames()
6666
var packages = SentryExtraPackages.getPackages()
6767
let sdkPackage = SentrySdkPackage.global()
@@ -87,7 +87,7 @@ final class SentrySdkInfo {
8787
}
8888

8989
// swiftlint:disable cyclomatic_complexity
90-
convenience init(dict: [AnyHashable: Any]?) {
90+
init(dict: [AnyHashable: Any]?) {
9191
var name = ""
9292
var version = ""
9393
var integrations = Set<String>()

‎Sources/Swift/Helper/SentrySerializationSwift.swift‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,9 @@
110110
#endif
111111
do {
112112
let headerDictionary = try JSONSerialization.jsonObject(with: headerData) as? [String: Any]
113-
var eventId: SentryId?
114-
if let eventIdAsString = headerDictionary?["event_id"] as? String {
115-
eventId = SentryId(uuidString: eventIdAsString)
116-
}
117-
118-
var sdkInfo: SentrySdkInfo?
119-
if let sdkDict = headerDictionary?["sdk"] as? [String: Any] {
120-
sdkInfo = SentrySdkInfo(dict: sdkDict)
121-
}
122-
123-
var traceContext: TraceContext?
124-
if let traceDict = headerDictionary?["trace"] as? [String: Any] {
125-
traceContext = TraceContext(dict: traceDict)
126-
}
113+
let eventId = (headerDictionary?["event_id"] as? String).map { SentryId(uuidString: $0) }
114+
let sdkInfo = (headerDictionary?["sdk"] as? [String: Any]).map { SentrySdkInfo(dict: $0) }
115+
let traceContext = (headerDictionary?["trace"] as? [String: Any]).map { TraceContext(dict: $0) } ?? .none
127116

128117
envelopeHeader = SentryEnvelopeHeader(id: eventId,
129118
sdkInfo: sdkInfo,

‎Sources/Swift/Protocol/SentrySDKSettings.swift‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22
* Describes the settings for the Sentry SDK
33
* @see https://develop.sentry.dev/sdk/event-payloads/sdk/
44
*/
5-
final class SentrySDKSettings {
5+
struct SentrySDKSettings {
66

77
init() {
88
autoInferIP = false
99
}
10-
11-
convenience init(options: Options?) {
12-
self.init(sendDefaultPii: options?.sendDefaultPii ?? false)
13-
}
1410

1511
init(sendDefaultPii: Bool) {
1612
autoInferIP = sendDefaultPii
@@ -24,7 +20,7 @@ final class SentrySDKSettings {
2420
}
2521
}
2622

27-
var autoInferIP: Bool
23+
let autoInferIP: Bool
2824

2925
func serialize() -> NSDictionary {
3026
[

‎Sources/Swift/Tools/SentryEnvelopeHeader.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
* An event id exist if the envelope contains an event of items within it are related. i.e
5252
* Attachments
5353
*/
54-
@objc public var eventId: SentryId?
55-
var sdkInfo: SentrySdkInfo?
56-
@objc public var traceContext: TraceContext?
54+
@objc public let eventId: SentryId?
55+
let sdkInfo: SentrySdkInfo?
56+
@objc public let traceContext: TraceContext?
5757

5858
/**
5959
* The timestamp when the event was sent from the SDK as string in RFC 3339 format. Used

‎Tests/SentryTests/Protocol/SentrySDKSettingsTests.swift‎

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,6 @@ import XCTest
33

44
class SentrySDKSettingsTests: XCTestCase {
55

6-
// MARK: - initWithOptions tests
7-
8-
func testInitWithOptions_WhenOptionsNil_ReturnsDefaultSettings() {
9-
let settings = SentrySDKSettings(options: nil)
10-
11-
XCTAssertNotNil(settings)
12-
XCTAssertFalse(settings.autoInferIP)
13-
}
14-
15-
func testInitWithOptions_WhenSendDefaultPiiTrue_SetsAutoInferIPToTrue() throws {
16-
let options = try XCTUnwrap(SentryOptionsInternal.initWithDict([
17-
"dsn": "https://username:[email protected]/12345",
18-
"sendDefaultPii": true
19-
]))
20-
21-
XCTAssertNotNil(options)
22-
23-
let settings = SentrySDKSettings(options: options)
24-
25-
XCTAssertNotNil(settings)
26-
XCTAssertTrue(settings.autoInferIP)
27-
}
28-
29-
func testInitWithOptions_WhenSendDefaultPiiFalse_SetsAutoInferIPToFalse() throws {
30-
let options = try XCTUnwrap(SentryOptionsInternal.initWithDict([
31-
"dsn": "https://username:[email protected]/12345",
32-
"sendDefaultPii": false
33-
]))
34-
35-
XCTAssertNotNil(options)
36-
37-
let settings = SentrySDKSettings(options: options)
38-
39-
XCTAssertNotNil(settings)
40-
XCTAssertFalse(settings.autoInferIP)
41-
}
42-
436
// MARK: - initWithDict tests
447

458
func testInitWithDict_WhenInferIpIsAuto_SetsAutoInferIPToTrue() {
@@ -119,8 +82,7 @@ class SentrySDKSettingsTests: XCTestCase {
11982
}
12083

12184
func testSerialize_WhenAutoInferIPIsSetDirectly_ReturnsCorrectDictionary() {
122-
let settings = SentrySDKSettings()
123-
settings.autoInferIP = true
85+
let settings = SentrySDKSettings(sendDefaultPii: true)
12486

12587
let serialized = settings.serialize()
12688

@@ -129,8 +91,7 @@ class SentrySDKSettingsTests: XCTestCase {
12991
}
13092

13193
func testSerialize_WhenAutoInferIPIsSetToFalseDirectly_ReturnsCorrectDictionary() {
132-
let settings = SentrySDKSettings()
133-
settings.autoInferIP = false
94+
let settings = SentrySDKSettings(sendDefaultPii: false)
13495

13596
let serialized = settings.serialize()
13697

@@ -141,17 +102,17 @@ class SentrySDKSettingsTests: XCTestCase {
141102
// MARK: - autoInferIP property tests
142103

143104
func testAutoInferIPProperty_CanBeSetAndRetrieved() {
144-
let settings = SentrySDKSettings()
105+
var settings = SentrySDKSettings()
145106

146107
// Test default value
147108
XCTAssertFalse(settings.autoInferIP)
148109

149110
// Test setting to true
150-
settings.autoInferIP = true
111+
settings = SentrySDKSettings(sendDefaultPii: true)
151112
XCTAssertTrue(settings.autoInferIP)
152113

153114
// Test setting to false
154-
settings.autoInferIP = false
115+
settings = SentrySDKSettings(sendDefaultPii: false)
155116
XCTAssertFalse(settings.autoInferIP)
156117
}
157118

‎Tests/SentryTests/Protocol/SentrySdkInfoTests.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ class SentrySdkInfoTests: XCTestCase {
171171

172172
func testInitWithDict_SdkInfo() {
173173
let version = "10.3.1"
174-
let settings = SentrySDKSettings()
175-
settings.autoInferIP = true
174+
let settings = SentrySDKSettings(sendDefaultPii: true)
176175
let expected = SentrySdkInfo(
177176
name: sdkName,
178177
version: version,
@@ -292,8 +291,7 @@ class SentrySdkInfoTests: XCTestCase {
292291

293292
func testInitWithDict_WrongTypesInArrays() {
294293
let version = "10.3.1"
295-
let settings = SentrySDKSettings(dict: [:])
296-
settings.autoInferIP = false
294+
let settings = SentrySDKSettings(sendDefaultPii: false)
297295
let expected = SentrySdkInfo(
298296
name: sdkName,
299297
version: version,

0 commit comments

Comments
 (0)