Update webpa-common to pull in final sd metrics

xmidt-org · Feb 9, 2018 · d09a2ec · d09a2ec
1 parent a5e5a08
commit d09a2ec
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 18 deletions.
diff --git a/src/glide.lock b/src/glide.lock
diff --git a/src/glide.yaml b/src/glide.yaml
@@ -2,4 +2,4 @@ package: .
 homepage: https://github.com/Comcast/petasos
 import:
 - package: github.com/Comcast/webpa-common
-  version: 49d31397e019541d27795f8543e634ab0846ed82
+  version: 46b42ed45a7f6d8624dd1890b4683fe9f246282f
diff --git a/src/petasos/petasos.go b/src/petasos/petasos.go
@@ -48,7 +48,7 @@ func petasos(arguments []string) int {
 		f = pflag.NewFlagSet(applicationName, pflag.ContinueOnError)
 		v = viper.New()
 
-		logger, metricsRegistry, webPA, err = server.Initialize(applicationName, arguments, f, v)
+		logger, metricsRegistry, webPA, err = server.Initialize(applicationName, arguments, f, v, service.Metrics)
 		infoLog                             = logging.Info(logger)
 		errorLog                            = logging.Error(logger)
 	)
@@ -70,6 +70,7 @@ func petasos(arguments []string) int {
 
 	infoLog.Log("configurationFile", v.ConfigFileUsed(), "serviceOptions", serviceOptions)
 	serviceOptions.Logger = logger
+	serviceOptions.MetricsProvider = metricsRegistry
 	services, err := service.New(serviceOptions)
 	if err != nil {
 		errorLog.Log(logging.MessageKey(), "Unable to initialize service discovery", logging.ErrorKey(), err)

diff --git a/src/petasos/petasos.json b/src/petasos/petasos.json
@@ -10,7 +10,15 @@
 	"pprof": {
 		"address": ":9191"
 	},
-
+
+	"metric": {
+		"address": ":9292",
+		"metricsOptions": {
+			"namespace": "xmidt",
+			"subsystem": "petasos"
+		}
+	},
+
 	"service": {
 		"servers": ["localhost:2181"],
 		"path": "/xmidt/local",