Merge pull request #93 from mahmednabil109/main

Remove the prometheus registry parameter

Author: xaionaro

pkg/api/listener.go

@@ -7,7 +7,6 @@ package api
 
 import (
 	"github.com/linuxboot/contest/pkg/xcontext"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 // Listener defines the interface for an API listener. This is used to
@@ -18,5 +17,5 @@ type Listener interface {
 	// The channel is used for cancellation, which can be called by the
 	// JobManager and should be handled by the listener to do a graceful
 	// shutdown.
-	Serve(xcontext.Context, *API, *prometheus.Registry) error
+	Serve(xcontext.Context, *API) error
 }

pkg/jobmanager/jobmanager.go

@@ -161,7 +161,7 @@ func (jm *JobManager) Run(ctx xcontext.Context, resumeJobs bool) error {
 
 	errCh := make(chan error, 1)
 	go func() {
-		lErr := jm.apiListener.Serve(apiCtx, a, nil)
+		lErr := jm.apiListener.Serve(apiCtx, a)
 		ctx.Infof("Listener shut down successfully.")
 		errCh <- lErr
 		close(errCh)

plugins/listeners/httplistener/httplistener.go

@@ -21,7 +21,6 @@ import (
 	"github.com/linuxboot/contest/pkg/storage"
 	"github.com/linuxboot/contest/pkg/types"
 	"github.com/linuxboot/contest/pkg/xcontext"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 // HTTPListener implements the api.Listener interface.
@@ -241,7 +240,7 @@ func listenWithCancellation(ctx xcontext.Context, s *http.Server) error {
 
 // Serve implements the api.Listener.Serve interface method. It starts an HTTP
 // API listener and returns an api.Event channel that the caller can iterate on.
-func (h *HTTPListener) Serve(ctx xcontext.Context, a *api.API, promRegistry *prometheus.Registry) error {
+func (h *HTTPListener) Serve(ctx xcontext.Context, a *api.API) error {
 	if a == nil {
 		return errors.New("API object is nil")
 	}

tests/integ/jobmanager/common.go

@@ -49,7 +49,6 @@ import (
 	"github.com/linuxboot/contest/tests/plugins/teststeps/noreturn"
 	readmetastep "github.com/linuxboot/contest/tests/plugins/teststeps/readmeta"
 	"github.com/linuxboot/contest/tests/plugins/teststeps/slowecho"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 // Integration tests for the JobManager use an in-memory storage layer, which
@@ -93,7 +92,7 @@ type TestListener struct {
 
 // Serve implements the main logic of a dummy listener which talks to the API
 // layer to trigger actions in the JobManager
-func (tl *TestListener) Serve(ctx xcontext.Context, contestApi *api.API, promRegistry *prometheus.Registry) error {
+func (tl *TestListener) Serve(ctx xcontext.Context, contestApi *api.API) error {
 	ctx.Debugf("Serving mock listener")
 	tl.api = contestApi
 	for {