diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2019-02-04 19:29:30 +0300 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2019-02-04 19:35:48 +0300 |
| commit | f4fa8583051eba4c6a63648b0893e3ea88535301 (patch) | |
| tree | c817ab55a2dc7b17aebdfe0dbe72dfac4ca64747 | |
| parent | 94ecbad5f45e36d9ece21e26bb998543a0094c5c (diff) | |
Statically link jaeger into Gitaly by default
This change will statically compile the jaeger client into gitaly by
default. This will allow support staff to enable the GITLAB_TRACING
variable to investigate issues further.
Note that by default, this will not enable tracing, only compile the
client in.
| -rw-r--r-- | _support/makegen.go | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index 3200f3d25..c381b149b 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -232,6 +232,7 @@ PREFIX ?= /usr/local INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ BUNDLE_FLAGS ?= --deployment ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly +BUILD_TAGS := tracer_static tracer_static_jaeger unexport GOROOT unexport GOBIN diff --git a/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml b/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml new file mode 100644 index 000000000..fa1b2fc92 --- /dev/null +++ b/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml @@ -0,0 +1,5 @@ +--- +title: Statically link jaeger into Gitaly by default +merge_request: 1063 +author: +type: other |