Skip to content

[WIP] Handle and return errors for metrics registration #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fahlmant wants to merge 2 commits into from
Closed

[WIP] Handle and return errors for metrics registration #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20fa291
Handle and return errors for metrics registration
fahlmant Jul 27, 2020
41623a9
Test commit
fahlmant Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pkg/metrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,23 @@ import (
)

// StartMetrics starts the server based on the metricsConfig provided by the user.
func StartMetrics(config metricsConfig) {
func StartMetrics(config metricsConfig) error {
// Register metrics only when the metric list is provided by the operator
fmt.Println("REGISTERING METRICS")
if config.collectorList != nil {
RegisterMetrics(config.collectorList)
err := RegisterMetrics(config.collectorList)
if err != nil {
log.Error(err, "Something")
return err
}
}

http.Handle(config.metricsPath, promhttp.Handler())
log.Info(fmt.Sprintf("Port: %s", config.metricsPort))
metricsPort := ":" + (config.metricsPort)
go http.ListenAndServe(metricsPort, nil)

return nil
}

// RegisterMetrics takes the list of metrics to be registered from the user and
Expand Down
6 changes: 5 additions & 1 deletion pkg/metrics/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,11 @@ func GenerateRoute(s *v1.Service, path string) *routev1.Route {
func ConfigureMetrics(ctx context.Context, userMetricsConfig metricsConfig) error {
log.Info("Starting prometheus metrics")

StartMetrics(userMetricsConfig)
err := StartMetrics(userMetricsConfig)
if err != nil {
log.Info("Failed to register metrics", "Error", err.Error())
return err
}

client, err := createClient()
if err != nil {
Expand Down