Merge branch '375-cache-query-result' of...

Merge branch '375-cache-query-result' of git.science.uu.nl:datastrophe/microservices-backbone/query-service into 375-cache-query-result

cmd/query-service/main.go

 package main
 
 import (
+	"log"
+	"net/http"
 	"query-service/internal/drivers/rpcdriver"
 	"query-service/internal/usecases/consume"
 	"query-service/internal/usecases/databaseinfo"
@@ -12,6 +14,7 @@ import (
 	"git.science.uu.nl/datastrophe/objectstore"
 	"git.science.uu.nl/datastrophe/query-conversion/aql"
 	"git.science.uu.nl/datastrophe/query-execution/arangodb"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/thijsheijden/alice"
 )
 
@@ -23,7 +26,10 @@ func main() {
 	keyValueStore := keyvaluestore.NewDriver()
 
 	objectStore := objectstore.NewDriver()
-	objectStore.Connect()
+	err := objectStore.Connect()
+	if err != nil {
+		logger.Log(err.Error())
+	}
 
 	// Create new rpc driver
 	rpcDriver := rpcdriver.New()
@@ -49,5 +55,10 @@ func main() {
 
 	go consumeService.Start()
 
+	// Expose /metrics endpoint for prometheus
+	logger.Log("Starting metrics server")
+	http.Handle("/metrics", promhttp.Handler())
+	log.Fatal(http.ListenAndServe(":8080", nil))
+
 	select {}
 }

deployments/deployment.yml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: query-handler
+  name: query-service
   labels:
     app: query-service
+    monitor: go-service
 spec:
   replicas: 1 
   selector:
     matchLabels:
       app: query-service
+      monitor: go-service
   template:
     metadata:
       labels:
         app: query-service
+        monitor: go-service
     spec:
       containers:
       - name: query-service
         image: datastropheregistry.azurecr.io/query-service:latest
         ports:
-        - containerPort: 3000 
+        - containerPort: 8080
         env:
         - name: RABBIT_HOST
           value: rabbitmq

deployments/svc.yml

@@ -7,5 +7,6 @@ spec:
   selector:
     app: query-service
   ports:
-    - port: 3000
-      targetPort: 3000
+    - name: monitoring
+      port: 8080
\ No newline at end of file
+      targetPort: 8080
\ No newline at end of file

go.mod

@@ -8,13 +8,11 @@ require (
 	git.science.uu.nl/datastrophe/objectstore v0.0.0-20210603160015-4cbd339b979c
 	git.science.uu.nl/datastrophe/query-conversion v0.0.0-20210601141629-c90342e61f80
 	git.science.uu.nl/datastrophe/query-execution v0.0.0-20210518112715-043c7046dc7b
-	github.com/boumenot/gocover-cobertura v1.1.0 // indirect
+	github.com/prometheus/client_golang v1.10.0
 	github.com/stretchr/testify v1.7.0
 	github.com/thijsheijden/alice v0.1.18
-	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
 	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 	golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect
-	golang.org/x/tools v0.1.2 // indirect
 	google.golang.org/grpc v1.37.0
 	google.golang.org/protobuf v1.26.0
 )