diff --git a/PKG-INFO b/PKG-INFO index 538e7cbd5b38935b98ed34ed95db68549ca0fb59..2a44df2fba4c52f199547365932831bb0175cd91 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: swh.loader.git -Version: 1.9.0 +Version: 1.9.1 Summary: Software Heritage git loader Home-page: https://forge.softwareheritage.org/diffusion/DLDG/ Author: Software Heritage developers diff --git a/swh.loader.git.egg-info/PKG-INFO b/swh.loader.git.egg-info/PKG-INFO index 538e7cbd5b38935b98ed34ed95db68549ca0fb59..2a44df2fba4c52f199547365932831bb0175cd91 100644 --- a/swh.loader.git.egg-info/PKG-INFO +++ b/swh.loader.git.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: swh.loader.git -Version: 1.9.0 +Version: 1.9.1 Summary: Software Heritage git loader Home-page: https://forge.softwareheritage.org/diffusion/DLDG/ Author: Software Heritage developers diff --git a/swh/loader/git/base.py b/swh/loader/git/base.py index 10f42bb029e017806753c80008b3aff12898316c..b92060b2c6dac3fcda750fd9dcf79b045f08caa9 100644 --- a/swh/loader/git/base.py +++ b/swh/loader/git/base.py @@ -121,7 +121,9 @@ class BaseGitLoader(BaseLoader): tags = {"object_type": object_type} # unweighted average - self.statsd_average("filtered_objects_percent", filtered / total, tags=tags) + self.statsd.histogram( + "filtered_objects_percent", filtered / total, tags=tags + ) # average weighted by total self.statsd.increment("filtered_objects_total_sum", filtered, tags=tags) diff --git a/swh/loader/git/tests/test_loader.py b/swh/loader/git/tests/test_loader.py index dbaca4503e0f02eb386df4a363001667de23e546..62f7131d37b15406054870de16a4737db971743a 100644 --- a/swh/loader/git/tests/test_loader.py +++ b/swh/loader/git/tests/test_loader.py @@ -128,23 +128,18 @@ class TestGitLoader(FullGitLoaderTests, CommonGitLoaderNotFound): ] total_sum_name = "filtered_objects_total_sum" total_count_name = "filtered_objects_total_count" - percent_sum_name = "filtered_objects_percent_sum" - percent_count_name = "filtered_objects_percent_count" + percent_name = "filtered_objects_percent" assert [c for c in statsd_calls if c[1][0].startswith("filtered_")] == [ - call(percent_sum_name, "c", 0.0, {"object_type": "content"}, 1), - call(percent_count_name, "c", 1, {"object_type": "content"}, 1), + call(percent_name, "h", 0.0, {"object_type": "content"}, 1), call(total_sum_name, "c", 0, {"object_type": "content"}, 1), call(total_count_name, "c", 4, {"object_type": "content"}, 1), - call(percent_sum_name, "c", 0.0, {"object_type": "directory"}, 1), - call(percent_count_name, "c", 1, {"object_type": "directory"}, 1), + call(percent_name, "h", 0.0, {"object_type": "directory"}, 1), call(total_sum_name, "c", 0, {"object_type": "directory"}, 1), call(total_count_name, "c", 7, {"object_type": "directory"}, 1), - call(percent_sum_name, "c", 0.0, {"object_type": "revision"}, 1), - call(percent_count_name, "c", 1, {"object_type": "revision"}, 1), + call(percent_name, "h", 0.0, {"object_type": "revision"}, 1), call(total_sum_name, "c", 0, {"object_type": "revision"}, 1), call(total_count_name, "c", 7, {"object_type": "revision"}, 1), - call(percent_sum_name, "c", 0.0, {"object_type": "snapshot"}, 1), - call(percent_count_name, "c", 1, {"object_type": "snapshot"}, 1), + call(percent_name, "h", 0.0, {"object_type": "snapshot"}, 1), call(total_sum_name, "c", 0, {"object_type": "snapshot"}, 1), call(total_count_name, "c", 1, {"object_type": "snapshot"}, 1), ] @@ -200,23 +195,18 @@ class TestGitLoader(FullGitLoaderTests, CommonGitLoaderNotFound): ] total_sum_name = "filtered_objects_total_sum" total_count_name = "filtered_objects_total_count" - percent_sum_name = "filtered_objects_percent_sum" - percent_count_name = "filtered_objects_percent_count" + percent_name = "filtered_objects_percent" assert [c for c in statsd_calls if c[1][0].startswith("filtered_")] == [ - call(percent_sum_name, "c", 1 / 4, {"object_type": "content"}, 1), - call(percent_count_name, "c", 1, {"object_type": "content"}, 1), + call(percent_name, "h", 1 / 4, {"object_type": "content"}, 1), call(total_sum_name, "c", 1, {"object_type": "content"}, 1), call(total_count_name, "c", 4, {"object_type": "content"}, 1), - call(percent_sum_name, "c", 3 / 7, {"object_type": "directory"}, 1), - call(percent_count_name, "c", 1, {"object_type": "directory"}, 1), + call(percent_name, "h", 3 / 7, {"object_type": "directory"}, 1), call(total_sum_name, "c", 3, {"object_type": "directory"}, 1), call(total_count_name, "c", 7, {"object_type": "directory"}, 1), - call(percent_sum_name, "c", 2 / 7, {"object_type": "revision"}, 1), - call(percent_count_name, "c", 1, {"object_type": "revision"}, 1), + call(percent_name, "h", 2 / 7, {"object_type": "revision"}, 1), call(total_sum_name, "c", 2, {"object_type": "revision"}, 1), call(total_count_name, "c", 7, {"object_type": "revision"}, 1), - call(percent_sum_name, "c", 0.0, {"object_type": "snapshot"}, 1), - call(percent_count_name, "c", 1, {"object_type": "snapshot"}, 1), + call(percent_name, "h", 0.0, {"object_type": "snapshot"}, 1), call(total_sum_name, "c", 0, {"object_type": "snapshot"}, 1), call(total_count_name, "c", 1, {"object_type": "snapshot"}, 1), ]