ref: Update dependencies including symbolic (#1056)

This updates symbolic to a version that has `SourceFileDescriptor`s.
getsentry · Feb 23, 2023 · a047b46 · a047b46
1 parent 9a81498
commit a047b46
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 138 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/process-event/Cargo.toml b/crates/process-event/Cargo.toml
@@ -12,4 +12,4 @@ reqwest = { version = "0.11.0", features = ["blocking", "json", "multipart", "tr
 serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.81"
 structopt = "0.3.21"
-symbolic-common = "11.0.0"
+symbolic-common = "12.0.0"
diff --git a/crates/symbolicator-crash/Cargo.toml b/crates/symbolicator-crash/Cargo.toml
@@ -13,5 +13,5 @@ publish = false
 [dependencies]
 
 [build-dependencies]
-bindgen = "0.63.0"
+bindgen = "0.64.0"
 cmake = { version = "0.1.46" }
diff --git a/crates/symbolicator-service/Cargo.toml b/crates/symbolicator-service/Cargo.toml
@@ -39,7 +39,7 @@ serde_json = "1.0.81"
 serde_yaml = "0.9.14"
 sha2 = "0.10.6"
 sourcemap = "6.2.1"
-symbolic = { version = "11.0.0", features = ["cfi", "common-serde", "debuginfo", "demangle", "sourcemapcache", "symcache", "il2cpp", "ppdb"] }
+symbolic = { version = "12.0.0", features = ["cfi", "common-serde", "debuginfo", "demangle", "sourcemapcache", "symcache", "il2cpp", "ppdb"] }
 symbolicator-sources = { path = "../symbolicator-sources" }
 tempfile = "3.2.0"
 thiserror = "1.0.31"

diff --git a/crates/symbolicator-service/src/services/module_lookup.rs b/crates/symbolicator-service/src/services/module_lookup.rs
@@ -393,7 +393,9 @@ impl ModuleLookup {
 
         let entry = self.get_module_by_addr(frame.instruction_addr.0, frame.addr_mode)?;
         let session = debug_sessions.get(&entry.module_index)?.as_ref()?;
-        let source = session.source_by_path(abs_path).ok()??;
+        let source_descriptor = session.source_by_path(abs_path).ok()??;
+        // TODO: add support for source links via `source_descriptor.url()`
+        let source = source_descriptor.contents()?;
 
         let start_line = lineno.saturating_sub(num_lines);
         let line_diff = lineno - start_line;

diff --git a/crates/symbolicator-sources/Cargo.toml b/crates/symbolicator-sources/Cargo.toml
@@ -12,7 +12,7 @@ aws-types = { version = "0.52.0", features = ["hardcoded-credentials"] }
 glob = "0.3.0"
 lazy_static = "1.4.0"
 serde = { version = "1.0.137", features = ["derive", "rc"] }
-symbolic = "11.0.0"
+symbolic = "12.0.0"
 url = { version = "2.2.0", features = ["serde"] }
 
 [dev-dependencies]

diff --git a/crates/symbolicator/Cargo.toml b/crates/symbolicator/Cargo.toml
@@ -20,7 +20,7 @@ sentry = { version = "0.29.1", features = ["anyhow", "debug-images", "tracing",
 serde = { version = "1.0.137", features = ["derive", "rc"] }
 serde_json = "1.0.81"
 structopt = "0.3.21"
-symbolic = "11.0.0"
+symbolic = "12.0.0"
 symbolicator-crash = { path = "../symbolicator-crash", optional = true }
 symbolicator-service = { path = "../symbolicator-service" }
 symbolicator-sources = { path = "../symbolicator-sources" }

diff --git a/crates/symbolicli/Cargo.toml b/crates/symbolicli/Cargo.toml
@@ -14,7 +14,7 @@ reqwest = { version = "0.11.12", features = ["json"] }
 serde = { version = "1.0.137", features = ["derive", "rc"] }
 serde_json = "1.0.81"
 serde_yaml = "0.9.14"
-symbolic = "11.0.0"
+symbolic = "12.0.0"
 symbolicator-service = { path = "../symbolicator-service" }
 symbolicator-sources = { path = "../symbolicator-sources" }
 tempfile = "3.3.0"

diff --git a/crates/symsorter/Cargo.toml b/crates/symsorter/Cargo.toml
@@ -15,7 +15,7 @@ regex = "1.5.5"
 serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.81"
 structopt = "0.3.21"
-symbolic = { version = "11.0.0", features = ["debuginfo-serde"] }
+symbolic = { version = "12.0.0", features = ["debuginfo-serde"] }
 walkdir = "2.3.1"
 # NOTE: zip:0.6 by default depends on a version of zstd which conflicts with our other dependencies
 zip = { version = "0.6.2", default-features = false, features = ["deflate", "bzip2"] }