Set up metrics on service start (fixes #251) (#262)

Signed-off-by: Lazaros Tsigkakos <[email protected]>
mantzas · Jan 9, 2019 · 5ea220f · 5ea220f
1 parent 07da69e
commit 5ea220f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/cmd/patron/main.go b/cmd/patron/main.go
@@ -195,7 +195,7 @@ var (
 func main() {
 	name := "{{name}}"
 
-	err := patron.SetupLogging(name, version)
+	err := patron.Setup(name, version)
 	if err != nil {
 		fmt.Printf("failed to set up logging: %v", err)
 		os.Exit(1)

diff --git a/examples/first/main.go b/examples/first/main.go
@@ -35,7 +35,7 @@ func main() {
 	name := "first"
 	version := "1.0.0"
 
-	err := patron.SetupLogging(name, version)
+	err := patron.Setup(name, version)
 	if err != nil {
 		fmt.Printf("failed to set up logging: %v", err)
 		os.Exit(1)

diff --git a/examples/fourth/main.go b/examples/fourth/main.go
@@ -40,7 +40,7 @@ func main() {
 	name := "fourth"
 	version := "1.0.0"
 
-	err := patron.SetupLogging(name, version)
+	err := patron.Setup(name, version)
 	if err != nil {
 		fmt.Printf("failed to set up logging: %v", err)
 		os.Exit(1)

diff --git a/examples/second/main.go b/examples/second/main.go
@@ -46,7 +46,7 @@ func main() {
 	name := "second"
 	version := "1.0.0"
 
-	err := patron.SetupLogging(name, version)
+	err := patron.Setup(name, version)
 	if err != nil {
 		fmt.Printf("failed to set up logging: %v", err)
 		os.Exit(1)

diff --git a/examples/third/main.go b/examples/third/main.go
@@ -44,7 +44,7 @@ func main() {
 	name := "third"
 	version := "1.0.0"
 
-	err := patron.SetupLogging(name, version)
+	err := patron.Setup(name, version)
 	if err != nil {
 		fmt.Printf("failed to set up logging: %v", err)
 		os.Exit(1)

diff --git a/service.go b/service.go
@@ -50,12 +50,11 @@ func New(name, version string, oo ...OptionFunc) (*Service, error) {
 
 	s := Service{cps: []Component{}, hcf: http.DefaultHealthCheck, termSig: make(chan os.Signal, 1)}
 
-	err := SetupLogging(name, version)
+	err := Setup(name, version)
 	if err != nil {
 		return nil, err
 	}
 
-	metric.Setup(name)
 	err = s.setupDefaultTracing(name, version)
 	if err != nil {
 		return nil, err
@@ -129,8 +128,10 @@ func (s *Service) Run() error {
 	return errors.Aggregate(ee...)
 }
 
-// SetupLogging set's up default logging.
-func SetupLogging(name, version string) error {
+// Setup set's up metrics and default logging.
+func Setup(name, version string) error {
+	metric.Setup(name)
+
 	lvl, ok := os.LookupEnv("PATRON_LOG_LEVEL")
 	if !ok {
 		lvl = string(log.InfoLevel)