Merge branch 'osw-bump-labkit-version' into 'master'

Bump Labkit version to support profiler sample versioning

See merge request gitlab-org/gitlab-workhorse!479

CHANGELOG

@@ -2,6 +2,10 @@
 
 Formerly known as 'gitlab-git-http-server'.
 
+v 8.29.0
+
+- Bump Labkit version to support Profiler sample versioning
+
 v 8.28.0
 
 - Reject parameters that override upload fields

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/sirupsen/logrus v1.3.0
 	github.com/stretchr/testify v1.4.0
 	gitlab.com/gitlab-org/gitaly v1.74.0
-	gitlab.com/gitlab-org/labkit v0.0.0-20200227174525-4f8041c014c2
+	gitlab.com/gitlab-org/labkit v0.0.0-20200327153541-fac94cb428e6
 	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
 	golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
 	golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect

go.sum

@@ -267,6 +267,8 @@ gitlab.com/gitlab-org/labkit v0.0.0-20200219201213-4f4f5c1b0539 h1:I2xPr4WlOK3Gt
 gitlab.com/gitlab-org/labkit v0.0.0-20200219201213-4f4f5c1b0539/go.mod h1:WyFbg+j26WJmH44qGeINba3QlIVbLxepQ/+qMA2s2+U=
 gitlab.com/gitlab-org/labkit v0.0.0-20200227174525-4f8041c014c2 h1:CCfQxzBy7He5oakCE/3e5yJWFA4yHJqLnGQVje4HiJc=
 gitlab.com/gitlab-org/labkit v0.0.0-20200227174525-4f8041c014c2/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=

main.go

@@ -128,7 +128,7 @@ func main() {
 	}
 
 	go func() {
-		err := monitoring.Serve(monitoringOpts...)
+		err := monitoring.Start(monitoringOpts...)
 		if err != nil {
 			log.WithError(err).Error("Failed to start monitoring")
 		}