redis-benchmarks-specification 0.1.297__tar.gz → 0.1.298__tar.gz

{redis_benchmarks_specification-0.1.297 → redis_benchmarks_specification-0.1.298}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redis-benchmarks-specification
-Version: 0.1.297
+Version: 0.1.298
 Summary: The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute.
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redis_benchmarks_specification-0.1.297 → redis_benchmarks_specification-0.1.298}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redis-benchmarks-specification"
-version = "0.1.297"
+version = "0.1.298"
 description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "Readme.md"

{redis_benchmarks_specification-0.1.297 → redis_benchmarks_specification-0.1.298}/redis_benchmarks_specification/__common__/runner.py

@@ -153,6 +153,8 @@ def exporter_datasink_common(
     topology_spec_name,
     default_metrics=None,
     git_hash=None,
+    collect_commandstats=True,
+    collect_memory_metrics=True,
 ):
     logging.info(
         f"Using datapoint_time_ms: {datapoint_time_ms}. git_hash={git_hash}, git_branch={git_branch}, git_version={git_version}. gh_org={tf_github_org}, gh_repo={tf_github_repo}"
@@ -181,71 +183,77 @@ def exporter_datasink_common(
         None,
         git_hash,
     )
-    logging.info("Collecting memory metrics")
-    (
-        _,
-        _,
-        overall_end_time_metrics,
-    ) = collect_redis_metrics(
-        redis_conns,
-        ["memory"],
-        {
-            "memory": [
-                "used_memory",
-                "used_memory_dataset",
-            ]
-        },
-    )
-    print(overall_end_time_metrics)
-    # 7 days from now
-    expire_redis_metrics_ms = 7 * 24 * 60 * 60 * 1000
-    export_redis_metrics(
-        git_version,
-        datapoint_time_ms,
-        overall_end_time_metrics,
-        datasink_conn,
-        setup_name,
-        setup_type,
-        test_name,
-        git_branch,
-        tf_github_org,
-        tf_github_repo,
-        tf_triggering_env,
-        {"metric-type": "redis-metrics"},
-        expire_redis_metrics_ms,
-    )
-    logging.info("Collecting commandstat metrics")
-    (
-        _,
-        _,
-        overall_commandstats_metrics,
-    ) = collect_redis_metrics(redis_conns, ["commandstats"])
-    export_redis_metrics(
-        git_version,
-        datapoint_time_ms,
-        overall_commandstats_metrics,
-        datasink_conn,
-        setup_name,
-        setup_type,
-        test_name,
-        git_branch,
-        tf_github_org,
-        tf_github_repo,
-        tf_triggering_env,
-        {"metric-type": "commandstats"},
-        expire_redis_metrics_ms,
-    )
+    if collect_memory_metrics:
+        logging.info("Collecting memory metrics")
+        (
+            _,
+            _,
+            overall_end_time_metrics,
+        ) = collect_redis_metrics(
+            redis_conns,
+            ["memory"],
+            {
+                "memory": [
+                    "used_memory",
+                    "used_memory_dataset",
+                ]
+            },
+        )
+        print(overall_end_time_metrics)
+        # 7 days from now
+        expire_redis_metrics_ms = 7 * 24 * 60 * 60 * 1000
+        export_redis_metrics(
+            git_version,
+            datapoint_time_ms,
+            overall_end_time_metrics,
+            datasink_conn,
+            setup_name,
+            setup_type,
+            test_name,
+            git_branch,
+            tf_github_org,
+            tf_github_repo,
+            tf_triggering_env,
+            {"metric-type": "redis-memory-metrics"},
+            expire_redis_metrics_ms,
+            git_hash,
+            running_platform,
+        )
+    if collect_commandstats:
+        logging.info("Collecting commandstat metrics")
+        (
+            _,
+            _,
+            overall_commandstats_metrics,
+        ) = collect_redis_metrics(redis_conns, ["commandstats"])
+        export_redis_metrics(
+            git_version,
+            datapoint_time_ms,
+            overall_commandstats_metrics,
+            datasink_conn,
+            setup_name,
+            setup_type,
+            test_name,
+            git_branch,
+            tf_github_org,
+            tf_github_repo,
+            tf_triggering_env,
+            {"metric-type": "commandstats"},
+            expire_redis_metrics_ms,
+            git_hash,
+            running_platform,
+        )
 
     # Update deployment tracking sets
     deployment_type_and_name = f"{setup_type}_AND_{setup_name}"
     deployment_type_and_name_and_version = f"{setup_type}_AND_{setup_name}_AND_{git_version}"
 
     # Add to deployment-specific set
-    deployment_set_key = f"ci.benchmarks.redislabs/{tf_triggering_env}/{deployment_type_and_name_and_version}:set"
+    deployment_set_key = f"ci.benchmarks.redis/{tf_triggering_env}/{deployment_type_and_name_and_version}:set"
     datasink_conn.sadd(deployment_set_key, test_name)
 
     # Add to testcases set
-    testcases_set_key = f"ci.benchmarks.redislabs/{tf_triggering_env}/testcases:set"
+    testcases_set_key = f"ci.benchmarks.redis/{tf_triggering_env}/testcases:set"
     datasink_conn.sadd(testcases_set_key, test_name)
 
     # Add metadata fields to timeseries metadata

{redis_benchmarks_specification-0.1.297 → redis_benchmarks_specification-0.1.298}/redis_benchmarks_specification/__common__/timeseries.py

@@ -1173,7 +1173,6 @@ def timeseries_test_sucess_flow(
     testcase_metric_context_paths = []
     version_target_tables = None
     branch_target_tables = None
-
     if timeseries_dict is None:
         (
             timeseries_dict,

{redis_benchmarks_specification-0.1.297 → redis_benchmarks_specification-0.1.298}/redis_benchmarks_specification/__runner__/runner.py

@@ -28,6 +28,8 @@ from redisbench_admin.run.common import (
     prepare_benchmark_parameters,
     dbconfig_keyspacelen_check,
 )
+from redisbench_admin.run_remote.run_remote import export_redis_metrics
+
 from redisbench_admin.run.metrics import extract_results_table
 from redisbench_admin.run.run import calculate_client_tool_duration_and_check
 from redisbench_admin.utils.benchmark_config import (
@@ -1430,7 +1432,7 @@ def process_self_contained_coordinator_stream(
                         logging.info(f"Auto-detected github_version: {git_version}")
 
                     # Auto-detect git hash if it's the default value
-                    if git_hash == "NA" and detected_info["github_hash"] != "unknown":
+                    if (git_hash is None or git_hash == "NA") and detected_info["github_hash"] != "unknown":
                         git_hash = detected_info["github_hash"]
                         logging.info(f"Auto-detected git_hash: {git_hash}")
 
@@ -1913,7 +1915,32 @@ def process_self_contained_coordinator_stream(
 
                             # Set datapoint_time_ms for memory comparison mode
                             datapoint_time_ms = start_time_ms
-
+                            # 7 days from now
+                            expire_redis_metrics_ms = 7 * 24 * 60 * 60 * 1000
+                            metadata["metric-type"] = "memory-stats"
+
+                            # Debug: Check git_hash value and memory metrics before export
+                            logging.info(f"DEBUG: About to export memory metrics with git_hash='{git_hash}', type={type(git_hash)}")
+                            logging.info(f"DEBUG: memory_metrics_dict has {len(memory_metrics_dict)} items: {list(memory_metrics_dict.keys())}")
+                            logging.info(f"DEBUG: Sample values: {dict(list(memory_metrics_dict.items())[:3])}")
+                            export_redis_metrics(
+                                git_version,
+                                datapoint_time_ms,
+                                memory_metrics_dict,
+                                datasink_conn,
+                                setup_name,
+                                setup_type,
+                                test_name,
+                                git_branch,
+                                tf_github_org,
+                                tf_github_repo,
+                                tf_triggering_env,
+                                metadata,
+                                expire_redis_metrics_ms,
+                                git_hash,
+                                running_platform,
+                            )
+                            
                             exporter_datasink_common(
                                 benchmark_config,
                                 0,  # benchmark_duration_seconds = 0 for memory only
@@ -1937,6 +1964,8 @@ def process_self_contained_coordinator_stream(
                                 topology_spec_name,
                                 default_metrics,
                                 git_hash,
+                                collect_commandstats=False,
+                                collect_memory_metrics=True,
                             )
 
                         # Send MEMORY PURGE after memory comparison (if FLUSHALL at test end is not enabled)