fix: metrics options

goriller · Dec 14, 2022 · 1c4fc5c · 1c4fc5c
1 parent 834389c
commit 1c4fc5c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/app.go b/app.go
@@ -51,10 +51,11 @@ type Application struct {
 
 // Option
 type Option struct {
-	Name     string
-	Version  string
-	GrpcAddr string
-	HttpAddr string
+	Name        string
+	Version     string
+	GrpcAddr    string
+	HttpAddr    string
+	MetricsAddr string
 }
 
 // NewOption
@@ -91,6 +92,11 @@ func NewApp(
 			server.WithHttpAddr(option.HttpAddr),
 		)
 	}
+	if option.MetricsAddr != "" {
+		opts = append(opts,
+			server.WithMetricsAddr(option.MetricsAddr),
+		)
+	}
 
 	opts = append(opts, opt...)
 	app.Server = server.NewServer(ctx, logger, opts...)

diff --git a/server/options.go b/server/options.go
@@ -168,6 +168,15 @@ func WithHttpAddr(addr string) Option {
 	}
 }
 
+// WithMetricsAddr
+func WithMetricsAddr(addr string) Option {
+	return func(o *options) {
+		if addr != "" {
+			o.metricsAddr = addr
+		}
+	}
+}
+
 // WithDiscover
 func WithDiscover(d Discover) Option {
 	return func(o *options) {

diff --git a/server/server.go b/server/server.go
@@ -148,6 +148,9 @@ func (s *Server) Close(ctx context.Context) error {
 	if s.healthServer != nil {
 		s.healthServer.Close()
 	}
+	if s.metricsServer != nil {
+		s.metricsServer.Close()
+	}
 	// deRegister
 	err := s.deRegister(ctx)
 	if err != nil {