optional datadog

mpcontribs-api/scripts/start.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 
-zzz=$(($DEPLOYMENT*60))
+set -e
+zzz=$(($DEPLOYMENT * 60))
 echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..."
 sleep $zzz
 
 pmgrc=$HOME/.pmgrc.yaml
-[[ ! -e $pmgrc ]] && echo "PMG_DUMMY_VAR: dummy" > $pmgrc
+[[ ! -e $pmgrc ]] && echo "PMG_DUMMY_VAR: dummy" >$pmgrc
 
-exec wait-for-it.sh $JUPYTER_GATEWAY_HOST -q -t 50 -- ddtrace-run gunicorn "mpcontribs.api:create_app()"
+CMD="gunicorn \"mpcontribs.api:create_app()\""
+
+if [[ -n "$DD_TRACE_HOST" ]]; then
+	wait-for-it.sh $DD_TRACE_HOST -q -s -t 10 && CMD="ddtrace-run $CMD"
+fi
+
+exec wait-for-it.sh $JUPYTER_GATEWAY_HOST -q -t 50 -- $CMD

mpcontribs-api/scripts/start_rq.sh

@@ -1,7 +1,15 @@
 #!/bin/bash
 
-zzz=$(($DEPLOYMENT*60))
+set -e
+zzz=$(($DEPLOYMENT * 60))
 echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..."
 sleep $zzz
 
-exec wait-for-it.sh $JUPYTER_GATEWAY_HOST -s -t 50 -- wait-for-it.sh $MPCONTRIBS_API_HOST -s -t 15 -- ddtrace-run flask rq $1
+CMD="flask rq $1"
+
+if [[ -n "$DD_TRACE_HOST" ]]; then
+	wait-for-it.sh $DD_TRACE_HOST -q -s -t 10 && CMD="ddtrace-run $CMD"
+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

mpcontribs-api/supervisord/supervisord.conf.jinja

@@ -33,7 +33,7 @@ environment=
     DD_TRACE_SAMPLE_RATE="1"
 
 [program:main]
-command=ddtrace-run ./main.py
+command=./main.py
 directory=/app
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0

mpcontribs-kernel-gateway/Dockerfile

@@ -1,5 +1,4 @@
 FROM materialsproject/devops:python-3.1010.24 as base
-MAINTAINER Patrick Huck (tschaume)
 RUN apt-get update && apt-get install -y --no-install-recommends libopenblas-dev libpq-dev && apt-get clean
 
 FROM base as python-deps
@@ -10,9 +9,9 @@ ARG MORE_PIP_FLAGS
 ENV MORE_PIP_FLAGS=$MORE_PIP_FLAGS
 COPY requirements/deployment.txt ./requirements.txt
 RUN pip install $PIP_FLAGS $MORE_PIP_FLAGS -r requirements.txt && \
-    python -m ipykernel install --user
+  python -m ipykernel install --user
 RUN wget -q https://github.com/raw/vishnubob/wait-for-it/master/wait-for-it.sh && \
-    chmod +x wait-for-it.sh && mv wait-for-it.sh /root/.local/bin/
+  chmod +x wait-for-it.sh && mv wait-for-it.sh /root/.local/bin/
 
 FROM base
 COPY --from=python-deps /root/.local/lib/python3.10/site-packages /root/.local/lib/python3.10/site-packages

mpcontribs-kernel-gateway/start.sh

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