fix(alerts): scope thread events by their parent entity instead of bypassing filters

openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/AlertsRuleEvaluatorResourceIT.java

@@ -23,6 +23,7 @@
 import org.openmetadata.schema.entity.data.DataContract;
 import org.openmetadata.schema.entity.data.DatabaseSchema;
 import org.openmetadata.schema.entity.data.Table;
+import org.openmetadata.schema.entity.feed.Thread;
 import org.openmetadata.schema.entity.services.DatabaseService;
 import org.openmetadata.schema.entity.teams.User;
 import org.openmetadata.schema.tests.TestCase;
@@ -37,6 +38,7 @@
 import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.schema.type.EventType;
 import org.openmetadata.schema.type.FieldChange;
+import org.openmetadata.schema.type.ThreadType;
 import org.openmetadata.schema.utils.JsonUtils;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.events.subscription.AlertsRuleEvaluator;
@@ -81,6 +83,55 @@ void test_matchAnyOwnerName(TestNamespace ns) {
     assertFalse(evaluateExpression("matchAnyOwnerName('nonExistentOwner')", evaluationContext));
   }
 
+  // #30555: a thread event carries the Thread, so owner and domain must resolve its parent entity.
+  @Test
+  void test_matchAnyOwnerName_threadAboutOwnedEntity(TestNamespace ns) {
+    Table createdTable = createTableWithOwner(ns);
+    EvaluationContext evaluationContext =
+        threadEvaluationContext(createdTable.getEntityReference());
+
+    String ownerName = SharedEntities.get().USER1.getName();
+    assertTrue(evaluateExpression("matchAnyOwnerName('" + ownerName + "')", evaluationContext));
+    assertFalse(evaluateExpression("matchAnyOwnerName('nonExistentOwner')", evaluationContext));
+  }
+
+  @Test
+  void test_matchAnyDomain_threadAboutEntityInDomain(TestNamespace ns) {
+    Table createdTable = createTableInDomain(ns);
+    EvaluationContext evaluationContext =
+        threadEvaluationContext(createdTable.getEntityReference());
+
+    String domainFqn = SharedEntities.get().DOMAIN.getFullyQualifiedName();
+    assertTrue(evaluateExpression("matchAnyDomain({'" + domainFqn + "'})", evaluationContext));
+    assertFalse(evaluateExpression("matchAnyDomain({'nonExistentDomain'})", evaluationContext));
+  }
+
+  @Test
+  void test_matchAnyEntityFqn_threadAboutEntity(TestNamespace ns) {
+    Table createdTable = createTable(ns);
+    EvaluationContext evaluationContext =
+        threadEvaluationContext(createdTable.getEntityReference());
+
+    String tableFqn = createdTable.getFullyQualifiedName();
+    assertTrue(evaluateExpression("matchAnyEntityFqn({'" + tableFqn + "'})", evaluationContext));
+    assertFalse(evaluateExpression("matchAnyEntityFqn({'nonExistentFqn'})", evaluationContext));
+  }
+
+  @Test
+  void test_scopingFilters_threadAboutUnresolvableEntity() {
+    EntityReference missing =
+        new EntityReference()
+            .withId(UUID.randomUUID())
+            .withType(Entity.TABLE)
+            .withFullyQualifiedName("service.db.schema.missingTable");
+    EvaluationContext evaluationContext = threadEvaluationContext(missing);
+
+    String ownerName = SharedEntities.get().USER1.getName();
+    String domainFqn = SharedEntities.get().DOMAIN.getFullyQualifiedName();
+    assertFalse(evaluateExpression("matchAnyOwnerName('" + ownerName + "')", evaluationContext));
+    assertFalse(evaluateExpression("matchAnyDomain({'" + domainFqn + "'})", evaluationContext));
+  }
+
   @Test
   @Disabled("TestCase.getTestSuite().getFullyQualifiedName() returns null - needs investigation")
   void test_matchAnyEntityFqn(TestNamespace ns) {
@@ -694,6 +745,35 @@ private Table createTableWithOwner(TestNamespace ns) {
     return SdkClients.adminClient().tables().create(tableRequest);
   }
 
+  private Table createTableInDomain(TestNamespace ns) {
+    Table table = createTable(ns);
+    CreateTable update =
+        new CreateTable()
+            .withName(table.getName())
+            .withDatabaseSchema(table.getDatabaseSchema().getFullyQualifiedName())
+            .withColumns(table.getColumns())
+            .withDomains(List.of(SharedEntities.get().DOMAIN.getFullyQualifiedName()));
+
+    return SdkClients.adminClient().tables().createOrUpdate(update);
+  }
+
+  private EvaluationContext threadEvaluationContext(EntityReference parent) {
+    Thread thread =
+        new Thread()
+            .withId(UUID.randomUUID())
+            .withType(ThreadType.Conversation)
+            .withEntityRef(parent);
+    ChangeEvent changeEvent = new ChangeEvent();
+    changeEvent.setEntityType(Entity.THREAD);
+    changeEvent.setEventType(EventType.THREAD_CREATED);
+    changeEvent.setEntity(thread);
+
+    return SimpleEvaluationContext.forReadOnlyDataBinding()
+        .withInstanceMethods()
+        .withRootObject(new AlertsRuleEvaluator(changeEvent))
+        .build();
+  }
+
   private TestCase createTestCase(TestNamespace ns, Table table) {
     CreateTestCase createTestCase = new CreateTestCase();
     createTestCase.setName(ns.prefix("testCase"));

openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java

@@ -177,8 +177,8 @@ public static boolean shouldTriggerAlert(ChangeEvent event, FilteringRules confi
     return config.getResources().contains(event.getEntityType()); // Use Trigger Specific Settings
   }
 
-  private static final Set<String> THREAD_TYPE_RESOURCES =
-      Set.of("announcement", "task", "conversation");
+  // Announcement is its own entity since #25894; task stays until #30559 retires the legacy path.
+  private static final Set<String> THREAD_TYPE_RESOURCES = Set.of("task", "conversation");
 
   private static boolean shouldTriggerAlertForThread(ChangeEvent event, String resource) {
     Thread thread = AlertsRuleEvaluator.getThread(event);

openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java

@@ -82,6 +82,8 @@ public class AlertsRuleEvaluator {
               Entity.FIELD_DOMAINS, Include.NON_DELETED));
 
   private final ChangeEvent changeEvent;
+  private EntityReference threadSubject;
+  private boolean threadSubjectResolved;
 
   public AlertsRuleEvaluator(ChangeEvent event) {
     this.changeEvent = event;
@@ -99,9 +101,8 @@ public boolean matchAnySource(List<String> originEntities) {
       return false;
     }
 
-    // Filter does not apply to Thread Change Events
     if (changeEvent.getEntityType().equals(THREAD)) {
-      return true;
+      return threadSubjectMatchesType(originEntities);
     }
 
     String changeEventEntity = changeEvent.getEntityType();
@@ -123,10 +124,10 @@ public boolean matchAnySource(List<String> originEntities) {
   public boolean matchAnyOwnerName(List<String> ownerNameList) {
     boolean matched = false;
     if (changeEvent != null && changeEvent.getEntity() != null) {
-      // Filter does not apply to Thread Change Events
       matched =
           THREAD.equals(changeEvent.getEntityType())
-              || matchesEntityOrTestSuiteOwner(getEntity(changeEvent), ownerNameList);
+              ? threadSubjectMatchesOwner(ownerNameList)
+              : matchesEntityOrTestSuiteOwner(getEntity(changeEvent), ownerNameList);
     }
     return matched;
   }
@@ -170,9 +171,8 @@ public boolean matchAnyEntityFqn(List<String> entityFqns) {
       return false;
     }
 
-    // Filter does not apply to Thread Change Events
     if (changeEvent.getEntityType().equals(THREAD)) {
-      return true;
+      return threadSubjectMatchesFqn(entityFqns);
     }
 
     EntityInterface entity = getEntity(changeEvent);
@@ -217,18 +217,11 @@ public boolean matchAnyEntityId(List<String> entityIds) {
       return false;
     }
 
-    // Filter does not apply to Thread Change Events
     if (changeEvent.getEntityType().equals(THREAD)) {
-      return true;
+      return threadSubjectMatchesId(entityIds);
     }
 
-    EntityInterface entity = getEntity(changeEvent);
-    for (String id : entityIds) {
-      if (entity.getId().equals(UUID.fromString(id))) {
-        return true;
-      }
-    }
-    return false;
+    return matchesAnyId(getEntity(changeEvent).getId(), entityIds);
   }
 
   @Function(
@@ -494,10 +487,10 @@ public boolean matchAnyFieldChange(List<String> fieldChangeUpdate) {
   public boolean matchAnyDomain(List<String> fieldChangeUpdate) {
     boolean matched = false;
     if (changeEvent != null) {
-      // Filter does not apply to Thread Change Events
       matched =
           THREAD.equals(changeEvent.getEntityType())
-              || matchesEntityOrTestSuiteDomain(getEntity(changeEvent), fieldChangeUpdate);
+              ? threadSubjectMatchesDomain(fieldChangeUpdate)
+              : matchesEntityOrTestSuiteDomain(getEntity(changeEvent), fieldChangeUpdate);
     }
     return matched;
   }
@@ -726,6 +719,69 @@ private boolean testSuiteOwnerMatcher(List<TestSuite> testSuites, List<String> o
     return false;
   }
 
+  // Scoping filters on a thread event are about the thread's parent entity, not the thread.
+  // Memoized: every matcher in one evaluation asks for the same subject.
+  private EntityReference threadSubject() {
+    if (!threadSubjectResolved) {
+      threadSubjectResolved = true;
+      if (changeEvent.getEntity() != null) {
+        threadSubject = getThread(changeEvent).getEntityRef();
+      }
+    }
+    return threadSubject;
+  }
+
+  private boolean threadSubjectMatchesType(List<String> entityTypes) {
+    EntityReference subject = threadSubject();
+    return subject != null && entityTypes.contains(subject.getType());
+  }
+
+  private boolean threadSubjectMatchesFqn(List<String> entityFqns) {
+    EntityReference subject = threadSubject();
+    return subject != null && matchesFqnOrDescendant(subject.getFullyQualifiedName(), entityFqns);
+  }
+
+  private boolean threadSubjectMatchesId(List<String> entityIds) {
+    EntityReference subject = threadSubject();
+    return subject != null && matchesAnyId(subject.getId(), entityIds);
+  }
+
+  // A filter value that is not a UUID cannot match; throwing here would abort the whole batch.
+  private static boolean matchesAnyId(UUID entityId, List<String> entityIds) {
+    boolean matched = false;
+    for (String id : entityIds) {
+      if (entityId.equals(parseUuidOrNull(id))) {
+        matched = true;
+        break;
+      }
+    }
+    return matched;
+  }
+
+  private static UUID parseUuidOrNull(String id) {
+    UUID parsed = null;
+    try {
+      parsed = UUID.fromString(id);
+    } catch (IllegalArgumentException e) {
+      LOG.debug("Ignoring non-UUID entity id filter value '{}'", id);
+    }
+    return parsed;
+  }
+
+  private boolean threadSubjectMatchesOwner(List<String> ownerNameList) {
+    EntityInterface subject =
+        Entity.getEntityOrNull(threadSubject(), Entity.FIELD_OWNERS, Include.NON_DELETED);
+    return subject != null
+        && !nullOrEmpty(subject.getOwners())
+        && matchOwners(subject.getOwners(), ownerNameList);
+  }
+
+  private boolean threadSubjectMatchesDomain(List<String> domainFqns) {
+    EntityInterface subject =
+        Entity.getEntityOrNull(threadSubject(), Entity.FIELD_DOMAINS, Include.NON_DELETED);
+    return subject != null && matchesAnyDomainFqn(subject.getDomains(), domainFqns);
+  }
+
   private boolean matchOwners(List<EntityReference> ownerReferences, List<String> ownerNameList) {
     Set<String> ownerNames =
         ownerNameList.stream().map(EntityInterfaceUtil::unquoteName).collect(Collectors.toSet());

openmetadata-service/src/test/java/org/openmetadata/service/events/subscription/AlertUtilTest.java

@@ -161,14 +161,25 @@ void shouldTriggerAlert_taskThread_taskResource_returnsTrue() {
   }
 
   @Test
-  void shouldTriggerAlert_announcementThread_announcementResource_returnsTrue() {
+  void shouldTriggerAlert_announcementThread_announcementResource_returnsFalse() {
     Thread thread =
         new Thread()
             .withId(UUID.randomUUID())
             .withType(ThreadType.Announcement)
             .withEntityRef(new EntityReference().withId(UUID.randomUUID()).withType("table"));
     ChangeEvent event = threadChangeEvent(thread, EventType.THREAD_CREATED);
     FilteringRules config = filteringRules("announcement");
+    assertFalse(AlertUtil.shouldTriggerAlert(event, config));
+  }
+
+  @Test
+  void shouldTriggerAlert_announcementEntityEvent_announcementResource_returnsTrue() {
+    ChangeEvent event =
+        new ChangeEvent()
+            .withId(UUID.randomUUID())
+            .withEventType(EventType.ENTITY_CREATED)
+            .withEntityType("announcement");
+    FilteringRules config = filteringRules("announcement");
     assertTrue(AlertUtil.shouldTriggerAlert(event, config));
   }