Merge pull request 'fix' (#16) from master into dev

Reviewed-on: https://gitea.chocomarsh.com/self/monitoring/pulls/16

app/routers/metrics/task.go

@@ -0,0 +1,25 @@
+package routers
+
+import (
+	"encoding/json"
+	"log"
+	tasks "monitoring/app/storage/clickhouse/tables"
+	"net/http"
+)
+
+func AddTaskMetric(r *http.Request) (interface{}, int) {
+	d := json.NewDecoder(r.Body)
+	body := tasks.TaskMetric{}
+	err := d.Decode(&body)
+	if err != nil {
+		return nil, http.StatusBadRequest
+	}
+
+	err = tasks.AddTaskMetric(body)
+	if err != nil {
+		log.Print(err.Error())
+		return nil, http.StatusInternalServerError
+	}
+
+	return nil, http.StatusAccepted
+}

app/storage/clickhouse/tables/endpoints.go

@@ -9,12 +9,12 @@ import (
 )
 
 type EndpointMetric struct {
-	Timestamp time.Time `json:"timestamp"`
+	Timestamp    time.Time `json:"timestamp"`
-	Service string `json:"service"`
+	Service      string    `json:"service"`
-	Endpoint string `json:"endpoint"`
+	Endpoint     string    `json:"endpoint"`
-	StatusCode int `json:"status_code"`
+	StatusCode   int       `json:"status_code"`
-	ResponseTime int `json:"response_time"`
+	ResponseTime int       `json:"response_time"`
-	Method string `json:"method"`
+	Method       string    `json:"method"`
 }
 
 func AddEndpointMetric(metric EndpointMetric) error {

app/storage/clickhouse/tables/tasks.go

@@ -0,0 +1,34 @@
+package storage
+
+import (
+	"context"
+	"time"
+)
+
+type TaskMetric struct {
+	Timestamp       time.Time `json:"timestamp"`
+	Service         string    `json:"service"`
+	Queue           string    `json:"queue"`
+	Success         bool      `json:"success"`
+	ExecutionTimeMs int       `json:"execution_time_ms"`
+}
+
+func AddTaskMetric(metric TaskMetric) error {
+	batch, err := connection().PrepareBatch(context.Background(), "INSERT INTO tasks")
+	if err != nil {
+		return err
+	}
+
+	err = batch.Append(
+		metric.Timestamp,
+		metric.Service,
+		metric.Queue,
+		metric.Success,
+		metric.ExecutionTimeMs,
+	)
+	if err != nil {
+		return err
+	}
+
+	return batch.Send()
+}

main.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"log"
 	endpoint "monitoring/app/routers/metrics"
+	task "monitoring/app/routers/metrics"
 	client "monitoring/app/storage/clickhouse"
 	"net/http"
 	"time"
@@ -41,6 +42,7 @@ func main() {
 	}
 
 	http.HandleFunc("/api/v1/metrics/endpoint", handlerWrapper(endpoint.AddEndpointMetric))
+	http.HandleFunc("/api/v1/metrics/task", handlerWrapper(task.AddTaskMetric))
 	log.Printf("Server started")
 	http.ListenAndServe(":1237", nil)
 }