start scripts for datadog

Author: tschaume

mpcontribs-api/scripts/start.sh

@@ -12,12 +12,11 @@ STATS_ARG=""
 SERVER_APP="mpcontribs.api:create_app()"
 WAIT_FOR="wait-for-it.sh $JUPYTER_GATEWAY_HOST -q -t 50"
 
+set -x
+
 if [[ -n "$DD_TRACE_HOST" ]]; then
-  wait-for-it.sh $DD_TRACE_HOST -q -s -t 10 && STATS_ARG="--statsd-host $DD_AGENT_HOST:8125"
+  wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && STATS_ARG="--statsd-host $DD_AGENT_HOST:8125" || echo "WARNING: datadog agent unreachable"
 fi
 
-#if [[ -n "$STATS_ARG" ]]; then
-#	exec $WAIT_FOR -- ddtrace-run gunicorn $STATS_ARG $SERVER_APP
-#else
-exec $WAIT_FOR -- gunicorn $SERVER_APP
-#fi
+[[ -n "$STATS_ARG" ]] && CMD="ddtrace-run" || CMD=""
+exec $WAIT_FOR -- $CMD gunicorn $STATS_ARG $SERVER_APP

mpcontribs-api/scripts/start_rq.sh

@@ -6,10 +6,11 @@ echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..."
 sleep $zzz
 
 CMD="flask rq $1"
+set -x
 
-#if [[ -n "$DD_TRACE_HOST" ]]; then
-#	wait-for-it.sh $DD_TRACE_HOST -q -s -t 10 && CMD="ddtrace-run $CMD"
-#fi
+if [[ -n "$DD_TRACE_HOST" ]]; then
+  wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && CMD="ddtrace-run $CMD" || echo "WARNING: datadog agent unreachable"
+fi
 
-exec wait-for-it.sh $JUPYTER_GATEWAY_HOST -q -s -t 50 -- \
-  wait-for-it.sh $MPCONTRIBS_API_HOST -q -s -t 15 -- $CMD
+exec wait-for-it.sh "$JUPYTER_GATEWAY_HOST" -q -s -t 50 -- \
+  wait-for-it.sh "$MPCONTRIBS_API_HOST" -q -s -t 15 -- $CMD

mpcontribs-api/supervisord/supervisord.conf.jinja

@@ -29,7 +29,6 @@ environment=
     JUPYTER_GATEWAY_URL="{{ jupyter_gateway_url }}",
     JUPYTER_GATEWAY_HOST="{{ jupyter_gateway_host }}",
     DD_AGENT_HOST="{{ dd_agent_host }}",
-    DD_GEVENT_PATCH_ALL="true",
     DD_TRACE_SAMPLE_RATE="1",
     TINI_SUBREAPER="true"
 

mpcontribs-kernel-gateway/start.sh

@@ -1,14 +1,13 @@
 #!/bin/bash
 
 set -e
-pmgrc=$HOME/.pmgrc.yaml
-[[ ! -e $pmgrc ]] && echo "PMG_DUMMY_VAR: dummy" >$pmgrc
+PMGRC=$HOME/.pmgrc.yaml
+[[ ! -e $PMGRC ]] && echo "PMG_DUMMY_VAR: dummy" >"$PMGRC"
 
 CMD="jupyter kernelgateway"
 
-# NOTE ddtrace-run causes 100% CPU usage
-#if [[ -n "$DD_TRACE_HOST" ]]; then
-#  wait-for-it.sh $DD_TRACE_HOST -q -s -t 10 && CMD="ddtrace-run $CMD"
-#fi
+if [[ -n "$DD_TRACE_HOST" ]]; then
+  wait-for-it.sh "$DD_TRACE_HOST" -q -s -t 10 && CMD="ddtrace-run $CMD" || echo "WARNING: datadog agent unreachable"
+fi
 
 exec $CMD --KernelGatewayApp.log_format='%(asctime)s,%(msecs)03d %(levelname)s [%(name)s] [%(module)s:%(lineno)d] - %(message)s'

mpcontribs-portal/supervisord/supervisord.conf.jinja

@@ -21,7 +21,6 @@ environment=
     NODE_ENV="{{ node_env }}",
     DD_AGENT_HOST="{{ dd_agent_host }}",
     DD_LOG_LEVEL="{{ log_level }}",
-    DD_GEVENT_PATCH_ALL="true",
     DD_TRACE_SAMPLE_RATE="1",
     REDIS_ADDRESS="%(ENV_REDIS_ADDRESS)s",
     TINI_SUBREAPER="true",