Add module to default rule names.

src/python/pants/engine/internals/engine_test.py

@@ -108,7 +108,7 @@ class Epsilon:
     pass
 
 
-@rule(canonical_name="rule_one", desc="Rule number 1", level=LogLevel.INFO)
+@rule(canonical_name="canonical_rule_one", desc="Rule number 1", level=LogLevel.INFO)
 async def rule_one_function(i: Input) -> Beta:
     """This rule should be the first one executed by the engine, and thus have no parent."""
     a = Alpha()
@@ -410,24 +410,38 @@ def test_streaming_workunits_parent_id_and_rule_metadata(self):
 
         # rule_one should complete well-after the other rules because of the artificial delay in it caused by the sleep().
         assert {item["name"] for item in tracker.finished_workunit_chunks[0]} == {
-            "rule_two",
-            "rule_three",
-            "rule_four",
+            "pants.engine.internals.engine_test.rule_two",
+            "pants.engine.internals.engine_test.rule_three",
+            "pants.engine.internals.engine_test.rule_four",
         }
 
         # Because of the artificial delay in rule_one, it should have time to be reported as
         # started but not yet finished.
         started = list(itertools.chain.from_iterable(tracker.started_workunit_chunks))
-        assert len(list(item for item in started if item["name"] == "rule_one")) > 0
+        assert len(list(item for item in started if item["name"] == "canonical_rule_one")) > 0
 
-        assert {item["name"] for item in tracker.finished_workunit_chunks[1]} == {"rule_one"}
+        assert {item["name"] for item in tracker.finished_workunit_chunks[1]} == {
+            "canonical_rule_one"
+        }
 
         finished = list(itertools.chain.from_iterable(tracker.finished_workunit_chunks))
 
-        r1 = next(item for item in finished if item["name"] == "rule_one")
-        r2 = next(item for item in finished if item["name"] == "rule_two")
-        r3 = next(item for item in finished if item["name"] == "rule_three")
-        r4 = next(item for item in finished if item["name"] == "rule_four")
+        r1 = next(item for item in finished if item["name"] == "canonical_rule_one")
+        r2 = next(
+            item
+            for item in finished
+            if item["name"] == "pants.engine.internals.engine_test.rule_two"
+        )
+        r3 = next(
+            item
+            for item in finished
+            if item["name"] == "pants.engine.internals.engine_test.rule_three"
+        )
+        r4 = next(
+            item
+            for item in finished
+            if item["name"] == "pants.engine.internals.engine_test.rule_four"
+        )
 
         # rule_one should have no parent_id because its actual parent workunit was filted based on level
         assert r1.get("parent_id", None) is None
@@ -464,12 +478,18 @@ def test_streaming_workunit_log_levels(self) -> None:
         select = next(
             item
             for item in finished
-            if item["name"] not in {"rule_one", "rule_two", "rule_three", "rule_four"}
+            if item["name"]
+            not in {
+                "canonical_rule_one",
+                "pants.engine.internals.engine_test.rule_two",
+                "pants.engine.internals.engine_test.rule_three",
+                "pants.engine.internals.engine_test.rule_four",
+            }
         )
         assert select["name"] == "select"
         assert select["level"] == "DEBUG"
 
-        r1 = next(item for item in finished if item["name"] == "rule_one")
+        r1 = next(item for item in finished if item["name"] == "canonical_rule_one")
         assert r1["parent_id"] == select["span_id"]
 
     def test_streaming_workunit_log_level_parent_rewrite(self) -> None:
@@ -493,8 +513,12 @@ def test_streaming_workunit_log_level_parent_rewrite(self) -> None:
         finished = list(itertools.chain.from_iterable(tracker.finished_workunit_chunks))
 
         assert len(finished) == 2
-        r_A = next(item for item in finished if item["name"] == "rule_A")
-        r_C = next(item for item in finished if item["name"] == "rule_C")
+        r_A = next(
+            item for item in finished if item["name"] == "pants.engine.internals.engine_test.rule_A"
+        )
+        r_C = next(
+            item for item in finished if item["name"] == "pants.engine.internals.engine_test.rule_C"
+        )
         assert "parent_id" not in r_A
         assert r_C["parent_id"] == r_A["span_id"]
 
@@ -516,9 +540,15 @@ def test_streaming_workunit_log_level_parent_rewrite(self) -> None:
         assert tracker.finished
         finished = list(itertools.chain.from_iterable(tracker.finished_workunit_chunks))
 
-        r_A = next(item for item in finished if item["name"] == "rule_A")
-        r_B = next(item for item in finished if item["name"] == "rule_B")
-        r_C = next(item for item in finished if item["name"] == "rule_C")
+        r_A = next(
+            item for item in finished if item["name"] == "pants.engine.internals.engine_test.rule_A"
+        )
+        r_B = next(
+            item for item in finished if item["name"] == "pants.engine.internals.engine_test.rule_B"
+        )
+        r_C = next(
+            item for item in finished if item["name"] == "pants.engine.internals.engine_test.rule_C"
+        )
         assert r_B["parent_id"] == r_A["span_id"]
         assert r_C["parent_id"] == r_B["span_id"]
 
@@ -551,7 +581,9 @@ def a_rule(n: int) -> ModifiedOutput:
             scheduler.product_request(ModifiedOutput, subjects=[0])
 
         finished = list(itertools.chain.from_iterable(tracker.finished_workunit_chunks))
-        workunit = next(item for item in finished if item["name"] == "a_rule")
+        workunit = next(
+            item for item in finished if item["name"] == "pants.engine.internals.engine_test.a_rule"
+        )
         assert workunit["level"] == "ERROR"
 
     def test_engine_aware_none_case(self):
@@ -585,7 +617,9 @@ def a_rule(n: int) -> ModifiedOutput:
             scheduler.product_request(ModifiedOutput, subjects=[0])
 
         finished = list(itertools.chain.from_iterable(tracker.finished_workunit_chunks))
-        workunit = next(item for item in finished if item["name"] == "a_rule")
+        workunit = next(
+            item for item in finished if item["name"] == "pants.engine.internals.engine_test.a_rule"
+        )
         assert workunit["level"] == "DEBUG"
 
 

src/python/pants/engine/rules.py

@@ -342,11 +342,11 @@ def rule_decorator(func, **kwargs) -> Callable:
     validate_parameter_types(func_id, parameter_types, cacheable)
 
     # Set a default canonical name if one is not explicitly provided. For Goal classes
-    # this is the name of the Goal; for other named ruled this is the __name__ of the function
-    # that implements it.
+    # this is the name of the Goal; for other named ruled this is the module and name of the
+    # function that implements it.
     effective_name = kwargs.get("canonical_name")
     if effective_name is None:
-        effective_name = return_type.name if is_goal_cls else func.__name__
+        effective_name = return_type.name if is_goal_cls else f"{func.__module__}.{func.__name__}"
 
     effective_desc = kwargs.get("desc")
     if effective_desc is None and is_goal_cls:

src/python/pants/engine/rules_test.py

@@ -403,7 +403,7 @@ def a_named_rule(a: int, b: str) -> bool:
             return False
 
         self.assertIsNotNone(a_named_rule.rule)
-        self.assertEqual(a_named_rule.rule.canonical_name, "a_named_rule")
+        self.assertEqual(a_named_rule.rule.canonical_name, "pants.engine.rules_test.a_named_rule")
         self.assertEqual(a_named_rule.rule.desc, None)
         self.assertEqual(a_named_rule.rule.level, LogLevel.INFO)