Fixed profile data querying

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.9.24"
+version = "0.9.27"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"
@@ -30,7 +30,7 @@ pyWorkFlow = "^0.0.2"
 Flask = "^2.0.1"
 flask-restx = "^0.5.1"
 Flask-HTTPAuth = "^4.4.0"
-docker = "^6.0.0"
+docker = "^5.0.0"
 daemonize = "^2.5.0"
 pandas = "^1.0"
 ansicolors = "^1.1.8"

redisbench_admin/compare/args.py

@@ -76,6 +76,7 @@ def create_compare_arguments(parser):
     parser.add_argument("--comparison-branch", type=str, default=None, required=False)
     parser.add_argument("--comparison-tag", type=str, default=None, required=False)
     parser.add_argument("--print-regressions-only", type=bool, default=False)
+    parser.add_argument("--print-improvements-only", type=bool, default=False)
     parser.add_argument("--verbose", type=bool, default=False)
     parser.add_argument("--simple-table", type=bool, default=False)
     parser.add_argument("--use_metric_context_path", type=bool, default=False)

redisbench_admin/compare/compare.py

@@ -78,6 +78,10 @@ def compare_command_logic(args, project_name, project_version):
     baseline_branch = args.baseline_branch
     comparison_branch = args.comparison_branch
     simplify_table = args.simple_table
+    print_regressions_only = args.print_regressions_only
+    print_improvements_only = args.print_improvements_only
+    print_all = print_regressions_only is False and print_improvements_only is False
+
     by_str = ""
     baseline_str = ""
     comparison_str = ""
@@ -378,27 +382,24 @@ def compare_command_logic(args, project_name, project_version):
             if unstable:
                 total_unstable += 1
 
-            if args.print_regressions_only is False or detected_regression:
-                percentage_change_str = "{:.1f}% ".format(percentage_change)
-                if simplify_table:
-                    table.append(
-                        [
-                            test_name,
-                            baseline_v_str,
-                            comparison_v_str,
-                            percentage_change_str,
-                        ]
-                    )
-                else:
-                    table.append(
-                        [
-                            test_name,
-                            baseline_v_str,
-                            comparison_v_str,
-                            percentage_change_str,
-                            note.strip(),
-                        ]
-                    )
+            should_add_line = False
+            if print_regressions_only and detected_regression:
+                should_add_line = True
+            if print_improvements_only and detected_improvement:
+                should_add_line = True
+            if print_all:
+                should_add_line = True
+
+            if should_add_line:
+                add_line(
+                    baseline_v_str,
+                    comparison_v_str,
+                    note,
+                    percentage_change,
+                    simplify_table,
+                    table,
+                    test_name,
+                )
 
     logging.info("Printing differential analysis between branches")
 
@@ -453,6 +454,37 @@ def compare_command_logic(args, project_name, project_version):
         )
 
 
+def add_line(
+    baseline_v_str,
+    comparison_v_str,
+    note,
+    percentage_change,
+    simplify_table,
+    table,
+    test_name,
+):
+    percentage_change_str = "{:.1f}% ".format(percentage_change)
+    if simplify_table:
+        table.append(
+            [
+                test_name,
+                baseline_v_str,
+                comparison_v_str,
+                percentage_change_str,
+            ]
+        )
+    else:
+        table.append(
+            [
+                test_name,
+                baseline_v_str,
+                comparison_v_str,
+                percentage_change_str,
+                note.strip(),
+            ]
+        )
+
+
 def get_v_pct_change_and_largest_var(
     args,
     comparison_datapoints,

redisbench_admin/run/args.py

@@ -100,7 +100,9 @@ def common_run_args(parser):
     parser.add_argument("--github_repo", type=str, default=GIT_REPO)
     parser.add_argument("--github_org", type=str, default=GIT_ORG)
     parser.add_argument("--github_sha", type=str, default=None, nargs="?", const="")
-    parser.add_argument("--github_branch", type=str, default=GIT_BRANCH)
+    parser.add_argument(
+        "--github_branch", type=str, default=GIT_BRANCH, nargs="?", const=""
+    )
     parser.add_argument("--triggering_env", type=str, default=TRIGGERING_ENV)
     parser.add_argument(
         "--module_path",

redisbench_admin/run/grafana.py

@@ -126,7 +126,7 @@ def generate_artifacts_table_grafana_redis(
                     "collapsed_stack_count": collapsed_stack_count,
                     "collection_time": str(current_time),
                 }
-                profile_string_testcase_markdown_key = (
+                profile_hash_string_testcase_markdown_key = (
                     "profiling_data:all_threads:{}:{}:{}:{}:{}:#{}".format(
                         tf_github_org,
                         tf_github_repo,
@@ -138,16 +138,16 @@ def generate_artifacts_table_grafana_redis(
                 )
                 try:
                     redis_conn.hset(
-                        profile_string_testcase_markdown_key, mapping=hash_key
+                        profile_hash_string_testcase_markdown_key, mapping=hash_key
                     )
                     redis_conn.expire(
-                        profile_string_testcase_markdown_key,
+                        profile_hash_string_testcase_markdown_key,
                         EXPIRE_TIME_SECS_PROFILE_KEYS,
                     )
                 except redis.exceptions.ResponseError as e:
                     logging.error(
                         "While setting the profile key: {} received the following error: {}".format(
-                            profile_string_testcase_markdown_key, e.__str__()
+                            profile_hash_string_testcase_markdown_key, e.__str__()
                         )
                     )
                     pass