add version command and add build information to metrics

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

proxy/pkg/command/root.go

@@ -32,12 +32,14 @@ func Execute() error {
 		Flags: flagset.RootWithConfig(cfg),
 
 		Before: func(c *cli.Context) error {
+			cfg.Service.Version = version.String
 			return ParseConfig(c, cfg)
 		},
 
 		Commands: []*cli.Command{
 			Server(cfg),
 			Health(cfg),
+			PrintVersion(cfg),
 		},
 	}
 

proxy/pkg/command/server.go

@@ -58,7 +58,6 @@ func Server(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
-			httpNamespace := c.String("http-namespace")
 
 			if cfg.Tracing.Enabled {
 				switch t := cfg.Tracing.Type; t {
@@ -152,6 +151,8 @@ func Server(cfg *config.Config) *cli.Command {
 
 			defer cancel()
 
+			metrics.BuildInfo.WithLabelValues(cfg.Service.Version).Set(1)
+
 			rp := proxy.NewMultiHostReverseProxy(
 				proxy.Logger(logger),
 				proxy.Config(cfg),
@@ -161,7 +162,6 @@ func Server(cfg *config.Config) *cli.Command {
 				server, err := proxyHTTP.Server(
 					proxyHTTP.Handler(rp),
 					proxyHTTP.Logger(logger),
-					proxyHTTP.Namespace(httpNamespace),
 					proxyHTTP.Context(ctx),
 					proxyHTTP.Config(cfg),
 					proxyHTTP.Metrics(metrics),

proxy/pkg/command/version.go

@@ -0,0 +1,45 @@
+package command
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/micro/cli/v2"
+	"github.com/micro/go-micro/v2/registry/mdns"
+	tw "github.com/olekukonko/tablewriter"
+	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/flagset"
+)
+
+// PrintVersion prints the service versions of all running instances.
+func PrintVersion(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "version",
+		Usage: "Print the versions of the running instances",
+		Flags: flagset.ListProxyWithConfig(cfg),
+		Action: func(c *cli.Context) error {
+			reg := mdns.NewRegistry()
+			services, err := reg.GetService(cfg.Service.Namespace + "." + cfg.Service.Name)
+			if err != nil {
+				fmt.Println(fmt.Errorf("could not get proxy services from the registry: %v", err))
+				return err
+			}
+
+			if len(services) == 0 {
+				fmt.Println("No running proxy service found.")
+				return nil
+			}
+
+			table := tw.NewWriter(os.Stdout)
+			table.SetHeader([]string{"Version", "Address", "Id"})
+			table.SetAutoFormatHeaders(false)
+			for _, s := range services {
+				for _, n := range s.Nodes {
+					table.Append([]string{s.Version, n.Address, n.Id})
+				}
+			}
+			table.Render()
+			return nil
+		},
+	}
+}