diff options
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | _support/Makefile.template | 2 | ||||
| -rw-r--r-- | cmd/gitaly/main.go | 2 | ||||
| -rw-r--r-- | cmd/praefect/main.go | 2 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rw-r--r-- | internal/blackbox/blackbox.go | 2 |
7 files changed, 14 insertions, 7 deletions
@@ -160,6 +160,12 @@ For example, to configure Jaeger, you could use the following command: GITLAB_TRACING=opentracing://jaeger ./gitaly config.toml ``` +## Continuous Profiling + +Gitaly supports Continuous Profiling through [LabKit][] using [Stackdriver Profiler](https://cloud.google.com/profiler). + +For more information on how to set it up, see the [LabKit monitoring docs](https://gitlab.com/gitlab-org/labkit/-/blob/master/monitoring/doc.go). + ## Presentations - [How Gitaly fits into GitLab (Youtube)](https://www.youtube.com/playlist?list=PL05JrBw4t0KqoFUiX42JG7BAc7pipMBAy) - a series of 1-hour training videos for contributors new to GitLab and Gitaly. @@ -227,3 +233,4 @@ GITLAB_TRACING=opentracing://jaeger ./gitaly config.toml - [Git Paris meetup, 2017-02-22](https://docs.google.com/presentation/d/19OZUalFMIDM8WujXrrIyCuVb_oVeaUzpb-UdGThOvAo/edit?usp=sharing) a high-level overview of what our plans are and where we are. [roadmap]: https://gitlab.com/groups/gitlab-org/-/roadmap?label_name%5B%5D=Gitaly&scope=all&sort=start_date_asc&state=opened +[LabKit]: https://gitlab.com/gitlab-org/labkit/ diff --git a/_support/Makefile.template b/_support/Makefile.template index c6c164025..9f7f5338f 100644 --- a/_support/Makefile.template +++ b/_support/Makefile.template @@ -10,7 +10,7 @@ PREFIX ?= /usr/local INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ BUNDLE_FLAGS ?= {{ .BundleFlags }} ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly -BUILD_TAGS := tracer_static tracer_static_jaeger +BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver unexport GOROOT export GOBIN = {{ .BuildDir }}/bin diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index dc6964eaa..39360c2b4 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -117,7 +117,7 @@ func run(b *bootstrap.Bootstrap) error { log.WithField("address", addr).Info("starting prometheus listener") go func() { - if err := monitoring.Serve( + if err := monitoring.Start( monitoring.WithListener(l), monitoring.WithBuildInformation( version.GetVersion(), diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index 47ca053b7..31ddec044 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -144,7 +144,7 @@ func configure(conf config.Config) { conf.Prometheus.Configure() go func() { - if err := monitoring.Serve( + if err := monitoring.Start( monitoring.WithListenerAddress(conf.PrometheusListenAddr), monitoring.WithBuildInformation(praefect.GetVersion(), praefect.GetBuildTime())); err != nil { logger.WithError(err).Errorf("Unable to start healthcheck listener: %v", conf.PrometheusListenAddr) @@ -17,7 +17,7 @@ require ( github.com/sirupsen/logrus v1.4.2 github.com/stretchr/testify v1.4.0 github.com/tinylib/msgp v1.1.0 // indirect - gitlab.com/gitlab-org/labkit v0.0.0-20200303165501-9cb7801f7fea + gitlab.com/gitlab-org/labkit v0.0.0-20200327153541-fac94cb428e6 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e golang.org/x/sys v0.0.0-20200113162924-86b910548bc1 google.golang.org/grpc v1.24.0 @@ -307,8 +307,8 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -gitlab.com/gitlab-org/labkit v0.0.0-20200303165501-9cb7801f7fea h1:Nx2TF8KYu1GCKIKnrnemyq2Ed0CIHRqrE2Kx5sP/WPw= -gitlab.com/gitlab-org/labkit v0.0.0-20200303165501-9cb7801f7fea/go.mod h1:WyFbg+j26WJmH44qGeINba3QlIVbLxepQ/+qMA2s2+U= +gitlab.com/gitlab-org/labkit v0.0.0-20200327153541-fac94cb428e6 h1:FZ/+I7jHVKUq3ev8SmD1fD743Kb7qYkjDcsaNg887vg= +gitlab.com/gitlab-org/labkit v0.0.0-20200327153541-fac94cb428e6/go.mod h1:WyFbg+j26WJmH44qGeINba3QlIVbLxepQ/+qMA2s2+U= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= diff --git a/internal/blackbox/blackbox.go b/internal/blackbox/blackbox.go index db3242c88..d9f39dd59 100644 --- a/internal/blackbox/blackbox.go +++ b/internal/blackbox/blackbox.go @@ -32,7 +32,7 @@ func runProbes(cfg *Config) { } func servePrometheus(l net.Listener) error { - return monitoring.Serve( + return monitoring.Start( monitoring.WithListener(l), monitoring.WithBuildInformation(version.GetVersion(), version.GetBuildTime()), ) |