add version command and add build information to metrics

Signed-off-by: David Christofas <dchristofas@owncloud.com>

konnectd/pkg/server/debug/server.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis/konnectd/pkg/config"
-	"github.com/owncloud/ocis/konnectd/pkg/version"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 )
 
@@ -15,8 +14,8 @@ func Server(opts ...Option) (*http.Server, error) {
 
 	return debug.NewService(
 		debug.Logger(options.Logger),
-		debug.Name("konnectd"),
-		debug.Version(version.String),
+		debug.Name(options.Config.Service.Name),
+		debug.Version(options.Config.Service.Version),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

konnectd/pkg/server/http/server.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/owncloud/ocis/konnectd/pkg/crypto"
 	svc "github.com/owncloud/ocis/konnectd/pkg/service/v0"
-	"github.com/owncloud/ocis/konnectd/pkg/version"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/service/http"
 )
@@ -44,9 +43,9 @@ func Server(opts ...Option) (http.Service, error) {
 
 	service := http.NewService(
 		http.Logger(options.Logger),
-		http.Namespace(options.Config.HTTP.Namespace),
-		http.Name("konnectd"),
-		http.Version(version.String),
+		http.Namespace(options.Config.Service.Namespace),
+		http.Name(options.Config.Service.Name),
+		http.Version(options.Config.Service.Version),
 		http.Address(options.Config.HTTP.Addr),
 		http.Context(options.Context),
 		http.Flags(options.Flags...),
@@ -63,8 +62,8 @@ func Server(opts ...Option) (http.Service, error) {
 			middleware.Cors,
 			middleware.Secure,
 			middleware.Version(
-				"konnectd",
-				version.String,
+				options.Config.Service.Name,
+				options.Config.Service.Version,
 			),
 			middleware.Logger(
 				options.Logger,