From a7641863ca7317735cdcde79b2a8315d8ad7b816 Mon Sep 17 00:00:00 2001
From: hc-github-team-secure-vault-core
 <82990506+hc-github-team-secure-vault-core@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:50:32 -0400
Subject: [PATCH] backport of commit 33cd7f4b13a6f438623c66b3b89b204757a12331
 (#20298)

Co-authored-by: Christopher Swenson <christopher.swenson@hashicorp.com>
---
 changelog/20294.txt  | 3 +++
 scripts/ci-helper.sh | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelog/20294.txt

diff --git a/changelog/20294.txt b/changelog/20294.txt
new file mode 100644
index 000000000000..92f7c291892b
--- /dev/null
+++ b/changelog/20294.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+Add debug symbols back to builds to fix Dynatrace support
+```
diff --git a/scripts/ci-helper.sh b/scripts/ci-helper.sh
index 585f89786cf7..ba855fc20bc6 100755
--- a/scripts/ci-helper.sh
+++ b/scripts/ci-helper.sh
@@ -156,9 +156,10 @@ function build() {
   # Build our ldflags
   msg="--> Building Vault v$version, revision $revision, built $build_date"
 
-  # Strip the symbol and dwarf information by default
+  # Keep the symbol and dwarf information by default
+  # TODO: maybe add REMOVE_SYMBOLS?
   if [ -n "$KEEP_SYMBOLS" ]; then
-    ldflags=""
+    ldflags="-s -w "
   else
     ldflags="-s -w "
   fi