Merge pull request #21 from SwimResults/develop

add prometheus endpoint; update go 1.24

Author: konrad2002

.github/workflows/go.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.18
+        go-version: 1.24
 
     - name: Build
       run: CGO_ENABLED=0 go build -v -o . -x ./...

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM golang:1.16-alpine
+FROM golang:1.24-alpine
 
 WORKDIR /app
 

client/disq_client_test.go

@@ -22,7 +22,7 @@ package client
 //
 //	r, _, e := client.ImportDisqualification(start1, "Guter Grund", time.Now())
 //	if e != nil {
-//		fmt.Printf(e.Error())
+//		fmt.Println(e)
 //	}
 //	fmt.Println(r)
 //	//fmt.Printf("id: %s, number: %d, start: %s", r.Identifier.String(), r.Number, r.StartEstimation.Format("15:04"))

client/heat_client_test.go

@@ -11,7 +11,7 @@ package client
 //	tm, _ := time.Parse("2006-01-02 15:04", "2019-12-06 13:02")
 //	r, _, e := client.ImportHeat("IESC19", 13, 3, tm)
 //	if e != nil {
-//		fmt.Printf(e.Error())
+//		fmt.Println(e)
 //	}
 //	fmt.Printf("id: %s, number: %d, start: %s", r.Identifier.String(), r.Number, r.StartEstimation.Format("15:04"))
 //}

client/start_client_test.go

@@ -36,7 +36,7 @@ func TestStartClient_ImportStart(t *testing.T) {
 //
 //	r, _, e := client.ImportStart(start1)
 //	if e != nil {
-//		fmt.Printf(e.Error())
+//		fmt.Println(e)
 //	}
 //	fmt.Println(r)
 //	//fmt.Printf("id: %s, number: %d, start: %s", r.Identifier.String(), r.Number, r.StartEstimation.Format("15:04"))
@@ -63,7 +63,7 @@ func TestStartClient_ImportStart(t *testing.T) {
 //
 //	r, _, e := client.ImportResult(start1, result1)
 //	if e != nil {
-//		fmt.Printf(e.Error())
+//		fmt.Println(e)
 //	}
 //	fmt.Println(r)
 //	fmt.Printf("type: %s, time: %f", r.ResultType, r.Time.Seconds())

controller/controller.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/swimresults/start-service/service"
+	ginprometheus "github.com/zsais/go-gin-prometheus"
 	"net/http"
 	"os"
 )
@@ -19,6 +20,11 @@ func Run() {
 		return
 	}
 
+	p := ginprometheus.NewWithConfig(ginprometheus.Config{
+		Subsystem: "gin",
+	})
+	p.Use(router)
+
 	startController()
 	heatController()
 	disqualificationController()

controller/disq_controller.go

@@ -21,7 +21,7 @@ func importDisqualification(c *gin.Context) {
 
 	disqualification, _, err := service.ImportDisqualification(request.Start, request.Disqualification)
 	if err != nil {
-		fmt.Printf(err.Error())
+		fmt.Println(err)
 		c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
 		return
 	}

controller/heat_controller.go

@@ -257,7 +257,7 @@ func importHeat(c *gin.Context) {
 
 	heat, r, err := service.ImportHeat(request.Heat)
 	if err != nil {
-		fmt.Printf(err.Error())
+		fmt.Println(err)
 		c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
 		return
 	}

controller/result_controller.go

@@ -21,7 +21,7 @@ func importResult(c *gin.Context) {
 
 	result, _, err := service.ImportResult(request.Start, request.Result)
 	if err != nil {
-		fmt.Printf(err.Error())
+		fmt.Println(err)
 		c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
 		return
 	}

controller/start_controller.go

@@ -345,7 +345,7 @@ func importStart(c *gin.Context) {
 
 	start, r, err := service.ImportStart(request.Start)
 	if err != nil {
-		fmt.Printf(err.Error())
+		fmt.Println(err)
 		c.IndentedJSON(http.StatusInternalServerError, gin.H{"message": err.Error()})
 		return
 	}