From 03e66d51ff00de5a91736337026de1bd78b4f6c8 Mon Sep 17 00:00:00 2001 From: "tomas.panik" Date: Fri, 6 Oct 2023 17:34:49 +0200 Subject: [PATCH] NH-57036: Minor adjustment --- tests/integration/test_utils.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/integration/test_utils.py b/tests/integration/test_utils.py index 89e0ce46..0f9e24c8 100644 --- a/tests/integration/test_utils.py +++ b/tests/integration/test_utils.py @@ -177,10 +177,6 @@ def merge_datapoints(existing_datapoints, new_datapoints): existing_datapoints.extend(dp for _, dp in merged_datapoints) def merge_metrics(existing_metric, new_metric): - if new_metric["name"] == "k8s.cluster.nodes.ready": - print("Skipping merge of scrape_duration_seconds metric") - return - metric_types = ["sum", "gauge", "histogram"] for metric_type in metric_types: @@ -224,7 +220,7 @@ def custom_json_merge(result, new_json): def get_merged_json(content): result = {"resourceMetrics": []} - for line in content.splitlines()[:5]: # take only last 5 lines to make it more reliable + for line in content.splitlines(): custom_json_merge(result, json.loads(line)) # Sort the result and set timeStamps to 0 to make it easier to compare