Revert "feat: Add Unsupported variant to CacheError and `ObjectFi…

…leStatus` (#1541)"

This reverts commit 2474a74.

crates/symbolicator-js/src/interface.rs

@@ -142,7 +142,6 @@ impl From<CacheError> for JsScrapingResult {
             ),
             CacheError::DownloadError(details) => (JsScrapingFailureReason::DownloadError, details),
             CacheError::Malformed(details) => (JsScrapingFailureReason::Other, details),
-            CacheError::Unsupported(details) => (JsScrapingFailureReason::Other, details),
             CacheError::InternalError => (JsScrapingFailureReason::Other, String::new()),
         };
 

crates/symbolicator-native/src/caches/ppdb_caches.rs

@@ -58,7 +58,7 @@ impl PortablePdbCacheActor {
         let found_object = self
             .objects
             .find(FindObject {
-                filetypes: &[FileType::PortablePdb, FileType::Pdb],
+                filetypes: &[FileType::PortablePdb],
                 identifier: request.identifier,
                 sources: request.sources,
                 scope: request.scope,
@@ -124,12 +124,8 @@ fn write_ppdb_cache(file: &mut File, object_handle: &ObjectHandle) -> CacheEntry
 
     let ppdb_obj = match object_handle.object() {
         Object::PortablePdb(ppdb_obj) => ppdb_obj,
-        _ => {
-            tracing::warn!("Trying to symbolicate a .NET event with a non-PPDB object file");
-            return Err(CacheError::Unsupported(
-                "Only portable PDB files can be used for .NET symbolication".to_owned(),
-            ));
-        }
+        // FIXME(swatinem): instead of panic, we should return an internal error?
+        _ => panic!("object handle does not contain a valid portable pdb object"),
     };
 
     tracing::debug!("Converting ppdb cache for {}", object_handle.cache_key);

crates/symbolicator-native/src/symbolication/module_lookup.rs

@@ -47,7 +47,6 @@ pub fn object_file_status_from_cache_entry<T>(cache_entry: &CacheEntry<T>) -> Ob
         }
         Err(CacheError::Timeout(_)) => ObjectFileStatus::Timeout,
         Err(CacheError::Malformed(_)) => ObjectFileStatus::Malformed,
-        Err(CacheError::Unsupported(_)) => ObjectFileStatus::Unsupported,
         Err(CacheError::InternalError) => ObjectFileStatus::Other,
     }
 }

crates/symbolicator-native/tests/integration/snapshots/integration__symbolication__dotnet_embedded_sources.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/symbolicator-native/tests/integration/symbolication.rs
+source: crates/symbolicator-service/tests/integration/symbolication.rs
 expression: response.unwrap()
 ---
 stacktraces:
@@ -37,10 +37,6 @@ modules:
         location: "http://localhost:<port>/symbols/portable-embedded.pdb/B6919861510C48879994943F64F70C37870b9ef9/portable-embedded.src.zip"
         download:
           status: notfound
-      - source: local
-        location: "http://localhost:<port>/symbols/portable-embedded.pdb/B6919861510C48879994943F64F70C37ffffffff/portable-embedded.pd_"
-        download:
-          status: notfound
       - source: local
         location: "http://localhost:<port>/symbols/portable-embedded.pdb/B6919861510C48879994943F64F70C37ffffffff/portable-embedded.pdb"
         download:
@@ -56,3 +52,4 @@ modules:
         location: "http://localhost:<port>/symbols/portable-embedded.pdb/B6919861510C48879994943F64F70C37ffffffff/portable-embedded.src.zip"
         download:
           status: notfound
+

crates/symbolicator-native/tests/integration/snapshots/integration__symbolication__dotnet_integration.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/symbolicator-native/tests/integration/symbolication.rs
+source: crates/symbolicator-service/tests/integration/symbolication.rs
 expression: response.unwrap()
 ---
 stacktraces:
@@ -66,10 +66,6 @@ modules:
         location: "http://localhost:<port>/symbols/integration.pdb/0C1033F78632492E91C6C314B72E1920e60b819d/integration.src.zip"
         download:
           status: notfound
-      - source: local
-        location: "http://localhost:<port>/symbols/integration.pdb/0C1033F78632492E91C6C314B72E1920ffffffff/integration.pd_"
-        download:
-          status: notfound
       - source: local
         location: "http://localhost:<port>/symbols/integration.pdb/0C1033F78632492E91C6C314B72E1920ffffffff/integration.pdb"
         download:
@@ -85,3 +81,4 @@ modules:
         location: "http://localhost:<port>/symbols/integration.pdb/0C1033F78632492E91C6C314B72E1920ffffffff/integration.src.zip"
         download:
           status: notfound
+

crates/symbolicator-native/tests/integration/snapshots/integration__symbolication__dotnet_only_source_links.snap

@@ -38,10 +38,6 @@ modules:
         location: "http://localhost:<port>/symbols/source-links.pdb/0C380A12822140698565BEE6B3AC196Ea596286e/source-links.src.zip"
         download:
           status: notfound
-      - source: local
-        location: "http://localhost:<port>/symbols/source-links.pdb/0C380A12822140698565BEE6B3AC196Effffffff/source-links.pd_"
-        download:
-          status: notfound
       - source: local
         location: "http://localhost:<port>/symbols/source-links.pdb/0C380A12822140698565BEE6B3AC196Effffffff/source-links.pdb"
         download:

crates/symbolicator-native/tests/integration/snapshots/integration__symbolication__dotnet_source_links.snap

@@ -44,10 +44,6 @@ modules:
         location: "http://localhost:<port>/symbols/source-links.pdb/37E9E8A61A8E404EB93C6902E277FF55a09672e1/source-links.src.zip"
         download:
           status: notfound
-      - source: local
-        location: "http://localhost:<port>/symbols/source-links.pdb/37E9E8A61A8E404EB93C6902E277FF55ffffffff/source-links.pd_"
-        download:
-          status: notfound
       - source: local
         location: "http://localhost:<port>/symbols/source-links.pdb/37E9E8A61A8E404EB93C6902E277FF55ffffffff/source-links.pdb"
         download:

crates/symbolicator-native/tests/integration/symbolication.rs

@@ -156,48 +156,6 @@ async fn test_dotnet_integration() {
     assert_snapshot!(response.unwrap());
 }
 
-#[tokio::test]
-async fn test_dotnet_windows_pdb() {
-    let (symbolication, _cache_dir) = setup_service(|_| ());
-    let (_srv, source) = symbol_server();
-
-    // try to symbolicate a `PE_DOTNET` event with a Windows PDB file, this should fail
-    let request = make_symbolication_request(
-        vec![source],
-        r#"[{
-          "type":"pe_dotnet",
-          "debug_file":"crash.pdb",
-          "debug_id":"3249d99d0c4049318610f4e4fb0b6936"
-        }]"#,
-        r#"[{
-          "frames":[{
-            "instruction_addr": 10,
-            "function_id": 6,
-            "addr_mode":"rel:0"
-          }, {
-            "instruction_addr": 6,
-            "function_id": 5,
-            "addr_mode": "rel:0"
-          }, {
-            "instruction_addr": 0,
-            "function_id": 3,
-            "addr_mode": "rel:0"
-          }, {
-            "instruction_addr": 0,
-            "function_id": 2,
-            "addr_mode": "rel:0"
-          }, {
-            "instruction_addr": 45,
-            "function_id": 1,
-            "addr_mode": "rel:0"
-          }]
-        }]"#,
-    );
-    let response = symbolication.symbolicate(request).await;
-
-    assert_snapshot!(response.unwrap());
-}
-
 #[tokio::test]
 async fn test_dotnet_embedded_sources() {
     let (symbolication, _cache_dir) = setup_service(|_| ());

crates/symbolicator-service/src/caching/cache_error.rs

@@ -38,14 +38,6 @@ pub enum CacheError {
     /// during symcache conversion
     #[error("malformed: {0}")]
     Malformed(String),
-    /// The object is of a type that cannot be used for the symbolication task it was
-    /// requested for.
-    ///
-    /// This is currently only used when we try to symbolicate a .NET event with a Windows
-    /// PDB file. A tracking issue in `symbolic` for supporting this case is
-    /// [here](https://github.com/getsentry/symbolic/issues/871).
-    #[error("unsupported: {0}")]
-    Unsupported(String),
     /// An unexpected error in symbolicator itself.
     ///
     /// This variant is not intended to be persisted to or read from caches.
@@ -72,7 +64,6 @@ impl CacheError {
     pub(super) const PERMISSION_DENIED_MARKER: &'static [u8] = b"permissiondenied";
     pub(super) const TIMEOUT_MARKER: &'static [u8] = b"timeout";
     pub(super) const DOWNLOAD_ERROR_MARKER: &'static [u8] = b"downloaderror";
-    pub(super) const UNSUPPORTED_MARKER: &'static [u8] = b"unsupported";
 
     /// Writes error markers and details to a file.
     ///
@@ -108,10 +99,6 @@ impl CacheError {
                 file.write_all(Self::DOWNLOAD_ERROR_MARKER).await?;
                 file.write_all(details.as_bytes()).await?;
             }
-            CacheError::Unsupported(details) => {
-                file.write_all(Self::UNSUPPORTED_MARKER).await?;
-                file.write_all(details.as_bytes()).await?;
-            }
             CacheError::InternalError => {
                 unreachable!("this was already handled above");
             }
@@ -147,9 +134,6 @@ impl CacheError {
         } else if let Some(raw_message) = bytes.strip_prefix(Self::MALFORMED_MARKER) {
             let err_msg = utf8_message(raw_message);
             Some(Self::Malformed(err_msg.into_owned()))
-        } else if let Some(raw_message) = bytes.strip_prefix(Self::UNSUPPORTED_MARKER) {
-            let err_msg = utf8_message(raw_message);
-            Some(Self::Unsupported(err_msg.into_owned()))
         } else if bytes.is_empty() {
             Some(Self::NotFound)
         } else {

crates/symbolicator-service/src/types.rs

@@ -147,12 +147,6 @@ pub enum ObjectFileStatus {
     FetchingFailed,
     /// Downloading or processing the file took too long.
     Timeout,
-    /// The file could not be used for the purpose for which it was requested.
-    ///
-    /// This is currently only used when we try to symbolicate a .NET event with a Windows
-    /// PDB file. A tracking issue in `symbolic` for supporting this case is
-    /// [here](https://github.com/getsentry/symbolic/issues/871).
-    Unsupported,
     /// An internal error while handling this image.
     Other,
 }
@@ -167,7 +161,6 @@ impl ObjectFileStatus {
             ObjectFileStatus::Malformed => "malformed",
             ObjectFileStatus::FetchingFailed => "fetching_failed",
             ObjectFileStatus::Timeout => "timeout",
-            ObjectFileStatus::Unsupported => "unsupported",
             ObjectFileStatus::Other => "other",
         }
     }