diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
| commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
| tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /workhorse/main.go | |
| parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
| download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'workhorse/main.go')
| -rw-r--r-- | workhorse/main.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/workhorse/main.go b/workhorse/main.go index 47ab63a875a..c43ec45240f 100644 --- a/workhorse/main.go +++ b/workhorse/main.go @@ -16,6 +16,7 @@ import ( "gitlab.com/gitlab-org/labkit/tracing" "gitlab.com/gitlab-org/gitlab-workhorse/internal/config" + "gitlab.com/gitlab-org/gitlab-workhorse/internal/errortracker" "gitlab.com/gitlab-org/gitlab-workhorse/internal/queueing" "gitlab.com/gitlab-org/gitlab-workhorse/internal/redis" "gitlab.com/gitlab-org/gitlab-workhorse/internal/secret" @@ -156,6 +157,8 @@ func run(boot bootConfig, cfg config.Config) error { } defer closer.Close() + errortracker.Initialize(cfg.Version) + tracing.Initialize(tracing.WithServiceName("gitlab-workhorse")) log.WithField("version", Version).WithField("build_time", BuildTime).Print("Starting") @@ -223,7 +226,7 @@ func run(boot bootConfig, cfg config.Config) error { } defer accessCloser.Close() - up := wrapRaven(upstream.NewUpstream(cfg, accessLogger)) + up := upstream.NewUpstream(cfg, accessLogger) go func() { finalErrors <- http.Serve(listener, up) }() |