github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

fix: improve error handling and logging for metrics ingestion and secret key verification

Browse Source
This commit is contained in:
Simon Larsen
2025-01-03 09:47:35 +00:00
parent 8247f504c4
commit 5756623f45
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
InfrastructureAgent/agent.go
View File

@@ -1,15 +1,18 @@
package main
import (
"bytes"
"encoding/json"
"io"
"log/slog"
"net/http"
"oneuptime-infrastructure-agent/model"
"oneuptime-infrastructure-agent/utils"
"os"
"strconv"
"time"
"github.com/go-co-op/gocron/v2"
"github.com/gookit/greq"
)
type Agent struct {
@@ -118,17 +121,33 @@ func collectMetricsJob(secretKey string, oneuptimeURL string) {
}{
ServerMonitorResponse: metricsReport,
}
postBuilder := greq.New(oneuptimeURL).Post("/server-monitor/response/ingest/" + secretKey).
JSONType().JSONBody(reqData)
resp, err := postBuilder.Do()
reqBody, err := json.Marshal(reqData)
if err != nil {
slog.Error(err.Error())
slog.Error("Failed to marshal request data: ", err)
return
}
if resp.IsFail() {
req, err := http.NewRequest(http.MethodPost, oneuptimeURL+"/server-monitor/response/ingest/"+secretKey, bytes.NewBuffer(reqBody))
if err != nil {
slog.Error("Failed to create request: ", err)
return
}
req.Header.Set("Content-Type", "application/json")
client := &http.Client{}
resp, err := client.Do(req)
if err != nil {
slog.Error("Failed to send request: ", err)
return
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
slog.Error("Failed to ingest metrics with status code ", resp.StatusCode)
respJson, _ := json.Marshal(resp)
slog.Error("Response: ", string(respJson))
respBody, _ := io.ReadAll(resp.Body)
slog.Error("Response: ", string(respBody))
}
slog.Info("1 minute metrics have been sent to OneUptime.")
}
@@ -137,13 +156,13 @@ func checkIfSecretKeyIsValid(secretKey string, baseUrl string) bool {
slog.Error("Secret key is empty")
return false
}
resp, err := greq.New(baseUrl).JSONType().GetDo("/server-monitor/secret-key/verify/" + secretKey)
resp, err := http.NewRequest(http.MethodGet, baseUrl+"/server-monitor/secret-key/verify/"+secretKey, nil)
if err != nil {
slog.Error(err.Error())
return false
}
if resp.StatusCode != 200 {
slog.Error("Secret key verification failed with status code ", resp.StatusCode)
if resp.Response.StatusCode != 200 {
slog.Error("Secret key verification failed with status code " + strconv.Itoa(resp.Response.StatusCode))
return false
}
return true