Skip to content

Commit 68a0253

Browse files
authored
Merge pull request #91 from getsentry/feature/reverse-frames
Reverse frames in stacktrace, Remove in_app from stacktrace
2 parents 73da898 + b9d6f22 commit 68a0253

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

SentrySwift.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SentrySwift"
3-
s.version = "1.1.0"
3+
s.version = "1.2.0"
44
s.summary = "Swift client for Sentry"
55
s.homepage = "https://github.com/getsentry/sentry-swift"
66
s.license = "mit"

SentrySwift/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.0</string>
18+
<string>1.2.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

SentrySwiftTests/SentrySwiftCrashTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,9 @@ class SentrySwiftCrashTests: XCTestCase {
160160
XCTAssertEqual(thread0Frames[0].instructionAddress, "0x3157e63d")
161161
XCTAssertEqual(thread0Frames[0].symbolAddress, "0x3157e5dc")
162162
XCTAssertEqual(thread0Frames[0].imageAddress, "0x314e0000")
163-
XCTAssertEqual(thread0Frames[0].inApp, false)
164163
XCTAssertEqual(thread0Frames[1].instructionAddress, "0x35099c5d")
165164
XCTAssertEqual(thread0Frames[1].symbolAddress, "0x35099c44")
166165
XCTAssertEqual(thread0Frames[1].imageAddress, "0x35095000")
167-
XCTAssertEqual(thread0Frames[1].inApp, true)
168166

169167
// Thread 1
170168
let thread1 = threads[1]

Sources/Sentry.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ internal enum SentryError: Error {
6565
// MARK: - Enums
6666

6767
internal struct Info {
68-
static let version: String = "1.1.0"
68+
static let version: String = "1.2.0"
6969
static let sentryVersion: Int = 7
7070
}
7171

Sources/Stacktrace.swift

+7-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import Foundation
1919
}
2020

2121
let frames = (appleCrashTreadBacktraceDict["contents"] as? [[String: AnyObject]])?
22-
.flatMap({Frame(appleCrashFrameDict: $0, binaryImages: binaryImages)})
22+
.flatMap({ Frame(appleCrashFrameDict: $0, binaryImages: binaryImages) })
2323
self.init(frames: frames)
2424

2525
}
@@ -33,8 +33,13 @@ import Foundation
3333
extension Stacktrace: EventSerializable {
3434
internal typealias SerializedType = SerializedTypeDictionary
3535
internal var serialized: SerializedType {
36+
#if swift(>=3.0)
3637
return [:]
37-
.set("frames", value: frames.map({$0.serialized}))
38+
.set("frames", value: frames.reversed().map({ $0.serialized }))
39+
#else
40+
return [:]
41+
.set("frames", value: frames.reverse().map({ $0.serialized }))
42+
#endif
3843
}
3944
}
4045

@@ -50,7 +55,6 @@ extension Stacktrace: EventSerializable {
5055
public var platform: String?
5156
public var instructionAddress: String?
5257
public var symbolAddress: String?
53-
public var inApp: Bool?
5458

5559
var fileName: String? {
5660
guard let file = file else { return nil }
@@ -85,12 +89,6 @@ extension Stacktrace: EventSerializable {
8589
self.init()
8690

8791
self.function = frameDict["symbol_name"] as? String
88-
89-
#if swift(>=3.0)
90-
self.inApp = binaryImage.name?.contains("/Bundle/Application/") ?? false
91-
#else
92-
self.inApp = binaryImage.name?.containsString("/Bundle/Application/") ?? false
93-
#endif
9492
self.package = binaryImage.name
9593

9694
self.imageAddress = BinaryImage.getHexAddress(binaryImage.imageAddress)
@@ -117,7 +115,6 @@ extension Frame: EventSerializable {
117115
attributes.append(("image_addr", imageAddress))
118116
attributes.append(("instruction_addr", instructionAddress))
119117
attributes.append(("symbol_addr", symbolAddress))
120-
attributes.append(("in_app", inApp))
121118

122119
return convertAttributes(attributes)
123120
}

0 commit comments

Comments
 (0)