Skip to content

Commit

Permalink
Add more raw crash payload info to stackTrace
Browse files Browse the repository at this point in the history
  • Loading branch information
Hongyan Jiang authored and GitHub Enterprise committed Nov 16, 2023
1 parent 286d31a commit d76cdd5
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 12 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 1.6.7
- Add more raw crash payload info to stackTrace

## 1.6.6
- Fix client side crash symbolication for arm64e architecture
- Fix unit test cases that failed in command line execution
Expand Down
2 changes: 1 addition & 1 deletion InstanaAgent.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "InstanaAgent"
s.version = "1.6.6"
s.version = "1.6.7"
s.summary = "Instana iOS agent."

# This description is used to generate tags and improve search results.
Expand Down
2 changes: 1 addition & 1 deletion Sources/InstanaAgent/Configuration/Defines.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ let crashMetaKeyUserID = "ui"
let crashMetaKeyUserName = "un"
let crashMetaKeyUserEmail = "ue"

let currentInstanaCrashPayloadVersion = "0.92"
let currentInstanaCrashPayloadVersion = "0.93"
let defaultCrashViewName = "CrashView"

let maxSecondsToKeepCrashLog = (maxDaysToKeepCrashLog * 60 * 60 * 24)
2 changes: 1 addition & 1 deletion Sources/InstanaAgent/Configuration/VersionConfig.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
struct VersionConfig {
static let agentVersion = "1.6.6"
static let agentVersion = "1.6.7"
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,9 @@ struct DiagnosticSymbolicator {
}
stThread.appendFrame(name: frame.binaryName!,
address: String(format: "0x%llx", frame.address!),
offsetIntoBinaryTextSegment: String(frame.offsetIntoBinaryTextSegment!),
symbol: stSymbol,
offset: stOffset)
symbolOffset: stOffset)
}
stackTrace.appendThread(stThread: stThread)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,29 +71,36 @@ class StThread: Codable {
frames = []
}

func appendFrame(name: String, address: String, symbol: String?, offset: String?) {
frames.append(StFrame(name: name, address: address, symbol: symbol, offset: offset))
func appendFrame(name: String, address: String, offsetIntoBinaryTextSegment: String,
symbol: String?, symbolOffset: String?) {
frames.append(StFrame(name: name, address: address,
offsetIntoBinaryTextSegment: offsetIntoBinaryTextSegment,
symbol: symbol, symbolOffset: symbolOffset))
}
}

struct StFrame: Codable {
let name: String
let address: String
let address: String // raw crash payload address
let offsetIntoBinaryTextSegment: String // raw crash payload offsetIntoBinaryTextSegment
let symbol: String?
let offset: String?
let symbolOffset: String?

private enum CodingKeys: String, CodingKey {
case name = "n"
case address = "a"
case offsetIntoBinaryTextSegment = "o"
case symbol = "f"
case offset = "o"
case symbolOffset = "o2"
}

init(name: String, address: String, symbol: String?, offset: String?) {
init(name: String, address: String, offsetIntoBinaryTextSegment: String,
symbol: String?, symbolOffset: String?) {
self.name = name
self.address = address
self.offsetIntoBinaryTextSegment = offsetIntoBinaryTextSegment
self.symbol = symbol
self.offset = offset
self.symbolOffset = symbolOffset
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class InstanaSystemUtilsTests: InstanaTestCase {

func test_AgentVersion() {
// Then
AssertTrue(InstanaSystemUtils.agentVersion == "1.6.6")
AssertTrue(InstanaSystemUtils.agentVersion == "1.6.7")
}

func test_systemVersion() {
Expand Down

0 comments on commit d76cdd5

Please sign in to comment.