redis-benchmarks-specification 0.1.296__py3-none-any.whl → 0.1.298__py3-none-any.whl

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/__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/__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}")
 
@@ -1790,6 +1792,7 @@ def process_self_contained_coordinator_stream(
                             start_time_ms,
                             start_time_str,
                         ) = get_start_time_vars()
+                        dataset_load_duration_seconds = 0  # No dataset loading time for memory comparison
 
                         # Skip load tests (keyspacelen = 0) in memory comparison mode
                         keyspacelen = benchmark_config.get("dbconfig", {}).get("check", {}).get("keyspacelen", None)
@@ -1912,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
@@ -1936,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)

{redis_benchmarks_specification-0.1.296.dist-info → redis_benchmarks_specification-0.1.298.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redis-benchmarks-specification
-Version: 0.1.296
+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.296.dist-info → redis_benchmarks_specification-0.1.298.dist-info}/RECORD

@@ -15,9 +15,9 @@ redis_benchmarks_specification/__common__/builder_schema.py,sha256=kfDpRIk7NkJrb
 redis_benchmarks_specification/__common__/env.py,sha256=kvJ8Ll-fvI_Tc0vynrzUEr22TqnJizzvJ4Lu9RjNr_M,3119
 redis_benchmarks_specification/__common__/github.py,sha256=9TZtnISsSgXTSAN_VQejo5YRPDPhlU0gjxgKGPw_sP8,10699
 redis_benchmarks_specification/__common__/package.py,sha256=4uVt1BAZ999LV2rZkq--Tk6otAVIf9YR3g3KGeUpiW4,834
-redis_benchmarks_specification/__common__/runner.py,sha256=TT5c5vJSsg1RApUqbitSkvsyl4PQm2qnW48iu4LXJmo,7871
+redis_benchmarks_specification/__common__/runner.py,sha256=3eZ3GUKfWMUbvNhoryRnbennqPVRqzQ9189-B9N2YdE,8314
 redis_benchmarks_specification/__common__/spec.py,sha256=D_SN48wg6NMthW_-OS1H5bydSDiuZpfd4WPPj7Vfwmc,5760
-redis_benchmarks_specification/__common__/timeseries.py,sha256=dae3YF4cX2Css8i5VnOGxAk3DOu8tHfZt-Vy-uiWQDQ,52917
+redis_benchmarks_specification/__common__/timeseries.py,sha256=w8XQrGPEFuuemDXXz4iny7lYsNbYH0ycQyq3jHIr80g,52916
 redis_benchmarks_specification/__compare__/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redis_benchmarks_specification/__compare__/args.py,sha256=shER83ddBRBMAlbgxGXJ5H5XziKe-sP_Nyx7t5aLOo8,7650
 redis_benchmarks_specification/__compare__/compare.py,sha256=nymItbCO28KiAe3bVxYVObwbzpLmISAF_qyJ6b3KCPQ,62466
@@ -25,7 +25,7 @@ redis_benchmarks_specification/__init__.py,sha256=YQIEx2sLPPA0JR9OuCuMNMNtm-f_gq
 redis_benchmarks_specification/__runner__/__init__.py,sha256=l-G1z-t6twUgi8QLueqoTQLvJmv3hJoEYskGm6H7L6M,83
 redis_benchmarks_specification/__runner__/args.py,sha256=YeN7-eOGoqCHKh5FrKz9z5Ee-Rh-3DF9tm2Hb-3m7sQ,10648
 redis_benchmarks_specification/__runner__/remote_profiling.py,sha256=JS46mFxnRB2HSU_HO90WE4w7P7usHzX1dwZg1bJpTMc,18588
-redis_benchmarks_specification/__runner__/runner.py,sha256=q54TjleiQILgCgNwip9m7X_6sf12GokYPO_cXaM0MzU,136136
+redis_benchmarks_specification/__runner__/runner.py,sha256=H2XoMfvmPJEYcmT_8kukSN5YgyU-y1shdebwJe8CttE,137951
 redis_benchmarks_specification/__self_contained_coordinator__/__init__.py,sha256=l-G1z-t6twUgi8QLueqoTQLvJmv3hJoEYskGm6H7L6M,83
 redis_benchmarks_specification/__self_contained_coordinator__/args.py,sha256=uxBjdQ78klvsVi6lOfGYQVaWIxc8OI-DwYKY16SgvCY,5952
 redis_benchmarks_specification/__self_contained_coordinator__/artifacts.py,sha256=OVHqJzDgeSSRfUSiKp1ZTAVv14PvSbk-5yJsAAoUfpw,936
@@ -273,8 +273,8 @@ redis_benchmarks_specification/test-suites/memtier_benchmark-nokeys-pubsub-publi
 redis_benchmarks_specification/test-suites/memtier_benchmark-nokeys-server-time-pipeline-10.yml,sha256=7G_J8kUFay7jXhZvsZK5jvVHSLZvhMV0uuDMkZBbeSQ,675
 redis_benchmarks_specification/test-suites/template.txt,sha256=d_edIE7Sxa5X7I2yG-Io0bPdbDIHR0oWFoCA3XUt_EU,435
 redis_benchmarks_specification/vector-search-test-suites/vector_db_benchmark_test.yml,sha256=PD7ow-k4Ll2BkhEC3aIqiaCZt8Hc4aJIp96Lw3J3mcI,791
-redis_benchmarks_specification-0.1.296.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-redis_benchmarks_specification-0.1.296.dist-info/METADATA,sha256=Bcnx415tWst5YOLzbPmN6o_oAq1ATijUzHeIlXbxPzI,22726
-redis_benchmarks_specification-0.1.296.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redis_benchmarks_specification-0.1.296.dist-info/entry_points.txt,sha256=x5WBXCZsnDRTZxV7SBGmC65L2k-ygdDOxV8vuKN00Nk,715
-redis_benchmarks_specification-0.1.296.dist-info/RECORD,,
+redis_benchmarks_specification-0.1.298.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+redis_benchmarks_specification-0.1.298.dist-info/METADATA,sha256=quT5ecfq6InxVjpWL5LEasY2QSToisbH73pbkSWMdcc,22726
+redis_benchmarks_specification-0.1.298.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redis_benchmarks_specification-0.1.298.dist-info/entry_points.txt,sha256=x5WBXCZsnDRTZxV7SBGmC65L2k-ygdDOxV8vuKN00Nk,715
+redis_benchmarks_specification-0.1.298.dist-info/RECORD,,