From 90dc303293411812d96068e22c04fedda1877dde Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@staff.ietf.org>
Date: Tue, 16 Apr 2024 17:03:50 -0300
Subject: [PATCH] ci: Add scoutapm sidecar container (#7330)

* ci: Add scoutapm sidecar container

* ci: Configure ScoutAPM via helm
---
 helm/settings_local.py                      |  8 +++-----
 helm/templates/deployments/datatracker.yaml |  7 +++++++
 helm/values.yaml                            | 10 ++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/helm/settings_local.py b/helm/settings_local.py
index 18010a686..af27e17f7 100644
--- a/helm/settings_local.py
+++ b/helm/settings_local.py
@@ -176,14 +176,12 @@ if _SCOUT_KEY is not None:
         DEV_PRE_APPS = ["scout_apm.django", ]
     SCOUT_MONITOR = True
     SCOUT_KEY = _SCOUT_KEY
-    SCOUT_NAME = "Datatracker"
+    SCOUT_NAME = os.environ.get("DATATRACKER_SCOUT_NAME", "Datatracker")
     SCOUT_ERRORS_ENABLED = True
     SCOUT_SHUTDOWN_MESSAGE_ENABLED = False
-    SCOUT_CORE_AGENT_DIR = "/a/core-agent/1.4.0"
-    SCOUT_CORE_AGENT_FULL_NAME = "scout_apm_core-v1.4.0-x86_64-unknown-linux-musl"
     SCOUT_CORE_AGENT_SOCKET_PATH = "tcp://{host}:{port}".format(
-        host=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_HOST", "scout"),
-        port=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_PORT", "16590"),
+        host=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_HOST", "localhost"),
+        port=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_PORT", "6590"),
     ),
     SCOUT_CORE_AGENT_DOWNLOAD = False
     SCOUT_CORE_AGENT_LAUNCH = False
diff --git a/helm/templates/deployments/datatracker.yaml b/helm/templates/deployments/datatracker.yaml
index 0cc5ab617..d62587297 100644
--- a/helm/templates/deployments/datatracker.yaml
+++ b/helm/templates/deployments/datatracker.yaml
@@ -57,6 +57,13 @@ spec:
             {{- toYaml $podValues.startupProbe | nindent 12 }}
           resources:
             {{- toYaml $podValues.resources | nindent 12 }}
+      {{- if $podValues.scoutapm }}
+      initContainers:
+        - name: "scoutapm"
+          image: "{{ $podValues.scoutapm.image.repository }}:{{ default "latest" $podValues.image.tag }}"
+          imagePullPolicy: {{ default "IfNotPresent" $podValues.scoutapm.image.imagePullPolicy }}
+          restartPolicy: "Always"
+      {{- end }}
       {{- with $podValues.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/values.yaml b/helm/values.yaml
index ed568094c..564f8c025 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -166,6 +166,12 @@ datatracker:
   nodeSelector: {}
 
   affinity: {}
+  
+  # Set this to enable a Scout APM Core Agent sidecar
+  scoutapm:
+    image:
+      repository: "scoutapp/scoutapm"
+      tag: "version-1.4.0"
 
 # -------------------------------------------------------------
 # CELERY
@@ -661,3 +667,7 @@ env:
   # use this to override default - one entry per line
   # DATATRACKER_CSRF_TRUSTED_ORIGINS: |-
   #   https://datatracker.staging.ietf.org
+
+  # Scout configuration
+  DATATRACKER_SCOUT_KEY: "this-is-the-scout-key"
+  DATATRACKER_SCOUT_NAME: "StagingDatatracker"