From a5aca2b9fa7328f3b44a48447e7e7a84c1e9b9f4 Mon Sep 17 00:00:00 2001 From: Anna Scholtz Date: Thu, 13 Oct 2022 09:43:57 -0700 Subject: [PATCH] Use metric_config_parser --- opmon/cli.py | 8 ++------ opmon/config.py | 6 +++--- opmon/experimenter.py | 2 +- opmon/metadata.py | 2 +- opmon/monitoring.py | 4 ++-- opmon/statistic.py | 4 ++-- opmon/tests/test_experimenter.py | 2 +- opmon/tests/test_monitoring.py | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) diff --git a/opmon/cli.py b/opmon/cli.py index 4b548fe..2c9db96 100644 --- a/opmon/cli.py +++ b/opmon/cli.py @@ -11,12 +11,8 @@ from typing import Iterable, Tuple import click import pytz -from jetstream_config_parser.config import ( - DEFAULTS_DIR, - DEFINITIONS_DIR, - entity_from_path, -) -from jetstream_config_parser.monitoring import MonitoringConfiguration, MonitoringSpec +from metric_config_parser.config import DEFAULTS_DIR, DEFINITIONS_DIR, entity_from_path +from metric_config_parser.monitoring import MonitoringConfiguration, MonitoringSpec from opmon.config import DEFAULT_CONFIG_REPO, METRIC_HUB_REPO, ConfigLoader, validate from opmon.dryrun import DryRunFailedError diff --git a/opmon/config.py b/opmon/config.py index 002e206..125bc97 100644 --- a/opmon/config.py +++ b/opmon/config.py @@ -12,15 +12,15 @@ concrete resolved Configuration class. import datetime as dt from typing import List, Optional, Union -from jetstream_config_parser.config import ( +from metric_config_parser.config import ( Config, ConfigCollection, DefaultConfig, DefinitionConfig, Outcome, ) -from jetstream_config_parser.experiment import Experiment -from jetstream_config_parser.monitoring import MonitoringSpec +from metric_config_parser.experiment import Experiment +from metric_config_parser.monitoring import MonitoringSpec from pytz import UTC DEFAULT_CONFIG_REPO = "https://github.com/mozilla/opmon-config" diff --git a/opmon/experimenter.py b/opmon/experimenter.py index 8539a18..e3f8d53 100644 --- a/opmon/experimenter.py +++ b/opmon/experimenter.py @@ -8,7 +8,7 @@ import attr import cattr import pytz import requests -from jetstream_config_parser.experiment import Channel +from metric_config_parser.experiment import Channel from .utils import retry_get diff --git a/opmon/metadata.py b/opmon/metadata.py index cf6be91..696f7f4 100644 --- a/opmon/metadata.py +++ b/opmon/metadata.py @@ -5,8 +5,8 @@ from pathlib import Path from typing import Any, Dict, List, Tuple import attr -from jetstream_config_parser.monitoring import MonitoringConfiguration from jinja2 import Environment, FileSystemLoader +from metric_config_parser.monitoring import MonitoringConfiguration from opmon.bigquery_client import BigQueryClient from opmon.statistic import Summary diff --git a/opmon/monitoring.py b/opmon/monitoring.py index 6dbde40..5fd86f4 100644 --- a/opmon/monitoring.py +++ b/opmon/monitoring.py @@ -10,9 +10,9 @@ from typing import Any, Dict, Optional import attr from google import cloud from google.cloud import bigquery -from jetstream_config_parser.alert import AlertType -from jetstream_config_parser.monitoring import MonitoringConfiguration from jinja2 import Environment, FileSystemLoader +from metric_config_parser.alert import AlertType +from metric_config_parser.monitoring import MonitoringConfiguration from opmon.platform import PLATFORM_CONFIGS diff --git a/opmon/statistic.py b/opmon/statistic.py index 713bb77..4c73b02 100644 --- a/opmon/statistic.py +++ b/opmon/statistic.py @@ -6,8 +6,8 @@ from abc import ABC from typing import Any, Dict, List import attr -from jetstream_config_parser import metric as parser_metric -from jetstream_config_parser.metric import Metric +from metric_config_parser import metric as parser_metric +from metric_config_parser.metric import Metric from opmon.errors import StatisticNotImplementedForTypeException diff --git a/opmon/tests/test_experimenter.py b/opmon/tests/test_experimenter.py index 9d794d4..0d66fcd 100644 --- a/opmon/tests/test_experimenter.py +++ b/opmon/tests/test_experimenter.py @@ -5,7 +5,7 @@ from unittest.mock import MagicMock import pytest import pytz -from jetstream_config_parser.experiment import Channel +from metric_config_parser.experiment import Channel from opmon.experimenter import ( Branch, diff --git a/opmon/tests/test_monitoring.py b/opmon/tests/test_monitoring.py index 57ae678..eda261b 100644 --- a/opmon/tests/test_monitoring.py +++ b/opmon/tests/test_monitoring.py @@ -4,7 +4,7 @@ from textwrap import dedent import pytest import pytz import toml -from jetstream_config_parser.monitoring import MonitoringConfiguration, MonitoringSpec +from metric_config_parser.monitoring import MonitoringConfiguration, MonitoringSpec from opmon import errors from opmon.config import ConfigLoader