diff --git a/api/chalicelib/core/__init__.py b/api/chalicelib/core/__init__.py index ee17d1efaf..bb557c55cc 100644 --- a/api/chalicelib/core/__init__.py +++ b/api/chalicelib/core/__init__.py @@ -1,10 +1,4 @@ from decouple import config import logging -logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO)) - -if config("EXP_CH_LAYER", cast=bool, default=True): - from . import metrics_ch as metrics - from . import metrics as metrics_legacy -else: - from . import metrics +logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO)) \ No newline at end of file diff --git a/api/env.default b/api/env.default index 4e52e5c57f..ac9a4df9e6 100644 --- a/api/env.default +++ b/api/env.default @@ -70,5 +70,4 @@ sourcemaps_bucket=sourcemaps sourcemaps_reader=http://sourcemapreader-openreplay.app.svc.cluster.local:9000/sourcemaps/{}/sourcemaps STAGE=default-foss TZ=UTC -EXP_CH_DRIVER=true -EXP_CH_LAYER=true \ No newline at end of file +EXP_CH_DRIVER=true \ No newline at end of file diff --git a/ee/api/.gitignore b/ee/api/.gitignore index f1acae1822..73b0b2708d 100644 --- a/ee/api/.gitignore +++ b/ee/api/.gitignore @@ -195,7 +195,6 @@ Pipfile.lock /chalicelib/core/collaboration_slack.py /chalicelib/core/countries.py /chalicelib/core/metrics.py -/chalicelib/core/metrics_ch.py /chalicelib/core/custom_metrics.py /chalicelib/core/custom_metrics_predefined.py /chalicelib/core/dashboards.py diff --git a/api/chalicelib/core/metrics_ch.py b/ee/api/chalicelib/core/metrics_ch.py similarity index 100% rename from api/chalicelib/core/metrics_ch.py rename to ee/api/chalicelib/core/metrics_ch.py diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh index a56afff7b9..df688b0a60 100755 --- a/ee/api/clean-dev.sh +++ b/ee/api/clean-dev.sh @@ -16,7 +16,6 @@ rm -rf ./chalicelib/core/collaboration_msteams.py rm -rf ./chalicelib/core/collaboration_slack.py rm -rf ./chalicelib/core/countries.py rm -rf ./chalicelib/core/metrics.py -rm -rf ./chalicelib/core/metrics_ch.py rm -rf ./chalicelib/core/custom_metrics.py rm -rf ./chalicelib/core/custom_metrics_predefined.py rm -rf ./chalicelib/core/dashboards.py