#110 Refactor influxdb monitoring

to use it as singleton.
This enables the possibility to monitor processes that are independent of an incoming request.

internal/api/api.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"github.com/gorilla/mux"
-	influxdb2API "github.com/influxdata/influxdb-client-go/v2/api"
 	"github.com/openHPI/poseidon/internal/api/auth"
 	"github.com/openHPI/poseidon/internal/config"
 	"github.com/openHPI/poseidon/internal/environment"
@@ -29,14 +28,13 @@ const (
 // always returns a router for the newest version of our API. We
 // use gorilla/mux because it is more convenient than net/http, e.g.
 // when extracting path parameters.
-func NewRouter(runnerManager runner.Manager, environmentManager environment.ManagerHandler,
-	influxClient influxdb2API.WriteAPI) *mux.Router {
+func NewRouter(runnerManager runner.Manager, environmentManager environment.ManagerHandler) *mux.Router {
 	router := mux.NewRouter()
 	// this can later be restricted to a specific host with
 	// `router.Host(...)` and to HTTPS with `router.Schemes("https")`
 	configureV1Router(router, runnerManager, environmentManager)
 	router.Use(logging.HTTPLoggingMiddleware)
-	router.Use(monitoring.InfluxDB2Middleware(influxClient, environmentManager))
+	router.Use(monitoring.InfluxDB2Middleware)
 	return router
 }
 

internal/api/environments_test.go

@@ -31,7 +31,7 @@ func TestEnvironmentControllerTestSuite(t *testing.T) {
 
 func (s *EnvironmentControllerTestSuite) SetupTest() {
 	s.manager = &environment.ManagerHandlerMock{}
-	s.router = NewRouter(nil, s.manager, nil)
+	s.router = NewRouter(nil, s.manager)
 }
 
 func (s *EnvironmentControllerTestSuite) TestList() {

internal/api/runners.go

@@ -68,7 +68,7 @@ func (r *RunnerController) provide(writer http.ResponseWriter, request *http.Req
 		}
 		return
 	}
-	monitoring.AddRunnerMonitoringData(request, nextRunner)
+	monitoring.AddRunnerMonitoringData(request, nextRunner.ID(), nextRunner.Environment())
 	sendJSON(writer, &dto.RunnerResponse{ID: nextRunner.ID(), MappedPorts: nextRunner.MappedPorts()}, http.StatusOK)
 }
 
@@ -82,7 +82,7 @@ func (r *RunnerController) updateFileSystem(writer http.ResponseWriter, request
 	}
 
 	targetRunner, _ := runner.FromContext(request.Context())
-	monitoring.AddRunnerMonitoringData(request, targetRunner)
+	monitoring.AddRunnerMonitoringData(request, targetRunner.ID(), targetRunner.Environment())
 	if err := targetRunner.UpdateFileSystem(fileCopyRequest); err != nil {
 		log.WithError(err).Error("Could not perform the requested updateFileSystem.")
 		writeInternalServerError(writer, err, dto.ErrorUnknown)
@@ -108,7 +108,7 @@ func (r *RunnerController) execute(writer http.ResponseWriter, request *http.Req
 		scheme = "ws"
 	}
 	targetRunner, _ := runner.FromContext(request.Context())
-	monitoring.AddRunnerMonitoringData(request, targetRunner)
+	monitoring.AddRunnerMonitoringData(request, targetRunner.ID(), targetRunner.Environment())
 
 	path, err := r.runnerRouter.Get(WebsocketPath).URL(RunnerIDKey, targetRunner.ID())
 	if err != nil {
@@ -160,7 +160,7 @@ func (r *RunnerController) findRunnerMiddleware(next http.Handler) http.Handler
 // It destroys the given runner on the executor and removes it from the used runners list.
 func (r *RunnerController) delete(writer http.ResponseWriter, request *http.Request) {
 	targetRunner, _ := runner.FromContext(request.Context())
-	monitoring.AddRunnerMonitoringData(request, targetRunner)
+	monitoring.AddRunnerMonitoringData(request, targetRunner.ID(), targetRunner.Environment())
 
 	err := r.manager.Return(targetRunner)
 	if err != nil {

internal/api/runners_test.go

@@ -107,7 +107,7 @@ type RunnerRouteTestSuite struct {
 
 func (s *RunnerRouteTestSuite) SetupTest() {
 	s.runnerManager = &runner.ManagerMock{}
-	s.router = NewRouter(s.runnerManager, nil, nil)
+	s.router = NewRouter(s.runnerManager, nil)
 	s.runner = runner.NewNomadJob("some-id", nil, nil, nil)
 	s.executionID = "execution"
 	s.runner.StoreExecution(s.executionID, &dto.ExecutionRequest{})

internal/api/websocket.go

@@ -76,7 +76,7 @@ func (wp *webSocketProxy) waitForExit(exit <-chan runner.ExitInfo, cancelExecuti
 // connectToRunner is the endpoint for websocket connections.
 func (r *RunnerController) connectToRunner(writer http.ResponseWriter, request *http.Request) {
 	targetRunner, _ := runner.FromContext(request.Context())
-	monitoring.AddRunnerMonitoringData(request, targetRunner)
+	monitoring.AddRunnerMonitoringData(request, targetRunner.ID(), targetRunner.Environment())
 
 	executionID := request.URL.Query().Get(ExecutionIDKey)
 	if !targetRunner.ExecutionExists(executionID) {

internal/api/websocket_test.go

@@ -51,7 +51,7 @@ func (s *WebSocketTestSuite) SetupTest() {
 
 	runnerManager := &runner.ManagerMock{}
 	runnerManager.On("Get", s.runner.ID()).Return(s.runner, nil)
-	s.router = NewRouter(runnerManager, nil, nil)
+	s.router = NewRouter(runnerManager, nil)
 	s.server = httptest.NewServer(s.router)
 }
 
@@ -257,7 +257,7 @@ func TestWebsocketTLS(t *testing.T) {
 
 	runnerManager := &runner.ManagerMock{}
 	runnerManager.On("Get", r.ID()).Return(r, nil)
-	router := NewRouter(runnerManager, nil, nil)
+	router := NewRouter(runnerManager, nil)
 
 	server, err := helpers.StartTLSServer(t, router)
 	require.NoError(t, err)
@@ -327,7 +327,7 @@ func newRunnerWithNotMockedRunnerManager(t *testing.T, apiMock *nomad.ExecutorAP
 		call.ReturnArguments = mock.Arguments{nil}
 	})
 	runnerManager := runner.NewNomadRunnerManager(apiMock, context.Background())
-	router := NewRouter(runnerManager, nil, nil)
+	router := NewRouter(runnerManager, nil)
 	server := httptest.NewServer(router)
 
 	runnerID := tests.DefaultRunnerID