Track Pagure metrics by package name (namespace/repo)

For Pagure projects, metrics are now tracked as "rpms/python-requests" instead of just "rpms" to provide better granularity per package.

Author: majamassarini

ogr/metrics.py

@@ -98,6 +98,9 @@ def track_ogr_request(service_type: str) -> Callable[[F], F]:
     The decorated method must be called on a GitProject instance
     (which has `namespace` and `service` attributes).
 
+    For Pagure projects, the namespace is combined with the repo name
+    (e.g., "rpms/python-requests") to provide more granular metrics.
+
     Args:
         service_type: The service type (e.g., "github", "gitlab", "pagure")
 
@@ -113,6 +116,13 @@ def wrapper(self, *args, **kwargs):
             namespace = getattr(self, "namespace", None)
             if namespace:
                 try:
+                    # For Pagure, append the repo name to the namespace
+                    # to get more granular metrics (e.g., "rpms/python-requests")
+                    if service_type == "pagure":
+                        repo = getattr(self, "repo", None)
+                        if repo:
+                            namespace = f"{namespace}/{repo}"
+
                     record_ogr_request(service_type, namespace)
                 except Exception as e:
                     logger.debug(f"Failed to record metrics: {e}")

tests/unit/test_metrics.py

@@ -276,3 +276,62 @@ def get_issues(self):
             ("github", "packit"): 2,
             ("github", "rpms"): 1,
         }
+
+    def test_decorator_pagure_appends_repo_to_namespace(self):
+        """Test that Pagure decorator appends repo name to namespace."""
+        tracker = get_metrics_tracker()
+        tracker.reset()
+
+        # Create mock Pagure project with namespace and repo
+        mock_project = flexmock(namespace="rpms", repo="python-requests")
+
+        @track_ogr_request("pagure")
+        def test_method(self):
+            return "success"
+
+        result = test_method(mock_project)
+
+        assert result == "success"
+
+        counts = tracker.get_all_counts()
+        assert counts == {("pagure", "rpms/python-requests"): 1}
+
+    def test_decorator_pagure_without_repo(self):
+        """Test Pagure decorator when repo attribute is missing."""
+        tracker = get_metrics_tracker()
+        tracker.reset()
+
+        # Create mock Pagure project with only namespace
+        mock_project = flexmock(namespace="rpms")
+
+        @track_ogr_request("pagure")
+        def test_method(self):
+            return "success"
+
+        result = test_method(mock_project)
+
+        assert result == "success"
+
+        # Should fall back to just namespace when repo is missing
+        counts = tracker.get_all_counts()
+        assert counts == {("pagure", "rpms"): 1}
+
+    def test_decorator_non_pagure_does_not_append_repo(self):
+        """Test that non-Pagure services don't append repo to namespace."""
+        tracker = get_metrics_tracker()
+        tracker.reset()
+
+        # Create mock project with both namespace and repo
+        mock_project = flexmock(namespace="packit", repo="some-repo")
+
+        @track_ogr_request("github")
+        def test_method(self):
+            return "success"
+
+        result = test_method(mock_project)
+
+        assert result == "success"
+
+        # For non-Pagure services, repo should be ignored
+        counts = tracker.get_all_counts()
+        assert counts == {("github", "packit"): 1}