Use metric_config_parser

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

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"

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
 

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

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
 

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
 

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,

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