From 2e7f39232d31a818c7b2dd6e044d9311d2833aae Mon Sep 17 00:00:00 2001 From: Isaac Milarsky Date: Tue, 23 Jan 2024 15:52:19 -0600 Subject: [PATCH] Remove unneeded resource metric Signed-off-by: Isaac Milarsky --- scripts/metricsLib/metrics_definitions.py | 30 +++++++++++------------ scripts/metricsLib/oss_metric_entities.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/metricsLib/metrics_definitions.py b/scripts/metricsLib/metrics_definitions.py index 731df5c43c..4a6dbb87fb 100644 --- a/scripts/metricsLib/metrics_definitions.py +++ b/scripts/metricsLib/metrics_definitions.py @@ -2,7 +2,7 @@ Definitions of specific metrics for metricsLib """ from metricsLib.metrics_data_structures import CustomMetric, parse_commits_by_month -from metricsLib.metrics_data_structures import GraphQLMetric, SumMetric, ResourceMetric +from metricsLib.metrics_data_structures import GraphQLMetric, SumMetric from metricsLib.metrics_data_structures import ListMetric from metricsLib.constants import TOKEN, AUGUR_HOST @@ -138,9 +138,9 @@ # TODO: Ask Sean why this endpoint isn't working for any repo except for augur. # might just be lack of data. -RESOURCE_METRICS.append(ResourceMetric("firstResponseForClosedPR", sixMonthsParams, - AUGUR_HOST + "/pull_request_reports/PR_time_to_first_response/" + - "?repo_id={repo_id}&start_date={begin_month}&end_date={end_date}")) +#RESOURCE_METRICS.append(ResourceMetric("firstResponseForClosedPR", sixMonthsParams, +# AUGUR_HOST + "/pull_request_reports/PR_time_to_first_response/" + +# "?repo_id={repo_id}&start_date={begin_month}&end_date={end_date}")) ORG_GITHUB_GRAPHQL_QUERY = """ @@ -177,17 +177,17 @@ FOLLOWERS_ENDPOINT, "followers_count", token=TOKEN) ) -ORG_METRICS.append(ListMetric("issueNewWeekly", ["repo_group_id","period","begin_week","end_date"], - AUGUR_HOST + - "/repo-groups/{repo_group_id}/issues-new" + - "?period={period}&begin_date={begin_week}&end_date={end_date}", - {"new_issues_by_day_over_last_month": ["date", "issues"]})) - -ORG_METRICS.append(ListMetric("issueNewMonthly",["repo_group_id","period","begin_month","end_date"], - AUGUR_HOST + - "/repo-groups/{repo_group_id}/issues-new" + - "?period={period}&begin_date={begin_month}&end_date={end_date}", - {"new_issues_by_day_over_last_six_months": ["date", "issues"]})) +#ORG_METRICS.append(ListMetric("issueNewWeekly", ["repo_group_id","period","begin_week","end_date"], +# AUGUR_HOST + +# "/repo-groups/{repo_group_id}/issues-new" + +# "?period={period}&begin_date={begin_week}&end_date={end_date}", +# {"new_issues_by_day_over_last_month": ["date", "issues"]})) + +#ORG_METRICS.append(ListMetric("issueNewMonthly",["repo_group_id","period","begin_month","end_date"], +# AUGUR_HOST + +# "/repo-groups/{repo_group_id}/issues-new" + +# "?period={period}&begin_date={begin_month}&end_date={end_date}", +# {"new_issues_by_day_over_last_six_months": ["date", "issues"]})) COMMITS_ENDPOINT = "https://api.github.com/repos/{owner}/{repo}/commits" SIMPLE_METRICS.append(CustomMetric("getCommitsByMonth", [ diff --git a/scripts/metricsLib/oss_metric_entities.py b/scripts/metricsLib/oss_metric_entities.py index 69aa3560c9..628d38ef43 100644 --- a/scripts/metricsLib/oss_metric_entities.py +++ b/scripts/metricsLib/oss_metric_entities.py @@ -218,7 +218,7 @@ def __init__(self, repo_git_url, owner_id): repo_val = next( x for x in response_json if x['repo_name'] and x['repo_name'].lower() == repo_name.lower()) except StopIteration: - print(f"Could not find repo in group {owner_id}") + print(f"Could not find repo {repo_git_url} in group {owner_id}") repo_val = { 'repo_id': None }