fix: Include running_platform in by.version key paths

The export_redis_metrics function creates keys with the format:
{prefix}/{test}/{by_variant}/benchmark_end/{running_platform}/{setup}/{metric}

But tests were expecting keys without running_platform:
{prefix}/{test}/{by_variant}/benchmark_end/{setup}/{metric}

This fixes all 6 failing tests by adding running_platform to the expected key format.
Also removes debug print statements that helped diagnose the issue.

Author: slice4e

redis_benchmarks_specification/__common__/runner.py

@@ -275,12 +275,6 @@ def export_redis_metrics(
         by_variants["by.branch/{}".format(tf_github_branch)] = {
             "branch": tf_github_branch
         }
-    print(
-        f"DEBUG export_redis_metrics: artifact_version={artifact_version!r} (type={type(artifact_version)}), git_hash={git_hash!r}, tf_github_branch={tf_github_branch!r}"
-    )
-    logging.info(
-        f"export_redis_metrics: artifact_version={artifact_version} (type={type(artifact_version)}), git_hash={git_hash}, tf_github_branch={tf_github_branch}"
-    )
     if git_hash is not None and git_hash != "":
         by_variants["by.hash/{}".format(git_hash)] = {"hash": git_hash}
         if artifact_version is not None and artifact_version != "":
@@ -289,13 +283,6 @@ def export_redis_metrics(
         by_variants["by.version/{}".format(artifact_version)] = {
             "version": artifact_version
         }
-        print(f"DEBUG: Created by.version variant for version: {artifact_version!r}")
-        logging.info(f"Created by.version variant for version: {artifact_version}")
-    else:
-        print(f"DEBUG: Skipping by.version - artifact_version={artifact_version!r}")
-        logging.warning(
-            f"Skipping by.version variant creation: artifact_version={artifact_version}"
-        )
     for (
         by_variant,
         variant_labels_dict,

utils/tests/test_self_contained_coordinator_memtier.py

@@ -334,7 +334,7 @@ def test_self_contained_coordinator_dockerhub_preload():
             assert result == True
             assert number_processed_streams == 1
             assert num_process_test_suites == 1
-            by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-generic-touch-pipeline-10/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+            by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-generic-touch-pipeline-10/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
             assert datasink_conn.exists(by_version_key)
             rts = datasink_conn.ts()
             # check we have by version metrics
@@ -465,7 +465,7 @@ def test_self_contained_coordinator_dockerhub():
             assert result == True
             assert number_processed_streams == 1
             assert num_process_test_suites == 1
-            by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+            by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
             assert datasink_conn.exists(by_version_key)
             rts = datasink_conn.ts()
             # check we have by version metrics
@@ -596,7 +596,7 @@ def test_self_contained_coordinator_dockerhub_iothreads():
             assert result == True
             assert number_processed_streams == 1
             assert num_process_test_suites == 1
-            by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone-02-io-threads/memory_maxmemory"
+            by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone-02-io-threads/memory_maxmemory"
             assert datasink_conn.exists(by_version_key)
             rts = datasink_conn.ts()
             # check we have by version metrics
@@ -735,7 +735,7 @@ def test_self_contained_coordinator_dockerhub_valkey():
             assert result == True
             assert number_processed_streams == 1
             assert num_process_test_suites == 1
-            by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+            by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
             assert datasink_conn.exists(by_version_key)
             rts = datasink_conn.ts()
             # check we have by version metrics
@@ -873,7 +873,7 @@ def test_dockerhub_via_cli():
         assert result == True
         assert number_processed_streams == 1
         assert num_process_test_suites == 1
-        by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+        by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
         assert datasink_conn.exists(by_version_key)
         rts = datasink_conn.ts()
         # check we have by version metrics
@@ -1007,7 +1007,7 @@ def test_dockerhub_via_cli_airgap():
         assert result == True
         assert number_processed_streams == 1
         assert num_process_test_suites == 1
-        by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+        by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
         assert datasink_conn.exists(by_version_key)
         rts = datasink_conn.ts()
         # check we have by version metrics