Skip to content

Commit

Permalink
NH-57036: Minor adjustment
Browse files Browse the repository at this point in the history
  • Loading branch information
gantrior committed Oct 6, 2023
1 parent cf8222d commit 03e66d5
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions tests/integration/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 03e66d5

Please sign in to comment.