Emit version metric from SPIRE Server and Agent on startup

Makefile

@@ -21,12 +21,14 @@ gopath := $(shell go env GOPATH)
 goversion := $(shell go version | cut -f3 -d' ')
 goversion-required := $(shell cat .go-version)
 gittag := $(shell git tag --points-at HEAD)
+githash := $(shell git rev-parse --short=7 HEAD)
 gitdirty := $(shell git status -s)
 # don't provide the git tag if the git status is dirty.
 ifneq ($(gitdirty),)
 	gittag :=
+	githash :=
 endif
-ldflags := '-s -w -X github.com/spiffe/spire/pkg/common/version.gittag=$(gittag)'
+ldflags := '-s -w -X github.com/spiffe/spire/pkg/common/version.gittag=$(gittag) -X github.com/spiffe/spire/pkg/common/version.githash=$(githash)'
 
 utils = github.com/spiffe/spire/tools/spire-plugingen
 

go.mod

@@ -1,7 +1,5 @@
 module github.com/spiffe/spire
 
-go 1.13
-
 replace github.com/spiffe/spire/proto/spire => ./proto/spire
 
 require (

pkg/agent/agent.go

@@ -59,6 +59,8 @@ func (a *Agent) Run(ctx context.Context) error {
 		Metrics: metrics,
 	})
 
+	telemetry.EmitVersion(metrics)
+
 	cat, err := catalog.Load(ctx, catalog.Config{
 		Log: a.c.Log.WithField(telemetry.SubsystemName, telemetry.Catalog),
 		GlobalConfig: catalog.GlobalConfig{

pkg/common/telemetry/version.go

@@ -0,0 +1,11 @@
+package telemetry
+
+import (
+	"github.com/spiffe/spire/pkg/common/version"
+)
+
+func EmitVersion(m Metrics) {
+	m.SetGaugeWithLabels([]string{"started"}, 1, []Label{
+		{Name: "version", Value: version.Version()},
+	})
+}

pkg/common/version/version.go

@@ -7,12 +7,13 @@ const (
 )
 
 var (
-	gittag = ""
+	gittag  = ""
+	githash = "unk"
 )
 
 func Version() string {
 	if gittag == "" {
-		return fmt.Sprintf("%s-dev", Base)
+		return fmt.Sprintf("%s-dev-%s", Base, githash)
 	}
-	return Base
+	return gittag
 }

pkg/server/server.go

@@ -171,6 +171,8 @@ func (s *Server) run(ctx context.Context) (err error) {
 		Metrics: metrics,
 	})
 
+	telemetry.EmitVersion(metrics)
+
 	// Create the identity provider host service. It will not be functional
 	// until the call to SetDeps() below. There is some tricky initialization
 	// stuff going on since the identity provider host service requires plugins

tools/external/go.mod

@@ -16,3 +16,5 @@ require (
 	github.com/pseudomuto/protokit v0.1.0 // indirect
 	golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846 // indirect
 )
+
+go 1.13