backport of commit 33cd7f4 (hashicorp#20298)

Co-authored-by: Christopher Swenson <christopher.swenson@hashicorp.com>
fopina · Apr 21, 2023 · a764186 · a764186
1 parent 9ad11f8
commit a764186
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelog/20294.txt 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
@@ -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