Skip to content

Commit

Permalink
Merge pull request #299 from uktrade/LTD-5756-fix-apm-local-settings
Browse files Browse the repository at this point in the history
Only add APM app if env setting is set
  • Loading branch information
kevincarrogan authored Dec 27, 2024
2 parents 11e87b1 + 3c0ed34 commit baa71a2
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions conf/settings.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
import os
import sys
import uuid
import sentry_sdk

from django_log_formatter_ecs import ECSFormatter
from environ import Env
from pathlib import Path
from sentry_sdk.integrations.django import DjangoIntegration
from urllib.parse import urlencode
from django_log_formatter_asim import ASIMFormatter

from dbt_copilot_python.network import setup_allowed_hosts
import dj_database_url
import sentry_sdk
from dbt_copilot_python.database import database_url_from_env
from dbt_copilot_python.network import setup_allowed_hosts
from dbt_copilot_python.utility import is_copilot

import dj_database_url
from django_log_formatter_asim import ASIMFormatter
from django_log_formatter_ecs import ECSFormatter
from environ import Env
from sentry_sdk.integrations.django import DjangoIntegration

# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
Expand Down Expand Up @@ -354,7 +352,6 @@ def _build_redis_url(base_url, db_number, **query_args):
# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
DATABASES = {"default": env.db()}
REDIS_BASE_URL = env("REDIS_BASE_URL", default=None)
INSTALLED_APPS.append("elasticapm.contrib.django")
DB_ANONYMISER_AWS_ENDPOINT_URL = AWS_ENDPOINT_URL
DB_ANONYMISER_AWS_ACCESS_KEY_ID = env("DB_ANONYMISER_AWS_ACCESS_KEY_ID", default=None)
DB_ANONYMISER_AWS_SECRET_ACCESS_KEY = env("DB_ANONYMISER_AWS_SECRET_ACCESS_KEY", default=None)
Expand Down

0 comments on commit baa71a2

Please sign in to comment.