Disable DataDog logging for now.

vote · Sep 9, 2021 · ad9b08f · ad9b08f
1 parent 050bcfc
commit ad9b08f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/app/app/celery_app.py b/app/app/celery_app.py
@@ -6,8 +6,8 @@
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "app.settings")
 
-if os.environ.get("DATADOG_API_KEY"):
-    ddtrace.patch_all()
+# if os.environ.get("DATADOG_API_KEY"):
+    # ddtrace.patch_all()
 
 app = celery.Celery("uptime")
 

diff --git a/app/app/settings.py b/app/app/settings.py
@@ -183,10 +183,10 @@
             "handlers": [handler],
             "level": env.str("DJANGO_LOGGING_LEVEL", default="INFO"),
         },
-        "ddtrace": {
-            "handlers": [handler],
-            "level": env.str("DJANGO_LOGGING_LEVEL", default="INFO"),
-        },
+        # "ddtrace": {
+        #     "handlers": [handler],
+        #     "level": env.str("DJANGO_LOGGING_LEVEL", default="INFO"),
+        # },
         "common": {
             "handlers": [handler],
             "level": env.str("DJANGO_LOGGING_LEVEL", default="INFO"),
@@ -248,7 +248,7 @@
 
 #### DATADOG CONFIGURATION
 
-ddtrace.tracer.set_tags({"build": BUILD})
+# ddtrace.tracer.set_tags({"build": BUILD})
 
 #### END DATADOG CONFIGURATION
 

diff --git a/app/app/wsgi_prod.py b/app/app/wsgi_prod.py
@@ -10,12 +10,12 @@
 
 from common.apm import tracer
 
-ddtrace.patch_all()
-ddtrace.patch(gevent=True)
+# ddtrace.patch_all()
+# ddtrace.patch(gevent=True)
 
-ddtrace.Pin.override(django, tracer=tracer)
-ddtrace.Pin.override(psycopg2, tracer=tracer)
-ddtrace.Pin.override(redis, tracer=tracer)
+# ddtrace.Pin.override(django, tracer=tracer)
+# ddtrace.Pin.override(psycopg2, tracer=tracer)
+# ddtrace.Pin.override(redis, tracer=tracer)
 
 monkey.patch_all()
 

diff --git a/app/common/apm.py b/app/common/apm.py
@@ -6,12 +6,14 @@
 
 logger = logging.getLogger("apm")
 
+# Return before writing to DataDog for now instead of removing
+# the code so we can reactivate it easily later when needed.
 
 class UptimeTracer(Tracer):
     def write(self, spans):
         logger.debug(spans)
-        if settings.DEBUG:
-            return
+        # if settings.DEBUG:
+        return # return to under If to restore DataDog logging
         return super().write(spans)
 
 

diff --git a/app/ops/beat_launch.sh b/app/ops/beat_launch.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-ddtrace-run celery -A app.celery_beat beat --scheduler redbeat.RedBeatScheduler --pidfile="/app/celerybeat-checkable.pid"
+# Uncomment and have this command run the following to restore DataDog logging
+# ddtrace-run
+celery -A app.celery_beat beat --scheduler redbeat.RedBeatScheduler --pidfile="/app/celerybeat-checkable.pid"
diff --git a/app/ops/migration_launch.sh b/app/ops/migration_launch.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-ddtrace-run python /app/manage.py migrate
+# Uncomment and have this command run the following to restore DataDog logging
+# ddtrace-run
+python /app/manage.py migrate
diff --git a/app/ops/worker_launch.sh b/app/ops/worker_launch.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-ddtrace-run celery -A app.celery_app worker -Q ${1} --without-heartbeat --without-mingle --without-gossip
+# Uncomment and have this command run the following to restore DataDog logging
+# ddtrace-run
+celery -A app.celery_app worker -Q ${1} --without-heartbeat --without-mingle --without-gossip