Keep symbols by default (#20519)

By reversing the logic and adding a `REMOVE_SYMBOLS` environment
variable that, when set, will remove symbols.

This has been requested to re-enable Dynatrace support, which
requires symbols are intact.

Sadly this increases the size (on my mac) from 192,609,682 bytes
to 236,696,722 bytes (+23% increase).

I confirmed that this adds symbols back, and that `dlv` will load
the Vault binary.
This commit is contained in:
Christopher Swenson 2023-05-04 13:23:06 -07:00 committed by GitHub
parent 2656c020ae
commit 42f7def9aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

3
changelog/20519.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
Add debug symbols back to builds to fix Dynatrace support
```

View File

@ -154,17 +154,16 @@ function build() {
prerelease=$(version_pre) prerelease=$(version_pre)
build_date=$(build_date) build_date=$(build_date)
: "${GO_TAGS:=""}" : "${GO_TAGS:=""}"
: "${KEEP_SYMBOLS:=""}" : "${REMOVE_SYMBOLS:=""}"
# Build our ldflags # Build our ldflags
msg="--> Building Vault v$version, revision $revision, built $build_date" msg="--> Building Vault v$version, revision $revision, built $build_date"
# Keep the symbol and dwarf information by default # Keep the symbol and dwarf information by default
# TODO: maybe add REMOVE_SYMBOLS? if [ -n "$REMOVE_SYMBOLS" ]; then
if [ -n "$KEEP_SYMBOLS" ]; then
ldflags="-s -w " ldflags="-s -w "
else else
ldflags="-s -w " ldflags=""
fi fi
ldflags="${ldflags}-X github.com/hashicorp/vault/version.Version=$version -X github.com/hashicorp/vault/version.GitCommit=$revision -X github.com/hashicorp/vault/version.BuildDate=$build_date" ldflags="${ldflags}-X github.com/hashicorp/vault/version.Version=$version -X github.com/hashicorp/vault/version.GitCommit=$revision -X github.com/hashicorp/vault/version.BuildDate=$build_date"