Allow tags without specified category to be 'non-generic'

Summary: Most 'unspecified' tags (tags associated with both input and infra errors) should be excluded from category keys ('generic'), but not all. IO_EDEN should be unspecified but not generic in order to correctly attribute eden errors (via source_area).

Reviewed By: iguridi

Differential Revision: D71503398

fbshipit-source-id: 7b2bb2da7b82e1f81dbd9fda56f1dc2d87ad487e

Author: christolliday

app/buck2_error/src/classify.rs

@@ -38,6 +38,15 @@ pub enum Tier {
 struct TagMetadata {
     category: Option<Tier>,
     rank: u32,
+    // If true and an error includes non-generic tags,
+    // generic tags will be excluded from category key.
+    generic: bool,
+}
+
+impl TagMetadata {
+    fn generic(self, generic: bool) -> Self {
+        Self { generic, ..self }
+    }
 }
 
 macro_rules! rank {
@@ -46,18 +55,22 @@ macro_rules! rank {
             "environment" => TagMetadata {
                 category: Some(Tier::Environment),
                 rank: line!(),
+                generic: false,
             },
             "tier0" => TagMetadata {
                 category: Some(Tier::Tier0),
                 rank: line!(),
+                generic: false,
             },
             "input" => TagMetadata {
                 category: Some(Tier::Input),
                 rank: line!(),
+                generic: false,
             },
             "unspecified" => TagMetadata {
                 category: None,
                 rank: line!(),
+                generic: true,
             },
             _ => unreachable!(),
         }
@@ -187,18 +200,19 @@ fn tag_metadata(tag: ErrorTag) -> TagMetadata {
 
         ErrorTag::Input => rank!(input),
 
-        // Generic tags, these can represent:
+        // Tags with unspecified category, these can represent:
         // - Tags not specific enough to determine infra vs user categorization.
         // - Tags not specific enough to usefully disambiguate category keys.
         // - Something that isn't actually an error.
         // - A phase of the build.
+        // By default these are generic (excluded from category keys)
         ErrorTag::ClientGrpc => rank!(unspecified),
         ErrorTag::IoBrokenPipe => rank!(unspecified),
         ErrorTag::IoWindowsSharingViolation => rank!(unspecified),
         ErrorTag::IoNotFound => rank!(unspecified),
         ErrorTag::IoSource => rank!(unspecified),
         ErrorTag::IoSystem => rank!(unspecified),
-        ErrorTag::IoEden => rank!(unspecified),
+        ErrorTag::IoEden => rank!(unspecified).generic(false),
         ErrorTag::IoEdenConnectionError => rank!(unspecified),
         ErrorTag::IoEdenRequestError => rank!(unspecified),
         ErrorTag::IoEdenUnknownField => rank!(unspecified),
@@ -225,7 +239,7 @@ pub fn tag_is_generic(tag: &ErrorTag) -> bool {
     if tag_is_hidden(tag) {
         return true;
     }
-    tag_metadata(*tag).category.is_none()
+    tag_metadata(*tag).generic
 }
 
 /// Hidden tags only used internally, for categorization.

tests/core/build/test_error_categorization.py

@@ -402,4 +402,4 @@ async def test_eden_io_error_tagging(buck: Buck, tmp_path: Path) -> None:
     [error] = errors
 
     assert "IO_EDEN" in error["tags"]
-    assert error["category_key"] == "IO_PERMISSION_DENIED"
+    assert error["category_key"] == "IO_EDEN:IO_PERMISSION_DENIED"